Rename top-level artifact properly
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5368904..3c26980 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -18,14 +18,14 @@
 <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/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>jclouds-cli-pom</artifactId>
+    <artifactId>jclouds-cli</artifactId>
     <groupId>org.apache.jclouds.cli</groupId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.jclouds.cli</groupId>
-  <artifactId>jclouds-cli</artifactId>
+  <artifactId>jclouds-cli-assembly</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <name>jclouds :: cli :: assembly</name>
 
@@ -280,7 +280,7 @@
               <descriptors>
                 <descriptor>src/main/assembly/unix.xml</descriptor>
               </descriptors>
-              <finalName>${project.artifactId}-${project.version}</finalName>
+              <finalName>jclouds-cli-${project.version}</finalName>
               <tarLongFileMode>gnu</tarLongFileMode>
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
@@ -295,7 +295,7 @@
               <descriptors>
                 <descriptor>src/main/assembly/win.xml</descriptor>
               </descriptors>
-              <finalName>${project.artifactId}-${project.version}</finalName>
+              <finalName>jclouds-cli-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
diff --git a/branding/pom.xml b/branding/pom.xml
index bcdce45..8223c1a 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -16,7 +16,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>jclouds-cli-pom</artifactId>
+    <artifactId>jclouds-cli</artifactId>
     <groupId>org.apache.jclouds.cli</groupId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
diff --git a/pom.xml b/pom.xml
index 0665f5c..aa2a647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <groupId>org.apache.jclouds.cli</groupId>
-  <artifactId>jclouds-cli-pom</artifactId>
+  <artifactId>jclouds-cli</artifactId>
   <packaging>pom</packaging>
   <name>jclouds :: cli</name>
   <version>1.7.0-SNAPSHOT</version>
diff --git a/runner/pom.xml b/runner/pom.xml
index 604c78e..6222808 100644
--- a/runner/pom.xml
+++ b/runner/pom.xml
@@ -17,7 +17,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>jclouds-cli-pom</artifactId>
+    <artifactId>jclouds-cli</artifactId>
     <groupId>org.apache.jclouds.cli</groupId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>