diff --git a/its/.gitignore b/its/.gitignore
index f5404665c7..93298bd530 100644
--- a/its/.gitignore
+++ b/its/.gitignore
@@ -7,3 +7,4 @@ bin
 *.ipr
 *.iml
 *.iws
+.DS_Store
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
index 013fb9da1b..fe7231c08f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
@@ -52,7 +52,7 @@ public class MavenITmng3498ForkToOtherMojoTest
         File projectDir = new File( testDir, "mng-3498-project" );
 
         Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
-        verifier.deleteArtifact( "org.apache.maven.its.mng3498", "maven-mng3498-plugin", "1", "pom" );
+        verifier.deleteArtifact( "org.apache.maven.its.mng3498", "mavenit-mng3498-plugin", "1", "pom" );
 
         verifier.executeGoal( "install" );
 
diff --git a/its/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
index a55c31b464..c08508e15f 100644
--- a/its/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
@@ -22,7 +22,7 @@ under the License.
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3498</groupId>
-  <artifactId>maven-mng3498-plugin</artifactId>
+  <artifactId>mavenit-mng3498-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   <name>maven-mng3498-plugin Maven Mojo</name>
diff --git a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
index b590013306..9fe7eed76c 100644
--- a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3684</groupId>
-  <artifactId>maven-mng3684-plugin</artifactId>
+  <artifactId>mavenit-mng3684-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   <name>maven-mng3684-plugin Maven Mojo</name>
diff --git a/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml
index b45cdc1ea4..06aba49fa3 100644
--- a/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml
@@ -10,7 +10,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3684</groupId>
-        <artifactId>maven-mng3684-plugin</artifactId>
+        <artifactId>mavenit-mng3684-plugin</artifactId>
         <version>1</version>
         <executions>
           <execution>
@@ -30,7 +30,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3684</groupId>
-        <artifactId>maven-mng3684-plugin</artifactId>
+        <artifactId>mavenit-mng3684-plugin</artifactId>
         <version>1</version>
       </plugin>
     </plugins>
diff --git a/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
index 6a87751414..fc6b363f83 100644
--- a/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3693</groupId>
-  <artifactId>maven-mng3693-plugin</artifactId>
+  <artifactId>mavenit-mng3693-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   <name>maven-mng3693-plugin Maven Mojo</name>
diff --git a/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml b/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml
index 4d3d74bf18..311efa9e29 100644
--- a/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml
@@ -13,7 +13,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3693</groupId>
-        <artifactId>maven-mng3693-plugin</artifactId>
+        <artifactId>mavenit-mng3693-plugin</artifactId>
         <version>1</version>
         
         <executions>
diff --git a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
index e6eb83c0ff..1919320af2 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3694</groupId>
-  <artifactId>maven-mng3694-plugin</artifactId>
+  <artifactId>mavenit-mng3694-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   <name>maven-mng3694-plugin Maven Mojo</name>
diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml
index ec70207527..ae306c6144 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml
@@ -19,7 +19,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3694</groupId>
-        <artifactId>maven-mng3694-plugin</artifactId>
+        <artifactId>mavenit-mng3694-plugin</artifactId>
         <version>1</version>
         <executions>
           <execution>
diff --git a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
index 8a3642f68e..2f42e3be27 100644
--- a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
@@ -2,7 +2,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3703</groupId>
-  <artifactId>maven-mng3703-plugin</artifactId>
+  <artifactId>mavenit-mng3703-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>maven-mng3703-plugin Maven Mojo</name>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml
index 796da4ee32..04424a531e 100644
--- a/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml
@@ -18,7 +18,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3703</groupId>
-        <artifactId>maven-mng3703-plugin</artifactId>
+        <artifactId>mavenit-mng3703-plugin</artifactId>
         <version>1</version>
         <executions>
           <execution>
@@ -37,7 +37,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3703</groupId>
-        <artifactId>maven-mng3703-plugin</artifactId>
+        <artifactId>mavenit-mng3703-plugin</artifactId>
         <version>1</version>
         <reportSets>
           <reportSet>
diff --git a/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
index c84744da56..407f299375 100644
--- a/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3710</groupId>
-  <artifactId>maven-mng3710-directInvoke-plugin</artifactId>
+  <artifactId>mavenit-mng3710-directInvoke-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
 
diff --git a/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
index 12c7a244db..d4cafa12af 100644
--- a/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3710</groupId>
-  <artifactId>maven-mng3710-originalModel-plugin</artifactId>
+  <artifactId>mavenit-mng3710-originalModel-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
 
