diff --git a/README.md b/README.md
index ca3fc96..55d2176 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ TestNG Remote - the modules for running TestNG remotely. This is normally used b
 
 ```xml
 <dependency>
-  <groupId>org.testng.testng-remote</groupId>
+  <groupId>org.testng</groupId>
   <artifactId>testng-remote-dist</artifactId>
   <version>1.5.0</version>
   <classifier>shaded</classifier>
diff --git a/dist/pom.xml b/dist/pom.xml
index e1331db..cf60564 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
@@ -13,36 +13,36 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
-            <artifactId>testng-remote6_0</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng-remote-6_0</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
-            <artifactId>testng-remote6_5</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng-remote-6_5</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
-            <artifactId>testng-remote6_9_7</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng-remote-6_9_7</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
-            <artifactId>testng-remote6_9_10</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng-remote-6_9_10</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
-            <artifactId>testng-remote6_10</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng-remote-6_10</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
-            <artifactId>testng-remote6_12</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng-remote-6_12</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
-            <artifactId>testng-remote7_8</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng-remote-7_8</artifactId>
         </dependency>
     </dependencies>
 
@@ -61,14 +61,14 @@
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <artifactSet>
                                 <includes>
-                                    <include>org.testng.testng-remote:testng-remote</include>
-                                    <include>org.testng.testng-remote:testng-remote6_0</include>
-                                    <include>org.testng.testng-remote:testng-remote6_5</include>
-                                    <include>org.testng.testng-remote:testng-remote6_9_7</include>
-                                    <include>org.testng.testng-remote:testng-remote6_9_10</include>
-                                    <include>org.testng.testng-remote:testng-remote6_10</include>
-                                    <include>org.testng.testng-remote:testng-remote6_12</include>
-                                    <include>org.testng.testng-remote:testng-remote7_8</include>
+                                    <include>org.testng:testng-remote</include>
+                                    <include>org.testng:testng-remote-6_0</include>
+                                    <include>org.testng:testng-remote-6_5</include>
+                                    <include>org.testng:testng-remote-6_9_7</include>
+                                    <include>org.testng:testng-remote-6_9_10</include>
+                                    <include>org.testng:testng-remote-6_10</include>
+                                    <include>org.testng:testng-remote-6_12</include>
+                                    <include>org.testng:testng-remote-7_8</include>
                                 </includes>
                             </artifactSet>
                             <transformers>
diff --git a/pom.xml b/pom.xml
index 68739fb..bbaa7f7 100644
--- a/pom.xml
+++ b/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.testng.testng-remote</groupId>
+    <groupId>org.testng</groupId>
     <artifactId>testng-remote-parent</artifactId>
     <packaging>pom</packaging>
     <version>1.5.0-SNAPSHOT</version>
@@ -16,13 +16,13 @@
 
     <modules>
         <module>remote</module>
-        <module>remote7_8</module>
-        <module>remote6_12</module>
-        <module>remote6_10</module>
-        <module>remote6_9_10</module>
-        <module>remote6_9_7</module>
-        <module>remote6_5</module>
-        <module>remote6_0</module>
+        <module>remote-7_8</module>
+        <module>remote-6_12</module>
+        <module>remote-6_10</module>
+        <module>remote-6_9_10</module>
+        <module>remote-6_9_7</module>
+        <module>remote-6_5</module>
+        <module>remote-6_0</module>
         <module>dist</module>
         <module>remote-test</module>
     </modules>
@@ -51,7 +51,7 @@
                 <optional>true</optional>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
+                <groupId>org.testng</groupId>
                 <artifactId>testng-remote</artifactId>
                 <version>${project.version}</version>
                 <exclusions>
@@ -62,7 +62,7 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
+                <groupId>org.testng</groupId>
                 <artifactId>testng-remote</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
@@ -75,38 +75,38 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
-                <artifactId>testng-remote6_0</artifactId>
+                <groupId>org.testng</groupId>
+                <artifactId>testng-remote-6_0</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
-                <artifactId>testng-remote6_5</artifactId>
+                <groupId>org.testng</groupId>
+                <artifactId>testng-remote-6_5</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
-                <artifactId>testng-remote6_9_7</artifactId>
+                <groupId>org.testng</groupId>
+                <artifactId>testng-remote-6_9_7</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
-                <artifactId>testng-remote6_9_10</artifactId>
+                <groupId>org.testng</groupId>
+                <artifactId>testng-remote-6_9_10</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
-                <artifactId>testng-remote6_10</artifactId>
+                <groupId>org.testng</groupId>
+                <artifactId>testng-remote-6_10</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
-                <artifactId>testng-remote6_12</artifactId>
+                <groupId>org.testng</groupId>
+                <artifactId>testng-remote-6_12</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.testng.testng-remote</groupId>
-                <artifactId>testng-remote7_8</artifactId>
+                <groupId>org.testng</groupId>
+                <artifactId>testng-remote-7_8</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>
diff --git a/remote6_0/pom.xml b/remote-6_0/pom.xml
similarity index 88%
rename from remote6_0/pom.xml
rename to remote-6_0/pom.xml
index 9652cb5..551c21c 100644
--- a/remote6_0/pom.xml
+++ b/remote-6_0/pom.xml
@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testng-remote6_0</artifactId>
+    <artifactId>testng-remote-6_0</artifactId>
     <name>TestNG Remote for version [6.0, 6.5.1)</name>
 
     <properties>
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
@@ -31,7 +31,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
             <type>test-jar</type>
         </dependency>
diff --git a/remote6_0/src/main/java/org/testng/remote/support/RemoteTestNG6_0.java b/remote-6_0/src/main/java/org/testng/remote/support/RemoteTestNG6_0.java
similarity index 100%
rename from remote6_0/src/main/java/org/testng/remote/support/RemoteTestNG6_0.java
rename to remote-6_0/src/main/java/org/testng/remote/support/RemoteTestNG6_0.java
diff --git a/remote6_0/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_0.java b/remote-6_0/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_0.java
similarity index 100%
rename from remote6_0/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_0.java
rename to remote-6_0/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_0.java
diff --git a/remote6_0/src/test/java/test/remote/Remote6_0_Test.java b/remote-6_0/src/test/java/test/remote/Remote6_0_Test.java
similarity index 100%
rename from remote6_0/src/test/java/test/remote/Remote6_0_Test.java
rename to remote-6_0/src/test/java/test/remote/Remote6_0_Test.java
diff --git a/remote6_10/pom.xml b/remote-6_10/pom.xml
similarity index 88%
rename from remote6_10/pom.xml
rename to remote-6_10/pom.xml
index 4bd7afc..729e5a4 100644
--- a/remote6_10/pom.xml
+++ b/remote-6_10/pom.xml
@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testng-remote6_10</artifactId>
+    <artifactId>testng-remote-6_10</artifactId>
     <name>TestNG Remote for version [6.10, 6.12)</name>
 
     <properties>
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
@@ -31,7 +31,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
             <type>test-jar</type>
         </dependency>
diff --git a/remote6_10/src/main/java/org/testng/remote/support/RemoteTestNG6_10.java b/remote-6_10/src/main/java/org/testng/remote/support/RemoteTestNG6_10.java
similarity index 100%
rename from remote6_10/src/main/java/org/testng/remote/support/RemoteTestNG6_10.java
rename to remote-6_10/src/main/java/org/testng/remote/support/RemoteTestNG6_10.java
diff --git a/remote6_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_10.java b/remote-6_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_10.java
similarity index 100%
rename from remote6_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_10.java
rename to remote-6_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_10.java
diff --git a/remote6_10/src/test/java/test/remote/Remote6_10_Test.java b/remote-6_10/src/test/java/test/remote/Remote6_10_Test.java
similarity index 100%
rename from remote6_10/src/test/java/test/remote/Remote6_10_Test.java
rename to remote-6_10/src/test/java/test/remote/Remote6_10_Test.java
diff --git a/remote6_12/pom.xml b/remote-6_12/pom.xml
similarity index 88%
rename from remote6_12/pom.xml
rename to remote-6_12/pom.xml
index 96c5133..d47ac7c 100644
--- a/remote6_12/pom.xml
+++ b/remote-6_12/pom.xml
@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testng-remote6_12</artifactId>
+    <artifactId>testng-remote-6_12</artifactId>
     <name>TestNG Remote for version [6.12, 7.8)</name>
 
     <properties>
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
@@ -31,7 +31,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
             <type>test-jar</type>
         </dependency>
diff --git a/remote6_12/src/main/java/org/testng/remote/support/RemoteTestNG6_12.java b/remote-6_12/src/main/java/org/testng/remote/support/RemoteTestNG6_12.java
similarity index 100%
rename from remote6_12/src/main/java/org/testng/remote/support/RemoteTestNG6_12.java
rename to remote-6_12/src/main/java/org/testng/remote/support/RemoteTestNG6_12.java
diff --git a/remote6_12/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_12.java b/remote-6_12/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_12.java
similarity index 100%
rename from remote6_12/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_12.java
rename to remote-6_12/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_12.java
diff --git a/remote6_12/src/test/java/test/remote/Remote6_12_Test.java b/remote-6_12/src/test/java/test/remote/Remote6_12_Test.java
similarity index 100%
rename from remote6_12/src/test/java/test/remote/Remote6_12_Test.java
rename to remote-6_12/src/test/java/test/remote/Remote6_12_Test.java
diff --git a/remote6_5/pom.xml b/remote-6_5/pom.xml
similarity index 88%
rename from remote6_5/pom.xml
rename to remote-6_5/pom.xml
index 21fcbbe..1e28f56 100644
--- a/remote6_5/pom.xml
+++ b/remote-6_5/pom.xml
@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testng-remote6_5</artifactId>
+    <artifactId>testng-remote-6_5</artifactId>
     <name>TestNG Remote for version [6.5.1, 6.9.7)</name>
 
     <properties>
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
@@ -31,7 +31,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
             <type>test-jar</type>
         </dependency>
diff --git a/remote6_5/src/main/java/org/testng/remote/support/RemoteTestNG6_5.java b/remote-6_5/src/main/java/org/testng/remote/support/RemoteTestNG6_5.java
similarity index 100%
rename from remote6_5/src/main/java/org/testng/remote/support/RemoteTestNG6_5.java
rename to remote-6_5/src/main/java/org/testng/remote/support/RemoteTestNG6_5.java
diff --git a/remote6_5/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_5.java b/remote-6_5/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_5.java
similarity index 100%
rename from remote6_5/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_5.java
rename to remote-6_5/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_5.java
diff --git a/remote6_5/src/test/java/test/remote/Remote6_5_Test.java b/remote-6_5/src/test/java/test/remote/Remote6_5_Test.java
similarity index 100%
rename from remote6_5/src/test/java/test/remote/Remote6_5_Test.java
rename to remote-6_5/src/test/java/test/remote/Remote6_5_Test.java
diff --git a/remote6_9_10/pom.xml b/remote-6_9_10/pom.xml
similarity index 88%
rename from remote6_9_10/pom.xml
rename to remote-6_9_10/pom.xml
index 672659e..ac4511b 100644
--- a/remote6_9_10/pom.xml
+++ b/remote-6_9_10/pom.xml
@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testng-remote6_9_10</artifactId>
+    <artifactId>testng-remote-6_9_10</artifactId>
     <name>TestNG Remote for version [6.9.10, 6.10)</name>
 
     <properties>
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
@@ -31,7 +31,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
             <type>test-jar</type>
         </dependency>
diff --git a/remote6_9_10/src/main/java/org/testng/remote/support/RemoteTestNG6_9_10.java b/remote-6_9_10/src/main/java/org/testng/remote/support/RemoteTestNG6_9_10.java
similarity index 100%
rename from remote6_9_10/src/main/java/org/testng/remote/support/RemoteTestNG6_9_10.java
rename to remote-6_9_10/src/main/java/org/testng/remote/support/RemoteTestNG6_9_10.java
diff --git a/remote6_9_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_10.java b/remote-6_9_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_10.java
similarity index 100%
rename from remote6_9_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_10.java
rename to remote-6_9_10/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_10.java
diff --git a/remote6_9_10/src/test/java/test/remote/Remote6_9_10_Test.java b/remote-6_9_10/src/test/java/test/remote/Remote6_9_10_Test.java
similarity index 100%
rename from remote6_9_10/src/test/java/test/remote/Remote6_9_10_Test.java
rename to remote-6_9_10/src/test/java/test/remote/Remote6_9_10_Test.java
diff --git a/remote6_9_7/pom.xml b/remote-6_9_7/pom.xml
similarity index 88%
rename from remote6_9_7/pom.xml
rename to remote-6_9_7/pom.xml
index 7227957..af0e16b 100644
--- a/remote6_9_7/pom.xml
+++ b/remote-6_9_7/pom.xml
@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testng-remote6_9_7</artifactId>
+    <artifactId>testng-remote-6_9_7</artifactId>
     <name>TestNG Remote for version [6.9.7, 6.9.10)</name>
 
     <properties>
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
@@ -31,7 +31,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
             <type>test-jar</type>
         </dependency>
diff --git a/remote6_9_7/src/main/java/org/testng/remote/support/RemoteTestNG6_9_7.java b/remote-6_9_7/src/main/java/org/testng/remote/support/RemoteTestNG6_9_7.java
similarity index 100%
rename from remote6_9_7/src/main/java/org/testng/remote/support/RemoteTestNG6_9_7.java
rename to remote-6_9_7/src/main/java/org/testng/remote/support/RemoteTestNG6_9_7.java
diff --git a/remote6_9_7/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_7.java b/remote-6_9_7/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_7.java
similarity index 100%
rename from remote6_9_7/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_7.java
rename to remote-6_9_7/src/main/java/org/testng/remote/support/RemoteTestNGFactory6_9_7.java
diff --git a/remote6_9_7/src/test/java/test/remote/Remote6_9_7Test.java b/remote-6_9_7/src/test/java/test/remote/Remote6_9_7Test.java
similarity index 100%
rename from remote6_9_7/src/test/java/test/remote/Remote6_9_7Test.java
rename to remote-6_9_7/src/test/java/test/remote/Remote6_9_7Test.java
diff --git a/remote7_8/pom.xml b/remote-7_8/pom.xml
similarity index 88%
rename from remote7_8/pom.xml
rename to remote-7_8/pom.xml
index 8599662..f025e47 100644
--- a/remote7_8/pom.xml
+++ b/remote-7_8/pom.xml
@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testng-remote7_8</artifactId>
+    <artifactId>testng-remote-7_8</artifactId>
     <name>TestNG Remote for version [7.8.0, -)</name>
 
     <properties>
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
         </dependency>
         <dependency>
@@ -31,7 +31,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.testng.testng-remote</groupId>
+            <groupId>org.testng</groupId>
             <artifactId>testng-remote</artifactId>
             <type>test-jar</type>
         </dependency>
diff --git a/remote7_8/src/main/java/org/testng/remote/support/RemoteTestNG7_8.java b/remote-7_8/src/main/java/org/testng/remote/support/RemoteTestNG7_8.java
similarity index 100%
rename from remote7_8/src/main/java/org/testng/remote/support/RemoteTestNG7_8.java
rename to remote-7_8/src/main/java/org/testng/remote/support/RemoteTestNG7_8.java
diff --git a/remote7_8/src/main/java/org/testng/remote/support/RemoteTestNGFactory7_8.java b/remote-7_8/src/main/java/org/testng/remote/support/RemoteTestNGFactory7_8.java
similarity index 100%
rename from remote7_8/src/main/java/org/testng/remote/support/RemoteTestNGFactory7_8.java
rename to remote-7_8/src/main/java/org/testng/remote/support/RemoteTestNGFactory7_8.java
diff --git a/remote7_8/src/test/java/test/remote/Remote7_8_Test.java b/remote-7_8/src/test/java/test/remote/Remote7_8_Test.java
similarity index 100%
rename from remote7_8/src/test/java/test/remote/Remote7_8_Test.java
rename to remote-7_8/src/test/java/test/remote/Remote7_8_Test.java
diff --git a/remote-test/pom.xml b/remote-test/pom.xml
index bb83fe9..d537b77 100644
--- a/remote-test/pom.xml
+++ b/remote-test/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
diff --git a/remote-test/src/test/groovy/Tester.groovy b/remote-test/src/test/groovy/Tester.groovy
index 2042b3a..0159c15 100644
--- a/remote-test/src/test/groovy/Tester.groovy
+++ b/remote-test/src/test/groovy/Tester.groovy
@@ -1,5 +1,5 @@
 @Grab(group = 'org.osgi', module = 'osgi.core', version = '6.0.0')
-@Grab(group = 'org.testng.testng-remote', module = 'testng-remote', version = '1.4.0')
+@Grab(group = 'org.testng', module = 'testng-remote', version = '1.4.0')
 
 import org.osgi.framework.Version
 import org.testng.remote.strprotocol.JsonMessageSender
@@ -39,7 +39,7 @@ ivyJar = "${mvnRepoDir}/org/apache/ivy/ivy/${ivyVer}/ivy-${ivyVer}.jar"
 
 grapeRepoDir = System.getenv("HOME") + "/.groovy/grapes"
 
-remoteTestngJar = "${grapeRepoDir}/org.testng.testng-remote/testng-remote-dist/jars/testng-remote-dist-${testngRemoteVer}-shaded.jar"
+remoteTestngJar = "${grapeRepoDir}/org.testng/testng-remote-dist/jars/testng-remote-dist-${testngRemoteVer}-shaded.jar"
 jcmdJar = "${grapeRepoDir}/com.beust/jcommander/jars/jcommander-${jcmdVer}.jar"
 slf4jJar = "${grapeRepoDir}/org.slf4j/slf4j-api/jars/slf4j-api-${slf4jVer}.jar"
 
@@ -204,7 +204,7 @@ def downloadTestNG(ver) {
 
         w << "@Grab(group = 'com.beust', module = 'jcommander', version = '${jcmdVer}')" + "\n"
         w << "@Grab(group = 'org.slf4j', module = 'slf4j-api', version = '${slf4jVer}')" + "\n"
-        w << "@Grab(group = 'org.testng.testng-remote', module = 'testng-remote-dist', version = '${testngRemoteVer}', classifier = 'shaded')" + "\n"
+        w << "@Grab(group = 'org.testng', module = 'testng-remote-dist', version = '${testngRemoteVer}', classifier = 'shaded')" + "\n"
 
         w << "import org.testng.annotations.Test;" + "\n"
     }
diff --git a/remote/pom.xml b/remote/pom.xml
index 4fb3c9b..129cd3d 100644
--- a/remote/pom.xml
+++ b/remote/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.testng.testng-remote</groupId>
+        <groupId>org.testng</groupId>
         <artifactId>testng-remote-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>