keycloak-aplcache

diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
index b2f9ace..788107f 100755
--- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
@@ -42,6 +42,7 @@
         </dependency>
     </dependencies>
     <build>
+        <finalName>${product.name}-${product.version}-eap6-adapter</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/distribution/adapters/js-adapter-zip/pom.xml b/distribution/adapters/js-adapter-zip/pom.xml
index 9938933..c62fe74 100755
--- a/distribution/adapters/js-adapter-zip/pom.xml
+++ b/distribution/adapters/js-adapter-zip/pom.xml
@@ -33,6 +33,7 @@
     <dependencies>
     </dependencies>
     <build>
+        <finalName>${product.name}-${product.version}-js-adapter</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
index 54cd02b..53b03d3 100755
--- a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
+++ b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
@@ -39,6 +39,7 @@
     </dependencies>
 
     <build>
+        <finalName>${product.name}-${product.version}-eap7-adapter</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/distribution/examples-dist/pom.xml b/distribution/examples-dist/pom.xml
index 401e80b..0b885be 100755
--- a/distribution/examples-dist/pom.xml
+++ b/distribution/examples-dist/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
     </dependencies>
     <build>
-        <finalName>keycloak-examples-${project.version}</finalName>
+        <finalName>${product.name}-${product.version}-examples</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
index f5ad89c..a802c04 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
@@ -42,6 +42,7 @@
         </dependency>
     </dependencies>
     <build>
+        <finalName>${product.name}-${product.version}-saml-eap6-adapter</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
index 4abf256..c9eb16c 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
@@ -39,6 +39,7 @@
     </dependencies>
 
     <build>
+        <finalName>${product.name}-${product.version}-saml-eap7-adapter</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml
index a85b6d3..d2b3261 100755
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -38,7 +38,7 @@
     </dependencies>
 
     <build>
-        <finalName>keycloak-${project.version}</finalName>
+        <finalName>${product.name}-${product.version}</finalName>
 
         <plugins>
             <plugin>

diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index b7c250a..5bcc607 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -27,7 +27,7 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/base</directory>
+            <directory>${project.build.directory}/unpacked/${product.name}-${product.version}/modules/system/layers/base</directory>
             <outputDirectory>modules/system/layers/base</outputDirectory>
             <includes>
                 <include>com/google/zxing/**</include>
@@ -41,18 +41,18 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/content</directory>
+            <directory>${project.build.directory}/unpacked/${product.name}-${product.version}/content</directory>
             <outputDirectory></outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/themes</directory>
+            <directory>${project.build.directory}/unpacked/${product.name}-${product.version}/standalone/configuration/themes</directory>
             <outputDirectory>standalone/configuration/themes</outputDirectory>
             <includes>
                 <include>**/**</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/providers</directory>
+            <directory>${project.build.directory}/unpacked/${product.name}-${product.version}/standalone/configuration/providers</directory>
             <outputDirectory>standalone/configuration/providers</outputDirectory>
             <includes>
                 <include>**/**</include>
@@ -76,16 +76,16 @@
 
     <files>
         <file>
-            <source>${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/keycloak-server.json</source>
+            <source>${project.build.directory}/unpacked/${product.name}-${product.version}/standalone/configuration/keycloak-server.json</source>
             <outputDirectory>standalone/configuration</outputDirectory>
         </file>
         <file>
-            <source>${project.build.directory}/unpacked/keycloak-${project.version}/bin/add-user.sh</source>
+            <source>${project.build.directory}/unpacked/${product.name}-${product.version}/bin/add-user.sh</source>
             <outputDirectory>bin</outputDirectory>
             <destName>add-user-keycloak.sh</destName>
         </file>
         <file>
-            <source>${project.build.directory}/unpacked/keycloak-${project.version}/bin/add-user.bat</source>
+            <source>${project.build.directory}/unpacked/${product.name}-${product.version}/bin/add-user.bat</source>
             <outputDirectory>bin</outputDirectory>
             <destName>add-user-keycloak.bat</destName>
         </file>

diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 311eb47..a6a5f33 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -38,7 +38,7 @@
     </dependencies>
 
     <build>
-        <finalName>keycloak-overlay-${project.version}</finalName>
+        <finalName>${product.name}-${product.version}-server-overlay</finalName>
 
         <plugins>
             <plugin>