diff --git a/distribution/artemis/pom.xml b/artemis-distribution/pom.xml
similarity index 99%
rename from distribution/artemis/pom.xml
rename to artemis-distribution/pom.xml
index ab6e2a980b..281e3c618e 100644
--- a/distribution/artemis/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -25,7 +25,7 @@
       <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>apache-activemq-artemis</artifactId>
+   <artifactId>apache-artemis</artifactId>
    <packaging>pom</packaging>
    <name>Apache ActiveMQ Artemis Distribution</name>
 
diff --git a/distribution/artemis/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
similarity index 100%
rename from distribution/artemis/src/main/assembly/dep.xml
rename to artemis-distribution/src/main/assembly/dep.xml
diff --git a/distribution/artemis/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml
similarity index 100%
rename from distribution/artemis/src/main/assembly/source-assembly.xml
rename to artemis-distribution/src/main/assembly/source-assembly.xml
diff --git a/distribution/artemis/src/main/resources/README.html b/artemis-distribution/src/main/resources/README.html
similarity index 100%
rename from distribution/artemis/src/main/resources/README.html
rename to artemis-distribution/src/main/resources/README.html
diff --git a/distribution/artemis/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
similarity index 100%
rename from distribution/artemis/src/main/resources/bin/artemis
rename to artemis-distribution/src/main/resources/bin/artemis
diff --git a/distribution/artemis/src/main/resources/bin/artemis.cmd b/artemis-distribution/src/main/resources/bin/artemis.cmd
similarity index 100%
rename from distribution/artemis/src/main/resources/bin/artemis.cmd
rename to artemis-distribution/src/main/resources/bin/artemis.cmd
diff --git a/distribution/artemis/src/main/resources/licenses/bin/LICENSE b/artemis-distribution/src/main/resources/licenses/bin/LICENSE
similarity index 100%
rename from distribution/artemis/src/main/resources/licenses/bin/LICENSE
rename to artemis-distribution/src/main/resources/licenses/bin/LICENSE
diff --git a/distribution/artemis/src/main/resources/licenses/bin/NOTICE b/artemis-distribution/src/main/resources/licenses/bin/NOTICE
similarity index 100%
rename from distribution/artemis/src/main/resources/licenses/bin/NOTICE
rename to artemis-distribution/src/main/resources/licenses/bin/NOTICE
diff --git a/distribution/pom.xml b/distribution/pom.xml
deleted file mode 100644
index 721bd1efe4..0000000000
--- a/distribution/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>artemis-pom</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-   </parent>
-
-   <artifactId>artemis-distribution</artifactId>
-   <packaging>pom</packaging>
-   <name>ActiveMQ Artemis Distribution</name>
-
-   <properties>
-      <skipLicenseCheck>true</skipLicenseCheck>
-      <skipStyleCheck>true</skipStyleCheck>
-   </properties>
-
-   <dependencies>
-      <dependency>
-         <groupId>org.apache.geronimo.specs</groupId>
-         <artifactId>geronimo-jms_2.0_spec</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-all</artifactId>
-      </dependency>
-   </dependencies>
-
-   <modules>
-      <module>artemis</module>
-   </modules>
-
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-         </plugin>
-      </plugins>
-   </build>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 53de67ed98..0d39ec874e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -505,7 +505,7 @@
             <module>integration/activemq-spring-integration</module>
             <module>integration/activemq-aerogear-integration</module>
             <module>integration/activemq-vertx-integration</module>
-            <module>distribution</module>
+            <module>artemis-distribution</module>
             <module>tests</module>
          </modules>
       </profile>
@@ -534,7 +534,7 @@
             <module>integration/activemq-vertx-integration</module>
             <module>examples</module>
             <module>tests</module>
-            <module>distribution</module>
+            <module>artemis-distribution</module>
          </modules>
       </profile>
       <profile>