diff --git a/core/org.eclipse.cdt.core.aix/cdtaix.jar b/core/org.eclipse.cdt.core.aix/cdtaix.jar
deleted file mode 100644
index 4736cf86eda..00000000000
Binary files a/core/org.eclipse.cdt.core.aix/cdtaix.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.linux/cdt_linux.jar b/core/org.eclipse.cdt.core.linux/cdt_linux.jar
deleted file mode 100644
index d08df0a9af6..00000000000
Binary files a/core/org.eclipse.cdt.core.linux/cdt_linux.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.macosx/cdt_macosx.jar b/core/org.eclipse.cdt.core.macosx/cdt_macosx.jar
deleted file mode 100644
index e70f582c8d4..00000000000
Binary files a/core/org.eclipse.cdt.core.macosx/cdt_macosx.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.solaris/cdt_solaris.jar b/core/org.eclipse.cdt.core.solaris/cdt_solaris.jar
deleted file mode 100644
index 490f0273d09..00000000000
Binary files a/core/org.eclipse.cdt.core.solaris/cdt_solaris.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.win32/cdt_win32.jar b/core/org.eclipse.cdt.core.win32/cdt_win32.jar
deleted file mode 100644
index b72115589c3..00000000000
Binary files a/core/org.eclipse.cdt.core.win32/cdt_win32.jar and /dev/null differ
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 15a36c3d118..e87ca2cfe37 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
@@ -12,6 +12,6 @@
 	</parent>
 
 	<version>4.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.gdb.dsf.source</artifactId>
+	<artifactId>org.eclipse.cdt.gnu.dsf.source</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 78c464fc855..a020ea9615a 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
@@ -12,6 +12,7 @@
 	</parent>
 
 	<version>7.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdtdebug.gdbjtag</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.debug.gdbjtag</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/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/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..35d10b8f8b2 100644
--- a/util/org.eclipse.cdt.util-feature/pom.xml
+++ b/util/org.eclipse.cdt.util-feature/pom.xml
@@ -12,6 +12,7 @@
 	</parent>
 
 	<version>5.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.util-feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.util</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..6635b5a7e91 100644
--- a/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
+++ b/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
@@ -12,6 +12,7 @@
 	</parent>
 
 	<version>6.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.xlc.source.feature</artifactId>
+	<groupId>org.eclipse.cdt.features</groupId>
+	<artifactId>org.eclipse.cdt.xlc.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>