diff --git a/its/core-it-suite/src/test/resources/mng-3710/original-model/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/original-model/project/pom.xml
index fd6fa78913..78a87f9fd7 100644
--- a/its/core-it-suite/src/test/resources/mng-3710/original-model/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3710/original-model/project/pom.xml
@@ -11,7 +11,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3710</groupId>
-        <artifactId>maven-mng3710-originalModel-plugin</artifactId>
+        <artifactId>mavenit-mng3710-originalModel-plugin</artifactId>
         <version>1</version>
         
         <executions>
diff --git a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
index da376bf457..96d878ab80 100644
--- a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3710</groupId>
-  <artifactId>maven-mng3710-pomInheritance-plugin</artifactId>
+  <artifactId>mavenit-mng3710-pomInheritance-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
 
diff --git a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/child/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/child/pom.xml
index 38d4dbb7b3..642e3a1e5c 100644
--- a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/child/pom.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-        <artifactId>middle</artifactId>
-        <groupId>org.apache.maven.its.mng3710</groupId>
-        <version>1</version>
-    </parent>
+    <artifactId>middle</artifactId>
+    <groupId>org.apache.maven.its.mng3710</groupId>
+    <version>1</version>
+  </parent>
   <groupId>org.apache.maven.its.mng3710</groupId>
   <artifactId>child</artifactId>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml
index 0ad1686f48..3e7926ab00 100644
--- a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml
@@ -19,7 +19,7 @@
       <plugins>
         <plugin>
           <groupId>org.apache.maven.its.mng3710</groupId>
-          <artifactId>maven-mng3710-pomInheritance-plugin</artifactId>
+          <artifactId>mavenit-mng3710-pomInheritance-plugin</artifactId>
           
           <executions>
             <execution>
diff --git a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/pom.xml
index c1938eee15..78fb70e1ac 100644
--- a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/pom.xml
@@ -14,7 +14,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3710</groupId>
-        <artifactId>maven-mng3710-pomInheritance-plugin</artifactId>
+        <artifactId>mavenit-mng3710-pomInheritance-plugin</artifactId>
         <version>1</version>
       </plugin>
     </plugins>
diff --git a/its/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
index 1720a54904..9eaecdc9c2 100644
--- a/its/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3716</groupId>
-  <artifactId>maven-mng3716-plugin</artifactId>
+  <artifactId>mavenit-mng3716-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>maven-mng3716-plugin Maven Mojo</name>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
index d2686d4676..8404582d33 100644
--- a/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3723</groupId>
-  <artifactId>maven-mng3723-plugin</artifactId>
+  <artifactId>mavenit-mng3723-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>maven-mng3723-plugin Maven Mojo</name>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3723/projects/child/pom.xml b/its/core-it-suite/src/test/resources/mng-3723/projects/child/pom.xml
index 453ed2d783..de720f7559 100644
--- a/its/core-it-suite/src/test/resources/mng-3723/projects/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3723/projects/child/pom.xml
@@ -15,7 +15,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3723</groupId>
-        <artifactId>maven-mng3723-plugin</artifactId>
+        <artifactId>mavenit-mng3723-plugin</artifactId>
         <version>1</version>
         <executions>
           <execution>
diff --git a/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
index dd5014706f..d41c102bd8 100644
--- a/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3724</groupId>
-  <artifactId>maven-mng3724-plugin</artifactId>
+  <artifactId>mavenit-mng3724-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>maven-mng3724-plugin Maven Mojo</name>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3724/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3724/project/pom.xml
index b2e2e0b50e..458ef66568 100644
--- a/its/core-it-suite/src/test/resources/mng-3724/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3724/project/pom.xml
@@ -10,7 +10,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3724</groupId>
-        <artifactId>maven-mng3724-plugin</artifactId>
+        <artifactId>mavenit-mng3724-plugin</artifactId>
         <version>1</version>
         <executions>
           <execution>
diff --git a/its/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
index ccd4f1deb0..2d2ce10520 100644
--- a/its/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3729</groupId>
-  <artifactId>maven-mng3729-plugin</artifactId>
+  <artifactId>mavenit-mng3729-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>maven-mng3729-plugin Maven Mojo</name>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3729/projects/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-3729/projects/child1/pom.xml
index 5c25a8d140..d2dc2d6123 100644
--- a/its/core-it-suite/src/test/resources/mng-3729/projects/child1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3729/projects/child1/pom.xml
@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-        <artifactId>projects</artifactId>
-        <groupId>org.apache.maven.its.mng3729</groupId>
-        <version>1</version>
-    </parent>
+    <artifactId>projects</artifactId>
+    <groupId>org.apache.maven.its.mng3729</groupId>
+    <version>1</version>
+  </parent>
   <groupId>org.apache.maven.its.mng3729</groupId>
   <artifactId>child1</artifactId>
   <version>1</version>
