diff --git a/maven-core-it/it0011/src/main/java/org/apache/maven/it0011/PersonFinder.java b/maven-core-it/it0011/src/main/java/org/apache/maven/it0011/PersonFinder.java
index 9b7de5dd37..e932e55733 100644
--- a/maven-core-it/it0011/src/main/java/org/apache/maven/it0011/PersonFinder.java
+++ b/maven-core-it/it0011/src/main/java/org/apache/maven/it0011/PersonFinder.java
@@ -2,5 +2,5 @@ package org.apache.maven.it0011;
 
 public class PersonFinder
 {
-    org.apache.maven.plugin.Plugin plugin;
+    org.apache.maven.plugin.Mojo mojo;
 }
diff --git a/maven-core-it/it0012/src/main/java/org/apache/maven/it0012/PersonFinder.java b/maven-core-it/it0012/src/main/java/org/apache/maven/it0012/PersonFinder.java
index 4532ad93d2..bd80092320 100644
--- a/maven-core-it/it0012/src/main/java/org/apache/maven/it0012/PersonFinder.java
+++ b/maven-core-it/it0012/src/main/java/org/apache/maven/it0012/PersonFinder.java
@@ -2,5 +2,5 @@ package org.apache.maven.it0012;
 
 public class PersonFinder
 {
-    private org.apache.maven.plugin.Plugin plugin;
+    private org.apache.maven.plugin.Mojo mojo;
 }
diff --git a/maven-core-it/it0013/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java b/maven-core-it/it0013/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
index 95ef00b7e3..75aa1088bb 100644
--- a/maven-core-it/it0013/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
+++ b/maven-core-it/it0013/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
@@ -16,9 +16,9 @@ package org.apache.maven.plugin.coreit;
  * limitations under the License.
  */
 
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionRequest;
-import org.apache.maven.plugin.PluginExecutionResponse;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionRequest;
+import org.apache.maven.plugin.MojoExecutionResponse;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -37,11 +37,11 @@ import java.io.FileWriter;
  *  description=""
  */
 public class CoreIt0013Mojo
-    extends AbstractPlugin
+    extends AbstractMojo
 {
     private static final int DELETE_RETRY_SLEEP_MILLIS = 10;
 
-    public void execute( PluginExecutionRequest request, PluginExecutionResponse response )
+    public void execute( MojoExecutionRequest request, MojoExecutionResponse response )
         throws Exception
     {
         String outputDirectory = (String) request.getParameter( "outputDirectory" );