diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocJarMojo.java
similarity index 96%
rename from src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocJar.java
rename to src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocJarMojo.java
index f8cad3ba9..5680c8a43 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocJar.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocJarMojo.java
@@ -38,7 +38,7 @@
         aggregator = true,
         requiresDependencyResolution = ResolutionScope.COMPILE)
 @Execute(phase = LifecyclePhase.COMPILE)
-public class AggregatorJavadocJar extends JavadocJar {
+public class AggregatorJavadocJarMojo extends JavadocJarMojo {
     @Override
     protected boolean isAggregator() {
         return true;
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJarMojo.java
similarity index 96%
rename from src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJar.java
rename to src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJarMojo.java
index d2686cb23..dba34342d 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJar.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJarMojo.java
@@ -38,7 +38,7 @@
         aggregator = true,
         requiresDependencyResolution = ResolutionScope.TEST)
 @Execute(phase = LifecyclePhase.TEST_COMPILE)
-public class AggregatorTestJavadocJar extends TestJavadocJar {
+public class AggregatorTestJavadocJarMojo extends TestJavadocJarMojo {
     @Override
     protected boolean isAggregator() {
         return true;
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java
rename to src/main/java/org/apache/maven/plugins/javadoc/JavadocJarMojo.java
index e295edd24..c10f85c99 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJarMojo.java
@@ -53,7 +53,7 @@
         defaultPhase = LifecyclePhase.PACKAGE,
         requiresDependencyResolution = ResolutionScope.COMPILE,
         threadSafe = true)
-public class JavadocJar extends AbstractJavadocMojo {
+public class JavadocJarMojo extends AbstractJavadocMojo {
     /**
      * Includes all generated Javadoc files
      */
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
rename to src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java
index 3da918223..54f3d5977 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java
@@ -47,7 +47,7 @@
         defaultPhase = LifecyclePhase.PACKAGE,
         requiresDependencyResolution = ResolutionScope.TEST,
         threadSafe = true)
-public class TestJavadocJar extends JavadocJar {
+public class TestJavadocJarMojo extends JavadocJarMojo {
     // ----------------------------------------------------------------------
     // Javadoc Options (should be inline with Javadoc options defined in TestJavadocReport)
     // ----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.java
index 7bdab3e1a..64a66e15e 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.java
@@ -26,7 +26,7 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
 /**
- * Bundle {@link TestJavadocJar#testJavadocDirectory}, along with javadoc configuration options from
+ * Bundle {@link TestJavadocJarMojo#testJavadocDirectory}, along with javadoc configuration options from
  * {@link AbstractJavadocMojo} such as taglet, doclet, and link information into a deployable
  * artifact. This artifact can then be consumed by the javadoc plugin mojos when used by the
  * <code>includeDependencySources</code> option, to generate javadocs that are somewhat consistent
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarMojoTest.java
similarity index 96%
rename from src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
rename to src/test/java/org/apache/maven/plugins/javadoc/JavadocJarMojoTest.java
index 49719af3a..785f58f16 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarMojoTest.java
@@ -44,10 +44,10 @@
 /**
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  */
-public class JavadocJarTest extends AbstractMojoTestCase {
+public class JavadocJarMojoTest extends AbstractMojoTestCase {
 
-    private JavadocJar lookupMojo(File testPom) throws Exception {
-        JavadocJar mojo = (JavadocJar) lookupMojo("jar", testPom);
+    private JavadocJarMojo lookupMojo(File testPom) throws Exception {
+        JavadocJarMojo mojo = (JavadocJarMojo) lookupMojo("jar", testPom);
 
         Plugin p = new Plugin();
         p.setGroupId("org.apache.maven.plugins");
@@ -78,7 +78,7 @@ private JavadocJar lookupMojo(File testPom) throws Exception {
     public void testDefaultConfig() throws Exception {
         File testPom = new File(
                 getBasedir(), "src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml");
-        JavadocJar mojo = lookupMojo(testPom);
+        JavadocJarMojo mojo = lookupMojo(testPom);
         mojo.execute();
 
         // check if the javadoc jar file was generated
@@ -144,7 +144,7 @@ public void testInvalidDestdir() throws Exception {
         File testPom = new File(
                 getBasedir(),
                 "src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml");
-        JavadocJar mojo = lookupMojo(testPom);
+        JavadocJarMojo mojo = lookupMojo(testPom);
         mojo.execute();
 
         // check if the javadoc jar file was generated
@@ -158,7 +158,7 @@ public void testContinueIfFailOnErrorIsFalse() throws Exception {
         File testPom = new File(
                 getBasedir(),
                 "src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml");
-        JavadocJar mojo = lookupMojo(testPom);
+        JavadocJarMojo mojo = lookupMojo(testPom);
         mojo.execute();
 
         // check if the javadoc jar file was generated
@@ -170,7 +170,7 @@ public void testContinueIfFailOnErrorIsFalse() throws Exception {
     public void testIncludeMavenDescriptorWhenExplicitlyConfigured() throws Exception {
         File testPom = new File(
                 getBasedir(), "src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml");
-        JavadocJar mojo = lookupMojo(testPom);
+        JavadocJarMojo mojo = lookupMojo(testPom);
         mojo.execute();
 
         // check if the javadoc jar file was generated
@@ -200,7 +200,7 @@ public void testIncludeMavenDescriptorWhenExplicitlyConfigured() throws Exceptio
 
     public void testStale() throws Exception {
         File testPom = new File(getBasedir(), "src/test/resources/unit/stale-test/stale-test-plugin-config.xml");
-        JavadocJar mojo = lookupMojo(testPom);
+        JavadocJarMojo mojo = lookupMojo(testPom);
         BufferingLog log = new BufferingLog();
         mojo.setLog(log);