diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index f5431e5013..0ffe64bb6b 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -32,6 +32,7 @@
 
         <!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) -->
         <alfresco.package.name>alfresco-enterprise-distribution</alfresco.package.name>
+        <alfresco.distribution.name>${alfresco.package.name}-distributionzip</alfresco.distribution.name>
     </properties>
 
     <dependencies>
@@ -76,7 +77,7 @@
                                     <artifactId>alfresco-solr1-distribution</artifactId>
                                     <version>${alfresco.platform.version}</version>
                                     <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/alf_data/solr</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${project.version}/alf_data/solr</outputDirectory>
                                 </artifactItem>
                                 <!-- WCMQS Distribution -->
                                 <artifactItem>
diff --git a/installer/pom.xml b/installer/pom.xml
index 15a500f620..1fb1ca7459 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -215,7 +215,7 @@
                                     <artifactId>alfresco-solr1-distribution</artifactId>
                                     <version>${alfresco.platform.version}</version>
                                     <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/alf_data/solr</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${project.version}/alf_data/solr</outputDirectory>
                                 </artifactItem>
                                 <!-- WCMQS Distribution -->
                                 <artifactItem>
diff --git a/pom.xml b/pom.xml
index ee940dbc5d..684afcb5a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
         <installer.libreoffice.version>4.2.5-alfresco</installer.libreoffice.version>
         <installer.installbuilder.version>15.1.0</installer.installbuilder.version>
 
-        <!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) -->
         <alfresco.package.name>alfresco-community</alfresco.package.name>
+        <alfresco.distribution.name>${alfresco.package.name}-distributionzip</alfresco.distribution.name>
     </properties>
 
     <modules>