-

diff --git a/archaius/pom.xml b/archaius/pom.xml
index 0dd580c..000d325 100644
--- a/archaius/pom.xml
+++ b/archaius/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-archaius</artifactId>
+  <artifactId>archaius</artifactId>
 
   <name>WildFly Swarm: Archaius</name>
   <description>WildFly Swarm: Archaius</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-guava</artifactId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/archetype/pom.xml b/archetype/pom.xml
index daf333b..223c866 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -5,13 +5,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-archetype</artifactId>
+  <artifactId>archetype</artifactId>
 
   <packaging>maven-archetype</packaging>
 
@@ -56,7 +56,7 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-fraction-list</artifactId>
+      <artifactId>fraction-list</artifactId>
       <type>txt</type>
     </dependency>
   </dependencies>
diff --git a/archetype/src/main/ruby/generate.rb b/archetype/src/main/ruby/generate.rb
index 55590f0..70de758 100644
--- a/archetype/src/main/ruby/generate.rb
+++ b/archetype/src/main/ruby/generate.rb
@@ -27,7 +27,7 @@ File.open( File.join( outputDir, 'pom.xml' ), 'w' ) do |f|
   f.puts '    <plugins>'
   f.puts '      <plugin>'
   f.puts '        <groupId>org.wildfly.swarm</groupId>'
-  f.puts '        <artifactId>wildfly-swarm-plugin</artifactId>'
+  f.puts '        <artifactId>plugin</artifactId>'
   f.puts '        <version>${version.wildfly-swarm}</version>'
   f.puts '        <configuration>'
   f.puts '          <mainClass>${package}.Main</mainClass>'
@@ -47,7 +47,7 @@ File.open( File.join( outputDir, 'pom.xml' ), 'w' ) do |f|
 
   f.puts '    <dependency>'
   f.puts '      <groupId>org.wildfly.swarm</groupId>'
-  f.puts '      <artifactId>wildfly-swarm-container</artifactId>'
+  f.puts '      <artifactId>container</artifactId>'
   f.puts '      <version>${version.wildfly-swarm}</version>'
   f.puts '    </dependency>'
   f.puts ''
diff --git a/arquillian/api/pom.xml b/arquillian/api/pom.xml
index aaebf0a..b560de8 100644
--- a/arquillian/api/pom.xml
+++ b/arquillian/api/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-arquillian-parent</artifactId>
+    <artifactId>arquillian-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-arquillian</artifactId>
+  <artifactId>arquillian</artifactId>
 
   <name>WildFly Swarm: Arquillian</name>
   <description>WildFly Swarm: Arquillian</description>
