diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
index e75c952999..30854b4d61 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
@@ -51,7 +51,7 @@ public class MavenITmng4148DepPomInterpWithSettingsProfilesTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         
         verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.it.mng4148" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng4148" );
         
         verifier.setAutoclean( false );
         
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index 1f1badd121..19d56843b2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -34,7 +34,7 @@ public class MavenITmng4238ArtifactHandlerExtensionUsageTest
     extends AbstractMavenIntegrationTestCase
 {
 
-    private static final String GID = "org.apache.maven.it.mng4238";
+    private static final String GID = "org.apache.maven.its.mng4238";
     private static final String AID = "mng-4238";
     private static final String VERSION = "1";
     private static final String TYPE = "jar";
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
index fe7d09cf69..8677556e8d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
@@ -51,7 +51,7 @@ public class MavenITmng4347ImportScopeWithSettingsProfilesTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         
         verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.it.mng4347" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng4347" );
         
         verifier.setAutoclean( false );
         
diff --git a/its/core-it-suite/src/test/resources/mng-3203/pom.xml b/its/core-it-suite/src/test/resources/mng-3203/pom.xml
index 0f83199c48..f09fbc3caa 100644
--- a/its/core-it-suite/src/test/resources/mng-3203/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3203/pom.xml
@@ -1,7 +1,7 @@
 <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>
-  <groupId>org.apache.maven.it.mng3203</groupId>
+  <groupId>org.apache.maven.its.mng3203</groupId>
   <artifactId>mng-3203</artifactId>
   <packaging>jar</packaging>
   <version>1</version>
diff --git a/its/core-it-suite/src/test/resources/mng-4148/pom.xml b/its/core-it-suite/src/test/resources/mng-4148/pom.xml
index e9be8b4541..4d175997f3 100644
--- a/its/core-it-suite/src/test/resources/mng-4148/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4148/pom.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<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>
-  <groupId>org.apache.maven.it.mng4148</groupId>
-  <artifactId>mng-4148</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  
-	<dependencies>
-		<dependency>
-        <groupId>org.apache.maven.it.mng4148</groupId>
-        <artifactId>module</artifactId>
-        <version>1.0.0</version>
-		</dependency>
-	</dependencies>	
-	
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+  <groupId>org.apache.maven.its.mng4148</groupId>
+  <artifactId>mng-4148</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.maven.its.mng4148</groupId>
+        <artifactId>module</artifactId>
+        <version>1.0.0</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar
rename to its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.jar
diff --git a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.pom
similarity index 83%
rename from its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom
rename to its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.pom
index 0d712311fd..030717d186 100644
--- a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom
+++ b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.pom
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<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>
-  <groupId>org.apache.maven.it.mng4148</groupId>
-  <artifactId>dep</artifactId>
-  <version>1.0.0</version>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+  <groupId>org.apache.maven.its.mng4148</groupId>
+  <artifactId>dep</artifactId>
+  <version>1.0.0</version>
+</project>
diff --git a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar
rename to its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.jar
diff --git a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom
similarity index 76%
rename from its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom
rename to its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom
index b0b9575273..a03fc9af74 100644
--- a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom
+++ b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<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>
-  <groupId>org.apache.maven.it.mng4148</groupId>
-  <artifactId>module</artifactId>
-  <version>1.0.0</version>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven.it.mng4148</groupId>
-			<artifactId>dep</artifactId>
-			<version>${depVersion}</version>
-		</dependency>
-	</dependencies>	
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+  <groupId>org.apache.maven.its.mng4148</groupId>
+  <artifactId>module</artifactId>
+  <version>1.0.0</version>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven.its.mng4148</groupId>
+			<artifactId>dep</artifactId>
+			<version>${depVersion}</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/parent/1.0.0/parent-1.0.0.pom
similarity index 84%
rename from its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom
rename to its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/parent/1.0.0/parent-1.0.0.pom
index 549b9b2e12..564ed1b5c1 100644
--- a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom
+++ b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/parent/1.0.0/parent-1.0.0.pom
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<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>
-  <groupId>org.apache.maven.it.mng4148</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0.0</version>
-  <packaging>pom</packaging>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+  <groupId>org.apache.maven.its.mng4148</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0.0</version>
+  <packaging>pom</packaging>
+</project>
diff --git a/its/core-it-suite/src/test/resources/mng-4238/pom.xml b/its/core-it-suite/src/test/resources/mng-4238/pom.xml
index 240f74e628..e7818faf8f 100644
--- a/its/core-it-suite/src/test/resources/mng-4238/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4238/pom.xml
@@ -1,7 +1,7 @@
 <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>
