diff --git a/docs/features/org.eclipse.jst.jsf.doc.feature/pom.xml b/docs/features/org.eclipse.jst.jsf.doc.feature/pom.xml
index 2342305..fb8c340 100644
--- a/docs/features/org.eclipse.jst.jsf.doc.feature/pom.xml
+++ b/docs/features/org.eclipse.jst.jsf.doc.feature/pom.xml
@@ -15,9 +15,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.docs</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
diff --git a/docs/plugins/org.eclipse.jst.jsf.doc.dev/pom.xml b/docs/plugins/org.eclipse.jst.jsf.doc.dev/pom.xml
index d14ae2a..f9b7859 100644
--- a/docs/plugins/org.eclipse.jst.jsf.doc.dev/pom.xml
+++ b/docs/plugins/org.eclipse.jst.jsf.doc.dev/pom.xml
@@ -15,9 +15,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.docs</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
diff --git a/docs/plugins/org.eclipse.jst.jsf.doc.user/pom.xml b/docs/plugins/org.eclipse.jst.jsf.doc.user/pom.xml
index 0769f12..a9772f4 100644
--- a/docs/plugins/org.eclipse.jst.jsf.doc.user/pom.xml
+++ b/docs/plugins/org.eclipse.jst.jsf.doc.user/pom.xml
@@ -15,9 +15,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.docs</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml b/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
index ae6c406..76edfa8 100644
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
+++ b/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
index 78498ca..ba971a9 100644
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
index 123ff2c..383a504 100644
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
index bff9c17..cd6986b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
index 2b8e341..ddd635b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
index 9bc6f00..4e64d78 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
index 9c74521..1183be0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
index 5c8583b..e63ec94 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
index 651e991..727c631 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml
index 1a050f8..4371122 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml b/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
index 5f2210b..5d580cc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
index 50a1841..e267504 100644
--- a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
index 2fcab26..a711e44 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
diff --git a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
index 2a9c434..d83d31c 100644
--- a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
-    <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
+    <artifactId>org.eclipse.webtools.jsf</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>