diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly
index 8ceff652..4422b974 100644
--- a/eclipse/plugin.jelly
+++ b/eclipse/plugin.jelly
@@ -194,7 +194,8 @@
       <externaltools>
         <j:set var="project" value="${org.apache.commons.jelly.werkz.Project}"/>
 
-        <j:forEach var="goal" items="${project.goals}">
+        <j:set var="session" value="${maven.session}"/>
+        <j:forEach var="goal" items="${session.allGoalNames}">
 
           <j:set var="maven.eclipse.generate" value="false"/>
           <j:set var="allGoals" value="${maven.eclipse.goals}" />
@@ -203,7 +204,7 @@
               <j:set var="maven.eclipse.generate" value="true"/>
             </j:when>
             <j:otherwise>
-              <j:if test="${goal.name.indexOf(':') == '-1'}">
+              <j:if test="${goal.indexOf(':') == '-1'}">
                 <j:set var="maven.eclipse.generate" value="true"/>
               </j:if>
             </j:otherwise>
@@ -214,12 +215,12 @@
               <entry key="!{tool_refresh}">$${project}</entry>
               <entry key="!{tool_show_log}">true</entry>
               <entry key="!{tool_loc}">${tool.loc}</entry>
-              <entry key="!{tool_args}">-e -p $${resource_loc} ${goal.name}</entry>
+              <entry key="!{tool_args}">-e -p $${resource_loc} ${goal}</entry>
               <entry key="!{tool_block}">false</entry>
               <entry key="!{tool_type}">org.eclipse.ui.externaltools.type.program</entry>
               <entry key="!{tool_dir}">$${container_loc}</entry>
               <entry key="!{tool_build_types}"></entry>
-              <entry key="!{tool_name}">Maven ${goal.name}</entry>
+              <entry key="!{tool_name}">Maven ${goal}</entry>
             </tool>
           </j:if>
         </j:forEach>