diff --git a/cactus/src/plugin-resources/cactus.jsl b/cactus/src/plugin-resources/cactus.jsl
index fd6fecba..d4a31550 100644
--- a/cactus/src/plugin-resources/cactus.jsl
+++ b/cactus/src/plugin-resources/cactus.jsl
@@ -12,12 +12,12 @@
   trim="false">
 
   <!-- This needs to be instantiated here to be available in the template matches -->
-  <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+  <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
   <j:useBean var="numbers" class="java.text.DecimalFormat"/>
   <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
-  <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/>
+  <j:useBean var="formatter" class="org.apache.maven.util.DVSLFormatter"/>
   <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
-  <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+  <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
 
   
   <define:taglib uri="junit">
diff --git a/checkstyle/src/plugin-resources/checkstyle.jsl b/checkstyle/src/plugin-resources/checkstyle.jsl
index a4038dac..d6424a97 100644
--- a/checkstyle/src/plugin-resources/checkstyle.jsl
+++ b/checkstyle/src/plugin-resources/checkstyle.jsl
@@ -10,10 +10,10 @@
   xmlns="dummy" trim="false">
 
   <!-- This needs to be instantiated here to be available in the template matches -->
-  <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+  <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
   <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
   <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
-  <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+  <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
 
   <jsl:template match="checkstyle">
     <document>
diff --git a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
index 478578f7..64b71a9b 100644
--- a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
+++ b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
@@ -7,7 +7,7 @@
   xmlns:x="jelly:xml"
   xmlns="dummy" trim="false">
   <!-- This needs to be instantiated here to be available in the template matches -->
-  <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+  <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
   <jsl:template match="changelog">
     <document>
       <jsl:applyTemplates/>
diff --git a/jdepend/src/plugin-resources/jdepend.jsl b/jdepend/src/plugin-resources/jdepend.jsl
index b27738e5..8a8a04d6 100644
--- a/jdepend/src/plugin-resources/jdepend.jsl
+++ b/jdepend/src/plugin-resources/jdepend.jsl
@@ -12,11 +12,11 @@
   trim="false">
 
   <!-- This needs to be instantiated here to be available in the template matches -->
-  <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+  <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
   <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
   <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
-  <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
-  <j:useBean var="stringTool" class="org.apache.maven.StringTool"/>
+  <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
+  <j:useBean var="stringTool" class="org.apache.maven.util.StringTool"/>
 
   <define:taglib uri="jdepend">
     <define:tag name="nav">
diff --git a/junit-report/src/plugin-resources/junit.jsl b/junit-report/src/plugin-resources/junit.jsl
index 12994198..c75d8174 100644
--- a/junit-report/src/plugin-resources/junit.jsl
+++ b/junit-report/src/plugin-resources/junit.jsl
@@ -12,12 +12,12 @@
   trim="false">
 
   <!-- This needs to be instantiated here to be available in the template matches -->
-  <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+  <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
   <j:useBean var="numbers" class="java.text.DecimalFormat"/>
   <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
-  <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/>
+  <j:useBean var="formatter" class="org.apache.maven.util.DVSLFormatter"/>
   <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
-  <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+  <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
 
   
   <define:taglib uri="junit">
diff --git a/pmd/src/plugin-resources/pmd.jsl b/pmd/src/plugin-resources/pmd.jsl
index 4d525e70..a10393f5 100644
--- a/pmd/src/plugin-resources/pmd.jsl
+++ b/pmd/src/plugin-resources/pmd.jsl
@@ -10,10 +10,10 @@
   xmlns="dummy" trim="false">
 
   <!-- This needs to be instantiated here to be available in the template matches -->
-  <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+  <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
   <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
   <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
-  <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+  <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
 
   <jsl:template match="pmd">
     <document>
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index b8048d4c..a207790d 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -72,7 +72,7 @@
            more of a global tool box.
       -->
       
-      <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/>
+      <j:useBean var="formatter" class="org.apache.maven.util.DVSLFormatter"/>
       ${formatter.formatNumber(string,pattern)}
     </define:tag>
 
@@ -605,7 +605,7 @@
     
 
     <!-- path tool for relative processing -->
-    <j:useBean var="pathTool" class="org.apache.maven.DVSLPathTool"/>
+    <j:useBean var="pathTool" class="org.apache.maven.util.DVSLPathTool"/>
 
     <!-- tool for loading resources from the class loader -->
     <j:useBean class="org.apache.maven.util.ResourceBean" var="resourceTool"/>