@@ -15,7 +15,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3729</groupId>
-        <artifactId>maven-mng3729-plugin</artifactId>
+        <artifactId>mavenit-mng3729-plugin</artifactId>
         <version>1</version>
         <executions>
           <execution>
diff --git a/its/core-it-suite/src/test/resources/mng-3729/projects/pom.xml b/its/core-it-suite/src/test/resources/mng-3729/projects/pom.xml
index 5e45b95b81..56c6df2aea 100644
--- a/its/core-it-suite/src/test/resources/mng-3729/projects/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3729/projects/pom.xml
@@ -13,7 +13,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3729</groupId>
-        <artifactId>maven-mng3729-plugin</artifactId>
+        <artifactId>mavenit-mng3729-plugin</artifactId>
         <version>1</version>
         <executions>
           <execution>
diff --git a/its/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
index fc900a3ba7..cf881b9b25 100644
--- a/its/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
@@ -6,7 +6,7 @@
     <version>1</version>
   </parent>
   <groupId>org.apache.maven.its.mng3740</groupId>
-  <artifactId>maven-mng3740-plugin</artifactId>
+  <artifactId>mavenit-mng3740-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   
diff --git a/its/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
index 300dd6c1a4..671b5eb9ee 100644
--- a/its/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
@@ -6,7 +6,7 @@
     <version>2</version>
   </parent>
   <groupId>org.apache.maven.its.mng3740</groupId>
-  <artifactId>maven-mng3740-plugin</artifactId>
+  <artifactId>mavenit-mng3740-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>2</version>
   
diff --git a/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml
index 843981e06b..55a616bc60 100644
--- a/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml
@@ -6,7 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>maven-mng3743-check-plugin</artifactId>
+  <artifactId>mavenit-mng3743-check-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>maven-mng3743-check-plugin Maven Mojo</name>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml
index 0433e67161..6de740d41f 100644
--- a/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml
@@ -6,7 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>maven-mng3743-report-plugin</artifactId>
+  <artifactId>mavenit-mng3743-report-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>maven-mng3743-report-plugin Maven Mojo</name>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/src/main/resources/META-INF/plexus/components.xml b/its/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/src/main/resources/META-INF/plexus/components.xml
index 11761aea49..b69aaa4556 100644
--- a/its/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/src/main/resources/META-INF/plexus/components.xml
@@ -9,7 +9,7 @@
           <lifecycle>
             <id>default</id>
             <phases>
-              <initialize>org.apache.maven.its.mng3743:maven-mng3743-check-plugin:check</initialize>
+              <initialize>org.apache.maven.its.mng3743:mavenit-mng3743-check-plugin:check</initialize>
             </phases>
           </lifecycle>
         </lifecycles>
diff --git a/its/core-it-suite/src/test/resources/mng-3743/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3743/project/pom.xml
index 8b8791a83a..d934ec62bc 100644
--- a/its/core-it-suite/src/test/resources/mng-3743/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3743/project/pom.xml
@@ -25,7 +25,7 @@
       <plugins>
         <plugin>
           <groupId>org.apache.maven.its.mng3743</groupId>
-          <artifactId>maven-mng3743-check-plugin</artifactId>
+          <artifactId>mavenit-mng3743-check-plugin</artifactId>
           <configuration>
             <skipError>true</skipError>
           </configuration>
@@ -39,7 +39,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3743</groupId>
-        <artifactId>maven-mng3743-report-plugin</artifactId>
+        <artifactId>mavenit-mng3743-report-plugin</artifactId>
         <version>1</version>
       </plugin>
     </plugins>
diff --git a/its/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
index 7dca9f90a6..b10e3d71fd 100644
--- a/its/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.mng3746</groupId>
-  <artifactId>maven-mng3746-plugin</artifactId>
+  <artifactId>mavenit-mng3746-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <name>maven-mng3746-plugin Maven Mojo</name>
+  <name>mavenit-mng3746-plugin Maven Mojo</name>
   <version>1</version>
   <url>http://maven.apache.org</url>
   <dependencies>