diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
index 0060701c..cddf7707 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -12,7 +12,7 @@
 
 
     <!-- Registration of new models -->
-    <bean id="${package}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+    <bean id="${artifactId}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
         <property name="models">
             <list>
                 <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
index fd8a4806..1e3c5cf9 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
@@ -22,13 +22,13 @@
 <beans>
     
     <!-- A simple class that is initialized by Spring -->
-    <bean id="${package}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
+    <bean id="${artifactId}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
 
     <!-- A simple module component that will be executed once.
          Note. this module component will only be executed once, and then there will be an entry for it in the Repo.
          So doing for example $ mvn clean install -Prun twice will only execute this component the first time.
          You need to remove /alf_data_dev for it to be executed again. -->
-    <bean id="${package}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
+    <bean id="${artifactId}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
         <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
         <property name="name" value="exampleComponent" />
         <property name="description" value="A demonstration component" />
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
index 2ed294d9..bbf979cf 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
@@ -17,7 +17,7 @@
    -->
 
    <!-- Add module specific messages and labels -->
-   <bean id="${package}.${artifactId}.resources"
+   <bean id="${artifactId}.resources"
          class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
       <property name="resourceBundles">
          <list>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
index 96b136c4..31e14f25 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -12,7 +12,7 @@
 
 
     <!-- Registration of new models -->
-    <bean id="${package}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+    <bean id="${artifactId}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
         <property name="models">
             <list>
                 <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
index 78363d59..c56de017 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
@@ -22,13 +22,13 @@
 <beans>
 
     <!-- A simple class that is initialized by Spring -->
-    <bean id="${package}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
+    <bean id="${artifactId}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
 
     <!-- A simple module component that will be executed once.
         Note. this module component will only be executed once, and then there will be an entry for it in the Repo.
         So doing for example $ mvn clean install -Pamp-to-war twice will only execute this component the first time.
         You need to remove /alf_data_dev for it to be executed again. -->
-    <bean id="${package}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
+    <bean id="${artifactId}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
         <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
         <property name="name" value="exampleComponent" />
         <property name="description" value="A demonstration component" />
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
index e17b9f32..2cbbf20d 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
@@ -17,7 +17,7 @@
     -->
 
     <!-- Add module specific messages and labels -->
-    <bean id="${package}.${artifactId}.resources"
+    <bean id="${artifactId}.resources"
           class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
         <property name="resourceBundles">
             <list>