diff --git a/distribution/pom.xml b/distribution/pom.xml
index ce77ce82c6..58af8c81ac 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,9 +6,9 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.3-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-community-distribution</artifactId>
+    <artifactId>alfresco-content-services-community-full-distribution</artifactId>
     <packaging>jar</packaging>
-    <name>Alfresco Full Distribution (Community Edition)</name>
+    <name>Alfresco Content Services Community Full Distribution</name>
 
     <!-- To replace in share-config-custom.xml -->
     <properties>
@@ -19,7 +19,7 @@
         <!-- Platform Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-platform-community-distributionzip</artifactId>
+            <artifactId>alfresco-content-services-community-distribution</artifactId>
             <version>${alfresco.platform.version}</version>
             <type>zip</type>
             <exclusions>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-solr4-distribution</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <version>${alfresco.solr4.version}</version>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -81,14 +81,14 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-platform-community-distributionzip</artifactId>
+                                    <artifactId>alfresco-content-services-community-distribution</artifactId>
                                     <version>${alfresco.platform.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-solr4-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
+                                    <version>${alfresco.solr4.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
                                 </artifactItem>
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index ec4c83d42c..736b953103 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -1,6 +1,9 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>distribution</id>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
     <formats>
         <format>zip</format>
     </formats>
@@ -14,13 +17,13 @@
 
         <!-- Platform Community Distribution -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-platform-community-distributionzip-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${alfresco.platform.version}</directory>
             <outputDirectory/>
         </fileSet>
 
         <!-- Platform Enterprise Distribution -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${alfresco.platform.version}</directory>
             <outputDirectory/>
         </fileSet>
 
diff --git a/ear/pom.xml b/ear/pom.xml
index c4bfa07292..c8d1407a96 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-content-services-ear-distribution</artifactId>
-    <name>Alfresco EAR Distribution</name>
+    <artifactId>alfresco-content-services-full-ear-distribution</artifactId>
+    <name>Alfresco Content Services Full EAR Distribution</name>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
@@ -26,7 +26,7 @@
         <!-- WARs to include in the EAR -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-enterprise-war-for-ear</artifactId>
+            <artifactId>alfresco-content-services-war-for-ear</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
@@ -53,8 +53,8 @@
         <!-- Distribution zip -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <artifactId>alfresco-content-services-full-distribution</artifactId>
+            <version>${project.version}</version>
             <type>zip</type>
             <scope>provided</scope>
             <exclusions>
@@ -196,7 +196,7 @@
                     <modules>
                         <webModule>
                             <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-enterprise-war-for-ear</artifactId>
+                            <artifactId>alfresco-content-services-war-for-ear</artifactId>
                             <bundleFileName>alfresco.war</bundleFileName>
                         </webModule>
                         <webModule>
@@ -228,9 +228,9 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>alfresco-content-services-platform-distributionzip</includeArtifactIds>
+                            <includeArtifactIds>alfresco-content-services-full-distribution</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
-                            <excludes>alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/modules/</excludes>
+                            <excludes>alfresco-content-services-full-distribution-${alfresco.platform.version}/solr4/,alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-full-distribution-${alfresco.platform.version}/modules/</excludes>
                         </configuration>
                     </execution>
 
@@ -262,7 +262,7 @@
                                     <version>1.0.1</version>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory>
+                            <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/ear/src/assembly/ear-distribution.xml b/ear/src/assembly/ear-distribution.xml
index 7b6bde3e30..0f3629d4b7 100644
--- a/ear/src/assembly/ear-distribution.xml
+++ b/ear/src/assembly/ear-distribution.xml
@@ -8,14 +8,14 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}</directory>
             <outputDirectory/>
             <excludes>
                 <exclude>web-server/shared/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/shared/classes</directory>
             <outputDirectory>web-server/classpath</outputDirectory>
         </fileSet>
         <fileSet>
@@ -29,7 +29,7 @@
             <source>${project.build.directory}/myfaces1_1-websphere-shared-lib-${project.version}.zip</source>
         </file>
         <file>
-            <source>${project.build.directory}/alfresco-content-services-ear-distribution-${project.version}.ear</source>
+            <source>${project.build.directory}/alfresco-content-services-full-ear-distribution-${project.version}.ear</source>
             <destName>alfresco-content-services-${project.version}.ear</destName>
         </file>
     </files>
diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml
index dab42ab2e9..4fd8b6745f 100644
--- a/enterprise-distribution/pom.xml
+++ b/enterprise-distribution/pom.xml
@@ -6,9 +6,9 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.3-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-content-services-distribution</artifactId>
+    <artifactId>alfresco-content-services-full-distribution</artifactId>
     <packaging>jar</packaging>
-    <name>Alfresco Full Distribution (Enterprise Edition)</name>
+    <name>Alfresco Content Services Full Distribution</name>
 
     <!-- To replace in share-config-custom.xml -->
     <properties>
@@ -16,10 +16,9 @@
     </properties>
 
     <dependencies>
-        <!-- Platform Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
+            <artifactId>alfresco-content-services-distribution</artifactId>
             <version>${alfresco.platform.version}</version>
             <type>zip</type>
             <exclusions>
@@ -34,7 +33,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-solr4-distribution</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <version>${alfresco.solr4.version}</version>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -81,14 +80,14 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
+                                    <artifactId>alfresco-content-services-distribution</artifactId>
                                     <version>${alfresco.platform.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-solr4-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
+                                    <version>${alfresco.solr4.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
                                 </artifactItem>
diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index f15de7bcb4..3661787949 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -6,9 +6,9 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.3-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-content-services-installer</artifactId>
+    <artifactId>alfresco-content-services-full-installer</artifactId>
     <packaging>pom</packaging>
-    <name>Alfresco Enterprise Full Installers</name>
+    <name>Alfresco Content Services Full Installers</name>
 
     <properties>
         <binaries.folder>${user.home}/binaries</binaries.folder>
@@ -29,8 +29,8 @@
         </bitrock.arguments>
 
         <!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) -->
-        <alfresco.package.name>alfresco-content-services</alfresco.package.name>
-        <alfresco.distribution.name>alfresco-content-services-distribution</alfresco.distribution.name>
+        <alfresco.package.name>alfresco-content-services-full</alfresco.package.name>
+        <alfresco.distribution.name>alfresco-content-services-full-distribution</alfresco.distribution.name>
 
         <!-- 
         Override alfresco.installer.name for the Enterprise installer that is still using 
@@ -43,10 +43,20 @@
         <!-- Import the dependencies from the Community installer -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-community-installer</artifactId>
+            <artifactId>alfresco-installer-resources</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-installer-resources</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-content-services-installer-resources</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -69,6 +79,12 @@
                         </goals>
                         <configuration>
                             <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-installer-resources</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-content-services-installer-resources</artifactId>
@@ -77,16 +93,16 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-content-services-distribution</artifactId>
+                                    <artifactId>alfresco-content-services-full-distribution</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/distribution</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}</outputDirectory>
                                 </artifactItem>
                                 <!-- Solr1 Distribution -->
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-solr1-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
+                                    <version>${alfresco.solr.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr</outputDirectory>
                                 </artifactItem>
diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
index a92696a577..9e83c72beb 100644
--- a/enterprise-war-for-ear/pom.xml
+++ b/enterprise-war-for-ear/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-enterprise-war-for-ear</artifactId>
-    <name>Alfresco Enterprise WAR for inclusion in EAR</name>
+    <artifactId>alfresco-content-services-war-for-ear</artifactId>
+    <name>Alfresco Content Services WAR for inclusion in EAR</name>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
@@ -12,7 +12,7 @@
     <dependencies>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-platform-enterprise</artifactId>
+            <artifactId>content-services</artifactId>
             <version>${alfresco.platform.version}</version>
             <type>war</type>
         </dependency>
@@ -54,7 +54,7 @@
                     <overlays>
                         <overlay>
                             <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-platform-enterprise</artifactId>
+                            <artifactId>content-services</artifactId>
                             <type>war</type>
                         </overlay>
                         <overlay>
diff --git a/installer/pom.xml b/installer/pom.xml
index 8586191225..41314cf846 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -6,15 +6,16 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.3-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-community-installer</artifactId>
+    <artifactId>alfresco-content-services-community-full-installer</artifactId>
     <packaging>pom</packaging>
-    <name>Alfresco Community Full Installers</name>
+    <name>Alfresco Content Services Community Full Installers</name>
 
     <properties>
         <binaries.folder>${user.home}/binaries</binaries.folder>
         <bitrock.folder>${project.build.directory}/installbuilder</bitrock.folder>
         <signing.key.location>${binaries.folder}/build-classpath/code-signing</signing.key.location>
         <license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location>
+        <alfresco.package.name>alfresco-content-services-community-full</alfresco.package.name>
         <bitrock.arguments>
            project.version=${installer.version.name} 
            project.fullName='Alfresco Community'
@@ -27,6 +28,13 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-installer-resources</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- These binaries are extracted using tar, to preserve symlinks -->
 
         <!-- Common -->
@@ -195,16 +203,16 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-community-distribution</artifactId>
+                                    <artifactId>alfresco-content-services-community-full-distribution</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/distribution</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}</outputDirectory>
                                 </artifactItem>
                                 <!-- Solr1 Distribution -->
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-solr1-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
+                                    <version>${alfresco.solr.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}/alf_data/solr</outputDirectory>
                                 </artifactItem>
diff --git a/pom.xml b/pom.xml
index 5d21e1905d..7ebd6cff85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,9 @@
         <!-- Alfresco Office Services Module -->
         <alfresco.aos-module.version>1.1.6</alfresco.aos-module.version>
 
+        <alfresco.solr.version>6.1</alfresco.solr.version>
+        <alfresco.solr4.version>6.4</alfresco.solr4.version>
+
         <!-- Versions of binaries packaged in the installer -->
         <installer.common.version>5.2-20170508</installer.common.version>
         <installer.tomcat.version>7.0.59-alfresco-distribution</installer.tomcat.version>