diff --git a/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/.content.xml b/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/.content.xml
index e4875010e..ff63da965 100644
--- a/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/.content.xml
+++ b/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/.content.xml
@@ -9,7 +9,7 @@
     groupTitle="${package.groupTitle}"
     builtWith="${package.builtWith}"
     name="${name}"
-    path="${crx.package.path}/${package.group}/${artifactId}-${version}"
+    path="${aem.package.path}/${package.group}/${artifactId}-${version}"
     version="${version}"
     providerName="${package.providerName}"
     providerUrl="${package.providerUrl}"
diff --git a/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
index cc15c9ace..c63f71024 100644
--- a/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
+++ b/aemdesign-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="nt:unstructured"
-  fileReference="${crx.package.path}/${package.group}/${artifactId}-${version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
+  fileReference="${aem.package.path}/${package.group}/${artifactId}-${version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
 </jcr:root>
diff --git a/aemdesign-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/aemdesign-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
index cc15c9ace..c63f71024 100644
--- a/aemdesign-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
+++ b/aemdesign-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="nt:unstructured"
-  fileReference="${crx.package.path}/${package.group}/${artifactId}-${version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
+  fileReference="${aem.package.path}/${package.group}/${artifactId}-${version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
 </jcr:root>
diff --git a/aemdesign-aem-content/pom.xml b/aemdesign-aem-content/pom.xml
index 9956acd84..2be896255 100644
--- a/aemdesign-aem-content/pom.xml
+++ b/aemdesign-aem-content/pom.xml
@@ -97,7 +97,7 @@
                 <configuration>
                     <group>${package.group}</group>
                     <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
-                    <targetURL>${package.uploadProtocol}://${crx.host}:${crx.port}/crx/packmgr/service.jsp</targetURL>
+                    <targetURL>${package.uploadProtocol}://${aem.host}:${aem.port}/crx/packmgr/service.jsp</targetURL>
                     <properties>
                         <description>${project.description}</description>
                         <created>${buildNumber}</created>
@@ -150,9 +150,9 @@
                                     <goal>install</goal>
                                 </goals>
                                 <configuration>
-                                    <targetURL>${package.uploadProtocol}://${crx.host}:${crx.port}/crx/packmgr/service.jsp</targetURL>
-                                    <userId>${crx.username}</userId>
-                                    <password>${crx.password}</password>
+                                    <targetURL>${package.uploadProtocol}://${aem.host}:${aem.port}/crx/packmgr/service.jsp</targetURL>
+                                    <userId>${aem.username}</userId>
+                                    <password>${aem.password}</password>
                                 </configuration>
                             </execution>
                         </executions>
@@ -184,16 +184,16 @@
                                     <executable>curl</executable>
                                     <arguments>
                                         <argument>-u</argument>
-                                        <argument>${crx.username}:${crx.password}</argument>
+                                        <argument>${aem.username}:${aem.password}</argument>
                                         <argument>-H</argument>
                                         <argument>User-Agent:curl</argument>
                                         <argument>-H</argument>
-                                        <argument>Referer:${package.uploadProtocol}://${crx.host}:${crx.port}</argument>
+                                        <argument>Referer:${package.uploadProtocol}://${aem.host}:${aem.port}</argument>
                                         <argument>-X</argument>
                                         <argument>POST</argument>
                                         <argument>-F</argument>
                                         <argument>enabled=false</argument>
-                                        <argument>${package.uploadProtocol}://${crx.host}:${crx.port}/libs/settings/workflow/launcher/config/update_asset_create</argument>
+                                        <argument>${package.uploadProtocol}://${aem.host}:${aem.port}/libs/settings/workflow/launcher/config/update_asset_create</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -207,16 +207,16 @@
                                     <executable>curl</executable>
                                     <arguments>
                                         <argument>-u</argument>
-                                        <argument>${crx.username}:${crx.password}</argument>
+                                        <argument>${aem.username}:${aem.password}</argument>
                                         <argument>-H</argument>
                                         <argument>User-Agent:curl</argument>
                                         <argument>-H</argument>
-                                        <argument>Referer:${package.uploadProtocol}://${crx.host}:${crx.port}</argument>
+                                        <argument>Referer:${package.uploadProtocol}://${aem.host}:${aem.port}</argument>
                                         <argument>-X</argument>
                                         <argument>POST</argument>
                                         <argument>-F</argument>
                                         <argument>enabled=false</argument>
-                                        <argument>${package.uploadProtocol}://${crx.host}:${crx.port}/libs/settings/workflow/launcher/config/update_asset_mod</argument>
+                                        <argument>${package.uploadProtocol}://${aem.host}:${aem.port}/libs/settings/workflow/launcher/config/update_asset_mod</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -248,16 +248,16 @@
                                     <executable>curl</executable>
                                     <arguments>
                                         <argument>-u</argument>
-                                        <argument>${crx.username}:${crx.password}</argument>
+                                        <argument>${aem.username}:${aem.password}</argument>
                                         <argument>-H</argument>
                                         <argument>User-Agent:curl</argument>
                                         <argument>-H</argument>
-                                        <argument>Referer:${package.uploadProtocol}://${crx.host}:${crx.port}</argument>
+                                        <argument>Referer:${package.uploadProtocol}://${aem.host}:${aem.port}</argument>
                                         <argument>-X</argument>
                                         <argument>POST</argument>
                                         <argument>-F</argument>
                                         <argument>enabled=true</argument>
-                                        <argument>${package.uploadProtocol}://${crx.host}:${crx.port}/libs/settings/workflow/launcher/config/update_asset_create</argument>
+                                        <argument>${package.uploadProtocol}://${aem.host}:${aem.port}/libs/settings/workflow/launcher/config/update_asset_create</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -271,11 +271,11 @@
                                     <executable>curl</executable>
                                     <arguments>
                                         <argument>-u</argument>
-                                        <argument>${crx.username}:${crx.password}</argument>
+                                        <argument>${aem.username}:${aem.password}</argument>
                                         <argument>-H</argument>
                                         <argument>User-Agent:curl</argument>
                                         <argument>-H</argument>
-                                        <argument>Referer:${package.uploadProtocol}://${crx.host}:${crx.port}</argument>
+                                        <argument>Referer:${package.uploadProtocol}://${aem.host}:${aem.port}</argument>
                                         <argument>-X</argument>
                                         <argument>POST</argument>
                                         <argument>-F</argument>