diff --git a/build/org.eclipse.cdt.gnu.build-feature/pom.xml b/build/org.eclipse.cdt.gnu.build-feature/pom.xml
index 3f346e92611..2fa1e844ea7 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/pom.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/pom.xml
@@ -11,6 +11,6 @@
../../pom.xml
- org.eclipse.cdt.gnu.build-feature
+ org.eclipse.cdt.gnu.build
eclipse-feature
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
index 5e69295e395..9036e2c5a6b 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
@@ -12,6 +12,6 @@
1.0.0-SNAPSHOT
- org.eclipse.cdt.build.crossgcc-feature
+ org.eclipse.cdt.build.crossgcc
eclipse-feature
diff --git a/debug/org.eclipse.cdt.gdb-feature/pom.xml b/debug/org.eclipse.cdt.gdb-feature/pom.xml
index 9557483fafa..451ed3db30a 100644
--- a/debug/org.eclipse.cdt.gdb-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/pom.xml
@@ -11,7 +11,7 @@
../../pom.xml
- org.eclipse.cdt.gdb-feature
+ org.eclipse.cdt.gdb
eclipse-feature
7.0.0-SNAPSHOT
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml b/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
index 5398f7632aa..032cc3f120f 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
@@ -11,7 +11,7 @@
../../pom.xml
- org.eclipse.cdt.gnu.debug-feature
+ org.eclipse.cdt.gnu.debug
eclipse-feature
7.1.0-SNAPSHOT
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..749f64554c5 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
@@ -12,6 +12,6 @@
4.0.0-SNAPSHOT
- org.eclipse.cdt.gdb.dsf-feature
+ org.eclipse.cdt.gdb.dsf
eclipse-feature
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
index 4441f062917..78790207f08 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
@@ -12,6 +12,6 @@
2.1.0-SNAPSHOT
- org.eclipse.cdt.examples.dsf-feature
+ org.eclipse.cdt.examples.dsf
eclipse-feature
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
index c944e575329..78c464fc855 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
@@ -12,6 +12,6 @@
7.0.0-SNAPSHOT
- org.eclipse.cdtdebug.gdbjtag-feature
+ org.eclipse.cdtdebug.gdbjtag
eclipse-feature
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..2f6b972d9b5 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
@@ -12,6 +12,6 @@
5.2.0-SNAPSHOT
- org.eclipse.cdt.core.lrparser.sdk.feature
+ org.eclipse.cdt.core.lrparser.sdk
eclipse-feature
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..84938e56c37 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
@@ -12,6 +12,6 @@
2.1.100-SNAPSHOT
- org.eclipse.cdt.debug.ui.memory-feature
+ org.eclipse.cdt.debug.ui.memory
eclipse-feature
diff --git a/releng/org.eclipse.cdt-feature/pom.xml b/releng/org.eclipse.cdt-feature/pom.xml
index 6d0c62769e1..44b7d33a088 100644
--- a/releng/org.eclipse.cdt-feature/pom.xml
+++ b/releng/org.eclipse.cdt-feature/pom.xml
@@ -11,6 +11,6 @@
../../pom.xml
- org.eclipse.cdt-feature
+ org.eclipse.cdt
eclipse-feature
diff --git a/releng/org.eclipse.cdt.platform-feature/pom.xml b/releng/org.eclipse.cdt.platform-feature/pom.xml
index ed7f836a907..0e8e246dc42 100644
--- a/releng/org.eclipse.cdt.platform-feature/pom.xml
+++ b/releng/org.eclipse.cdt.platform-feature/pom.xml
@@ -11,6 +11,6 @@
../../pom.xml
- org.eclipse.cdt.platform-feature
+ org.eclipse.cdt.platform
eclipse-feature
diff --git a/releng/org.eclipse.cdt.sdk-feature/pom.xml b/releng/org.eclipse.cdt.sdk-feature/pom.xml
index 8d8fb0696a3..f22a2469a54 100644
--- a/releng/org.eclipse.cdt.sdk-feature/pom.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/pom.xml
@@ -11,6 +11,6 @@
../../pom.xml
- org.eclipse.cdt.sdk-feature
+ org.eclipse.cdt.sdk
eclipse-feature
diff --git a/upc/org.eclipse.cdt.bupc-feature/pom.xml b/upc/org.eclipse.cdt.bupc-feature/pom.xml
index 8a069b6827d..314702433d6 100644
--- a/upc/org.eclipse.cdt.bupc-feature/pom.xml
+++ b/upc/org.eclipse.cdt.bupc-feature/pom.xml
@@ -12,6 +12,6 @@
1.0.3-SNAPSHOT
- org.eclipse.cdt.bupc-feature
+ org.eclipse.cdt.bupc
eclipse-feature
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..69d6b7a1e4c 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
@@ -12,6 +12,6 @@
5.1.0-SNAPSHOT
- org.eclipse.cdt.core.parser.upc.sdk.feature
+ org.eclipse.cdt.core.parser.upc.sdk
eclipse-feature
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
index 89d8d8b564f..365fa594a01 100644
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
@@ -12,6 +12,6 @@
6.1.0-SNAPSHOT
- org.eclipse.cdt.xlc.sdk-feature
+ org.eclipse.cdt.xlc.sdk
eclipse-feature