diff --git a/dist/pom.xml b/dist/pom.xml
index 7408ed7..cf60564 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -18,31 +18,31 @@
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng-remote6_0</artifactId>
+            <artifactId>testng-remote-6_0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng-remote6_5</artifactId>
+            <artifactId>testng-remote-6_5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng-remote6_9_7</artifactId>
+            <artifactId>testng-remote-6_9_7</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng-remote6_9_10</artifactId>
+            <artifactId>testng-remote-6_9_10</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng-remote6_10</artifactId>
+            <artifactId>testng-remote-6_10</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng-remote6_12</artifactId>
+            <artifactId>testng-remote-6_12</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
-            <artifactId>testng-remote7_8</artifactId>
+            <artifactId>testng-remote-7_8</artifactId>
         </dependency>
     </dependencies>
 
@@ -62,13 +62,13 @@
                             <artifactSet>
                                 <includes>
                                     <include>org.testng:testng-remote</include>
-                                    <include>org.testng:testng-remote6_0</include>
-                                    <include>org.testng:testng-remote6_5</include>
-                                    <include>org.testng:testng-remote6_9_7</include>
-                                    <include>org.testng:testng-remote6_9_10</include>
-                                    <include>org.testng:testng-remote6_10</include>
-                                    <include>org.testng:testng-remote6_12</include>
-                                    <include>org.testng:testng-remote7_8</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 5cc5859..bbaa7f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -76,37 +76,37 @@
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
-                <artifactId>testng-remote6_0</artifactId>
+                <artifactId>testng-remote-6_0</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
-                <artifactId>testng-remote6_5</artifactId>
+                <artifactId>testng-remote-6_5</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
-                <artifactId>testng-remote6_9_7</artifactId>
+                <artifactId>testng-remote-6_9_7</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
-                <artifactId>testng-remote6_9_10</artifactId>
+                <artifactId>testng-remote-6_9_10</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
-                <artifactId>testng-remote6_10</artifactId>
+                <artifactId>testng-remote-6_10</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
-                <artifactId>testng-remote6_12</artifactId>
+                <artifactId>testng-remote-6_12</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
-                <artifactId>testng-remote7_8</artifactId>
+                <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 97%
rename from remote6_0/pom.xml
rename to remote-6_0/pom.xml
index 9203aa6..551c21c 100644
--- a/remote6_0/pom.xml
+++ b/remote-6_0/pom.xml
@@ -7,7 +7,7 @@
         <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>
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 97%
rename from remote6_10/pom.xml
rename to remote-6_10/pom.xml
index a21c29e..729e5a4 100644
--- a/remote6_10/pom.xml
+++ b/remote-6_10/pom.xml
@@ -7,7 +7,7 @@
         <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>
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 97%
rename from remote6_12/pom.xml
rename to remote-6_12/pom.xml
index e29bf73..d47ac7c 100644
--- a/remote6_12/pom.xml
+++ b/remote-6_12/pom.xml
@@ -7,7 +7,7 @@
         <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>
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 97%
rename from remote6_5/pom.xml
rename to remote-6_5/pom.xml
index dd02af7..1e28f56 100644
--- a/remote6_5/pom.xml
+++ b/remote-6_5/pom.xml
@@ -7,7 +7,7 @@
         <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>
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 97%
rename from remote6_9_10/pom.xml
rename to remote-6_9_10/pom.xml
index 9a57045..ac4511b 100644
--- a/remote6_9_10/pom.xml
+++ b/remote-6_9_10/pom.xml
@@ -7,7 +7,7 @@
         <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>
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 97%
rename from remote6_9_7/pom.xml
rename to remote-6_9_7/pom.xml
index 665acfb..af0e16b 100644
--- a/remote6_9_7/pom.xml
+++ b/remote-6_9_7/pom.xml
@@ -7,7 +7,7 @@
         <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>
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 97%
rename from remote7_8/pom.xml
rename to remote-7_8/pom.xml
index e4136e4..f025e47 100644
--- a/remote7_8/pom.xml
+++ b/remote-7_8/pom.xml
@@ -7,7 +7,7 @@
         <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>
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