diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 855d392e..350d83f9 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -70,7 +70,7 @@
 		-->
 		<env>local</env>
 		<!-- Webapp used to test/develop locally the AMP -->
-		<webapp.name>${artifactId}-webapp</webapp.name>
+		<webapp.name>${project.artifactId}-webapp</webapp.name>
 		<!--
 			| | By default the src/test/properties/local/alfresco-global.properties
 			uses the property "alfresco.data.location" to specify where |
@@ -225,13 +225,13 @@
 			</resource>
 			<!--
 				Copies and filters AMP config in the proper package
-				'alfresco/module/${artifactId}' so to enforce full module
+				'alfresco/module/${project.artifactId}' so to enforce full module
 				naming single sourcing from POM properties
 			-->
 			<resource>
 				<filtering>true</filtering>
 				<directory>src/main/config</directory>
-				<targetPath>alfresco/module/${artifactId}</targetPath>
+				<targetPath>alfresco/module/${project.artifactId}</targetPath>
 				<excludes>
 					<exclude>**README-*</exclude>
 				</excludes>
@@ -398,7 +398,7 @@
 					</testResource>
 					<!--
 						src/main/config/ is copied into ==>
-						target/test-classes/alfresco/module/${artifactId} to be
+						target/test-classes/alfresco/module/${project.artifactId} to be
 						picked up by the maven-war plugin Best practice tacken from
 						recordsmanagement.amp, is enforced troughout the whole archetype.
 						This convention is also used for module.properties filtering.
@@ -409,7 +409,7 @@
 						<includes>
 							<include>module.properties</include>
 						</includes>
-						<targetPath>alfresco/module/${artifactId}</targetPath>
+						<targetPath>alfresco/module/${project.artifactId}</targetPath>
 					</testResource>
 				</testResources>
 			</build>