diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 7b8d6b6b..0fedef58 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -39,7 +39,7 @@
     <define:tag name="deregisterReport">
       <!-- @name : Report to deregister, must be same as name used to register -->
       
-      <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
+      <maven:get var="reports" plugin="maven-xdoc-plugin" property="reports" />
       
       <j:set var="removeRpt" value="null"/>
       <j:forEach var="rpt" items="${reports}">
@@ -60,7 +60,7 @@
       @link the nav-bar link for this report
       @target the target for the new page (_self, _blank, ...) 
       -->
-      <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
+      <maven:get var="reports" plugin="maven-xdoc-plugin" property="reports" />
 
       <!-- check if the given name is in the list already -->      
       <j:set var="add" value="true"/>
@@ -340,8 +340,8 @@
       <j:new var="dirMapper" className="org.apache.maven.util.CaseInsensitiveGlobPatternMapper"/>
       <j:setProperties object="${dirMapper}" from="${fromDirPattern}" to="${toDirPattern}"/>
 
-      <maven:pluginVar var="maven_xdoc_xml_copy_pattern" 
-        plugin='maven-xdoc-plugin' property='maven.xdoc.xml.copy' />
+      <maven:get var="maven_xdoc_xml_copy_pattern" 
+        plugin="maven-xdoc-plugin" property="maven.xdoc.xml.copy" />
 
       <!-- Set the current locale as default -->
       <j:if test="${currentLocale.equals(defaultLocale)}">
@@ -422,7 +422,7 @@
           <util:file var="docsSrcFile" name="${maven.docs.src}"/>
     
           <!-- parse the project nav. Someone jellier than me can remove the temp file requirement -->
-          <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
+          <maven:get var="reports" plugin="maven-xdoc-plugin" property="reports" />
     
           <util:file var="tempnav" name="${maven.build.dir}/project-nav.xml"/>
         
@@ -512,29 +512,29 @@
   
       <maven:param-check value="${srcdir}" fail="true" message="'srcdir' must be specified"/>
 
-      <maven:pluginVar var="maven.xdoc.jsl" 
-        plugin='maven-xdoc-plugin' property='maven.xdoc.jsl' />
+      <maven:get var="maven.xdoc.jsl" 
+        plugin="maven-xdoc-plugin" property="maven.xdoc.jsl" />
       
       <!-- copy old value for restoring it later -->
       <j:set var="previous.plugin.resources" value="${plugin.resources}" />
 
-      <maven:pluginVar var="plugin.resources" 
-        plugin='maven-xdoc-plugin' property='plugin.resources' />
+      <maven:get var="plugin.resources" 
+        plugin="maven-xdoc-plugin" property="plugin.resources" />
         
-      <maven:pluginVar var="includeProjectDocumentation" 
-        plugin='maven-xdoc-plugin' property='maven.xdoc.includeProjectDocumentation' />
+      <maven:get var="includeProjectDocumentation" 
+        plugin="maven-xdoc-plugin" property="maven.xdoc.includeProjectDocumentation" />
         
-      <maven:pluginVar var="maven.xdoc.poweredby.image" 
-        plugin='maven-xdoc-plugin' property='maven.xdoc.poweredby.image' />
+      <maven:get var="maven.xdoc.poweredby.image" 
+        plugin="maven-xdoc-plugin" property="maven.xdoc.poweredby.image" />
         
-      <maven:pluginVar var="maven.xdoc.poweredby.title" 
-        plugin='maven-xdoc-plugin' property='maven.xdoc.poweredby.title' />
+      <maven:get var="maven.xdoc.poweredby.title" 
+        plugin="maven-xdoc-plugin" property="maven.xdoc.poweredby.title" />
         
-      <maven:pluginVar var="maven.xdoc.poweredby.url" 
-        plugin='maven-xdoc-plugin' property='maven.xdoc.poweredby.url' />
+      <maven:get var="maven.xdoc.poweredby.url" 
+        plugin="maven-xdoc-plugin" property="maven.xdoc.poweredby.url" />
         
-      <maven:pluginVar var="maven.xdoc.crumb.separator" 
-        plugin='maven-xdoc-plugin' property='maven.xdoc.crumb.separator' />
+      <maven:get var="maven.xdoc.crumb.separator" 
+        plugin="maven-xdoc-plugin" property="maven.xdoc.crumb.separator" />
       
       <j:set var="outputDirectory" value="${maven.gen.docs}" />
       <j:set var="stylesheet" value="file:${plugin.resources}/site.jsl" />
@@ -671,7 +671,7 @@
     
     <!-- All the templates use $project for now. -->
     <j:set var="project" value="${pom}"/>
-    <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
+    <maven:get var="reports" plugin="maven-xdoc-plugin" property="reports" />
 
     <!-- Does the user want the maven-generated docs on their site? -->
     <j:set 
@@ -1095,7 +1095,7 @@
         <copy file="${themefile}" todir="${maven.docs.dest}/style/" overwrite="true" />
     </j:if>
 
-    <maven:pluginVar var="maven_xdoc_xml_copy_pattern" 
+    <maven:get var="maven_xdoc_xml_copy_pattern" 
       plugin="maven-xdoc-plugin" property="maven.xdoc.xml.copy" />
     
     <j:if test="${maven_xdoc_xml_copy_pattern!=null and !maven_xdoc_xml_copy_pattern.equals('')}">
@@ -1225,7 +1225,7 @@
   <goal name="xdoc:performJSL"
     description="Allows the LinkCheck plugin to xdoc a single directory">
 
-    <maven:pluginVar var="maven.xdoc.src" plugin="maven-linkcheck-plugin" property="maven.xdoc.src" />
+    <maven:get var="maven.xdoc.src" plugin="maven-linkcheck-plugin" property="maven.xdoc.src" />
     <doc:performJSL 
       srcdir="${maven.xdoc.src}" 
       destdir="${maven.docs.dest}"/>
@@ -1233,7 +1233,7 @@
   
   <goal name="xdoc:dump-report-settings">
     <echo>Dumping report settings</echo>
-    <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
+    <maven:get var="reports" plugin="maven-xdoc-plugin" property="reports" />
        
     <j:forEach var="report" items="${reports}">
       <echo>Report: ${report}</echo>