diff --git a/src/main/resources/META-INF/maven/archetype.xml b/src/main/resources/META-INF/maven/archetype.xml
index e377d386..189ba34c 100644
--- a/src/main/resources/META-INF/maven/archetype.xml
+++ b/src/main/resources/META-INF/maven/archetype.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?><archetype>
-  <id>test</id>
+  <id>maven-alfresco-amp-archetype</id>
   <sources>
     <source>src/main/java/com/sourcesense/demoamp/Demo.java</source>
     <source>src/main/java/com/sourcesense/demoamp/DemoComponent.java</source>
   </sources>
   <resources>
-    <resource>src/main/config/context/service-context.xml</resource>
-    <resource>src/main/config/log4j.properties</resource>
-    <resource>src/main/config/module-context.xml</resource>
-    <resource>src/main/webapp/css/demoamp.css</resource>
-    <resource>src/main/webapp/images/sourcesense.gif</resource>
-    <resource>src/main/webapp/jsp/demoamp.jsp</resource>
-    <resource>src/main/webapp/licenses/README-licenses.txt</resource>
-    <resource>src/main/webapp/scripts/demoamp.js</resource>
-    <resource>module.properties</resource>
-    <resource>README.txt</resource>
-    <resource>TODO.txt</resource>
+    <resource filtered="false">src/main/config/context/service-context.xml</resource>
+    <resource filtered="false">src/main/config/log4j.properties</resource>
+    <resource filtered="false">src/main/config/module-context.xml</resource>
+    <resource filtered="false">src/main/webapp/css/demoamp.css</resource>
+    <resource filtered="false">src/main/webapp/images/sourcesense.gif</resource>
+    <resource filtered="false">src/main/webapp/jsp/demoamp.jsp</resource>
+    <resource filtered="false">src/main/webapp/licenses/README-licenses.txt</resource>
+    <resource filtered="false">src/main/webapp/scripts/demoamp.js</resource>
+    <resource filtered="false">module.properties</resource>
+    <resource filtered="false">README.txt</resource>
+    <resource filtered="false">TODO.txt</resource>
   </resources>
   <testResources>
-    <resource>src/test/properties/local/application.properties</resource>
-    <resource>src/test/resources/alfresco/extension/custom-repository-context.xml</resource>
-    <resource>src/test/resources/alfresco/extension/file-servers-custom.xml</resource>
-    <resource>src/test/resources/log4j.properties</resource>
+    <resource filtered="false">src/test/properties/local/application.properties</resource>
+    <resource filtered="false">src/test/resources/alfresco/extension/custom-repository-context.xml</resource>
+    <resource filtered="false">src/test/resources/alfresco/extension/file-servers-custom.xml</resource>
+    <resource filtered="false">src/test/resources/log4j.properties</resource>
   </testResources>
 </archetype>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index c4133e37..3a0ef240 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -118,7 +118,7 @@
 			<plugin>
 				<groupId>org.alfresco.maven.plugin</groupId>
 				<artifactId>maven-amp-plugin</artifactId>
-				<version>1.0.0</version>
+				<version>2.0.0</version>
 				<extensions>true</extensions>
 				<configuration>
 					<archive>
@@ -154,7 +154,7 @@
 			<resource>
 				<filtering>true</filtering>
 				<directory>src/main/config</directory>
-				<targetPath>alfresco/modules/${groupId}.${artifactId}</targetPath>
+				<targetPath>alfresco/module/${groupId}.${artifactId}</targetPath>
 				<excludes>
 					<exclude>**README-*</exclude>
 				</excludes>
@@ -192,7 +192,7 @@
 							<dependency>
 								<groupId>org.alfresco.maven.plugin</groupId>
 								<artifactId>maven-amp-plugin</artifactId>
-								<version>1.0.0</version>
+								<version>2.0.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
@@ -244,7 +244,7 @@
 							<dependency>
 								<groupId>org.alfresco.maven.plugin</groupId>
 								<artifactId>maven-amp-plugin</artifactId>
-								<version>1.0.0</version>
+								<version>2.0.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/src/main/resources/archetype-resources/src/main/config/context/service-context.xml b/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
index af80bed8..9a634904 100644
--- a/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
+++ b/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
@@ -1,4 +1,4 @@
-<?xml version='${version}' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 <!--
 	Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/main/resources/archetype-resources/src/main/config/module-context.xml b/src/main/resources/archetype-resources/src/main/config/module-context.xml
index e6a65964..2421dacb 100644
--- a/src/main/resources/archetype-resources/src/main/config/module-context.xml
+++ b/src/main/resources/archetype-resources/src/main/config/module-context.xml
@@ -1,4 +1,4 @@
-<?xml version='${version}' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
 	Licensed to the Apache Software Foundation (ASF) under one or more
 	contributor license agreements.  See the NOTICE file distributed with