diff --git a/debug/org.eclipse.cdt.gdb.source-feature/.project b/debug/org.eclipse.cdt.gdb.source-feature/.project
new file mode 100644
index 00000000000..39edfc3dd84
--- /dev/null
+++ b/debug/org.eclipse.cdt.gdb.source-feature/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.gdb.source-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/debug/org.eclipse.cdt.gdb.source-feature/pom.xml b/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
index 640772e3b98..e3fdacbef54 100644
--- a/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gdb.source-feature</artifactId>
+	<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.source-feature/.project b/debug/org.eclipse.cdt.gnu.debug.source-feature/.project
new file mode 100644
index 00000000000..711ce10aadf
--- /dev/null
+++ b/debug/org.eclipse.cdt.gnu.debug.source-feature/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.gnu.debug.source-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
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..24535c68052 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,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.cdt.gnu.debug.source-feature</artifactId>
+	<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.source-feature/.project b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/.project
new file mode 100644
index 00000000000..6d0324d5e15
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.gnu.dsf.source-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
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..15a36c3d118 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-feature</artifactId>
+	<artifactId>org.eclipse.cdt.gdb.dsf.source</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..969f4461b16 100644
--- a/windows/org.eclipse.cdt.msw-feature/pom.xml
+++ b/windows/org.eclipse.cdt.msw-feature/pom.xml
@@ -12,6 +12,6 @@
 	</parent>
 
 	<version>1.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.msw-feature</artifactId>
+	<artifactId>org.eclipse.cdt.msw</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>