-  <groupId>org.apache.maven.it.mng4238</groupId>
+  <groupId>org.apache.maven.its.mng4238</groupId>
   <artifactId>mng-4238</artifactId>
   <version>1</version>
   
diff --git a/its/core-it-suite/src/test/resources/mng-4347/pom.xml b/its/core-it-suite/src/test/resources/mng-4347/pom.xml
index c1b04e7cbd..0fcb49ed43 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4347/pom.xml
@@ -22,14 +22,14 @@ under the License.
 <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>
-  <groupId>org.apache.maven.it.mng4347</groupId>
+  <groupId>org.apache.maven.its.mng4347</groupId>
   <artifactId>consumer</artifactId>
   <packaging>jar</packaging>
   <version>1</version>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.it.mng4347</groupId>
+      <groupId>org.apache.maven.its.mng4347</groupId>
       <artifactId>dep-with-import</artifactId>
       <version>1</version>
     </dependency>
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.jar b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.jar
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.jar
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.pom b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
similarity index 90%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.pom
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
index 130e0ccf5d..6036cf677a 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
@@ -22,7 +22,7 @@ under the License.
 <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>
-  <groupId>org.apache.maven.it.mng4347</groupId>
+  <groupId>org.apache.maven.its.mng4347</groupId>
   <artifactId>dep-with-import</artifactId>
   <packaging>jar</packaging>
   <version>1</version>
@@ -30,7 +30,7 @@ under the License.
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.maven.it.mng4347</groupId>
+        <groupId>org.apache.maven.its.mng4347</groupId>
         <artifactId>import-dep</artifactId>
         <version>1-SNAPSHOT</version>
         <type>pom</type>
@@ -41,7 +41,7 @@ under the License.
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.it.mng4347</groupId>
+      <groupId>org.apache.maven.its.mng4347</groupId>
       <artifactId>managed-dep</artifactId>
     </dependency>
   </dependencies>
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/maven-metadata.xml
similarity index 95%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/maven-metadata.xml
index add76c2ba0..b0b3c24aec 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata.xml
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/maven-metadata.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <metadata>
-  <groupId>org.apache.maven.it.mng4347</groupId>
+  <groupId>org.apache.maven.its.mng4347</groupId>
   <artifactId>dep-with-import</artifactId>
   <version>1</version>
   <versioning>
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
similarity index 88%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
index 107ca049f7..0b2f82c337 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
@@ -1,7 +1,7 @@
 <?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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.it.mng4347</groupId>
+  <groupId>org.apache.maven.its.mng4347</groupId>
   <artifactId>import-dep</artifactId>
   <version>1-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -16,7 +16,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.maven.it.mng4347</groupId>
+        <groupId>org.apache.maven.its.mng4347</groupId>
         <artifactId>managed-dep</artifactId>
         <version>2</version>
       </dependency>
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
similarity index 86%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
index 2110850deb..c1f0a9bfa5 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <groupId>org.apache.maven.it.mng4347</groupId>
+  <groupId>org.apache.maven.its.mng4347</groupId>
   <artifactId>import-dep</artifactId>
   <version>1-SNAPSHOT</version>
   <versioning>
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.jar b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.jar
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.jar
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.pom b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.pom
similarity index 95%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.pom
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.pom
index f6f8c31ce7..2b75ce5b0d 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.pom
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.pom
@@ -22,7 +22,7 @@ under the License.
 <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>
-  <groupId>org.apache.maven.it.mng4347</groupId>
+  <groupId>org.apache.maven.its.mng4347</groupId>
   <artifactId>managed-dep</artifactId>
   <packaging>jar</packaging>
   <version>2</version>
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/maven-metadata.xml
similarity index 95%
rename from its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/maven-metadata.xml
index 693091fd81..9ebc1a0f0f 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata.xml
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/maven-metadata.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <metadata>
-  <groupId>org.apache.maven.it.mng4347</groupId>
+  <groupId>org.apache.maven.its.mng4347</groupId>
   <artifactId>managed-dep</artifactId>
   <version>2</version>
   <versioning>