diff --git a/build.xml b/build.xml
index a7554655064..4c94d10e381 100644
--- a/build.xml
+++ b/build.xml
@@ -84,7 +84,7 @@
   </target>
 
   <!-- Clean: cleans compiled files and other temporary artifacts. -->
-  <target name="clean" depends="contrib-clean"
+  <target name="clean" depends="clean-contrib"
           description="Cleans compiled files and other temporary artifacts.">
     <delete dir="${dest}" />
     <delete dir="${dist}" />
@@ -200,7 +200,7 @@
     </sequential>
   </target>
 
-  <target name="javadoc-contrib" description="Generate javadoc for contrib classes" depends="contrib-build">
+  <target name="javadoc-contrib" description="Generate javadoc for contrib classes" depends="build-contrib">
     <contrib-crawl target="javadoc"
                    failonerror="true"/>
   </target>
@@ -412,7 +412,7 @@
   <!-- Run contrib unit tests. -->
   <target name="test"
         description="Runs the core unit tests."
-        depends="core-test, contrib-test" />
+        depends="core-test, test-contrib" />
   
   <target name="junit" depends="compileTests">
     <!-- no description so it doesn't show up in -projecthelp -->  
diff --git a/common-build.xml b/common-build.xml
index 38e5edfdbf4..54abbe21054 100644
--- a/common-build.xml
+++ b/common-build.xml
@@ -191,17 +191,17 @@
    </sequential>
   </macrodef>
 	
-  <target name="contrib-clean"
+  <target name="clean-contrib"
 	          description="Cleans all contrib modules and their tests">
 	<contrib-crawl target="clean"/>
   </target>
 	
-  <target name="contrib-build"
+  <target name="build-contrib"
           description="Builds all contrib modules and their tests">
     <contrib-crawl target="build"/>
   </target>
 
-  <target name="contrib-test" depends="contrib-build">
+  <target name="test-contrib" depends="build-contrib">
     <contrib-crawl target="test" failonerror="true"/>
   </target>