@@ -29,11 +29,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-tools</artifactId>
+      <artifactId>tools</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc</artifactId>
+      <artifactId>msc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian-daemon</artifactId>
+      <artifactId>arquillian-daemon</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.shrinkwrap.resolver</groupId>
diff --git a/arquillian/api/src/main/java/org/wildfly/swarm/arquillian/adapter/UberjarSimpleContainer.java b/arquillian/api/src/main/java/org/wildfly/swarm/arquillian/adapter/UberjarSimpleContainer.java
index 0508729..12b573f 100644
--- a/arquillian/api/src/main/java/org/wildfly/swarm/arquillian/adapter/UberjarSimpleContainer.java
+++ b/arquillian/api/src/main/java/org/wildfly/swarm/arquillian/adapter/UberjarSimpleContainer.java
@@ -139,7 +139,7 @@ public class UberjarSimpleContainer implements SimpleContainer {
             }
         } else {
             // ensure that arq daemon is available
-            this.requestedMavenArtifacts.add("org.wildfly.swarm:wildfly-swarm-arquillian-daemon");
+            this.requestedMavenArtifacts.add("org.wildfly.swarm:arquillian-daemon");
             for (String requestedDep : this.requestedMavenArtifacts) {
                 final MavenResolvedArtifact[] deps =
                         resolvingHelper.withResolver(r -> r.loadPomFromFile("pom.xml")
diff --git a/arquillian/daemon/api/pom.xml b/arquillian/daemon/api/pom.xml
index a539448..c0a173d 100644
--- a/arquillian/daemon/api/pom.xml
+++ b/arquillian/daemon/api/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-arquillian-daemon-parent</artifactId>
+    <artifactId>arquillian-daemon-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-arquillian-daemon</artifactId>
+  <artifactId>arquillian-daemon</artifactId>
 
   <name>WildFly Swarm: Arquillian Daemon API</name>
   <description>WildFly Swarm: Arquillian Daemon API</description>
@@ -24,7 +24,7 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian-daemon-modules</artifactId>
+      <artifactId>arquillian-daemon-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.msc</groupId>
diff --git a/arquillian/daemon/modules/pom.xml b/arquillian/daemon/modules/pom.xml
index 3fbf942..df01b1e 100644
--- a/arquillian/daemon/modules/pom.xml
+++ b/arquillian/daemon/modules/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-arquillian-daemon-parent</artifactId>
+    <artifactId>arquillian-daemon-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-arquillian-daemon-modules</artifactId>
+  <artifactId>arquillian-daemon-modules</artifactId>
 
   <name>WildFly Swarm: Arquillian Daemon Modules</name>
   <description>WildFly Swarm: Arquillian Daemon Modules</description>
@@ -39,11 +39,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jgroups-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly</groupId>
diff --git a/arquillian/daemon/modules/src/main/resources/modules/org/wildfly/swarm/arquillian/daemon/api/module.xml b/arquillian/daemon/modules/src/main/resources/modules/org/wildfly/swarm/arquillian/daemon/api/module.xml
index 54e0527..d57bb0a 100644
--- a/arquillian/daemon/modules/src/main/resources/modules/org/wildfly/swarm/arquillian/daemon/api/module.xml
+++ b/arquillian/daemon/modules/src/main/resources/modules/org/wildfly/swarm/arquillian/daemon/api/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.arquillian.daemon" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-arquillian-daemon:${project.version}"/>
+    <artifact name="org.wildfly.swarm:arquillian-daemon:${project.version}"/>
 
     <artifact name="org.jboss.arquillian.container:arquillian-container-test-spi:${version.org.arquillian}"/>
     <artifact name="org.jboss.arquillian.core:arquillian-core-spi:${version.org.arquillian}"/>
diff --git a/arquillian/daemon/pom.xml b/arquillian/daemon/pom.xml
index 8728d2f..8c854eb 100644
--- a/arquillian/daemon/pom.xml
+++ b/arquillian/daemon/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-arquillian-parent</artifactId>
+    <artifactId>arquillian-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-arquillian-daemon-parent</artifactId>
+  <artifactId>arquillian-daemon-parent</artifactId>
 
   <name>WildFly Swarm: Arquillian Daemon</name>
   <description>WildFly Swarm: Arquillian Daemon</description>
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index 2489fc2..0a14d87 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-arquillian-parent</artifactId>
+  <artifactId>arquillian-parent</artifactId>
 
   <name>WildFly Swarm: Arquillian Parent</name>
   <description>WildFly Swarm: Arquillian Parent</description>
diff --git a/arquillian/test/pom.xml b/arquillian/test/pom.xml
index b77741e..17b537f 100644
--- a/arquillian/test/pom.xml
+++ b/arquillian/test/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-arquillian-parent</artifactId>
+    <artifactId>arquillian-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-arquillian-test</artifactId>
+  <artifactId>arquillian-test</artifactId>
 
   <name>WildFly Swarm: Arquillian Test</name>
   <description>WildFly Swarm: Arquillian Test</description>
@@ -46,31 +46,41 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc</artifactId>
+      <artifactId>jgroups</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc-runtime</artifactId>
+      <artifactId>jgroups-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>msc</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-runtime</artifactId>
+      <artifactId>msc-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>naming</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>naming-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/arquillian/test/src/main/resources/modules/progress/main/module.xml b/arquillian/test/src/main/resources/modules/progress/main/module.xml
index f0db0ea..74bcc4f 100644
--- a/arquillian/test/src/main/resources/modules/progress/main/module.xml
+++ b/arquillian/test/src/main/resources/modules/progress/main/module.xml
@@ -3,4 +3,4 @@
   <resources>
     <artifact name="progress:progress:1.0.2"/>
   </resources>
-</module>
\ No newline at end of file
+</module>
diff --git a/bean-validation/api/pom.xml b/bean-validation/api/pom.xml
index 1132c66..9a85da2 100644
--- a/bean-validation/api/pom.xml
+++ b/bean-validation/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-bean-validation-parent</artifactId>
+    <artifactId>bean-validation-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-bean-validation</artifactId>
+  <artifactId>bean-validation</artifactId>
 
   <name>WildFly Swarm: Bean Validation API</name>
   <description>WildFly Swarm: Bean Validation API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bean-validation-modules</artifactId>
+      <artifactId>bean-validation-modules</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/bean-validation/modules/pom.xml b/bean-validation/modules/pom.xml
index 828d1cb..1f638b0 100644
--- a/bean-validation/modules/pom.xml
+++ b/bean-validation/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-bean-validation-parent</artifactId>
+    <artifactId>bean-validation-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-bean-validation-modules</artifactId>
+  <artifactId>bean-validation-modules</artifactId>
 
   <name>WildFly Swarm: Bean Validation Modules</name>
   <description>WildFly Swarm: Bean Validation Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/api/module.xml b/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/api/module.xml
index 78eb22c..6bc0512 100644
--- a/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/api/module.xml
+++ b/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.bean-validation" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-bean-validation:${project.version}"/>
+    <artifact name="org.wildfly.swarm:bean-validation:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/runtime/module.xml b/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/runtime/module.xml
index aa3e8b7..3404409 100644
--- a/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/runtime/module.xml
+++ b/bean-validation/modules/src/main/resources/modules/org/wildfly/swarm/bean-validation/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.bean-validation" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-bean-validation-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:bean-validation-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml
index ea2b01e..c3b0d69 100644
--- a/bean-validation/pom.xml
+++ b/bean-validation/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-bean-validation-parent</artifactId>
+  <artifactId>bean-validation-parent</artifactId>
 
   <name>WildFly Swarm: Bean Validation</name>
   <description>WildFly Swarm: Bean Validation</description>
diff --git a/bean-validation/runtime/pom.xml b/bean-validation/runtime/pom.xml
index 7e7c4a0..7a47666 100644
--- a/bean-validation/runtime/pom.xml
+++ b/bean-validation/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-bean-validation-parent</artifactId>
+    <artifactId>bean-validation-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-bean-validation-runtime</artifactId>
+  <artifactId>bean-validation-runtime</artifactId>
 
   <name>WildFly Swarm: Bean Validation Runtime</name>
   <description>WildFly Swarm: Bean Validation Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bean-validation</artifactId>
+      <artifactId>bean-validation</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index cc4701c..2a9a002 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -9,13 +9,13 @@
 
     <parent>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-parent</artifactId>
+        <artifactId>parent</artifactId>
         <version>1.0.0.Alpha6-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-bootstrap</artifactId>
+    <artifactId>bootstrap</artifactId>
 
     <name>WildFly Swarm: Bootstrap</name>
     <description>WildFly Swarm: Bootstrap</description>
diff --git a/bootstrap/src/it/java/org/wildfly/swarm/bootstrap/AbstractBootstrapIntegrationTestCase.java b/bootstrap/src/it/java/org/wildfly/swarm/bootstrap/AbstractBootstrapIntegrationTestCase.java
index f25b603..18dc906 100644
--- a/bootstrap/src/it/java/org/wildfly/swarm/bootstrap/AbstractBootstrapIntegrationTestCase.java
+++ b/bootstrap/src/it/java/org/wildfly/swarm/bootstrap/AbstractBootstrapIntegrationTestCase.java
@@ -82,7 +82,7 @@ public abstract class AbstractBootstrapIntegrationTestCase {
 
         File[] children = targetDir.toFile().listFiles();
         for (File child : children) {
-            if (child.getName().startsWith("wildfly-swarm-bootstrap") && child.getName().endsWith(".jar") && !child.getName().endsWith("-sources.jar")) {
+            if (child.getName().startsWith("bootstrap") && child.getName().endsWith(".jar") && !child.getName().endsWith("-sources.jar")) {
                 return child;
             }
         }
diff --git a/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/modules/ClasspathModuleFinder.java b/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/modules/ClasspathModuleFinder.java
index 1e8a5e7..f590274 100644
--- a/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/modules/ClasspathModuleFinder.java
+++ b/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/modules/ClasspathModuleFinder.java
@@ -53,10 +53,10 @@ public class ClasspathModuleFinder implements ModuleFinder {
                 return null;
             }
 
-            //System.err.println( "ClasspathModuleFinder: " + identifier );
-
             final URL base = new URL( url, "./" );
 
+            //System.err.println( "ClasspathModuleFinder: " + identifier + " > " + base );
+
             InputStream in = url.openStream();
 
             ModuleSpec moduleSpec = null;
diff --git a/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/impl/module.xml b/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/impl/module.xml
index 67fac66..f24c36e 100644
--- a/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/impl/module.xml
+++ b/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/impl/module.xml
@@ -11,4 +11,4 @@
     <artifact name="org.jboss.shrinkwrap:shrinkwrap-spi:${version.org.jboss.shrinkwrap}"/>
     <artifact name="org.jboss.shrinkwrap:shrinkwrap-impl-base:${version.org.jboss.shrinkwrap}"/>
   </resources>
-</module>
\ No newline at end of file
+</module>
diff --git a/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/main/module.xml b/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/main/module.xml
index 2d948ce..06e4a95 100644
--- a/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/main/module.xml
+++ b/bootstrap/src/main/resources/modules/org/jboss/shrinkwrap/main/module.xml
@@ -48,4 +48,4 @@
     </system>
     <module name="org.jboss.shrinkwrap" slot="impl" services="import" export="true"/>
   </dependencies>
-</module>
\ No newline at end of file
+</module>
diff --git a/bootstrap/src/test/java/org/wildfly/swarm/bootstrap/util/MavenArtifactDescriptorTest.java b/bootstrap/src/test/java/org/wildfly/swarm/bootstrap/util/MavenArtifactDescriptorTest.java
index b5f70b8..b588ab5 100644
--- a/bootstrap/src/test/java/org/wildfly/swarm/bootstrap/util/MavenArtifactDescriptorTest.java
+++ b/bootstrap/src/test/java/org/wildfly/swarm/bootstrap/util/MavenArtifactDescriptorTest.java
@@ -115,15 +115,15 @@ public class MavenArtifactDescriptorTest {
 
     @Test
     public void testFromMscGav() throws IOException {
-        MavenArtifactDescriptor desc = MavenArtifactDescriptor.fromMscGav( "org.wildfly.swarm:wildfly-swarm-container:1.0" );
+        MavenArtifactDescriptor desc = MavenArtifactDescriptor.fromMscGav( "org.wildfly.swarm:container:1.0" );
 
         assertThat( desc.groupId() ).isEqualTo( "org.wildfly.swarm" );
-        assertThat( desc.artifactId() ).isEqualTo( "wildfly-swarm-container" );
+        assertThat( desc.artifactId() ).isEqualTo( "container" );
         assertThat( desc.version() ).isEqualTo( "1.0" );
         assertThat( desc.type() ).isEqualTo( "jar" );
         assertThat( desc.classifier() ).isNull();
 
-        assertThat( desc.mscGav() ).isEqualTo( "org.wildfly.swarm:wildfly-swarm-container:1.0" );
+        assertThat( desc.mscGav() ).isEqualTo( "org.wildfly.swarm:container:1.0" );
     }
 
 }
diff --git a/connector/api/pom.xml b/connector/api/pom.xml
index c5dd990..e293ce2 100644
--- a/connector/api/pom.xml
+++ b/connector/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-connector-parent</artifactId>
+    <artifactId>connector-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-connector</artifactId>
+  <artifactId>connector</artifactId>
 
   <name>WildFly Swarm: Connector API</name>
   <description>WildFly Swarm: Connector API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector-modules</artifactId>
+      <artifactId>connector-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/connector/modules/pom.xml b/connector/modules/pom.xml
index 8059530..f88a4b0 100644
--- a/connector/modules/pom.xml
+++ b/connector/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-connector-parent</artifactId>
+    <artifactId>connector-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-connector-modules</artifactId>
+  <artifactId>connector-modules</artifactId>
 
   <name>WildFly Swarm: Connector Modules</name>
   <description>WildFly Swarm: Connector Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/api/module.xml b/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/api/module.xml
index 7b891e9..96ee642 100644
--- a/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/api/module.xml
+++ b/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.connector" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-connector:${project.version}"/>
+    <artifact name="org.wildfly.swarm:connector:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/runtime/module.xml b/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/runtime/module.xml
index a1deede..aab8df1 100644
--- a/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/runtime/module.xml
+++ b/connector/modules/src/main/resources/modules/org/wildfly/swarm/connector/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.connector" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-connector-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:connector-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/connector/pom.xml b/connector/pom.xml
index 40ae55c..c12cbfc 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-connector-parent</artifactId>
+  <artifactId>connector-parent</artifactId>
 
   <name>WildFly Swarm: Connector</name>
   <description>WildFly Swarm: Connector</description>
diff --git a/connector/runtime/pom.xml b/connector/runtime/pom.xml
index fb7cba0..a78023e 100644
--- a/connector/runtime/pom.xml
+++ b/connector/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-connector-parent</artifactId>
+    <artifactId>connector-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-connector-runtime</artifactId>
+  <artifactId>connector-runtime</artifactId>
 
   <name>WildFly Swarm: Connector Runtime</name>
   <description>WildFly Swarm: Connector Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector</artifactId>
+      <artifactId>connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/connector/test/pom.xml b/connector/test/pom.xml
index d2e3cbf..78d8932 100644
--- a/connector/test/pom.xml
+++ b/connector/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-connector-parent</artifactId>
+    <artifactId>connector-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-connector-test</artifactId>
+  <artifactId>connector-test</artifactId>
 
   <name>WildFly Swarm: Connector Test</name>
   <description>WildFly Swarm: Connector Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector</artifactId>
+      <artifactId>connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector-modules</artifactId>
+      <artifactId>connector-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/container/api/pom.xml b/container/api/pom.xml
index e9e75a3..8025294 100644
--- a/container/api/pom.xml
+++ b/container/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-container-parent</artifactId>
+    <artifactId>container-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-container</artifactId>
+  <artifactId>container</artifactId>
 
   <name>WildFly Swarm: Container API</name>
   <description>WildFly Swarm: Container API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
diff --git a/container/modules/pom.xml b/container/modules/pom.xml
index 52c96ff..8e7c45f 100644
--- a/container/modules/pom.xml
+++ b/container/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-container-parent</artifactId>
+    <artifactId>container-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-container-modules</artifactId>
+  <artifactId>container-modules</artifactId>
 
   <name>WildFly Swarm: Container Modules</name>
   <description>WildFly Swarm: Container Modules</description>
@@ -40,7 +40,7 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/container/modules/src/main/resources/modules/org/wildfly/swarm/container/api/module.xml b/container/modules/src/main/resources/modules/org/wildfly/swarm/container/api/module.xml
index 606a831..373de69 100644
--- a/container/modules/src/main/resources/modules/org/wildfly/swarm/container/api/module.xml
+++ b/container/modules/src/main/resources/modules/org/wildfly/swarm/container/api/module.xml
@@ -7,7 +7,7 @@
 
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.container" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-container:${project.version}"/>
+    <artifact name="org.wildfly.swarm:container:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.jboss.modules"/>
diff --git a/container/modules/src/main/resources/modules/org/wildfly/swarm/container/runtime/module.xml b/container/modules/src/main/resources/modules/org/wildfly/swarm/container/runtime/module.xml
index 444e44d..e8a1a13 100644
--- a/container/modules/src/main/resources/modules/org/wildfly/swarm/container/runtime/module.xml
+++ b/container/modules/src/main/resources/modules/org/wildfly/swarm/container/runtime/module.xml
@@ -7,7 +7,7 @@
 
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.container" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-container-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:container-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/container/pom.xml b/container/pom.xml
index 2f18176..a2f15d0 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-container-parent</artifactId>
+  <artifactId>container-parent</artifactId>
 
   <name>WildFly Swarm: Container</name>
   <description>WildFly Swarm: Container</description>
diff --git a/container/runtime/pom.xml b/container/runtime/pom.xml
index 987a84a..fd69bbe 100644
--- a/container/runtime/pom.xml
+++ b/container/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-container-parent</artifactId>
+    <artifactId>container-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-container-runtime</artifactId>
+  <artifactId>container-runtime</artifactId>
 
   <name>WildFly Swarm: Container Runtime</name>
   <description>WildFly Swarm: Container Runtime</description>
@@ -25,7 +25,7 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java b/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java
index 938ef23..2fedfa2 100644
--- a/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java
+++ b/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java
@@ -107,7 +107,7 @@ public class RuntimeServer implements Server {
                 Thread.currentThread().setContextClassLoader(originalCl);
             }
         } catch (ModuleLoadException e) {
-            System.err.println( "[WARN] wildfly-swarm-logging not available, logging will not be configured" );
+            System.err.println( "[WARN] logging not available, logging will not be configured" );
         }
     }
 
diff --git a/datasources/api/pom.xml b/datasources/api/pom.xml
index 515a77c..56567c9 100644
--- a/datasources/api/pom.xml
+++ b/datasources/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-datasources-parent</artifactId>
+    <artifactId>datasources-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-datasources</artifactId>
+  <artifactId>datasources</artifactId>
 
   <name>WildFly Swarm: Datasources API</name>
   <description>WildFly Swarm: Datasources API</description>
@@ -25,25 +25,25 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources-modules</artifactId>
+      <artifactId>datasources-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca</artifactId>
+      <artifactId>jca</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging</artifactId>
+      <artifactId>logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security</artifactId>
+      <artifactId>security</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/datasources/modules/pom.xml b/datasources/modules/pom.xml
index 1b5bd8b..cee40aa 100644
--- a/datasources/modules/pom.xml
+++ b/datasources/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-datasources-parent</artifactId>
+    <artifactId>datasources-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-datasources-modules</artifactId>
+  <artifactId>datasources-modules</artifactId>
 
   <name>WildFly Swarm: Datasources Modules</name>
   <description>WildFly Swarm: Datasources Modules</description>
@@ -40,23 +40,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca-modules</artifactId>
+      <artifactId>jca-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging-modules</artifactId>
+      <artifactId>logging-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-modules</artifactId>
+      <artifactId>security-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/api/module.xml b/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/api/module.xml
index e80ba1c..28520e0 100644
--- a/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/api/module.xml
+++ b/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.datasources" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-datasources:${project.version}"/>
+    <artifact name="org.wildfly.swarm:datasources:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/runtime/module.xml b/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/runtime/module.xml
index 35ec4d5..110c958 100644
--- a/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/runtime/module.xml
+++ b/datasources/modules/src/main/resources/modules/org/wildfly/swarm/datasources/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.datasources" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-datasources-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:datasources-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/datasources/pom.xml b/datasources/pom.xml
index 009455c..df1018a 100644
--- a/datasources/pom.xml
+++ b/datasources/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-datasources-parent</artifactId>
+  <artifactId>datasources-parent</artifactId>
 
   <name>WildFly Swarm: Datasources</name>
   <description>WildFly Swarm: Datasources</description>
diff --git a/datasources/runtime/pom.xml b/datasources/runtime/pom.xml
index bb8f51a..3289743 100644
--- a/datasources/runtime/pom.xml
+++ b/datasources/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-datasources-parent</artifactId>
+    <artifactId>datasources-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-datasources-runtime</artifactId>
+  <artifactId>datasources-runtime</artifactId>
 
   <name>WildFly Swarm: Datasources Runtime</name>
   <description>WildFly Swarm: Datasources Runtime</description>
@@ -25,25 +25,25 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources</artifactId>
+      <artifactId>datasources</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca-runtime</artifactId>
+      <artifactId>jca-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging-runtime</artifactId>
+      <artifactId>logging-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-runtime</artifactId>
+      <artifactId>security-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/datasources/test/pom.xml b/datasources/test/pom.xml
index fda3e26..bb22625 100644
--- a/datasources/test/pom.xml
+++ b/datasources/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-datasources-parent</artifactId>
+    <artifactId>datasources-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-datasources-test</artifactId>
+  <artifactId>datasources-test</artifactId>
 
   <name>WildFly Swarm: Datasources Test</name>
   <description>WildFly Swarm: Datasources Test</description>
@@ -41,21 +41,21 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources</artifactId>
+      <artifactId>datasources</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources-modules</artifactId>
+      <artifactId>datasources-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources-runtime</artifactId>
+      <artifactId>datasources-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/ee/api/pom.xml b/ee/api/pom.xml
index 32553fe..c0ee47e 100644
--- a/ee/api/pom.xml
+++ b/ee/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ee-parent</artifactId>
+    <artifactId>ee-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ee</artifactId>
+  <artifactId>ee</artifactId>
 
   <name>WildFly Swarm: EE API</name>
   <description>WildFly Swarm: EE API</description>
@@ -25,15 +25,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee-modules</artifactId>
+      <artifactId>ee-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/ee/modules/pom.xml b/ee/modules/pom.xml
index edd7243..9cd3e8b 100644
--- a/ee/modules/pom.xml
+++ b/ee/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ee-parent</artifactId>
+    <artifactId>ee-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ee-modules</artifactId>
+  <artifactId>ee-modules</artifactId>
 
   <name>WildFly Swarm: EE Modules</name>
   <description>WildFly Swarm: EE Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
 
     <dependency>
diff --git a/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/api/module.xml b/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/api/module.xml
index 2ed9130..b6fdfd8 100644
--- a/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/api/module.xml
+++ b/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ee" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ee:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ee:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/runtime/module.xml b/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/runtime/module.xml
index f15e708..37a6e8b 100644
--- a/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/runtime/module.xml
+++ b/ee/modules/src/main/resources/modules/org/wildfly/swarm/ee/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ee" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ee-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ee-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ee/pom.xml b/ee/pom.xml
index 95760b2..76d352e 100644
--- a/ee/pom.xml
+++ b/ee/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ee-parent</artifactId>
+  <artifactId>ee-parent</artifactId>
 
   <name>WildFly Swarm: EE</name>
   <description>WildFly Swarm: EE</description>
diff --git a/ee/runtime/pom.xml b/ee/runtime/pom.xml
index f95034a..28e0473 100644
--- a/ee/runtime/pom.xml
+++ b/ee/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ee-parent</artifactId>
+    <artifactId>ee-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ee-runtime</artifactId>
+  <artifactId>ee-runtime</artifactId>
 
   <name>WildFly Swarm: EE Runtime</name>
   <description>WildFly Swarm: EE Runtime</description>
@@ -25,15 +25,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-runtime</artifactId>
+      <artifactId>naming-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/ee/test/pom.xml b/ee/test/pom.xml
index 5e82735..3cf4abf 100644
--- a/ee/test/pom.xml
+++ b/ee/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ee-parent</artifactId>
+    <artifactId>ee-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ee-test</artifactId>
+  <artifactId>ee-test</artifactId>
 
   <name>WildFly Swarm: EE Test</name>
   <description>WildFly Swarm: EE Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee-modules</artifactId>
+      <artifactId>ee-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/ejb-remote/api/pom.xml b/ejb-remote/api/pom.xml
index 07c011f..fd3d660 100644
--- a/ejb-remote/api/pom.xml
+++ b/ejb-remote/api/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-remote-parent</artifactId>
+    <artifactId>ejb-remote-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-remote</artifactId>
+  <artifactId>ejb-remote</artifactId>
 
   <name>WildFly Swarm: EJB Remote API</name>
   <description>WildFly Swarm: EJB Remote API</description>
@@ -20,25 +20,25 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-remote-modules</artifactId>
+      <artifactId>ejb-remote-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb</artifactId>
+      <artifactId>ejb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting</artifactId>
+      <artifactId>remoting</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
 
   </dependencies>
diff --git a/ejb-remote/modules/pom.xml b/ejb-remote/modules/pom.xml
index fab3b8d..0d7599b 100644
--- a/ejb-remote/modules/pom.xml
+++ b/ejb-remote/modules/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-remote-parent</artifactId>
+    <artifactId>ejb-remote-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-remote-modules</artifactId>
+  <artifactId>ejb-remote-modules</artifactId>
 
   <name>WildFly Swarm: EJB Remote Modules</name>
   <description>WildFly Swarm: EJB Remote Modules</description>
@@ -35,23 +35,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-modules</artifactId>
+      <artifactId>ejb-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting-modules</artifactId>
+      <artifactId>remoting-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/api/module.xml b/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/api/module.xml
index 0a6be7d..f750615 100644
--- a/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/api/module.xml
+++ b/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ejb.remote" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ejb-remote:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ejb-remote:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/runtime/module.xml b/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/runtime/module.xml
index 8df81c3..a2f26aa 100644
--- a/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/runtime/module.xml
+++ b/ejb-remote/modules/src/main/resources/modules/org/wildfly/swarm/ejb/remote/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ejb.remote" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ejb-remote-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ejb-remote-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml
index 58b482f..ac42285 100644
--- a/ejb-remote/pom.xml
+++ b/ejb-remote/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-remote-parent</artifactId>
+  <artifactId>ejb-remote-parent</artifactId>
 
   <name>WildFly Swarm: EJB Remote</name>
   <description>WildFly Swarm: EJB Remote</description>
diff --git a/ejb-remote/runtime/pom.xml b/ejb-remote/runtime/pom.xml
index c07b4ac..dc3c4f4 100644
--- a/ejb-remote/runtime/pom.xml
+++ b/ejb-remote/runtime/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-remote-parent</artifactId>
+    <artifactId>ejb-remote-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-remote-runtime</artifactId>
+  <artifactId>ejb-remote-runtime</artifactId>
 
   <name>WildFly Swarm: EJB Remote Runtime</name>
   <description>WildFly Swarm: EJB Remote Runtime</description>
@@ -20,23 +20,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-remote</artifactId>
+      <artifactId>ejb-remote</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io-runtime</artifactId>
+      <artifactId>io-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting-runtime</artifactId>
+      <artifactId>remoting-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-runtime</artifactId>
+      <artifactId>undertow-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/ejb-remote/test/pom.xml b/ejb-remote/test/pom.xml
index 39ee1b4..e1ffaa4 100644
--- a/ejb-remote/test/pom.xml
+++ b/ejb-remote/test/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-remote-parent</artifactId>
+    <artifactId>ejb-remote-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-remote-test</artifactId>
+  <artifactId>ejb-remote-test</artifactId>
 
   <name>WildFly Swarm: EJB Remote Test</name>
   <description>WildFly Swarm: EJB Remote Test</description>
@@ -36,15 +36,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-remote</artifactId>
+      <artifactId>ejb-remote</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-remote-modules</artifactId>
+      <artifactId>ejb-remote-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/ejb/api/pom.xml b/ejb/api/pom.xml
index 6cb0135..7a69c87 100644
--- a/ejb/api/pom.xml
+++ b/ejb/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-parent</artifactId>
+    <artifactId>ejb-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb</artifactId>
+  <artifactId>ejb</artifactId>
 
   <name>WildFly Swarm: EJB API</name>
   <description>WildFly Swarm: EJB API</description>
@@ -25,25 +25,25 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-modules</artifactId>
+      <artifactId>ejb-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca</artifactId>
+      <artifactId>jca</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security</artifactId>
+      <artifactId>security</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/ejb/modules/pom.xml b/ejb/modules/pom.xml
index 446abee..614cc2e 100644
--- a/ejb/modules/pom.xml
+++ b/ejb/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-parent</artifactId>
+    <artifactId>ejb-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-modules</artifactId>
+  <artifactId>ejb-modules</artifactId>
 
   <name>WildFly Swarm: EJB Modules</name>
   <description>WildFly Swarm: EJB Modules</description>
@@ -40,23 +40,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca-modules</artifactId>
+      <artifactId>jca-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee-modules</artifactId>
+      <artifactId>ee-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-modules</artifactId>
+      <artifactId>security-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/api/module.xml b/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/api/module.xml
index b6668c6..cd75490 100644
--- a/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/api/module.xml
+++ b/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ejb" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ejb:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ejb:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/runtime/module.xml b/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/runtime/module.xml
index 1b99f0a..fa7f8ad 100644
--- a/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/runtime/module.xml
+++ b/ejb/modules/src/main/resources/modules/org/wildfly/swarm/ejb/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ejb" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ejb-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ejb-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ejb/pom.xml b/ejb/pom.xml
index 44521e8..87961f6 100644
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-parent</artifactId>
+  <artifactId>ejb-parent</artifactId>
 
   <name>WildFly Swarm: EJB</name>
   <description>WildFly Swarm: EJB</description>
diff --git a/ejb/runtime/pom.xml b/ejb/runtime/pom.xml
index 055cd52..305f259 100644
--- a/ejb/runtime/pom.xml
+++ b/ejb/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-parent</artifactId>
+    <artifactId>ejb-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-runtime</artifactId>
+  <artifactId>ejb-runtime</artifactId>
 
   <name>WildFly Swarm: EJB Runtime</name>
   <description>WildFly Swarm: EJB Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb</artifactId>
+      <artifactId>ejb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/ejb/test/pom.xml b/ejb/test/pom.xml
index d8442e9..28cae69 100644
--- a/ejb/test/pom.xml
+++ b/ejb/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ejb-parent</artifactId>
+    <artifactId>ejb-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ejb-test</artifactId>
+  <artifactId>ejb-test</artifactId>
 
   <name>WildFly Swarm: EJB Test</name>
   <description>WildFly Swarm: EJB Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb</artifactId>
+      <artifactId>ejb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-modules</artifactId>
+      <artifactId>ejb-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/fraction-list/pom.xml b/fraction-list/pom.xml
index 90b28a6..57d03e2 100644
--- a/fraction-list/pom.xml
+++ b/fraction-list/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-fraction-list</artifactId>
+  <artifactId>fraction-list</artifactId>
 
   <name>WildFly Swarm: Fraction List</name>
   <description>WildFly Swarm: Fraction List</description>
@@ -29,187 +29,187 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bean-validation</artifactId>
+      <artifactId>bean-validation</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector</artifactId>
+      <artifactId>connector</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources</artifactId>
+      <artifactId>datasources</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb</artifactId>
+      <artifactId>ejb</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb-remote</artifactId>
+      <artifactId>ejb-remote</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-hawkular</artifactId>
+      <artifactId>hawkular</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-hibernate-validator</artifactId>
+      <artifactId>hibernate-validator</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-infinispan</artifactId>
+      <artifactId>infinispan</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-jaxb</artifactId>
+      <artifactId>jaxrs-jaxb</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-jsonp</artifactId>
+      <artifactId>jaxrs-jsonp</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-multipart</artifactId>
+      <artifactId>jaxrs-multipart</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-weld</artifactId>
+      <artifactId>jaxrs-weld</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca</artifactId>
+      <artifactId>jca</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jgroups</artifactId>
+      <artifactId>jgroups</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx</artifactId>
+      <artifactId>jmx</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jolokia</artifactId>
+      <artifactId>jolokia</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jpa</artifactId>
+      <artifactId>jpa</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jsf</artifactId>
+      <artifactId>jsf</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak</artifactId>
+      <artifactId>keycloak</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging</artifactId>
+      <artifactId>logging</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logstash</artifactId>
+      <artifactId>logstash</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-mail</artifactId>
+      <artifactId>mail</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-messaging</artifactId>
+      <artifactId>messaging</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc</artifactId>
+      <artifactId>msc</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting</artifactId>
+      <artifactId>remoting</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon</artifactId>
+      <artifactId>ribbon</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-secured</artifactId>
+      <artifactId>ribbon-secured</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-webapp</artifactId>
+      <artifactId>ribbon-webapp</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security</artifactId>
+      <artifactId>security</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions</artifactId>
+      <artifactId>transactions</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-webservices</artifactId>
+      <artifactId>webservices</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-weld</artifactId>
+      <artifactId>weld</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/fraction-list/src/main/ruby/generate.rb b/fraction-list/src/main/ruby/generate.rb
index 6f9096a..d746f13 100644
--- a/fraction-list/src/main/ruby/generate.rb
+++ b/fraction-list/src/main/ruby/generate.rb
@@ -55,7 +55,7 @@ end
 
 def load_dependencies(gav)
   parts = gav.strip.split(':')
-  core = parts[1].gsub(/wildfly-swarm-/, '')
+  core = parts[1]
 
   path = File.join( Dir.pwd, '..', core, 'api', 'target', 'dependencies.info' )
   if ( File.exists?( path ) ) 
diff --git a/fraction-list/src/test/java/org/wildfly/swarm/fractionlist/FractionListTest.java b/fraction-list/src/test/java/org/wildfly/swarm/fractionlist/FractionListTest.java
index eb1e1db..699d6ea 100644
--- a/fraction-list/src/test/java/org/wildfly/swarm/fractionlist/FractionListTest.java
+++ b/fraction-list/src/test/java/org/wildfly/swarm/fractionlist/FractionListTest.java
@@ -19,16 +19,16 @@ public class FractionListTest {
 
         Collection<FractionDescriptor> descriptors = list.getFractionDescriptors();
 
-        FractionDescriptor logstash = descriptors.stream().filter(e -> e.getArtifactId().equals("wildfly-swarm-logstash")).findFirst().get();
+        FractionDescriptor logstash = descriptors.stream().filter(e -> e.getArtifactId().equals("logstash")).findFirst().get();
 
-        assertThat(list.getFractionDescriptor("org.wildfly.swarm", "wildfly-swarm-logstash")).isEqualTo(logstash);
+        assertThat(list.getFractionDescriptor("org.wildfly.swarm", "logstash")).isEqualTo(logstash);
 
         assertThat( logstash.getGroupId() ).isEqualTo("org.wildfly.swarm" );
-        assertThat( logstash.getArtifactId() ).isEqualTo("wildfly-swarm-logstash" );
+        assertThat( logstash.getArtifactId() ).isEqualTo("logstash" );
         assertThat( logstash.getDependencies() ).hasSize(2);
 
-        assertThat( logstash.getDependencies().stream().filter( e->e.getArtifactId().equals ("wildfly-swarm-container" ) ).collect(Collectors.toList())).isNotEmpty();
-        assertThat( logstash.getDependencies().stream().filter( e->e.getArtifactId().equals ("wildfly-swarm-logging" ) ).collect(Collectors.toList())).isNotEmpty();
+        assertThat( logstash.getDependencies().stream().filter( e->e.getArtifactId().equals ("container" ) ).collect(Collectors.toList())).isNotEmpty();
+        assertThat( logstash.getDependencies().stream().filter( e->e.getArtifactId().equals ("logging" ) ).collect(Collectors.toList())).isNotEmpty();
     }
 
 }
diff --git a/guava/pom.xml b/guava/pom.xml
index 822d9a4..613dacf 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-guava</artifactId>
+  <artifactId>guava</artifactId>
 
   <name>WildFly Swarm: Guava</name>
   <description>WildFly Swarm: Guava</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/hawkular/api/pom.xml b/hawkular/api/pom.xml
index a9c9bce..6285cec 100644
--- a/hawkular/api/pom.xml
+++ b/hawkular/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-hawkular-parent</artifactId>
+    <artifactId>hawkular-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-hawkular</artifactId>
+  <artifactId>hawkular</artifactId>
 
   <name>WildFly Swarm: Hawkular API</name>
   <description>WildFly Swarm: Hawkular API</description>
@@ -25,19 +25,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-hawkular-modules</artifactId>
+      <artifactId>hawkular-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/hawkular/modules/pom.xml b/hawkular/modules/pom.xml
index ed965ac..b804813 100644
--- a/hawkular/modules/pom.xml
+++ b/hawkular/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-hawkular-parent</artifactId>
+    <artifactId>hawkular-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-hawkular-modules</artifactId>
+  <artifactId>hawkular-modules</artifactId>
 
   <name>WildFly Swarm: Hawkular Modules</name>
   <description>WildFly Swarm: Hawkular Modules</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-rxjava</artifactId>
+      <artifactId>rxjava</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/hawkular/modules/src/main/resources/modules/org/hawkular/agent/monitor/main/module.xml b/hawkular/modules/src/main/resources/modules/org/hawkular/agent/monitor/main/module.xml
index 80da061..90dcf0a 100644
--- a/hawkular/modules/src/main/resources/modules/org/hawkular/agent/monitor/main/module.xml
+++ b/hawkular/modules/src/main/resources/modules/org/hawkular/agent/monitor/main/module.xml
@@ -77,4 +77,4 @@
       </paths>
     </system>
   </dependencies>
-</module>
\ No newline at end of file
+</module>
diff --git a/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/api/module.xml b/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/api/module.xml
index dc667c8..d6725f7 100644
--- a/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/api/module.xml
+++ b/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/api/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.hawkular" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-hawkular:${project.version}"/>
+    <artifact name="org.wildfly.swarm:hawkular:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/runtime/module.xml b/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/runtime/module.xml
index 44b80da..38d109f 100644
--- a/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/runtime/module.xml
+++ b/hawkular/modules/src/main/resources/modules/org/wildfly/swarm/hawkular/runtime/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.hawkular" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-hawkular-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:hawkular-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/hawkular/pom.xml b/hawkular/pom.xml
index 538b68a..1884533 100644
--- a/hawkular/pom.xml
+++ b/hawkular/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-hawkular-parent</artifactId>
+  <artifactId>hawkular-parent</artifactId>
 
   <name>WildFly Swarm: Hawkular</name>
   <description>WildFly Swarm: Hawkular</description>
diff --git a/hawkular/runtime/pom.xml b/hawkular/runtime/pom.xml
index 82fffa2..963fef3 100644
--- a/hawkular/runtime/pom.xml
+++ b/hawkular/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-hawkular-parent</artifactId>
+    <artifactId>hawkular-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-hawkular-runtime</artifactId>
+  <artifactId>hawkular-runtime</artifactId>
 
   <name>WildFly Swarm: Hawkular Runtime</name>
   <description>WildFly Swarm: Hawkular Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-hawkular</artifactId>
+      <artifactId>hawkular</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/hawkular/test/pom.xml b/hawkular/test/pom.xml
index e98809c..94a88f4 100644
--- a/hawkular/test/pom.xml
+++ b/hawkular/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-hawkular-parent</artifactId>
+    <artifactId>hawkular-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-hawkular-test</artifactId>
+  <artifactId>hawkular-test</artifactId>
 
   <name>WildFly Swarm: Hawkular Test</name>
   <description>WildFly Swarm: Hawkular Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-hawkular</artifactId>
+      <artifactId>hawkular</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-hawkular-modules</artifactId>
+      <artifactId>hawkular-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hibernate-validator/pom.xml b/hibernate-validator/pom.xml
index 0d3f269..b0c1af9 100644
--- a/hibernate-validator/pom.xml
+++ b/hibernate-validator/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-hibernate-validator</artifactId>
+  <artifactId>hibernate-validator</artifactId>
 
   <name>WildFly Swarm: Hibernate Validator</name>
   <description>WildFly Swarm: Hibernate Validator</description>
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index eb14964..b71cd3c 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-hystrix</artifactId>
+  <artifactId>hystrix</artifactId>
 
   <name>WildFly Swarm: Hystrix</name>
   <description>WildFly Swarm: Hystrix</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-archaius</artifactId>
+      <artifactId>archaius</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-rxjava</artifactId>
+      <artifactId>rxjava</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/infinispan/api/pom.xml b/infinispan/api/pom.xml
index 011a888..e081225 100644
--- a/infinispan/api/pom.xml
+++ b/infinispan/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-infinispan-parent</artifactId>
+    <artifactId>infinispan-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-infinispan</artifactId>
+  <artifactId>infinispan</artifactId>
 
   <name>WildFly Swarm: Infinispan API</name>
   <description>WildFly Swarm: Infinispan API</description>
@@ -25,17 +25,24 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-infinispan-modules</artifactId>
+      <artifactId>infinispan-modules</artifactId>
     </dependency>
 
-    <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx</artifactId>
+      <artifactId>jgroups</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>naming</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jmx</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/infinispan/modules/pom.xml b/infinispan/modules/pom.xml
index 488195d..c14f56f 100644
--- a/infinispan/modules/pom.xml
+++ b/infinispan/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-infinispan-parent</artifactId>
+    <artifactId>infinispan-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-infinispan-modules</artifactId>
+  <artifactId>infinispan-modules</artifactId>
 
   <name>WildFly Swarm: Infinispan Modules</name>
   <description>WildFly Swarm: Infinispan Modules</description>
@@ -40,11 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jgroups-modules</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jmx-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/api/module.xml b/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/api/module.xml
index 380e708..b2c397f 100644
--- a/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/api/module.xml
+++ b/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.infinispan" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-infinispan:${project.version}"/>
+    <artifact name="org.wildfly.swarm:infinispan:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/runtime/module.xml b/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/runtime/module.xml
index d548e96..6dab087 100644
--- a/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/runtime/module.xml
+++ b/infinispan/modules/src/main/resources/modules/org/wildfly/swarm/infinispan/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.infinispan" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-infinispan-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:infinispan-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/infinispan/pom.xml b/infinispan/pom.xml
index 97f68ed..356bccd 100644
--- a/infinispan/pom.xml
+++ b/infinispan/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-infinispan-parent</artifactId>
+  <artifactId>infinispan-parent</artifactId>
 
   <name>WildFly Swarm: Infinispan</name>
   <description>WildFly Swarm: Infinispan</description>
diff --git a/infinispan/runtime/pom.xml b/infinispan/runtime/pom.xml
index 1f37e36..28d9cc7 100644
--- a/infinispan/runtime/pom.xml
+++ b/infinispan/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-infinispan-parent</artifactId>
+    <artifactId>infinispan-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-infinispan-runtime</artifactId>
+  <artifactId>infinispan-runtime</artifactId>
 
   <name>WildFly Swarm: Infinispan Runtime</name>
   <description>WildFly Swarm: Infinispan Runtime</description>
@@ -25,15 +25,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-infinispan</artifactId>
+      <artifactId>infinispan</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx-runtime</artifactId>
+      <artifactId>msc-runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jmx-runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jgroups-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/infinispan/test/pom.xml b/infinispan/test/pom.xml
index 99a3a35..f341f83 100644
--- a/infinispan/test/pom.xml
+++ b/infinispan/test/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-infinispan-parent</artifactId>
+    <artifactId>infinispan-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-infinispan-test</artifactId>
+  <artifactId>infinispan-test</artifactId>
 
   <name>WildFly Swarm: Infinispan Test</name>
   <description>WildFly Swarm: Infinispan Test</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-infinispan</artifactId>
+      <artifactId>infinispan</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-infinispan-modules</artifactId>
+      <artifactId>infinispan-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
@@ -52,20 +52,40 @@
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc</artifactId>
+      <artifactId>infinispan-runtime</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>logging</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>logging-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>msc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>naming</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>naming-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.arquillian.junit</groupId>
       <artifactId>arquillian-junit-container</artifactId>
       <scope>test</scope>
diff --git a/infinispan/test/src/test/java/org/wildfly/swarm/infinispan/InfinispanTests.java b/infinispan/test/src/test/java/org/wildfly/swarm/infinispan/InfinispanTests.java
index 15b3e4c..d0630f6 100644
--- a/infinispan/test/src/test/java/org/wildfly/swarm/infinispan/InfinispanTests.java
+++ b/infinispan/test/src/test/java/org/wildfly/swarm/infinispan/InfinispanTests.java
@@ -21,14 +21,17 @@ import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Test;
+import org.wildfly.swarm.ContainerFactory;
+import org.wildfly.swarm.container.Container;
 import org.wildfly.swarm.container.JARArchive;
+import org.wildfly.swarm.logging.LoggingFraction;
 
 import javax.naming.InitialContext;
 
 import static org.junit.Assert.assertEquals;
 
 @SuppressWarnings({"unchecked", "unused"})
-public class InfinispanTests {
+public class InfinispanTests implements ContainerFactory {
     @Deployment
     public static Archive createDeployment() {
         return ShrinkWrap.create(JARArchive.class)
@@ -44,4 +47,9 @@ public class InfinispanTests {
         cache.put("ham", "biscuit");
         assertEquals("biscuit", cache.get("ham"));
     }
+
+    @Override
+    public Container newContainer(String... args) throws Exception {
+        return new Container().fraction( LoggingFraction.createDebugLoggingFraction() );
+    }
 }
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7965959..066564a 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-integration-tests</artifactId>
+  <artifactId>integration-tests</artifactId>
 
   <name>WildFly Swarm: Integration Tests</name>
   <description>WildFly Swarm: Integration Tests</description>
@@ -27,40 +27,40 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector</artifactId>
+      <artifactId>connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ejb</artifactId>
+      <artifactId>ejb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca</artifactId>
+      <artifactId>jca</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jpa</artifactId>
+      <artifactId>jpa</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-mail</artifactId>
+      <artifactId>mail</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-weld</artifactId>
+      <artifactId>weld</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/src/test/java/org/wildfly/swarm/integration/ejb/EJBOutsideTest.java b/integration-tests/src/test/java/org/wildfly/swarm/integration/ejb/EJBOutsideTest.java
index 6c62c03..51ba024 100644
--- a/integration-tests/src/test/java/org/wildfly/swarm/integration/ejb/EJBOutsideTest.java
+++ b/integration-tests/src/test/java/org/wildfly/swarm/integration/ejb/EJBOutsideTest.java
@@ -58,8 +58,8 @@ public class EJBOutsideTest {
     @ArtifactDependencies
     public static List<String> appDependencies() {
         return Arrays.asList(
-                "org.wildfly.swarm:wildfly-swarm-ejb",
-                "org.wildfly.swarm:wildfly-swarm-jaxrs"
+                "org.wildfly.swarm:ejb",
+                "org.wildfly.swarm:jaxrs"
         );
     }
 
diff --git a/integration-tests/src/test/java/org/wildfly/swarm/integration/jaxrs/JAXRSTest.java b/integration-tests/src/test/java/org/wildfly/swarm/integration/jaxrs/JAXRSTest.java
index f354f4e..6033d0b 100644
--- a/integration-tests/src/test/java/org/wildfly/swarm/integration/jaxrs/JAXRSTest.java
+++ b/integration-tests/src/test/java/org/wildfly/swarm/integration/jaxrs/JAXRSTest.java
@@ -55,7 +55,7 @@ public class JAXRSTest {
     @ArtifactDependencies
     public static List<String> appDependencies() {
         return Arrays.asList(
-                "org.wildfly.swarm:wildfly-swarm-jaxrs"
+                "org.wildfly.swarm:jaxrs"
         );
     }
 
diff --git a/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarSubdirTest.java b/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarSubdirTest.java
index 98410c2..87e75d6 100644
--- a/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarSubdirTest.java
+++ b/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarSubdirTest.java
@@ -35,7 +35,7 @@ public class StaticContentWarSubdirTest {
     @ArtifactDependencies
     public static List<String> appDependencies() {
         return Arrays.asList(
-                "org.wildfly.swarm:wildfly-swarm-undertow"
+                "org.wildfly.swarm:undertow"
         );
     }
 
diff --git a/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarTest.java b/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarTest.java
index 859b3b0..8c5329a 100644
--- a/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarTest.java
+++ b/integration-tests/src/test/java/org/wildfly/swarm/integration/staticcontent/war/StaticContentWarTest.java
@@ -53,7 +53,7 @@ public class StaticContentWarTest implements StaticContentCommonTests {
     @ArtifactDependencies
     public static List<String> appDependencies() {
         return Arrays.asList(
-                "org.wildfly.swarm:wildfly-swarm-undertow"
+                "org.wildfly.swarm:undertow"
         );
     }
 
diff --git a/io/api/pom.xml b/io/api/pom.xml
index 1861d3f..731b2d5 100644
--- a/io/api/pom.xml
+++ b/io/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-io-parent</artifactId>
+    <artifactId>io-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-io</artifactId>
+  <artifactId>io</artifactId>
 
   <name>WildFly Swarm: IO API</name>
   <description>WildFly Swarm: IO API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io-modules</artifactId>
+      <artifactId>io-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/io/modules/pom.xml b/io/modules/pom.xml
index ea3bc59..4b72e55 100644
--- a/io/modules/pom.xml
+++ b/io/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-io-parent</artifactId>
+    <artifactId>io-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-io-modules</artifactId>
+  <artifactId>io-modules</artifactId>
 
   <name>WildFly Swarm: IO Modules</name>
   <description>WildFly Swarm: IO Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/io/modules/src/main/resources/modules/org/wildfly/swarm/io/api/module.xml b/io/modules/src/main/resources/modules/org/wildfly/swarm/io/api/module.xml
index 49d703b..373e278 100644
--- a/io/modules/src/main/resources/modules/org/wildfly/swarm/io/api/module.xml
+++ b/io/modules/src/main/resources/modules/org/wildfly/swarm/io/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.io" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-io:${project.version}"/>
+    <artifact name="org.wildfly.swarm:io:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/io/modules/src/main/resources/modules/org/wildfly/swarm/io/runtime/module.xml b/io/modules/src/main/resources/modules/org/wildfly/swarm/io/runtime/module.xml
index 4f2f605..334f161 100644
--- a/io/modules/src/main/resources/modules/org/wildfly/swarm/io/runtime/module.xml
+++ b/io/modules/src/main/resources/modules/org/wildfly/swarm/io/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.io" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-io-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:io-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/io/pom.xml b/io/pom.xml
index b6bc72d..fb2affc 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-io-parent</artifactId>
+  <artifactId>io-parent</artifactId>
 
   <name>WildFly Swarm: IO</name>
   <description>WildFly Swarm: IO</description>
diff --git a/io/runtime/pom.xml b/io/runtime/pom.xml
index 61de34f..949f587 100644
--- a/io/runtime/pom.xml
+++ b/io/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-io-parent</artifactId>
+    <artifactId>io-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-io-runtime</artifactId>
+  <artifactId>io-runtime</artifactId>
 
   <name>WildFly Swarm: IO Runtime</name>
   <description>WildFly Swarm: IO Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io</artifactId>
+      <artifactId>io</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/io/test/pom.xml b/io/test/pom.xml
index 713bec3..741c2a6 100644
--- a/io/test/pom.xml
+++ b/io/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-io-parent</artifactId>
+    <artifactId>io-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-io-test</artifactId>
+  <artifactId>io-test</artifactId>
 
   <name>WildFly Swarm: IO Test</name>
   <description>WildFly Swarm: IO Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io</artifactId>
+      <artifactId>io</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io-modules</artifactId>
+      <artifactId>io-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jaxrs-jaxb/pom.xml b/jaxrs-jaxb/pom.xml
index a485fca..ed471fd 100644
--- a/jaxrs-jaxb/pom.xml
+++ b/jaxrs-jaxb/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-jaxb</artifactId>
+  <artifactId>jaxrs-jaxb</artifactId>
 
   <name>WildFly Swarm: JAX-RS + JAXB</name>
   <description>WildFly Swarm: JAX-RS + JAXB</description>
@@ -36,7 +36,7 @@
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
 
     <dependency>
diff --git a/jaxrs-jsonp/pom.xml b/jaxrs-jsonp/pom.xml
index 6ebc44e..aa379e6 100644
--- a/jaxrs-jsonp/pom.xml
+++ b/jaxrs-jsonp/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-jsonp</artifactId>
+  <artifactId>jaxrs-jsonp</artifactId>
 
   <name>WildFly Swarm: JAX-RS + JSON-P</name>
   <description>WildFly Swarm: JAX-RS + JSON-P</description>
@@ -36,7 +36,7 @@
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/jaxrs-multipart/pom.xml b/jaxrs-multipart/pom.xml
index eeec88c..ee054d7 100644
--- a/jaxrs-multipart/pom.xml
+++ b/jaxrs-multipart/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-multipart</artifactId>
+  <artifactId>jaxrs-multipart</artifactId>
 
   <name>WildFly Swarm: JAX-RS + Multipart</name>
   <description>WildFly Swarm: JAX-RS + Multipart</description>
@@ -41,7 +41,7 @@
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/jaxrs-weld/pom.xml b/jaxrs-weld/pom.xml
index e66474e..95a0f21 100644
--- a/jaxrs-weld/pom.xml
+++ b/jaxrs-weld/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-weld</artifactId>
+  <artifactId>jaxrs-weld</artifactId>
 
   <name>WildFly Swarm: JAX-RS + Weld</name>
   <description>WildFly Swarm: JAX-RS + Weld</description>
@@ -41,11 +41,11 @@
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-weld</artifactId>
+      <artifactId>weld</artifactId>
     </dependency>
 
     <dependency>
diff --git a/jaxrs/api/pom.xml b/jaxrs/api/pom.xml
index 0ab91ed..7e2785f 100644
--- a/jaxrs/api/pom.xml
+++ b/jaxrs/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jaxrs-parent</artifactId>
+    <artifactId>jaxrs-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs</artifactId>
+  <artifactId>jaxrs</artifactId>
 
   <name>WildFly Swarm: JAX-RS API</name>
   <description>WildFly Swarm: JAX-RS API</description>
@@ -25,25 +25,25 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-modules</artifactId>
+      <artifactId>jaxrs-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security</artifactId>
+      <artifactId>security</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/jaxrs/modules/pom.xml b/jaxrs/modules/pom.xml
index c72d70d..74fab54 100644
--- a/jaxrs/modules/pom.xml
+++ b/jaxrs/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jaxrs-parent</artifactId>
+    <artifactId>jaxrs-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-modules</artifactId>
+  <artifactId>jaxrs-modules</artifactId>
 
   <name>WildFly Swarm: JAX-RS Modules</name>
   <description>WildFly Swarm: JAX-RS Modules</description>
@@ -40,23 +40,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-modules</artifactId>
+      <artifactId>naming-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-modules</artifactId>
+      <artifactId>security-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/api/module.xml b/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/api/module.xml
index 8bb1c2f..efe28a6 100644
--- a/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/api/module.xml
+++ b/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jaxrs" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jaxrs:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jaxrs:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/runtime/module.xml b/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/runtime/module.xml
index 8152e13..ba27012 100644
--- a/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/runtime/module.xml
+++ b/jaxrs/modules/src/main/resources/modules/org/wildfly/swarm/jaxrs/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jaxrs" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jaxrs-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jaxrs-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 9692d29..8d91431 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-parent</artifactId>
+  <artifactId>jaxrs-parent</artifactId>
 
   <name>WildFly Swarm: JAX-RS</name>
   <description>WildFly Swarm: JAX-RS</description>
diff --git a/jaxrs/runtime/pom.xml b/jaxrs/runtime/pom.xml
index 10500b5..722c9ed 100644
--- a/jaxrs/runtime/pom.xml
+++ b/jaxrs/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jaxrs-parent</artifactId>
+    <artifactId>jaxrs-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-runtime</artifactId>
+  <artifactId>jaxrs-runtime</artifactId>
 
   <name>WildFly Swarm: JAX-RS Runtime</name>
   <description>WildFly Swarm: JAX-RS Runtime</description>
@@ -25,15 +25,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-runtime</artifactId>
+      <artifactId>undertow-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/jaxrs/test/pom.xml b/jaxrs/test/pom.xml
index 682d74c..fe99a3f 100644
--- a/jaxrs/test/pom.xml
+++ b/jaxrs/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jaxrs-parent</artifactId>
+    <artifactId>jaxrs-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jaxrs-test</artifactId>
+  <artifactId>jaxrs-test</artifactId>
 
   <name>WildFly Swarm: JAX-RS Test</name>
   <description>WildFly Swarm: JAX-RS Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-modules</artifactId>
+      <artifactId>jaxrs-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jca/api/pom.xml b/jca/api/pom.xml
index 9a17ad5..dd851c6 100644
--- a/jca/api/pom.xml
+++ b/jca/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jca-parent</artifactId>
+    <artifactId>jca-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jca</artifactId>
+  <artifactId>jca</artifactId>
 
   <name>WildFly Swarm: JCA API</name>
   <description>WildFly Swarm: JCA API</description>
@@ -25,21 +25,21 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca-modules</artifactId>
+      <artifactId>jca-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector</artifactId>
+      <artifactId>connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions</artifactId>
+      <artifactId>transactions</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/jca/modules/pom.xml b/jca/modules/pom.xml
index 71b387f..69e0a61 100644
--- a/jca/modules/pom.xml
+++ b/jca/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jca-parent</artifactId>
+    <artifactId>jca-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jca-modules</artifactId>
+  <artifactId>jca-modules</artifactId>
 
   <name>WildFly Swarm: JCA Modules</name>
   <description>WildFly Swarm: JCA Modules</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector-modules</artifactId>
+      <artifactId>connector-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions-modules</artifactId>
+      <artifactId>transactions-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/api/module.xml b/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/api/module.xml
index 5e7ee6c..e2fbd17 100644
--- a/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/api/module.xml
+++ b/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jca" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jca:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jca:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/runtime/module.xml b/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/runtime/module.xml
index 8b4fe74..2b15d56 100644
--- a/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/runtime/module.xml
+++ b/jca/modules/src/main/resources/modules/org/wildfly/swarm/jca/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jca" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jca-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jca-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jca/pom.xml b/jca/pom.xml
index 3c00ecb..227df19 100644
--- a/jca/pom.xml
+++ b/jca/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jca-parent</artifactId>
+  <artifactId>jca-parent</artifactId>
 
   <name>WildFly Swarm: JCA</name>
   <description>WildFly Swarm: JCA</description>
diff --git a/jca/runtime/pom.xml b/jca/runtime/pom.xml
index 0780e8b..adcee7b 100644
--- a/jca/runtime/pom.xml
+++ b/jca/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jca-parent</artifactId>
+    <artifactId>jca-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jca-runtime</artifactId>
+  <artifactId>jca-runtime</artifactId>
 
   <name>WildFly Swarm: JCA Runtime</name>
   <description>WildFly Swarm: JCA Runtime</description>
@@ -25,20 +25,20 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca</artifactId>
+      <artifactId>jca</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector-runtime</artifactId>
+      <artifactId>connector-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions-runtime</artifactId>
+      <artifactId>transactions-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/jca/test/pom.xml b/jca/test/pom.xml
index 09892d9..9a5310d 100644
--- a/jca/test/pom.xml
+++ b/jca/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jca-parent</artifactId>
+    <artifactId>jca-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jca-test</artifactId>
+  <artifactId>jca-test</artifactId>
 
   <name>WildFly Swarm: JCA Test</name>
   <description>WildFly Swarm: JCA Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca</artifactId>
+      <artifactId>jca</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca-modules</artifactId>
+      <artifactId>jca-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jgroups/api/pom.xml b/jgroups/api/pom.xml
index 904da3a..f3fc75f 100644
--- a/jgroups/api/pom.xml
+++ b/jgroups/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jgroups-parent</artifactId>
+    <artifactId>jgroups-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jgroups</artifactId>
+  <artifactId>jgroups</artifactId>
 
   <name>WildFly Swarm: JGroups API</name>
   <description>WildFly Swarm: JGroups API</description>
@@ -25,17 +25,17 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jgroups-modules</artifactId>
+      <artifactId>jgroups-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx</artifactId>
+      <artifactId>jmx</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/jgroups/modules/pom.xml b/jgroups/modules/pom.xml
index faa33db..5d06371 100644
--- a/jgroups/modules/pom.xml
+++ b/jgroups/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jgroups-parent</artifactId>
+    <artifactId>jgroups-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jgroups-modules</artifactId>
+  <artifactId>jgroups-modules</artifactId>
 
   <name>WildFly Swarm: JGroups Modules</name>
   <description>WildFly Swarm: JGroups Modules</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx-modules</artifactId>
+      <artifactId>jmx-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/api/module.xml b/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/api/module.xml
index 860c8d2..e516a99 100644
--- a/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/api/module.xml
+++ b/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jgroups" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jgroups:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jgroups:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/runtime/module.xml b/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/runtime/module.xml
index 0333723..c39fbec 100644
--- a/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/runtime/module.xml
+++ b/jgroups/modules/src/main/resources/modules/org/wildfly/swarm/jgroups/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jgroups" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jgroups-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jgroups-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jgroups/pom.xml b/jgroups/pom.xml
index 419a79a..4531993 100644
--- a/jgroups/pom.xml
+++ b/jgroups/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jgroups-parent</artifactId>
+  <artifactId>jgroups-parent</artifactId>
 
   <name>WildFly Swarm: JGroups</name>
   <description>WildFly Swarm: JGroups</description>
diff --git a/jgroups/runtime/pom.xml b/jgroups/runtime/pom.xml
index d870e97..ad1f664 100644
--- a/jgroups/runtime/pom.xml
+++ b/jgroups/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jgroups-parent</artifactId>
+    <artifactId>jgroups-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jgroups-runtime</artifactId>
+  <artifactId>jgroups-runtime</artifactId>
 
   <name>WildFly Swarm: JGroups Runtime</name>
   <description>WildFly Swarm: JGroups Runtime</description>
@@ -25,15 +25,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jgroups</artifactId>
+      <artifactId>jgroups</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx-runtime</artifactId>
+      <artifactId>jmx-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jgroups/test/pom.xml b/jgroups/test/pom.xml
index 56bf42e..ff0563d 100644
--- a/jgroups/test/pom.xml
+++ b/jgroups/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jgroups-parent</artifactId>
+    <artifactId>jgroups-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jgroups-test</artifactId>
+  <artifactId>jgroups-test</artifactId>
 
   <name>WildFly Swarm: JGroups Test</name>
   <description>WildFly Swarm: JGroups Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jgroups</artifactId>
+      <artifactId>jgroups</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jgroups-modules</artifactId>
+      <artifactId>jgroups-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -57,6 +57,28 @@
       <artifactId>arquillian-junit-container</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- for build ordering -->
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>container-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jgroups-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>jmx-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>msc-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/jmx/api/pom.xml b/jmx/api/pom.xml
index 0bd5f9a..42b9719 100644
--- a/jmx/api/pom.xml
+++ b/jmx/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jmx-parent</artifactId>
+    <artifactId>jmx-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jmx</artifactId>
+  <artifactId>jmx</artifactId>
 
   <name>WildFly Swarm: JMX API</name>
   <description>WildFly Swarm: JMX API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx-modules</artifactId>
+      <artifactId>jmx-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/jmx/modules/pom.xml b/jmx/modules/pom.xml
index 462943b..d912810 100644
--- a/jmx/modules/pom.xml
+++ b/jmx/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jmx-parent</artifactId>
+    <artifactId>jmx-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jmx-modules</artifactId>
+  <artifactId>jmx-modules</artifactId>
 
   <name>WildFly Swarm: JMX Modules</name>
   <description>WildFly Swarm: JMX Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/api/module.xml b/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/api/module.xml
index e80254b..0c7bc7d 100644
--- a/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/api/module.xml
+++ b/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jmx" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jmx:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jmx:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/runtime/module.xml b/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/runtime/module.xml
index 9447f78..5c38ad0 100644
--- a/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/runtime/module.xml
+++ b/jmx/modules/src/main/resources/modules/org/wildfly/swarm/jmx/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jmx" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jmx-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jmx-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jmx/pom.xml b/jmx/pom.xml
index 4140b74..c721f6a 100644
--- a/jmx/pom.xml
+++ b/jmx/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jmx-parent</artifactId>
+  <artifactId>jmx-parent</artifactId>
 
   <name>WildFly Swarm: JMX</name>
   <description>WildFly Swarm: JMX</description>
diff --git a/jmx/runtime/pom.xml b/jmx/runtime/pom.xml
index c41bade..e3b0e0b 100644
--- a/jmx/runtime/pom.xml
+++ b/jmx/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jmx-parent</artifactId>
+    <artifactId>jmx-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jmx-runtime</artifactId>
+  <artifactId>jmx-runtime</artifactId>
 
   <name>WildFly Swarm: JMX Runtime</name>
   <description>WildFly Swarm: JMX Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx</artifactId>
+      <artifactId>jmx</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jmx/test/pom.xml b/jmx/test/pom.xml
index 33d0e3a..0def11a 100644
--- a/jmx/test/pom.xml
+++ b/jmx/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jmx-parent</artifactId>
+    <artifactId>jmx-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jmx-test</artifactId>
+  <artifactId>jmx-test</artifactId>
 
   <name>WildFly Swarm: JMX Test</name>
   <description>WildFly Swarm: JMX Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx</artifactId>
+      <artifactId>jmx</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jmx-modules</artifactId>
+      <artifactId>jmx-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jolokia/api/pom.xml b/jolokia/api/pom.xml
index eecb793..4c6f857 100644
--- a/jolokia/api/pom.xml
+++ b/jolokia/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jolokia-parent</artifactId>
+    <artifactId>jolokia-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jolokia</artifactId>
+  <artifactId>jolokia</artifactId>
 
   <name>WildFly Swarm: Jolokia API</name>
   <description>WildFly Swarm: Jolokia API</description>
@@ -25,15 +25,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jolokia-modules</artifactId>
+      <artifactId>jolokia-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jolokia</groupId>
diff --git a/jolokia/modules/pom.xml b/jolokia/modules/pom.xml
index e75f4e3..05f7bea 100644
--- a/jolokia/modules/pom.xml
+++ b/jolokia/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jolokia-parent</artifactId>
+    <artifactId>jolokia-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jolokia-modules</artifactId>
+  <artifactId>jolokia-modules</artifactId>
 
   <name>WildFly Swarm: Jolokia Modules</name>
   <description>WildFly Swarm: Jolokia Modules</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/api/module.xml b/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/api/module.xml
index a18caf2..3f9e1b5 100644
--- a/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/api/module.xml
+++ b/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/api/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jolokia" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jolokia:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jolokia:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/runtime/module.xml b/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/runtime/module.xml
index 0196971..9e9498a 100644
--- a/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/runtime/module.xml
+++ b/jolokia/modules/src/main/resources/modules/org/wildfly/swarm/jolokia/runtime/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jolokia" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jolokia-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jolokia-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jolokia/pom.xml b/jolokia/pom.xml
index dec18a8..dbce620 100644
--- a/jolokia/pom.xml
+++ b/jolokia/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jolokia-parent</artifactId>
+  <artifactId>jolokia-parent</artifactId>
 
   <name>WildFly Swarm: Jolokia</name>
   <description>WildFly Swarm: Jolokia</description>
diff --git a/jolokia/runtime/pom.xml b/jolokia/runtime/pom.xml
index 82cca38..3db52a8 100644
--- a/jolokia/runtime/pom.xml
+++ b/jolokia/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jolokia-parent</artifactId>
+    <artifactId>jolokia-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jolokia-runtime</artifactId>
+  <artifactId>jolokia-runtime</artifactId>
 
   <name>WildFly Swarm: Jolokia Runtime</name>
   <description>WildFly Swarm: Jolokia Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jolokia</artifactId>
+      <artifactId>jolokia</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jpa/api/pom.xml b/jpa/api/pom.xml
index ce9e809..1164860 100644
--- a/jpa/api/pom.xml
+++ b/jpa/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jpa-parent</artifactId>
+    <artifactId>jpa-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jpa</artifactId>
+  <artifactId>jpa</artifactId>
 
   <name>WildFly Swarm: JPA API</name>
   <description>WildFly Swarm: JPA API</description>
@@ -25,21 +25,21 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jpa-modules</artifactId>
+      <artifactId>jpa-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources</artifactId>
+      <artifactId>datasources</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/jpa/modules/pom.xml b/jpa/modules/pom.xml
index c1f23fd..3bd6ea4 100644
--- a/jpa/modules/pom.xml
+++ b/jpa/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jpa-parent</artifactId>
+    <artifactId>jpa-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jpa-modules</artifactId>
+  <artifactId>jpa-modules</artifactId>
 
   <name>WildFly Swarm: JPA Modules</name>
   <description>WildFly Swarm: JPA Modules</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources-modules</artifactId>
+      <artifactId>datasources-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee-modules</artifactId>
+      <artifactId>ee-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jpa/modules/src/main/resources/modules/com/h2database/h2/main/module.xml b/jpa/modules/src/main/resources/modules/com/h2database/h2/main/module.xml
index 401386b..c36e3e6 100644
--- a/jpa/modules/src/main/resources/modules/com/h2database/h2/main/module.xml
+++ b/jpa/modules/src/main/resources/modules/com/h2database/h2/main/module.xml
@@ -9,4 +9,4 @@
     <module name="javax.transaction.api"/>
     <module name="javax.servlet.api" optional="true"/>
   </dependencies>
-</module>
\ No newline at end of file
+</module>
diff --git a/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/api/module.xml b/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/api/module.xml
index 12ec82e..a33be34 100644
--- a/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/api/module.xml
+++ b/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jpa" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jpa:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jpa:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/runtime/module.xml b/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/runtime/module.xml
index 106f79e..cfbae93 100644
--- a/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/runtime/module.xml
+++ b/jpa/modules/src/main/resources/modules/org/wildfly/swarm/jpa/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jpa" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jpa-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jpa-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jpa/pom.xml b/jpa/pom.xml
index 1479d8b..c7452f5 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jpa-parent</artifactId>
+  <artifactId>jpa-parent</artifactId>
 
   <name>WildFly Swarm: JPA</name>
   <description>WildFly Swarm: JPA</description>
diff --git a/jpa/runtime/pom.xml b/jpa/runtime/pom.xml
index 65ea017..990abf5 100644
--- a/jpa/runtime/pom.xml
+++ b/jpa/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jpa-parent</artifactId>
+    <artifactId>jpa-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jpa-runtime</artifactId>
+  <artifactId>jpa-runtime</artifactId>
 
   <name>WildFly Swarm: JPA Runtime</name>
   <description>WildFly Swarm: JPA Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jpa</artifactId>
+      <artifactId>jpa</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jpa/test/pom.xml b/jpa/test/pom.xml
index 066e9a9..d539a9b 100644
--- a/jpa/test/pom.xml
+++ b/jpa/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jpa-parent</artifactId>
+    <artifactId>jpa-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jpa-test</artifactId>
+  <artifactId>jpa-test</artifactId>
 
   <name>WildFly Swarm: JPA Test</name>
   <description>WildFly Swarm: JPA Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jpa</artifactId>
+      <artifactId>jpa</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jpa-modules</artifactId>
+      <artifactId>jpa-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jsf/api/pom.xml b/jsf/api/pom.xml
index 4c2c243..b7ee9d8 100644
--- a/jsf/api/pom.xml
+++ b/jsf/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jsf-parent</artifactId>
+    <artifactId>jsf-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jsf</artifactId>
+  <artifactId>jsf</artifactId>
 
   <name>WildFly Swarm: JSF API</name>
   <description>WildFly Swarm: JSF API</description>
@@ -25,17 +25,17 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jsf-modules</artifactId>
+      <artifactId>jsf-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/jsf/modules/pom.xml b/jsf/modules/pom.xml
index 7e79698..8fd6e08 100644
--- a/jsf/modules/pom.xml
+++ b/jsf/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jsf-parent</artifactId>
+    <artifactId>jsf-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jsf-modules</artifactId>
+  <artifactId>jsf-modules</artifactId>
 
   <name>WildFly Swarm: JSF Modules</name>
   <description>WildFly Swarm: JSF Modules</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/api/module.xml b/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/api/module.xml
index 75f8fd4..7943cb3 100644
--- a/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/api/module.xml
+++ b/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jsf" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jsf:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jsf:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/runtime/module.xml b/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/runtime/module.xml
index 8389bdb..15aa749 100644
--- a/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/runtime/module.xml
+++ b/jsf/modules/src/main/resources/modules/org/wildfly/swarm/jsf/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.jsf" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-jsf-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:jsf-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/jsf/pom.xml b/jsf/pom.xml
index fbb93e7..5bb85ae 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jsf-parent</artifactId>
+  <artifactId>jsf-parent</artifactId>
 
   <name>WildFly Swarm: JSF</name>
   <description>WildFly Swarm: JSF</description>
diff --git a/jsf/runtime/pom.xml b/jsf/runtime/pom.xml
index aae89d2..454ddaa 100644
--- a/jsf/runtime/pom.xml
+++ b/jsf/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jsf-parent</artifactId>
+    <artifactId>jsf-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jsf-runtime</artifactId>
+  <artifactId>jsf-runtime</artifactId>
 
   <name>WildFly Swarm: JSF Runtime</name>
   <description>WildFly Swarm: JSF Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jsf</artifactId>
+      <artifactId>jsf</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/jsf/test/pom.xml b/jsf/test/pom.xml
index 03ea296..c8a8bb6 100644
--- a/jsf/test/pom.xml
+++ b/jsf/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-jsf-parent</artifactId>
+    <artifactId>jsf-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-jsf-test</artifactId>
+  <artifactId>jsf-test</artifactId>
 
   <name>WildFly Swarm: JSF Test</name>
   <description>WildFly Swarm: JSF Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jsf</artifactId>
+      <artifactId>jsf</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jsf-modules</artifactId>
+      <artifactId>jsf-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/keycloak-server/api/pom.xml b/keycloak-server/api/pom.xml
index 36d8d43..4691e24 100644
--- a/keycloak-server/api/pom.xml
+++ b/keycloak-server/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-server-parent</artifactId>
+    <artifactId>keycloak-server-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-server</artifactId>
+  <artifactId>keycloak-server</artifactId>
 
   <name>WildFly Swarm: Keycloak Server API</name>
   <description>WildFly Swarm: Keycloak Server API</description>
@@ -25,29 +25,29 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-server-modules</artifactId>
+      <artifactId>keycloak-server-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-infinispan</artifactId>
+      <artifactId>infinispan</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources</artifactId>
+      <artifactId>datasources</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
 
   </dependencies>
diff --git a/keycloak-server/modules/pom.xml b/keycloak-server/modules/pom.xml
index beb3977..6c5ff0e 100644
--- a/keycloak-server/modules/pom.xml
+++ b/keycloak-server/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-server-parent</artifactId>
+    <artifactId>keycloak-server-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-server-modules</artifactId>
+  <artifactId>keycloak-server-modules</artifactId>
 
   <name>WildFly Swarm: Keycloak Server Modules</name>
   <description>WildFly Swarm: Keycloak Server Modules</description>
@@ -40,23 +40,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-modules</artifactId>
+      <artifactId>jaxrs-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-infinispan-modules</artifactId>
+      <artifactId>infinispan-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-datasources-modules</artifactId>
+      <artifactId>datasources-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/api/module.xml b/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/api/module.xml
index b573908..ce987b3 100644
--- a/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/api/module.xml
+++ b/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.keycloak.server" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-keycloak-server:${project.version}"/>
+    <artifact name="org.wildfly.swarm:keycloak-server:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/runtime/module.xml b/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/runtime/module.xml
index bb6605b..ea06ac8 100644
--- a/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/runtime/module.xml
+++ b/keycloak-server/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/server/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.keycloak.server" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-keycloak-server-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:keycloak-server-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/keycloak-server/pom.xml b/keycloak-server/pom.xml
index 397beef..5e0ec7e 100644
--- a/keycloak-server/pom.xml
+++ b/keycloak-server/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-server-parent</artifactId>
+  <artifactId>keycloak-server-parent</artifactId>
 
   <name>WildFly Swarm: Keycloak Server</name>
   <description>WildFly Swarm: Keycloak Server</description>
diff --git a/keycloak-server/runtime/pom.xml b/keycloak-server/runtime/pom.xml
index 22dc461..98f5d9f 100644
--- a/keycloak-server/runtime/pom.xml
+++ b/keycloak-server/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-server-parent</artifactId>
+    <artifactId>keycloak-server-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-server-runtime</artifactId>
+  <artifactId>keycloak-server-runtime</artifactId>
 
   <name>WildFly Swarm: Keycloak Server Runtime</name>
   <description>WildFly Swarm: Keycloak Server Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-server</artifactId>
+      <artifactId>keycloak-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/keycloak-server/test/pom.xml b/keycloak-server/test/pom.xml
index fcff12a..9f2f912 100644
--- a/keycloak-server/test/pom.xml
+++ b/keycloak-server/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-server-parent</artifactId>
+    <artifactId>keycloak-server-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-server-test</artifactId>
+  <artifactId>keycloak-server-test</artifactId>
 
   <name>WildFly Swarm: Keycloak Server Test</name>
   <description>WildFly Swarm: Keycloak Server Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-server</artifactId>
+      <artifactId>keycloak-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-server-modules</artifactId>
+      <artifactId>keycloak-server-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/keycloak/api/pom.xml b/keycloak/api/pom.xml
index ca868f9..270aa2e 100644
--- a/keycloak/api/pom.xml
+++ b/keycloak/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-parent</artifactId>
+    <artifactId>keycloak-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak</artifactId>
+  <artifactId>keycloak</artifactId>
 
   <name>WildFly Swarm: Keycloak API</name>
   <description>WildFly Swarm: Keycloak API</description>
@@ -25,21 +25,21 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-modules</artifactId>
+      <artifactId>keycloak-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security</artifactId>
+      <artifactId>security</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/keycloak/modules/pom.xml b/keycloak/modules/pom.xml
index 13e48f6..1807c8b 100644
--- a/keycloak/modules/pom.xml
+++ b/keycloak/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-parent</artifactId>
+    <artifactId>keycloak-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-modules</artifactId>
+  <artifactId>keycloak-modules</artifactId>
 
   <name>WildFly Swarm: Keycloak Modules</name>
   <description>WildFly Swarm: Keycloak Modules</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-modules</artifactId>
+      <artifactId>security-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/api/module.xml b/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/api/module.xml
index 41f9da9..d616f6e 100644
--- a/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/api/module.xml
+++ b/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.keycloak" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-keycloak:${project.version}"/>
+    <artifact name="org.wildfly.swarm:keycloak:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/runtime/module.xml b/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/runtime/module.xml
index 5561b65..5f4db39 100644
--- a/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/runtime/module.xml
+++ b/keycloak/modules/src/main/resources/modules/org/wildfly/swarm/keycloak/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.keycloak" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-keycloak-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:keycloak-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/keycloak/pom.xml b/keycloak/pom.xml
index dd3bc81..5a10ee0 100644
--- a/keycloak/pom.xml
+++ b/keycloak/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-parent</artifactId>
+  <artifactId>keycloak-parent</artifactId>
 
   <name>WildFly Swarm: Keycloak</name>
   <description>WildFly Swarm: Keycloak</description>
diff --git a/keycloak/runtime/pom.xml b/keycloak/runtime/pom.xml
index 32a32e5..295ec2a 100644
--- a/keycloak/runtime/pom.xml
+++ b/keycloak/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-parent</artifactId>
+    <artifactId>keycloak-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-runtime</artifactId>
+  <artifactId>keycloak-runtime</artifactId>
 
   <name>WildFly Swarm: Keycloak Runtime</name>
   <description>WildFly Swarm: Keycloak Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak</artifactId>
+      <artifactId>keycloak</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.keycloak</groupId>
diff --git a/keycloak/test/pom.xml b/keycloak/test/pom.xml
index 721e33c..f395301 100644
--- a/keycloak/test/pom.xml
+++ b/keycloak/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-keycloak-parent</artifactId>
+    <artifactId>keycloak-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-keycloak-test</artifactId>
+  <artifactId>keycloak-test</artifactId>
 
   <name>WildFly Swarm: Keycloak Test</name>
   <description>WildFly Swarm: Keycloak Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak</artifactId>
+      <artifactId>keycloak</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-modules</artifactId>
+      <artifactId>keycloak-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/logging/api/pom.xml b/logging/api/pom.xml
index d43fb89..f32c477 100644
--- a/logging/api/pom.xml
+++ b/logging/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logging-parent</artifactId>
+    <artifactId>logging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logging</artifactId>
+  <artifactId>logging</artifactId>
 
   <name>WildFly Swarm: Logging API</name>
   <description>WildFly Swarm: Logging API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging-modules</artifactId>
+      <artifactId>logging-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/logging/modules/pom.xml b/logging/modules/pom.xml
index 4ac076c..001ee98 100644
--- a/logging/modules/pom.xml
+++ b/logging/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logging-parent</artifactId>
+    <artifactId>logging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logging-modules</artifactId>
+  <artifactId>logging-modules</artifactId>
 
   <name>WildFly Swarm: Logging Modules</name>
   <description>WildFly Swarm: Logging Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/api/module.xml b/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/api/module.xml
index c443944..e4f13f6 100644
--- a/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/api/module.xml
+++ b/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/api/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.logging" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-logging:${project.version}"/>
+    <artifact name="org.wildfly.swarm:logging:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/runtime/module.xml b/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/runtime/module.xml
index 07dddcf..18cc846 100644
--- a/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/runtime/module.xml
+++ b/logging/modules/src/main/resources/modules/org/wildfly/swarm/logging/runtime/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.logging" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-logging-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:logging-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/logging/pom.xml b/logging/pom.xml
index d401910..0d5acca 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logging-parent</artifactId>
+  <artifactId>logging-parent</artifactId>
 
   <name>WildFly Swarm: Logging</name>
   <description>WildFly Swarm: Logging</description>
diff --git a/logging/runtime/pom.xml b/logging/runtime/pom.xml
index 02caf09..9f69895 100644
--- a/logging/runtime/pom.xml
+++ b/logging/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logging-parent</artifactId>
+    <artifactId>logging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logging-runtime</artifactId>
+  <artifactId>logging-runtime</artifactId>
 
   <name>WildFly Swarm: Logging Runtime</name>
   <description>WildFly Swarm: Logging Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging</artifactId>
+      <artifactId>logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/logging/test/pom.xml b/logging/test/pom.xml
index 48f3c73..05497fe 100644
--- a/logging/test/pom.xml
+++ b/logging/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logging-parent</artifactId>
+    <artifactId>logging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logging-test</artifactId>
+  <artifactId>logging-test</artifactId>
 
   <name>WildFly Swarm: Logging Test</name>
   <description>WildFly Swarm: Logging Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging</artifactId>
+      <artifactId>logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging-modules</artifactId>
+      <artifactId>logging-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/logstash/api/pom.xml b/logstash/api/pom.xml
index ace646b..d043af4 100644
--- a/logstash/api/pom.xml
+++ b/logstash/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logstash-parent</artifactId>
+    <artifactId>logstash-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logstash</artifactId>
+  <artifactId>logstash</artifactId>
 
   <name>WildFly Swarm: Logstash API</name>
   <description>WildFly Swarm: Logstash API</description>
@@ -25,17 +25,17 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logstash-modules</artifactId>
+      <artifactId>logstash-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging</artifactId>
+      <artifactId>logging</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/logstash/modules/pom.xml b/logstash/modules/pom.xml
index 95279fe..eb7c479 100644
--- a/logstash/modules/pom.xml
+++ b/logstash/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logstash-parent</artifactId>
+    <artifactId>logstash-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logstash-modules</artifactId>
+  <artifactId>logstash-modules</artifactId>
 
   <name>WildFly Swarm: Logstash Modules</name>
   <description>WildFly Swarm: Logstash Modules</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging-modules</artifactId>
+      <artifactId>logging-modules</artifactId>
     </dependency>
 
     <dependency>
diff --git a/logstash/modules/src/main/resources/modules/org/jboss/logmanager/ext/main/module.xml b/logstash/modules/src/main/resources/modules/org/jboss/logmanager/ext/main/module.xml
index 876db09..951c47a 100644
--- a/logstash/modules/src/main/resources/modules/org/jboss/logmanager/ext/main/module.xml
+++ b/logstash/modules/src/main/resources/modules/org/jboss/logmanager/ext/main/module.xml
@@ -11,4 +11,4 @@
     <module name="javax.json.api"/>
     <module name="javax.xml.stream.api"/>
   </dependencies>
-</module>
\ No newline at end of file
+</module>
diff --git a/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/api/module.xml b/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/api/module.xml
index 7396b18..187d365 100644
--- a/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/api/module.xml
+++ b/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/api/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.logstash" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-logstash:${project.version}"/>
+    <artifact name="org.wildfly.swarm:logstash:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/runtime/module.xml b/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/runtime/module.xml
index 97a2f60..b4e6e94 100644
--- a/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/runtime/module.xml
+++ b/logstash/modules/src/main/resources/modules/org/wildfly/swarm/logstash/runtime/module.xml
@@ -7,7 +7,7 @@
 
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.logstash" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-logstash-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:logstash-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/logstash/pom.xml b/logstash/pom.xml
index 934ff5e..ae72045 100644
--- a/logstash/pom.xml
+++ b/logstash/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logstash-parent</artifactId>
+  <artifactId>logstash-parent</artifactId>
 
   <name>WildFly Swarm: Logstash</name>
   <description>WildFly Swarm: Logstash</description>
diff --git a/logstash/runtime/pom.xml b/logstash/runtime/pom.xml
index 60ed082..92cea00 100644
--- a/logstash/runtime/pom.xml
+++ b/logstash/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logstash-parent</artifactId>
+    <artifactId>logstash-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logstash-runtime</artifactId>
+  <artifactId>logstash-runtime</artifactId>
 
   <name>WildFly Swarm: Logstash Runtime</name>
   <description>WildFly Swarm: Logstash Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logstash</artifactId>
+      <artifactId>logstash</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/logstash/test/pom.xml b/logstash/test/pom.xml
index f27347b..980c35b 100644
--- a/logstash/test/pom.xml
+++ b/logstash/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-logstash-parent</artifactId>
+    <artifactId>logstash-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-logstash-test</artifactId>
+  <artifactId>logstash-test</artifactId>
 
   <name>WildFly Swarm: Logstash Test</name>
   <description>WildFly Swarm: Logstash Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logstash</artifactId>
+      <artifactId>logstash</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logstash-modules</artifactId>
+      <artifactId>logstash-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/mail/api/pom.xml b/mail/api/pom.xml
index b775735..7da8a83 100644
--- a/mail/api/pom.xml
+++ b/mail/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-mail-parent</artifactId>
+    <artifactId>mail-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-mail</artifactId>
+  <artifactId>mail</artifactId>
 
   <name>WildFly Swarm: Mail API</name>
   <description>WildFly Swarm: Mail API</description>
@@ -25,21 +25,21 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-mail-modules</artifactId>
+      <artifactId>mail-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging</artifactId>
+      <artifactId>logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/mail/modules/pom.xml b/mail/modules/pom.xml
index 964a325..f3be577 100644
--- a/mail/modules/pom.xml
+++ b/mail/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-mail-parent</artifactId>
+    <artifactId>mail-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-mail-modules</artifactId>
+  <artifactId>mail-modules</artifactId>
 
   <name>WildFly Swarm: Mail Modules</name>
   <description>WildFly Swarm: Mail Modules</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging-modules</artifactId>
+      <artifactId>logging-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-modules</artifactId>
+      <artifactId>naming-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/api/module.xml b/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/api/module.xml
index 9a8008c..ebffd82 100644
--- a/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/api/module.xml
+++ b/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.mail" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-mail:${project.version}"/>
+    <artifact name="org.wildfly.swarm:mail:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/runtime/module.xml b/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/runtime/module.xml
index e29fcc4..b5e7fbd 100644
--- a/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/runtime/module.xml
+++ b/mail/modules/src/main/resources/modules/org/wildfly/swarm/mail/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.mail" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-mail-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:mail-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/mail/pom.xml b/mail/pom.xml
index 1d6e2db..c598cb0 100644
--- a/mail/pom.xml
+++ b/mail/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-mail-parent</artifactId>
+  <artifactId>mail-parent</artifactId>
 
   <name>WildFly Swarm: Mail</name>
   <description>WildFly Swarm: Mail</description>
diff --git a/mail/runtime/pom.xml b/mail/runtime/pom.xml
index e32dc82..541402f 100644
--- a/mail/runtime/pom.xml
+++ b/mail/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-mail-parent</artifactId>
+    <artifactId>mail-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-mail-runtime</artifactId>
+  <artifactId>mail-runtime</artifactId>
 
   <name>WildFly Swarm: Mail Runtime</name>
   <description>WildFly Swarm: Mail Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-mail</artifactId>
+      <artifactId>mail</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/mail/test/pom.xml b/mail/test/pom.xml
index f786529..b9083bf 100644
--- a/mail/test/pom.xml
+++ b/mail/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-mail-parent</artifactId>
+    <artifactId>mail-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-mail-test</artifactId>
+  <artifactId>mail-test</artifactId>
 
   <name>WildFly Swarm: Mail Test</name>
   <description>WildFly Swarm: Mail Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-mail</artifactId>
+      <artifactId>mail</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-mail-modules</artifactId>
+      <artifactId>mail-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/management/api/pom.xml b/management/api/pom.xml
index f40c0ec..144a5ba 100644
--- a/management/api/pom.xml
+++ b/management/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-management-parent</artifactId>
+    <artifactId>management-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-management</artifactId>
+  <artifactId>management</artifactId>
 
   <name>WildFly Swarm: Management API</name>
   <description>WildFly Swarm: Management API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-management-modules</artifactId>
+      <artifactId>management-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/management/modules/pom.xml b/management/modules/pom.xml
index bff9850..b9e395c 100644
--- a/management/modules/pom.xml
+++ b/management/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-management-parent</artifactId>
+    <artifactId>management-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-management-modules</artifactId>
+  <artifactId>management-modules</artifactId>
 
   <name>WildFly Swarm: Management Modules</name>
   <description>WildFly Swarm: Management Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/management/modules/src/main/resources/modules/org/wildfly/swarm/management/api/module.xml b/management/modules/src/main/resources/modules/org/wildfly/swarm/management/api/module.xml
index c680dba..6438b0e 100644
--- a/management/modules/src/main/resources/modules/org/wildfly/swarm/management/api/module.xml
+++ b/management/modules/src/main/resources/modules/org/wildfly/swarm/management/api/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.management" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-management:${project.version}"/>
+    <artifact name="org.wildfly.swarm:management:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/management/modules/src/main/resources/modules/org/wildfly/swarm/management/runtime/module.xml b/management/modules/src/main/resources/modules/org/wildfly/swarm/management/runtime/module.xml
index 0b08f77..016280e 100644
--- a/management/modules/src/main/resources/modules/org/wildfly/swarm/management/runtime/module.xml
+++ b/management/modules/src/main/resources/modules/org/wildfly/swarm/management/runtime/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.management" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-management-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:management-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/management/pom.xml b/management/pom.xml
index a096b37..0cff1a0 100644
--- a/management/pom.xml
+++ b/management/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-management-parent</artifactId>
+  <artifactId>management-parent</artifactId>
 
   <name>WildFly Swarm: Management</name>
   <description>WildFly Swarm: Management</description>
diff --git a/management/runtime/pom.xml b/management/runtime/pom.xml
index ec03005..d2b4f63 100644
--- a/management/runtime/pom.xml
+++ b/management/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-management-parent</artifactId>
+    <artifactId>management-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-management-runtime</artifactId>
+  <artifactId>management-runtime</artifactId>
 
   <name>WildFly Swarm: Management Runtime</name>
   <description>WildFly Swarm: Management Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-management</artifactId>
+      <artifactId>management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/management/test/pom.xml b/management/test/pom.xml
index 277fdf7..1735d83 100644
--- a/management/test/pom.xml
+++ b/management/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-management-parent</artifactId>
+    <artifactId>management-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-management-test</artifactId>
+  <artifactId>management-test</artifactId>
 
   <name>WildFly Swarm: Management Test</name>
   <description>WildFly Swarm: Management Test</description>
@@ -41,19 +41,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-management</artifactId>
+      <artifactId>management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-management-modules</artifactId>
+      <artifactId>management-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc-runtime</artifactId>
+      <artifactId>msc-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/messaging/api/pom.xml b/messaging/api/pom.xml
index d6e4164..aea4c89 100644
--- a/messaging/api/pom.xml
+++ b/messaging/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-messaging-parent</artifactId>
+    <artifactId>messaging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-messaging</artifactId>
+  <artifactId>messaging</artifactId>
 
   <name>WildFly Swarm: Messaging API</name>
   <description>WildFly Swarm: Messaging API</description>
@@ -25,34 +25,34 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-messaging-modules</artifactId>
+      <artifactId>messaging-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security</artifactId>
+      <artifactId>security</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-connector</artifactId>
+      <artifactId>connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jca</artifactId>
+      <artifactId>jca</artifactId>
     </dependency>
 
 <!-- Provided APIs -->
diff --git a/messaging/modules/pom.xml b/messaging/modules/pom.xml
index 738f2d7..ab4980a 100644
--- a/messaging/modules/pom.xml
+++ b/messaging/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-messaging-parent</artifactId>
+    <artifactId>messaging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-messaging-modules</artifactId>
+  <artifactId>messaging-modules</artifactId>
 
   <name>WildFly Swarm: Messaging Modules</name>
   <description>WildFly Swarm: Messaging Modules</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-modules</artifactId>
+      <artifactId>naming-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-modules</artifactId>
+      <artifactId>security-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/api/module.xml b/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/api/module.xml
index d9ba4d5..91064d5 100644
--- a/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/api/module.xml
+++ b/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.messaging" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-messaging:${project.version}"/>
+    <artifact name="org.wildfly.swarm:messaging:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/runtime/module.xml b/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/runtime/module.xml
index 7cf12e5..b718a43 100644
--- a/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/runtime/module.xml
+++ b/messaging/modules/src/main/resources/modules/org/wildfly/swarm/messaging/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.messaging" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-messaging-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:messaging-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/messaging/pom.xml b/messaging/pom.xml
index ce15783..b72ca06 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-messaging-parent</artifactId>
+  <artifactId>messaging-parent</artifactId>
 
   <name>WildFly Swarm: Messaging</name>
   <description>WildFly Swarm: Messaging</description>
diff --git a/messaging/runtime/pom.xml b/messaging/runtime/pom.xml
index 9490139..b2d0d0a 100644
--- a/messaging/runtime/pom.xml
+++ b/messaging/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-messaging-parent</artifactId>
+    <artifactId>messaging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-messaging-runtime</artifactId>
+  <artifactId>messaging-runtime</artifactId>
 
   <name>WildFly Swarm: Messaging Runtime</name>
   <description>WildFly Swarm: Messaging Runtime</description>
@@ -25,20 +25,20 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-messaging</artifactId>
+      <artifactId>messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-runtime</artifactId>
+      <artifactId>naming-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-runtime</artifactId>
+      <artifactId>security-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/messaging/test/pom.xml b/messaging/test/pom.xml
index 4430650..6a8cf68 100644
--- a/messaging/test/pom.xml
+++ b/messaging/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-messaging-parent</artifactId>
+    <artifactId>messaging-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-messaging-test</artifactId>
+  <artifactId>messaging-test</artifactId>
 
   <name>WildFly Swarm: Messaging Test</name>
   <description>WildFly Swarm: Messaging Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-messaging</artifactId>
+      <artifactId>messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-messaging-modules</artifactId>
+      <artifactId>messaging-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/msc/api/pom.xml b/msc/api/pom.xml
index cf45b76..3da632d 100644
--- a/msc/api/pom.xml
+++ b/msc/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-msc-parent</artifactId>
+    <artifactId>msc-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-msc</artifactId>
+  <artifactId>msc</artifactId>
 
   <name>WildFly Swarm: MSC API</name>
   <description>WildFly Swarm: MSC API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc-modules</artifactId>
+      <artifactId>msc-modules</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/msc/modules/pom.xml b/msc/modules/pom.xml
index 6be44f2..459f62a 100644
--- a/msc/modules/pom.xml
+++ b/msc/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-msc-parent</artifactId>
+    <artifactId>msc-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-msc-modules</artifactId>
+  <artifactId>msc-modules</artifactId>
 
   <name>WildFly Swarm: MSC Modules</name>
   <description>WildFly Swarm: MSC Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/api/module.xml b/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/api/module.xml
index 543038e..8ef25da 100644
--- a/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/api/module.xml
+++ b/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.msc" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-msc:${project.version}"/>
+    <artifact name="org.wildfly.swarm:msc:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/runtime/module.xml b/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/runtime/module.xml
index 8a51094..693ad16 100644
--- a/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/runtime/module.xml
+++ b/msc/modules/src/main/resources/modules/org/wildfly/swarm/msc/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.msc" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-msc-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:msc-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/msc/pom.xml b/msc/pom.xml
index 7aa4e4e..1f4a95a 100644
--- a/msc/pom.xml
+++ b/msc/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-msc-parent</artifactId>
+  <artifactId>msc-parent</artifactId>
 
   <name>WildFly Swarm: MSC</name>
   <description>WildFly Swarm: MSC</description>
diff --git a/msc/runtime/pom.xml b/msc/runtime/pom.xml
index 3364bd8..bfeffae 100644
--- a/msc/runtime/pom.xml
+++ b/msc/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-msc-parent</artifactId>
+    <artifactId>msc-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-msc-runtime</artifactId>
+  <artifactId>msc-runtime</artifactId>
 
   <name>WildFly Swarm: MSC Runtime</name>
   <description>WildFly Swarm: MSC Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc</artifactId>
+      <artifactId>msc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/msc/test/pom.xml b/msc/test/pom.xml
index 65af252..806547a 100644
--- a/msc/test/pom.xml
+++ b/msc/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-msc-parent</artifactId>
+    <artifactId>msc-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-msc-test</artifactId>
+  <artifactId>msc-test</artifactId>
 
   <name>WildFly Swarm: MSC Test</name>
   <description>WildFly Swarm: MSC Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc</artifactId>
+      <artifactId>msc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc-modules</artifactId>
+      <artifactId>msc-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/naming/api/pom.xml b/naming/api/pom.xml
index c2e3323..73a9bb6 100644
--- a/naming/api/pom.xml
+++ b/naming/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-naming-parent</artifactId>
+    <artifactId>naming-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-naming</artifactId>
+  <artifactId>naming</artifactId>
 
   <name>WildFly Swarm: Naming API</name>
   <description>WildFly Swarm: Naming API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-modules</artifactId>
+      <artifactId>naming-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/naming/modules/pom.xml b/naming/modules/pom.xml
index de99b83..5408191 100644
--- a/naming/modules/pom.xml
+++ b/naming/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-naming-parent</artifactId>
+    <artifactId>naming-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-naming-modules</artifactId>
+  <artifactId>naming-modules</artifactId>
 
   <name>WildFly Swarm: Naming Modules</name>
   <description>WildFly Swarm: Naming Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/api/module.xml b/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/api/module.xml
index 112c522..8b5e140 100644
--- a/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/api/module.xml
+++ b/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.naming" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-naming:${project.version}"/>
+    <artifact name="org.wildfly.swarm:naming:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/runtime/module.xml b/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/runtime/module.xml
index aa1d97f..501669c 100644
--- a/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/runtime/module.xml
+++ b/naming/modules/src/main/resources/modules/org/wildfly/swarm/naming/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.naming" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-naming-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:naming-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/naming/pom.xml b/naming/pom.xml
index 5b1a36e..4a5a357 100644
--- a/naming/pom.xml
+++ b/naming/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-naming-parent</artifactId>
+  <artifactId>naming-parent</artifactId>
 
   <name>WildFly Swarm: Naming</name>
   <description>WildFly Swarm: Naming</description>
diff --git a/naming/runtime/pom.xml b/naming/runtime/pom.xml
index dedf18c..fea74dd 100644
--- a/naming/runtime/pom.xml
+++ b/naming/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-naming-parent</artifactId>
+    <artifactId>naming-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-naming-runtime</artifactId>
+  <artifactId>naming-runtime</artifactId>
 
   <name>WildFly Swarm: Naming Runtime</name>
   <description>WildFly Swarm: Naming Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/naming/test/pom.xml b/naming/test/pom.xml
index ba55635..e467f1e 100644
--- a/naming/test/pom.xml
+++ b/naming/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-naming-parent</artifactId>
+    <artifactId>naming-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-naming-test</artifactId>
+  <artifactId>naming-test</artifactId>
 
   <name>WildFly Swarm: Naming Test</name>
   <description>WildFly Swarm: Naming Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-modules</artifactId>
+      <artifactId>naming-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 42c692c..6eb95c0 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-parent</artifactId>
+        <artifactId>parent</artifactId>
         <version>1.0.0.Alpha6-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
@@ -63,7 +63,7 @@
     <dependencies>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-tools</artifactId>
+        <artifactId>tools</artifactId>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index c5e4edf..b483ac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-parent</artifactId>
+  <artifactId>parent</artifactId>
   <version>1.0.0.Alpha6-SNAPSHOT</version>
 
   <name>WildFly Swarm: Parent</name>
@@ -347,197 +347,197 @@
       <!-- Project Artifacts -->
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-tools</artifactId>
+        <artifactId>tools</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-swarmtool</artifactId>
+        <artifactId>swarmtool</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-archaius</artifactId>
+        <artifactId>archaius</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-arquillian</artifactId>
+        <artifactId>arquillian</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-arquillian-daemon</artifactId>
+        <artifactId>arquillian-daemon</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-arquillian-daemon-modules</artifactId>
+        <artifactId>arquillian-daemon-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-bean-validation</artifactId>
+        <artifactId>bean-validation</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-bean-validation-modules</artifactId>
+        <artifactId>bean-validation-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-bean-validation-runtime</artifactId>
+        <artifactId>bean-validation-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-bootstrap</artifactId>
+        <artifactId>bootstrap</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-connector</artifactId>
+        <artifactId>connector</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-connector-modules</artifactId>
+        <artifactId>connector-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-connector-runtime</artifactId>
+        <artifactId>connector-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-container</artifactId>
+        <artifactId>container</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-container-modules</artifactId>
+        <artifactId>container-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-container-runtime</artifactId>
+        <artifactId>container-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-datasources</artifactId>
+        <artifactId>datasources</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-datasources-modules</artifactId>
+        <artifactId>datasources-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-datasources-runtime</artifactId>
+        <artifactId>datasources-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ee</artifactId>
+        <artifactId>ee</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ee-modules</artifactId>
+        <artifactId>ee-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ee-runtime</artifactId>
+        <artifactId>ee-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ejb</artifactId>
+        <artifactId>ejb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ejb-modules</artifactId>
+        <artifactId>ejb-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ejb-runtime</artifactId>
+        <artifactId>ejb-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ejb-remote</artifactId>
+        <artifactId>ejb-remote</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ejb-remote-modules</artifactId>
+        <artifactId>ejb-remote-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ejb-remote-runtime</artifactId>
+        <artifactId>ejb-remote-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-fraction-list</artifactId>
+        <artifactId>fraction-list</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-fraction-list</artifactId>
+        <artifactId>fraction-list</artifactId>
         <type>txt</type>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-guava</artifactId>
+        <artifactId>guava</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-hawkular</artifactId>
+        <artifactId>hawkular</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-hawkular-modules</artifactId>
+        <artifactId>hawkular-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-hawkular-runtime</artifactId>
+        <artifactId>hawkular-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-hibernate-validator</artifactId>
+        <artifactId>hibernate-validator</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-hystrix</artifactId>
+        <artifactId>hystrix</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -548,133 +548,133 @@
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-infinispan</artifactId>
+        <artifactId>infinispan</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-infinispan-modules</artifactId>
+        <artifactId>infinispan-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-infinispan-runtime</artifactId>
+        <artifactId>infinispan-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-io</artifactId>
+        <artifactId>io</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-io-modules</artifactId>
+        <artifactId>io-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-io-runtime</artifactId>
+        <artifactId>io-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jaxrs</artifactId>
+        <artifactId>jaxrs</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jaxrs-modules</artifactId>
+        <artifactId>jaxrs-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jaxrs-runtime</artifactId>
+        <artifactId>jaxrs-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jaxrs-jaxb</artifactId>
+        <artifactId>jaxrs-jaxb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jaxrs-jsonp</artifactId>
+        <artifactId>jaxrs-jsonp</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jaxrs-multipart</artifactId>
+        <artifactId>jaxrs-multipart</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jaxrs-weld</artifactId>
+        <artifactId>jaxrs-weld</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jca</artifactId>
+        <artifactId>jca</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jca-modules</artifactId>
+        <artifactId>jca-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jca-runtime</artifactId>
+        <artifactId>jca-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jgroups</artifactId>
+        <artifactId>jgroups</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jgroups-modules</artifactId>
+        <artifactId>jgroups-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jgroups-runtime</artifactId>
+        <artifactId>jgroups-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jmx</artifactId>
+        <artifactId>jmx</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jmx-modules</artifactId>
+        <artifactId>jmx-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jmx-runtime</artifactId>
+        <artifactId>jmx-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jolokia</artifactId>
+        <artifactId>jolokia</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jolokia-modules</artifactId>
+        <artifactId>jolokia-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jolokia-runtime</artifactId>
+        <artifactId>jolokia-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -686,97 +686,97 @@
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jpa</artifactId>
+        <artifactId>jpa</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jpa-modules</artifactId>
+        <artifactId>jpa-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jpa-runtime</artifactId>
+        <artifactId>jpa-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jsf</artifactId>
+        <artifactId>jsf</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jsf-modules</artifactId>
+        <artifactId>jsf-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-jsf-runtime</artifactId>
+        <artifactId>jsf-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-keycloak</artifactId>
+        <artifactId>keycloak</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-keycloak-modules</artifactId>
+        <artifactId>keycloak-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-keycloak-runtime</artifactId>
+        <artifactId>keycloak-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-keycloak-server</artifactId>
+        <artifactId>keycloak-server</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-keycloak-server-modules</artifactId>
+        <artifactId>keycloak-server-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-keycloak-server-runtime</artifactId>
+        <artifactId>keycloak-server-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-logging</artifactId>
+        <artifactId>logging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-logging-modules</artifactId>
+        <artifactId>logging-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-logging-runtime</artifactId>
+        <artifactId>logging-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-logstash</artifactId>
+        <artifactId>logstash</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-logstash-modules</artifactId>
+        <artifactId>logstash-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-logstash-runtime</artifactId>
+        <artifactId>logstash-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
@@ -788,113 +788,113 @@
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-mail</artifactId>
+        <artifactId>mail</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-mail-modules</artifactId>
+        <artifactId>mail-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-mail-runtime</artifactId>
+        <artifactId>mail-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-management</artifactId>
+        <artifactId>management</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-management-modules</artifactId>
+        <artifactId>management-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-management-runtime</artifactId>
+        <artifactId>management-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-messaging</artifactId>
+        <artifactId>messaging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-messaging-modules</artifactId>
+        <artifactId>messaging-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-messaging-runtime</artifactId>
+        <artifactId>messaging-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-msc</artifactId>
+        <artifactId>msc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-msc-modules</artifactId>
+        <artifactId>msc-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-msc-runtime</artifactId>
+        <artifactId>msc-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-naming</artifactId>
+        <artifactId>naming</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-naming-modules</artifactId>
+        <artifactId>naming-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-naming-runtime</artifactId>
+        <artifactId>naming-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-remoting</artifactId>
+        <artifactId>remoting</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-remoting-modules</artifactId>
+        <artifactId>remoting-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-remoting-runtime</artifactId>
+        <artifactId>remoting-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon</artifactId>
+        <artifactId>ribbon</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-modules</artifactId>
+        <artifactId>ribbon-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-runtime</artifactId>
+        <artifactId>ribbon-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -921,44 +921,44 @@
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-secured</artifactId>
+        <artifactId>ribbon-secured</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-secured-client</artifactId>
+        <artifactId>ribbon-secured-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-secured-modules</artifactId>
+        <artifactId>ribbon-secured-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-secured-runtime</artifactId>
+        <artifactId>ribbon-secured-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-webapp</artifactId>
+        <artifactId>ribbon-webapp</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-webapp-modules</artifactId>
+        <artifactId>ribbon-webapp-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-ribbon-webapp-runtime</artifactId>
+        <artifactId>ribbon-webapp-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-rxjava</artifactId>
+        <artifactId>rxjava</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -968,7 +968,7 @@
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-rxnetty</artifactId>
+        <artifactId>rxnetty</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -989,103 +989,103 @@
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-security</artifactId>
+        <artifactId>security</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-security-modules</artifactId>
+        <artifactId>security-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-security-runtime</artifactId>
+        <artifactId>security-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-servo</artifactId>
+        <artifactId>servo</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-swagger</artifactId>
+        <artifactId>swagger</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-swagger-modules</artifactId>
+        <artifactId>swagger-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-swagger-runtime</artifactId>
+        <artifactId>swagger-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-transactions</artifactId>
+        <artifactId>transactions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-transactions-modules</artifactId>
+        <artifactId>transactions-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-transactions-runtime</artifactId>
+        <artifactId>transactions-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-undertow</artifactId>
+        <artifactId>undertow</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-undertow-modules</artifactId>
+        <artifactId>undertow-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-undertow-runtime</artifactId>
+        <artifactId>undertow-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-webservices</artifactId>
+        <artifactId>webservices</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-webservices-modules</artifactId>
+        <artifactId>webservices-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-webservices-runtime</artifactId>
+        <artifactId>webservices-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-weld</artifactId>
+        <artifactId>weld</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-weld-modules</artifactId>
+        <artifactId>weld-modules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-weld-runtime</artifactId>
+        <artifactId>weld-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
 
diff --git a/remoting/api/pom.xml b/remoting/api/pom.xml
index b25deed..cf36e88 100644
--- a/remoting/api/pom.xml
+++ b/remoting/api/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-remoting-parent</artifactId>
+    <artifactId>remoting-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-remoting</artifactId>
+  <artifactId>remoting</artifactId>
 
   <name>WildFly Swarm: Remoting API</name>
   <description>WildFly Swarm: Remoting API</description>
@@ -20,21 +20,21 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting-modules</artifactId>
+      <artifactId>remoting-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io</artifactId>
+      <artifactId>io</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/remoting/modules/pom.xml b/remoting/modules/pom.xml
index c25bc8d..2c15e4d 100644
--- a/remoting/modules/pom.xml
+++ b/remoting/modules/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-remoting-parent</artifactId>
+    <artifactId>remoting-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-remoting-modules</artifactId>
+  <artifactId>remoting-modules</artifactId>
 
   <name>WildFly Swarm: Remoting Modules</name>
   <description>WildFly Swarm: Remoting Modules</description>
@@ -35,19 +35,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io-modules</artifactId>
+      <artifactId>io-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-modules</artifactId>
+      <artifactId>naming-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/api/module.xml b/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/api/module.xml
index ab3d38c..ae6df97 100644
--- a/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/api/module.xml
+++ b/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.remoting" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-remoting:${project.version}"/>
+    <artifact name="org.wildfly.swarm:remoting:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/runtime/module.xml b/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/runtime/module.xml
index 9ca6f40..b6ef2b3 100644
--- a/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/runtime/module.xml
+++ b/remoting/modules/src/main/resources/modules/org/wildfly/swarm/remoting/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.remoting" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-remoting-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:remoting-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index d9fac08..dda8c38 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-remoting-parent</artifactId>
+  <artifactId>remoting-parent</artifactId>
 
   <name>WildFly Swarm: Remoting</name>
   <description>WildFly Swarm: Remoting</description>
diff --git a/remoting/runtime/pom.xml b/remoting/runtime/pom.xml
index 8da2feb..f11aeba 100644
--- a/remoting/runtime/pom.xml
+++ b/remoting/runtime/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-remoting-parent</artifactId>
+    <artifactId>remoting-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-remoting-runtime</artifactId>
+  <artifactId>remoting-runtime</artifactId>
 
   <name>WildFly Swarm: Remoting Runtime</name>
   <description>WildFly Swarm: Remoting Runtime</description>
@@ -20,11 +20,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting</artifactId>
+      <artifactId>remoting</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/remoting/test/pom.xml b/remoting/test/pom.xml
index 0950152..34d6e61 100644
--- a/remoting/test/pom.xml
+++ b/remoting/test/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-remoting-parent</artifactId>
+    <artifactId>remoting-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-remoting-test</artifactId>
+  <artifactId>remoting-test</artifactId>
 
   <name>WildFly Swarm: Remoting Test</name>
   <description>WildFly Swarm: Remoting Test</description>
@@ -36,15 +36,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting</artifactId>
+      <artifactId>remoting</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-remoting-modules</artifactId>
+      <artifactId>remoting-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/ribbon-secured/api/pom.xml b/ribbon-secured/api/pom.xml
index f25b0ff..0bac68b 100644
--- a/ribbon-secured/api/pom.xml
+++ b/ribbon-secured/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-secured-parent</artifactId>
+    <artifactId>ribbon-secured-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-secured</artifactId>
+  <artifactId>ribbon-secured</artifactId>
 
   <name>WildFly Swarm: Ribbon Secured API</name>
   <description>WildFly Swarm: Ribbon Secured API</description>
@@ -25,31 +25,31 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-secured-modules</artifactId>
+      <artifactId>ribbon-secured-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon</artifactId>
+      <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak</artifactId>
+      <artifactId>keycloak</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-secured-client</artifactId>
+      <artifactId>ribbon-secured-client</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-runtime</artifactId>
+      <artifactId>keycloak-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/ribbon-secured/client/pom.xml b/ribbon-secured/client/pom.xml
index e243cb6..484fabf 100644
--- a/ribbon-secured/client/pom.xml
+++ b/ribbon-secured/client/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-secured-parent</artifactId>
+    <artifactId>ribbon-secured-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-secured-client</artifactId>
+  <artifactId>ribbon-secured-client</artifactId>
 
   <name>WildFly Swarm: Ribbon Secured Client</name>
   <description>WildFly Swarm: Ribbon Secured Client</description>
@@ -40,27 +40,27 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon</artifactId>
+      <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak</artifactId>
+      <artifactId>keycloak</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-secured-modules</artifactId>
+      <artifactId>ribbon-secured-modules</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-runtime</artifactId>
+      <artifactId>keycloak-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ribbon-secured/modules/pom.xml b/ribbon-secured/modules/pom.xml
index 30f83d1..46e7a93 100644
--- a/ribbon-secured/modules/pom.xml
+++ b/ribbon-secured/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-secured-parent</artifactId>
+    <artifactId>ribbon-secured-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-secured-modules</artifactId>
+  <artifactId>ribbon-secured-modules</artifactId>
 
   <name>WildFly Swarm: Ribbon Secured Modules</name>
   <description>WildFly Swarm: Ribbon Secured Modules</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-keycloak-modules</artifactId>
+      <artifactId>keycloak-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-modules</artifactId>
+      <artifactId>ribbon-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/api/module.xml b/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/api/module.xml
index 7522f72..e2c1ffe 100644
--- a/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/api/module.xml
+++ b/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.netflix.ribbon.secured" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ribbon-secured:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ribbon-secured:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/client/module.xml b/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/client/module.xml
index dffeb30..9a14ec6 100644
--- a/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/client/module.xml
+++ b/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/client/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.netflix.ribbon.secured" slot="client">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ribbon-secured-client:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ribbon-secured-client:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/runtime/module.xml b/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/runtime/module.xml
index 3e762cd..b2bcf8a 100644
--- a/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/runtime/module.xml
+++ b/ribbon-secured/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/secured/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.netflix.ribbon.secured" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ribbon-secured-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ribbon-secured-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ribbon-secured/pom.xml b/ribbon-secured/pom.xml
index 8e8517e..d2ca01a 100644
--- a/ribbon-secured/pom.xml
+++ b/ribbon-secured/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-secured-parent</artifactId>
+  <artifactId>ribbon-secured-parent</artifactId>
 
   <name>WildFly Swarm: Ribbon Secured</name>
   <description>WildFly Swarm: Ribbon Secured</description>
diff --git a/ribbon-secured/runtime/pom.xml b/ribbon-secured/runtime/pom.xml
index b28ae0b..5a18864 100644
--- a/ribbon-secured/runtime/pom.xml
+++ b/ribbon-secured/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-secured-parent</artifactId>
+    <artifactId>ribbon-secured-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-secured-runtime</artifactId>
+  <artifactId>ribbon-secured-runtime</artifactId>
 
   <name>WildFly Swarm: Ribbon Secured Runtime</name>
   <description>WildFly Swarm: Ribbon Secured Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-secured</artifactId>
+      <artifactId>ribbon-secured</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/ribbon-webapp/api/pom.xml b/ribbon-webapp/api/pom.xml
index 5759dc9..e4a60eb 100644
--- a/ribbon-webapp/api/pom.xml
+++ b/ribbon-webapp/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-webapp-parent</artifactId>
+    <artifactId>ribbon-webapp-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-webapp</artifactId>
+  <artifactId>ribbon-webapp</artifactId>
 
   <name>WildFly Swarm: Ribbon Web App API</name>
   <description>WildFly Swarm: Ribbon Web App API</description>
@@ -25,19 +25,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-webapp-modules</artifactId>
+      <artifactId>ribbon-webapp-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon</artifactId>
+      <artifactId>ribbon</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/ribbon-webapp/modules/pom.xml b/ribbon-webapp/modules/pom.xml
index 5feac42..922e521 100644
--- a/ribbon-webapp/modules/pom.xml
+++ b/ribbon-webapp/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-webapp-parent</artifactId>
+    <artifactId>ribbon-webapp-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-webapp-modules</artifactId>
+  <artifactId>ribbon-webapp-modules</artifactId>
 
   <name>WildFly Swarm: Ribbon Web App Modules</name>
   <description>WildFly Swarm: Ribbon Web App Modules</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-modules</artifactId>
+      <artifactId>ribbon-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/api/module.xml b/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/api/module.xml
index 50fd643..683913a 100644
--- a/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/api/module.xml
+++ b/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ribbon.webapp" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ribbon-webapp:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ribbon-webapp:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml b/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml
index 5cdb9e0..7b35660 100644
--- a/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml
+++ b/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.ribbon.webapp" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ribbon-webapp-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ribbon-webapp-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ribbon-webapp/pom.xml b/ribbon-webapp/pom.xml
index 1df44ff..41fb8b9 100644
--- a/ribbon-webapp/pom.xml
+++ b/ribbon-webapp/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-webapp-parent</artifactId>
+  <artifactId>ribbon-webapp-parent</artifactId>
 
   <name>WildFly Swarm: Ribbon Web App</name>
   <description>WildFly Swarm: Ribbon Web App</description>
diff --git a/ribbon-webapp/runtime/pom.xml b/ribbon-webapp/runtime/pom.xml
index 077b361..f361656 100644
--- a/ribbon-webapp/runtime/pom.xml
+++ b/ribbon-webapp/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-webapp-parent</artifactId>
+    <artifactId>ribbon-webapp-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-webapp-runtime</artifactId>
+  <artifactId>ribbon-webapp-runtime</artifactId>
 
   <name>WildFly Swarm: Ribbon Web App Runtime</name>
   <description>WildFly Swarm: Ribbon Web App Runtime</description>
@@ -25,19 +25,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-webapp</artifactId>
+      <artifactId>ribbon-webapp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon</artifactId>
+      <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/ribbon-webapp/test/pom.xml b/ribbon-webapp/test/pom.xml
index ffb73bf..b72d929 100644
--- a/ribbon-webapp/test/pom.xml
+++ b/ribbon-webapp/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-webapp-parent</artifactId>
+    <artifactId>ribbon-webapp-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-webapp-test</artifactId>
+  <artifactId>ribbon-webapp-test</artifactId>
 
   <name>WildFly Swarm: Ribbon Web App Test</name>
   <description>WildFly Swarm: Ribbon Web App Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-webapp</artifactId>
+      <artifactId>ribbon-webapp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-webapp-modules</artifactId>
+      <artifactId>ribbon-webapp-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/ribbon/api/pom.xml b/ribbon/api/pom.xml
index 1ca306d..eb01c72 100644
--- a/ribbon/api/pom.xml
+++ b/ribbon/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-parent</artifactId>
+    <artifactId>ribbon-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon</artifactId>
+  <artifactId>ribbon</artifactId>
 
   <name>WildFly Swarm: Ribbon API</name>
   <description>WildFly Swarm: Ribbon API</description>
@@ -25,21 +25,21 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-modules</artifactId>
+      <artifactId>ribbon-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc</artifactId>
+      <artifactId>msc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jgroups</artifactId>
+      <artifactId>jgroups</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/ribbon/modules/pom.xml b/ribbon/modules/pom.xml
index d62dc30..8fc20ea 100644
--- a/ribbon/modules/pom.xml
+++ b/ribbon/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-parent</artifactId>
+    <artifactId>ribbon-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-modules</artifactId>
+  <artifactId>ribbon-modules</artifactId>
 
   <name>WildFly Swarm: Ribbon Modules</name>
   <description>WildFly Swarm: Ribbon Modules</description>
@@ -40,35 +40,35 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jgroups-modules</artifactId>
+      <artifactId>jgroups-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-msc-modules</artifactId>
+      <artifactId>msc-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-rxjava</artifactId>
+      <artifactId>rxjava</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-rxnetty</artifactId>
+      <artifactId>rxnetty</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-archaius</artifactId>
+      <artifactId>archaius</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-hystrix</artifactId>
+      <artifactId>hystrix</artifactId>
     </dependency>
 
     <dependency>
diff --git a/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/api/module.xml b/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/api/module.xml
index eeb7065..441052e 100644
--- a/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/api/module.xml
+++ b/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.netflix.ribbon" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ribbon:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ribbon:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/runtime/module.xml b/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/runtime/module.xml
index f45e7df..990fc7a 100644
--- a/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/runtime/module.xml
+++ b/ribbon/modules/src/main/resources/modules/org/wildfly/swarm/netflix/ribbon/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.netflix.ribbon" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-ribbon-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:ribbon-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/ribbon/pom.xml b/ribbon/pom.xml
index 142c603..e1fca25 100644
--- a/ribbon/pom.xml
+++ b/ribbon/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-parent</artifactId>
+  <artifactId>ribbon-parent</artifactId>
 
   <name>WildFly Swarm: Ribbon</name>
   <description>WildFly Swarm: Ribbon</description>
diff --git a/ribbon/runtime/pom.xml b/ribbon/runtime/pom.xml
index 0a084e1..72f4511 100644
--- a/ribbon/runtime/pom.xml
+++ b/ribbon/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-parent</artifactId>
+    <artifactId>ribbon-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-runtime</artifactId>
+  <artifactId>ribbon-runtime</artifactId>
 
   <name>WildFly Swarm: Ribbon Runtime</name>
   <description>WildFly Swarm: Ribbon Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon</artifactId>
+      <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/ribbon/test/pom.xml b/ribbon/test/pom.xml
index 9ef773a..816b938 100644
--- a/ribbon/test/pom.xml
+++ b/ribbon/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-ribbon-parent</artifactId>
+    <artifactId>ribbon-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-ribbon-test</artifactId>
+  <artifactId>ribbon-test</artifactId>
 
   <name>WildFly Swarm: Ribbon Test</name>
   <description>WildFly Swarm: Ribbon Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon</artifactId>
+      <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ribbon-modules</artifactId>
+      <artifactId>ribbon-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/rxjava/pom.xml b/rxjava/pom.xml
index 7fce7d9..9eb8a8f 100644
--- a/rxjava/pom.xml
+++ b/rxjava/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-rxjava</artifactId>
+  <artifactId>rxjava</artifactId>
 
   <name>WildFly Swarm: RX-Java</name>
   <description>WildFly Swarm: RX-Java</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/rxnetty/pom.xml b/rxnetty/pom.xml
index 87e71e8..e1334dc 100644
--- a/rxnetty/pom.xml
+++ b/rxnetty/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-rxnetty</artifactId>
+  <artifactId>rxnetty</artifactId>
 
   <name>WildFly Swarm: RX-Netty</name>
   <description>WildFly Swarm: RX-Netty</description>
@@ -40,19 +40,19 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-rxjava</artifactId>
+      <artifactId>rxjava</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-servo</artifactId>
+      <artifactId>servo</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/security/api/pom.xml b/security/api/pom.xml
index 9cd9d5b..ff6defe 100644
--- a/security/api/pom.xml
+++ b/security/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-security-parent</artifactId>
+    <artifactId>security-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-security</artifactId>
+  <artifactId>security</artifactId>
 
   <name>WildFly Swarm: Security API</name>
   <description>WildFly Swarm: Security API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security-modules</artifactId>
+      <artifactId>security-modules</artifactId>
     </dependency>
 
     <!-- provided dependencies -->
diff --git a/security/modules/pom.xml b/security/modules/pom.xml
index 31afbb2..6bf41b6 100644
--- a/security/modules/pom.xml
+++ b/security/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-security-parent</artifactId>
+    <artifactId>security-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-security-modules</artifactId>
+  <artifactId>security-modules</artifactId>
 
   <name>WildFly Swarm: Security Modules</name>
   <description>WildFly Swarm: Security Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/security/modules/src/main/resources/modules/org/wildfly/swarm/security/api/module.xml b/security/modules/src/main/resources/modules/org/wildfly/swarm/security/api/module.xml
index f966f26..1779ba8 100644
--- a/security/modules/src/main/resources/modules/org/wildfly/swarm/security/api/module.xml
+++ b/security/modules/src/main/resources/modules/org/wildfly/swarm/security/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.security" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-security:${project.version}"/>
+    <artifact name="org.wildfly.swarm:security:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/security/modules/src/main/resources/modules/org/wildfly/swarm/security/runtime/module.xml b/security/modules/src/main/resources/modules/org/wildfly/swarm/security/runtime/module.xml
index 428d6b4..fa2ebb6 100644
--- a/security/modules/src/main/resources/modules/org/wildfly/swarm/security/runtime/module.xml
+++ b/security/modules/src/main/resources/modules/org/wildfly/swarm/security/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.security" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-security-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:security-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/security/pom.xml b/security/pom.xml
index 9e7a5a2..6a1ba43 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-security-parent</artifactId>
+  <artifactId>security-parent</artifactId>
 
   <name>WildFly Swarm: Security</name>
   <description>WildFly Swarm: Security</description>
diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index 5988d76..50b721a 100644
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-security-parent</artifactId>
+    <artifactId>security-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-security-runtime</artifactId>
+  <artifactId>security-runtime</artifactId>
 
   <name>WildFly Swarm: Security Runtime</name>
   <description>WildFly Swarm: Security Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-security</artifactId>
+      <artifactId>security</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/servo/pom.xml b/servo/pom.xml
index b4d6261..5a7beda 100644
--- a/servo/pom.xml
+++ b/servo/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-servo</artifactId>
+  <artifactId>servo</artifactId>
 
   <name>WildFly Swarm: Servo</name>
   <description>WildFly Swarm: Servo</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-guava</artifactId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/swagger/api/pom.xml b/swagger/api/pom.xml
index c327366..ed02fe4 100644
--- a/swagger/api/pom.xml
+++ b/swagger/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-swagger-parent</artifactId>
+    <artifactId>swagger-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-swagger</artifactId>
+  <artifactId>swagger</artifactId>
 
   <name>WildFly Swarm: Swagger API</name>
   <description>WildFly Swarm: Swagger API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-swagger-modules</artifactId>
+      <artifactId>swagger-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
diff --git a/swagger/modules/pom.xml b/swagger/modules/pom.xml
index 589b9d5..7b8e7f2 100644
--- a/swagger/modules/pom.xml
+++ b/swagger/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-swagger-parent</artifactId>
+    <artifactId>swagger-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-swagger-modules</artifactId>
+  <artifactId>swagger-modules</artifactId>
 
   <name>WildFly Swarm: Swagger Modules</name>
   <description>WildFly Swarm: Swagger Modules</description>
@@ -48,16 +48,16 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs</artifactId>
+      <artifactId>jaxrs</artifactId>
     </dependency>
 
     <dependency>
diff --git a/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/api/module.xml b/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/api/module.xml
index 1c922c6..bc91664 100644
--- a/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/api/module.xml
+++ b/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.swagger" slot="api">
     <resources>
-        <artifact name="org.wildfly.swarm:wildfly-swarm-swagger:${project.version}"/>
+        <artifact name="org.wildfly.swarm:swagger:${project.version}"/>
     </resources>
 
     <dependencies>
diff --git a/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/runtime/module.xml b/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/runtime/module.xml
index 834b8ba..3323055 100644
--- a/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/runtime/module.xml
+++ b/swagger/modules/src/main/resources/modules/org/wildfly/swarm/swagger/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.swagger" slot="runtime">
     <resources>
-      <artifact name="org.wildfly.swarm:wildfly-swarm-swagger-runtime:${project.version}"/>
+      <artifact name="org.wildfly.swarm:swagger-runtime:${project.version}"/>
       <artifact name="io.swagger:swagger-jaxrs:${version.io.swagger}"/>
         <artifact name="io.swagger:swagger-core:${version.io.swagger}"/>
         <artifact name="io.swagger:swagger-models:${version.io.swagger}"/>
diff --git a/swagger/pom.xml b/swagger/pom.xml
index 7a01bff..20347c3 100644
--- a/swagger/pom.xml
+++ b/swagger/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-swagger-parent</artifactId>
+  <artifactId>swagger-parent</artifactId>
 
   <name>WildFly Swarm: Swagger</name>
   <description>WildFly Swarm: Swagger</description>
diff --git a/swagger/runtime/pom.xml b/swagger/runtime/pom.xml
index eba64d5..47cd430 100644
--- a/swagger/runtime/pom.xml
+++ b/swagger/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-swagger-parent</artifactId>
+    <artifactId>swagger-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-swagger-runtime</artifactId>
+  <artifactId>swagger-runtime</artifactId>
 
   <name>WildFly Swarm: Swagger Runtime</name>
   <description>WildFly Swarm: Swagger Runtime</description>
@@ -25,15 +25,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-swagger</artifactId>
+      <artifactId>swagger</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-jaxrs-runtime</artifactId>
+      <artifactId>jaxrs-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/swagger/test/pom.xml b/swagger/test/pom.xml
index 7164c12..fb3dc83 100644
--- a/swagger/test/pom.xml
+++ b/swagger/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-swagger-parent</artifactId>
+    <artifactId>swagger-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-swagger-test</artifactId>
+  <artifactId>swagger-test</artifactId>
 
   <name>WildFly Swarm: Swagger Test</name>
   <description>WildFly Swarm: Swagger Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-swagger</artifactId>
+      <artifactId>swagger</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-swagger-modules</artifactId>
+      <artifactId>swagger-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/swarmtool/pom.xml b/swarmtool/pom.xml
index cfcdc10..cc26ae2 100644
--- a/swarmtool/pom.xml
+++ b/swarmtool/pom.xml
@@ -9,12 +9,12 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>wildfly-swarm-swarmtool</artifactId>
+  <artifactId>swarmtool</artifactId>
 
   <name>WildFly Swarm: SwarmTool</name>
   <description>WildFly Swarm: SwarmTool</description>
@@ -33,7 +33,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <configuration>
-          <finalName>wildfly-swarm-swarmtool-standalone</finalName>
+          <finalName>swarmtool-standalone</finalName>
           <transformers>
             <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
               <mainClass>org.wildfly.swarm.swarmtool.Main</mainClass>
@@ -71,19 +71,76 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-tools</artifactId>
+      <artifactId>tools</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-fraction-list</artifactId>
+      <artifactId>fraction-list</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
     </dependency>
     <dependency>
       <groupId>net.sf.jopt-simple</groupId>
       <artifactId>jopt-simple</artifactId>
     </dependency>
+
+    <!-- for build ordering for the test -->
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>ee</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>ee-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>io</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>io-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>logging-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>naming</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>naming-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>undertow</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.swarm</groupId>
+      <artifactId>undertow-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
   </dependencies>
 </project>
diff --git a/swarmtool/src/main/assembly/genexe.sh b/swarmtool/src/main/assembly/genexe.sh
index 66e05db..b4ed427 100755
--- a/swarmtool/src/main/assembly/genexe.sh
+++ b/swarmtool/src/main/assembly/genexe.sh
@@ -15,6 +15,6 @@ echo "Creating swarmtool executable"
 ARGS='"$@"'
 (echo '#!/bin/sh
 exec java -jar "$0" "$@"
-'; cat target/wildfly-swarm-swarmtool-standalone.jar) > $exe && chmod +x $exe
+'; cat target/swarmtool-standalone.jar) > $exe && chmod +x $exe
 
 
diff --git a/swarmtool/src/main/java/org/wildfly/swarm/swarmtool/Build.java b/swarmtool/src/main/java/org/wildfly/swarm/swarmtool/Build.java
index dd71015..77313e7 100644
--- a/swarmtool/src/main/java/org/wildfly/swarm/swarmtool/Build.java
+++ b/swarmtool/src/main/java/org/wildfly/swarm/swarmtool/Build.java
@@ -100,19 +100,11 @@ public class Build {
 
         for (String fractionName : this.swarmDependencies) {
             fractions.add(fractionName);
-            FractionDescriptor desc = fractionList.getFractionDescriptor("org.wildfly.swarm", "wildfly-swarm-" + fractionName);
+            FractionDescriptor desc = fractionList.getFractionDescriptor("org.wildfly.swarm", fractionName);
             if (desc != null) {
                 fractions.addAll(desc.getDependencies()
                                          .stream()
-                                         .map( d -> {
-                                             String artifactId = d.getArtifactId();
-                                             if (artifactId.startsWith("wildfly-swarm-")) {
-
-                                                 return artifactId.substring(14);
-                                             }
-
-                                             return artifactId;
-                                         })
+                                         .map( d -> d.getArtifactId())
                                          .collect(Collectors.toSet()));
             }
         }
@@ -149,7 +141,7 @@ public class Build {
         }
 
         for (String dep : this.swarmDependencies) {
-            tool.dependency("compile", "org.wildfly.swarm", "wildfly-swarm-" + dep, this.version, "jar", null, null);
+            tool.dependency("compile", "org.wildfly.swarm", dep, this.version, "jar", null, null);
         }
 
         final String jarName = this.name != null ? this.name : baseName;
diff --git a/tools/pom.xml b/tools/pom.xml
index 90d43ff..4d1c8ff 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-tools</artifactId>
+  <artifactId>tools</artifactId>
 
   <name>WildFly Swarm: Build Tools</name>
   <description>WildFly Swarm: Build Tools</description>
@@ -30,7 +30,7 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.shrinkwrap</groupId>
diff --git a/tools/src/main/java/org/wildfly/swarm/tools/BuildTool.java b/tools/src/main/java/org/wildfly/swarm/tools/BuildTool.java
index b02d695..87e346c 100644
--- a/tools/src/main/java/org/wildfly/swarm/tools/BuildTool.java
+++ b/tools/src/main/java/org/wildfly/swarm/tools/BuildTool.java
@@ -157,7 +157,7 @@ public class BuildTool {
         ArtifactSpec artifact = this.dependencyManager.findWildFlySwarmBootstrapJar();
 
         if ( artifact == null ) {
-            throw new BuildException( "Unable to load wildfly-swarm-bootstrap; check your dependencies" );
+            throw new BuildException( "Unable to load org.wildfly.swarm:bootstrap; check your dependencies" );
         }
 
         if (!bootstrapJarShadesJBossModules(artifact.file)) {
diff --git a/tools/src/main/java/org/wildfly/swarm/tools/DependencyManager.java b/tools/src/main/java/org/wildfly/swarm/tools/DependencyManager.java
index 6f778d3..a91b65d 100644
--- a/tools/src/main/java/org/wildfly/swarm/tools/DependencyManager.java
+++ b/tools/src/main/java/org/wildfly/swarm/tools/DependencyManager.java
@@ -31,7 +31,7 @@ public class DependencyManager {
 
     public static final String WILDFLY_SWARM_GROUP_ID = "org.wildfly.swarm";
 
-    public static final String WILDFLY_SWARM_BOOTSTRAP_ARTIFACT_ID = "wildfly-swarm-bootstrap";
+    public static final String WILDFLY_SWARM_BOOTSTRAP_ARTIFACT_ID = "bootstrap";
 
     public static final String JBOSS_MODULES_GROUP_ID = "org.jboss.modules";
 
@@ -293,6 +293,7 @@ public class DependencyManager {
 
     protected void analyzeModuleDependencies(ModuleAnalyzer analyzer) {
         this.moduleDependencies.addAll(analyzer.getDependencies());
+
         for (ArtifactSpec each : analyzer.getDependencies()) {
             providedGAVToModuleMappings.put(
                     each.groupId() + ":" + each.artifactId(),
diff --git a/tools/src/main/java/org/wildfly/swarm/tools/ModuleAnalyzer.java b/tools/src/main/java/org/wildfly/swarm/tools/ModuleAnalyzer.java
index c81e38f..545ad17 100644
--- a/tools/src/main/java/org/wildfly/swarm/tools/ModuleAnalyzer.java
+++ b/tools/src/main/java/org/wildfly/swarm/tools/ModuleAnalyzer.java
@@ -45,6 +45,9 @@ public class ModuleAnalyzer {
     }
 
     public String getName() {
+        if ( this.module == null ) {
+            return "UNKNOWN";
+        }
         return this.module.getName();
     }
 
diff --git a/tools/src/test/java/org/wildfly/swarm/tools/DependencyManagerTest.java b/tools/src/test/java/org/wildfly/swarm/tools/DependencyManagerTest.java
index 349aac8..9d4cf46 100644
--- a/tools/src/test/java/org/wildfly/swarm/tools/DependencyManagerTest.java
+++ b/tools/src/test/java/org/wildfly/swarm/tools/DependencyManagerTest.java
@@ -48,7 +48,7 @@ public class DependencyManagerTest {
 
     @Before
     public void setUp() throws Exception {
-        BOOTSTRAP_JAR = ArtifactSpec.fromMscGav("org.wildfly.swarm:wildfly-swarm-bootstrap:1.0");
+        BOOTSTRAP_JAR = ArtifactSpec.fromMscGav("org.wildfly.swarm:bootstrap:1.0");
 
         BOOTSTRAP_EMPTY_A = ArtifactSpec.fromMscGav("test:bootstrap-empty-A:1.0");
 
diff --git a/transactions/api/pom.xml b/transactions/api/pom.xml
index 6fc7fe1..3225c85 100644
--- a/transactions/api/pom.xml
+++ b/transactions/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-transactions-parent</artifactId>
+    <artifactId>transactions-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-transactions</artifactId>
+  <artifactId>transactions</artifactId>
 
   <name>WildFly Swarm: Transactions API</name>
   <description>WildFly Swarm: Transactions API</description>
@@ -25,17 +25,17 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions-modules</artifactId>
+      <artifactId>transactions-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming</artifactId>
+      <artifactId>naming</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/transactions/modules/pom.xml b/transactions/modules/pom.xml
index 18007ab..3c2ca83 100644
--- a/transactions/modules/pom.xml
+++ b/transactions/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-transactions-parent</artifactId>
+    <artifactId>transactions-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-transactions-modules</artifactId>
+  <artifactId>transactions-modules</artifactId>
 
   <name>WildFly Swarm: Transactions Modules</name>
   <description>WildFly Swarm: Transactions Modules</description>
@@ -40,15 +40,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-modules</artifactId>
+      <artifactId>naming-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/api/module.xml b/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/api/module.xml
index 64066bc..1351670 100644
--- a/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/api/module.xml
+++ b/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.transactions" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-transactions:${project.version}"/>
+    <artifact name="org.wildfly.swarm:transactions:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/runtime/module.xml b/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/runtime/module.xml
index 5705273..6e3376b 100644
--- a/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/runtime/module.xml
+++ b/transactions/modules/src/main/resources/modules/org/wildfly/swarm/transactions/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.transactions" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-transactions-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:transactions-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/transactions/pom.xml b/transactions/pom.xml
index aa5c680..d3120b1 100644
--- a/transactions/pom.xml
+++ b/transactions/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-transactions-parent</artifactId>
+  <artifactId>transactions-parent</artifactId>
 
   <name>WildFly Swarm: Transactions</name>
   <description>WildFly Swarm: Transactions</description>
diff --git a/transactions/runtime/pom.xml b/transactions/runtime/pom.xml
index 282f2d5..5079213 100644
--- a/transactions/runtime/pom.xml
+++ b/transactions/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-transactions-parent</artifactId>
+    <artifactId>transactions-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-transactions-runtime</artifactId>
+  <artifactId>transactions-runtime</artifactId>
 
   <name>WildFly Swarm: Transactions Runtime</name>
   <description>WildFly Swarm: Transactions Runtime</description>
@@ -25,15 +25,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions</artifactId>
+      <artifactId>transactions</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-naming-runtime</artifactId>
+      <artifactId>naming-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/transactions/test/pom.xml b/transactions/test/pom.xml
index d48461c..bbe479c 100644
--- a/transactions/test/pom.xml
+++ b/transactions/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-transactions-parent</artifactId>
+    <artifactId>transactions-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-transactions-test</artifactId>
+  <artifactId>transactions-test</artifactId>
 
   <name>WildFly Swarm: Transactions Test</name>
   <description>WildFly Swarm: Transactions Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions</artifactId>
+      <artifactId>transactions</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions-modules</artifactId>
+      <artifactId>transactions-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/undertow-js/pom.xml b/undertow-js/pom.xml
index 110d23e..1b1655c 100644
--- a/undertow-js/pom.xml
+++ b/undertow-js/pom.xml
@@ -4,13 +4,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-undertow-js</artifactId>
+  <artifactId>undertow-js</artifactId>
 
   <name>WildFly Swarm: Undertow.js</name>
   <description>WildFly Swarm: Undertow.js</description>
@@ -36,7 +36,7 @@
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
 
     <dependency>
diff --git a/undertow/api/pom.xml b/undertow/api/pom.xml
index b688508..cca36ec 100644
--- a/undertow/api/pom.xml
+++ b/undertow/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-undertow-parent</artifactId>
+    <artifactId>undertow-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-undertow</artifactId>
+  <artifactId>undertow</artifactId>
 
   <name>WildFly Swarm: Undertow API</name>
   <description>WildFly Swarm: Undertow API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.shrinkwrap.descriptors</groupId>
@@ -43,15 +43,15 @@
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging</artifactId>
+      <artifactId>logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io</artifactId>
+      <artifactId>io</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/undertow/modules/pom.xml b/undertow/modules/pom.xml
index 30ca7f6..1a33d56 100644
--- a/undertow/modules/pom.xml
+++ b/undertow/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-undertow-parent</artifactId>
+    <artifactId>undertow-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-undertow-modules</artifactId>
+  <artifactId>undertow-modules</artifactId>
 
   <name>WildFly Swarm: Undertow Modules</name>
   <description>WildFly Swarm: Undertow Modules</description>
@@ -40,23 +40,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-logging-modules</artifactId>
+      <artifactId>logging-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-io-modules</artifactId>
+      <artifactId>io-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee-modules</artifactId>
+      <artifactId>ee-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/api/module.xml b/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/api/module.xml
index 4e835d8..1048ebf 100644
--- a/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/api/module.xml
+++ b/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.undertow" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-undertow:${project.version}"/>
+    <artifact name="org.wildfly.swarm:undertow:${project.version}"/>
   </resources>
   <dependencies>
     <module name="org.wildfly.swarm.container"/>
diff --git a/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/runtime/module.xml b/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/runtime/module.xml
index 03624e1..ed99dee 100644
--- a/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/runtime/module.xml
+++ b/undertow/modules/src/main/resources/modules/org/wildfly/swarm/undertow/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.undertow" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-undertow-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:undertow-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/undertow/pom.xml b/undertow/pom.xml
index cce27d4..1b75156 100644
--- a/undertow/pom.xml
+++ b/undertow/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-undertow-parent</artifactId>
+  <artifactId>undertow-parent</artifactId>
 
   <name>WildFly Swarm: Undertow</name>
   <description>WildFly Swarm: Undertow</description>
diff --git a/undertow/runtime/pom.xml b/undertow/runtime/pom.xml
index 04763bc..c07eab1 100644
--- a/undertow/runtime/pom.xml
+++ b/undertow/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-undertow-parent</artifactId>
+    <artifactId>undertow-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-undertow-runtime</artifactId>
+  <artifactId>undertow-runtime</artifactId>
 
   <name>WildFly Swarm: Undertow Runtime</name>
   <description>WildFly Swarm: Undertow Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/undertow/test/pom.xml b/undertow/test/pom.xml
index 7ba5514..9feb782 100644
--- a/undertow/test/pom.xml
+++ b/undertow/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-undertow-parent</artifactId>
+    <artifactId>undertow-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-undertow-test</artifactId>
+  <artifactId>undertow-test</artifactId>
 
   <name>WildFly Swarm: Undertow Test</name>
   <description>WildFly Swarm: Undertow Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow</artifactId>
+      <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-undertow-modules</artifactId>
+      <artifactId>undertow-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/webservices/api/pom.xml b/webservices/api/pom.xml
index fd49a27..5eaf880 100644
--- a/webservices/api/pom.xml
+++ b/webservices/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-webservices-parent</artifactId>
+    <artifactId>webservices-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-webservices</artifactId>
+  <artifactId>webservices</artifactId>
 
   <name>WildFly Swarm: WebServices API</name>
   <description>WildFly Swarm: WebServices API</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-webservices-modules</artifactId>
+      <artifactId>webservices-modules</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/webservices/modules/pom.xml b/webservices/modules/pom.xml
index 352994a..ad1a57a 100644
--- a/webservices/modules/pom.xml
+++ b/webservices/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-webservices-parent</artifactId>
+    <artifactId>webservices-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-webservices-modules</artifactId>
+  <artifactId>webservices-modules</artifactId>
 
   <name>WildFly Swarm: WebServices Modules</name>
   <description>WildFly Swarm: WebServices Modules</description>
@@ -40,11 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/api/module.xml b/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/api/module.xml
index 5609cc3..b79fb1a 100644
--- a/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/api/module.xml
+++ b/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/api/module.xml
@@ -6,7 +6,7 @@
 
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.webservices" slot="api">
     <resources>
-        <artifact name="org.wildfly.swarm:wildfly-swarm-webservices:${project.version}"/>
+        <artifact name="org.wildfly.swarm:webservices:${project.version}"/>
     </resources>
     <dependencies>
 
@@ -14,4 +14,4 @@
         <module name="org.wildfly.swarm.configuration"/>
 
     </dependencies>
-</module>
\ No newline at end of file
+</module>
diff --git a/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/runtime/module.xml b/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/runtime/module.xml
index dfbfdb2..1e19ac9 100644
--- a/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/runtime/module.xml
+++ b/webservices/modules/src/main/resources/modules/org/wildfly/swarm/webservices/runtime/module.xml
@@ -6,7 +6,7 @@
 
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.webservices" slot="runtime">
     <resources>
-        <artifact name="org.wildfly.swarm:wildfly-swarm-webservices-runtime:${project.version}"/>
+        <artifact name="org.wildfly.swarm:webservices-runtime:${project.version}"/>
     </resources>
 
     <dependencies>
@@ -20,4 +20,4 @@
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow"/>
 
     </dependencies>
-</module>
\ No newline at end of file
+</module>
diff --git a/webservices/pom.xml b/webservices/pom.xml
index 8bd0348..d4698ab 100644
--- a/webservices/pom.xml
+++ b/webservices/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-webservices-parent</artifactId>
+  <artifactId>webservices-parent</artifactId>
 
   <name>WildFly Swarm: WebServices</name>
   <description>WildFly Swarm: WebServices</description>
diff --git a/webservices/runtime/pom.xml b/webservices/runtime/pom.xml
index 3194b20..d433914 100644
--- a/webservices/runtime/pom.xml
+++ b/webservices/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-webservices-parent</artifactId>
+    <artifactId>webservices-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-webservices-runtime</artifactId>
+  <artifactId>webservices-runtime</artifactId>
 
   <name>WildFly Swarm: WebServices Runtime</name>
   <description>WildFly Swarm: WebServices Runtime</description>
@@ -25,11 +25,11 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-webservices</artifactId>
+      <artifactId>webservices</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/webservices/test/pom.xml b/webservices/test/pom.xml
index 14384e0..bb0a357 100644
--- a/webservices/test/pom.xml
+++ b/webservices/test/pom.xml
@@ -8,13 +8,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>wildfly-swarm-webservices-parent</artifactId>
+        <artifactId>webservices-parent</artifactId>
         <groupId>org.wildfly.swarm</groupId>
         <version>1.0.0.Alpha6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>wildfly-swarm-webservices-test</artifactId>
+    <artifactId>webservices-test</artifactId>
 
     <name>WildFly Swarm: WebServices Test</name>
     <description>WildFly Swarm: WebServices Test</description>
@@ -38,15 +38,15 @@
     <dependencies>
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
-            <artifactId>wildfly-swarm-webservices</artifactId>
+            <artifactId>webservices</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
-            <artifactId>wildfly-swarm-webservices-modules</artifactId>
+            <artifactId>webservices-modules</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
-            <artifactId>wildfly-swarm-undertow</artifactId>
+            <artifactId>undertow</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/weld/api/pom.xml b/weld/api/pom.xml
index 718affb..961ffdc 100644
--- a/weld/api/pom.xml
+++ b/weld/api/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-weld-parent</artifactId>
+    <artifactId>weld-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-weld</artifactId>
+  <artifactId>weld</artifactId>
 
   <name>WildFly Swarm: Weld API</name>
   <description>WildFly Swarm: Weld API</description>
@@ -25,25 +25,25 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container</artifactId>
+      <artifactId>container</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-weld-modules</artifactId>
+      <artifactId>weld-modules</artifactId>
     </dependency>
 
     <!-- Dependent APIs -->
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions</artifactId>
+      <artifactId>transactions</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bean-validation</artifactId>
+      <artifactId>bean-validation</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee</artifactId>
+      <artifactId>ee</artifactId>
     </dependency>
 
     <!-- Provided APIs -->
diff --git a/weld/modules/pom.xml b/weld/modules/pom.xml
index 0fe3393..b5fdb07 100644
--- a/weld/modules/pom.xml
+++ b/weld/modules/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-weld-parent</artifactId>
+    <artifactId>weld-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-weld-modules</artifactId>
+  <artifactId>weld-modules</artifactId>
 
   <name>WildFly Swarm: Weld Modules</name>
   <description>WildFly Swarm: Weld Modules</description>
@@ -40,23 +40,23 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bootstrap</artifactId>
+      <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-modules</artifactId>
+      <artifactId>container-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions-modules</artifactId>
+      <artifactId>transactions-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bean-validation-modules</artifactId>
+      <artifactId>bean-validation-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee-modules</artifactId>
+      <artifactId>ee-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.core</groupId>
diff --git a/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/api/module.xml b/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/api/module.xml
index 81d4349..e7de549 100644
--- a/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/api/module.xml
+++ b/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/api/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.weld" slot="api">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-weld:${project.version}"/>
+    <artifact name="org.wildfly.swarm:weld:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/runtime/module.xml b/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/runtime/module.xml
index e6e3a8a..1584106 100644
--- a/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/runtime/module.xml
+++ b/weld/modules/src/main/resources/modules/org/wildfly/swarm/weld/runtime/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.3" name="org.wildfly.swarm.weld" slot="runtime">
   <resources>
-    <artifact name="org.wildfly.swarm:wildfly-swarm-weld-runtime:${project.version}"/>
+    <artifact name="org.wildfly.swarm:weld-runtime:${project.version}"/>
   </resources>
 
   <dependencies>
diff --git a/weld/pom.xml b/weld/pom.xml
index 73d9bde..ef68e5a 100644
--- a/weld/pom.xml
+++ b/weld/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-parent</artifactId>
+    <artifactId>parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-weld-parent</artifactId>
+  <artifactId>weld-parent</artifactId>
 
   <name>WildFly Swarm: Weld</name>
   <description>WildFly Swarm: Weld</description>
diff --git a/weld/runtime/pom.xml b/weld/runtime/pom.xml
index cf70386..d502469 100644
--- a/weld/runtime/pom.xml
+++ b/weld/runtime/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-weld-parent</artifactId>
+    <artifactId>weld-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-weld-runtime</artifactId>
+  <artifactId>weld-runtime</artifactId>
 
   <name>WildFly Swarm: Weld Runtime</name>
   <description>WildFly Swarm: Weld Runtime</description>
@@ -25,25 +25,25 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-weld</artifactId>
+      <artifactId>weld</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-container-runtime</artifactId>
+      <artifactId>container-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-transactions-runtime</artifactId>
+      <artifactId>transactions-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-bean-validation-runtime</artifactId>
+      <artifactId>bean-validation-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-ee-runtime</artifactId>
+      <artifactId>ee-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/weld/test/pom.xml b/weld/test/pom.xml
index ee225d6..adbf533 100644
--- a/weld/test/pom.xml
+++ b/weld/test/pom.xml
@@ -9,13 +9,13 @@
 
   <parent>
     <groupId>org.wildfly.swarm</groupId>
-    <artifactId>wildfly-swarm-weld-parent</artifactId>
+    <artifactId>weld-parent</artifactId>
     <version>1.0.0.Alpha6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-weld-test</artifactId>
+  <artifactId>weld-test</artifactId>
 
   <name>WildFly Swarm: Weld Test</name>
   <description>WildFly Swarm: Weld Test</description>
@@ -41,15 +41,15 @@
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-weld</artifactId>
+      <artifactId>weld</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-weld-modules</artifactId>
+      <artifactId>weld-modules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-arquillian</artifactId>
+      <artifactId>arquillian</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>