diff --git a/build/org.eclipse.cdt.gnu.build-feature/pom.xml b/build/org.eclipse.cdt.gnu.build-feature/pom.xml
index 3f346e92611..d7cb7798566 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/pom.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gnu.build-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.gnu.build</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml b/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml
index c6e6e2d2705..38de6b463b4 100644
--- a/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml
+++ b/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gnu.build.source-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.gnu.build.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
index 5e69295e395..0dbd208747f 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>1.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.build.crossgcc-feature</artifactId>
+	<artifactId>org.eclipse.cdt.build.crossgcc</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/debug/org.eclipse.cdt.gdb-feature/pom.xml b/debug/org.eclipse.cdt.gdb-feature/pom.xml
index 9557483fafa..37e0cb11ad3 100644
--- a/debug/org.eclipse.cdt.gdb-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gdb-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.gdb</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>7.0.0-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.gdb.source-feature/pom.xml b/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
index 640772e3b98..20ba4cadd25 100644
--- a/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gdb.source-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.gdb.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>7.0.0-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml b/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
index 5398f7632aa..75d1005c392 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gnu.debug-feature</artifactId>
+	<groupId>org.eclipse.cdt.feature</groupId>
+	<artifactId>org.eclipse.cdt.gnu.debug</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>7.1.0-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml b/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml
index d3dad153249..43f7cc7e261 100644
--- a/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gnu.debug.source-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.gnu.debug.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>7.1.0-SNAPSHOT</version>
 </project>
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
index 9dfaab0d04a..15429734414 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.feature</groupId>
 	<version>4.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.gdb.dsf-feature</artifactId>
+	<artifactId>org.eclipse.cdt.gnu.dsf</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml
index ec4f9e758ec..e2800dc1574 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>4.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.gdb.dsf.source-feature</artifactId>
+	<artifactId>org.eclipse.cdt.gnu.dsf.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
index 4441f062917..dd728c9dbb3 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>2.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.examples.dsf-feature</artifactId>
+	<artifactId>org.eclipse.cdt.examples.dsf</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
index c944e575329..a4455f31a81 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>7.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdtdebug.gdbjtag-feature</artifactId>
+	<artifactId>org.eclipse.cdt.debug.gdbjtag</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml
index cf9e28368c9..b3da39ced44 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>8.0.0-SNAPSHOT</version>
+	<version>8.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.debug.gdbjtag.core</artifactId>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
index ff465dede44..43fe2313723 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>5.2.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.core.lrparser.sdk.feature</artifactId>
+	<artifactId>org.eclipse.cdt.core.lrparser.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml
index 4b49629a7ef..e70437ff8d7 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>5.2.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.core.lrparser.source.feature</artifactId>
+	<artifactId>org.eclipse.cdt.core.lrparser.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
index 2fca78c685c..a762d34f0dc 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>2.1.100-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.debug.ui.memory-feature</artifactId>
+	<artifactId>org.eclipse.cdt.debug.ui.memory</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/p2/org.eclipse.cdt.p2-feature/pom.xml b/p2/org.eclipse.cdt.p2-feature/pom.xml
index 3016643ba12..2cbde6f9d5e 100644
--- a/p2/org.eclipse.cdt.p2-feature/pom.xml
+++ b/p2/org.eclipse.cdt.p2-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>1.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.p2-feature</artifactId>
+	<artifactId>org.eclipse.cdt.p2</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt-feature/pom.xml b/releng/org.eclipse.cdt-feature/pom.xml
index 6d0c62769e1..028f479703a 100644
--- a/releng/org.eclipse.cdt-feature/pom.xml
+++ b/releng/org.eclipse.cdt-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt.platform-feature/pom.xml b/releng/org.eclipse.cdt.platform-feature/pom.xml
index ed7f836a907..f42595737f0 100644
--- a/releng/org.eclipse.cdt.platform-feature/pom.xml
+++ b/releng/org.eclipse.cdt.platform-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.platform-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.platform</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt.platform.source-feature/pom.xml b/releng/org.eclipse.cdt.platform.source-feature/pom.xml
index 54a16327fea..67d6df2f593 100644
--- a/releng/org.eclipse.cdt.platform.source-feature/pom.xml
+++ b/releng/org.eclipse.cdt.platform.source-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.platform.source-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.platform.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt.sdk-feature/pom.xml b/releng/org.eclipse.cdt.sdk-feature/pom.xml
index 8d8fb0696a3..ac901feebff 100644
--- a/releng/org.eclipse.cdt.sdk-feature/pom.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.sdk-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/upc/org.eclipse.cdt.bupc-feature/pom.xml b/upc/org.eclipse.cdt.bupc-feature/pom.xml
index 8a069b6827d..7dbcecf3fd7 100644
--- a/upc/org.eclipse.cdt.bupc-feature/pom.xml
+++ b/upc/org.eclipse.cdt.bupc-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>1.0.3-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.bupc-feature</artifactId>
+	<artifactId>org.eclipse.cdt.bupc</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
index a5db8467e60..fcd12aef9dc 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>5.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.core.parser.upc.sdk.feature</artifactId>
+	<artifactId>org.eclipse.cdt.core.parser.upc.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
index 424facea986..589c5e15a0c 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>5.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.core.parser.upc.source.feature</artifactId>
+	<artifactId>org.eclipse.cdt.core.parser.upc.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/util/org.eclipse.cdt.util-feature/pom.xml b/util/org.eclipse.cdt.util-feature/pom.xml
index ee2668cccd5..12d34011929 100644
--- a/util/org.eclipse.cdt.util-feature/pom.xml
+++ b/util/org.eclipse.cdt.util-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>5.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.util-feature</artifactId>
+	<artifactId>org.eclipse.cdt.util</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/windows/org.eclipse.cdt.msw-feature/pom.xml b/windows/org.eclipse.cdt.msw-feature/pom.xml
index c9dc94c493e..413e52398ec 100644
--- a/windows/org.eclipse.cdt.msw-feature/pom.xml
+++ b/windows/org.eclipse.cdt.msw-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>1.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.msw-feature</artifactId>
+	<artifactId>org.eclipse.cdt.msw</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
index 89d8d8b564f..e13665a81ed 100644
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>6.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.xlc.sdk-feature</artifactId>
+	<artifactId>org.eclipse.cdt.xlc.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml b/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
index 3fca6e7739b..496cfdee59b 100644
--- a/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
+++ b/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
@@ -11,7 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<version>6.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.xlc.source.feature</artifactId>
+	<artifactId>org.eclipse.cdt.xlc.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>