diff --git a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
index d56a40fd1a..d2c288668d 100644
--- a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
+++ b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * @goal compile
  *
- * @requiresDependencyResolution
+ * @requiresDependencyResolutionXX
  *
  * @description Compiles application sources
  *
diff --git a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
index d713c60346..4ab62bc140 100644
--- a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
+++ b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
@@ -9,7 +9,7 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * @goal test:compile
+ * @goal testCompile
  *
  * @description Compiles test sources
  *
diff --git a/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java b/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
index d8996ba4d5..9204b8d02a 100644
--- a/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
+++ b/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
@@ -13,21 +13,21 @@ import org.apache.maven.plugin.generator.jelly.JellyHarnessGenerator;
  *  required="true"
  *  validator=""
  *  expression="#project.build.sourceDirectory"
- *  description=""
+ *  description="x"
  * @parameter
  *  name="outputDirectory"
  *  type="String"
  *  required="true" 
  *  validator=""
  *  expression="#project.build.output
- *  description=""
+ *  description="x"
  * @parameter
  *  name="pom"
  *  type="String"
  *  required="true"
  *  validator=""
  *  expression="#project.getFile().getPath()"
- *  description=""
+ *  description="x"
  *
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
diff --git a/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java b/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
index c28245033a..cf903ab513 100644
--- a/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
+++ b/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * @goal test:resources
+ * @goal testResources
  *
  * @description copy test resources
  *
diff --git a/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java b/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
index 55beffbbab..62645ee4f3 100644
--- a/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
+++ b/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
@@ -14,9 +14,9 @@ import java.util.List;
  * @description Run tests using surefire
  *
  * @prereq compiler:compile
- * @prereq compiler:test:compile
+ * @prereq compiler:testCompile
  * @prereq resources:resources
- * @prereq resources:test:resources
+ * @prereq resources:testResources
  *
  * @parameter
  *  name="mavenRepoLocal"