diff --git a/features/org.eclipse.dd.dsf.examples-feature/feature.xml b/features/org.eclipse.dd.dsf.examples-feature/feature.xml
index 60bd795e6e9..fb73defb128 100644
--- a/features/org.eclipse.dd.dsf.examples-feature/feature.xml
+++ b/features/org.eclipse.dd.dsf.examples-feature/feature.xml
@@ -29,7 +29,7 @@ Examples
    </requires>
 
    <plugin
-         id="org.eclipse.dd.dsf.examples"
+         id="org.eclipse.dd.examples.dsf"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.dd.dsf.gdb-feature/feature.xml b/features/org.eclipse.dd.dsf.gdb-feature/feature.xml
index 512cf8270ce..ac38a161555 100644
--- a/features/org.eclipse.dd.dsf.gdb-feature/feature.xml
+++ b/features/org.eclipse.dd.dsf.gdb-feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.dd.dsf.gdb"
-      label="Debugger Services Framework gdb/mi support"
+      label="Debugger Services Framework GDB integration"
       version="1.0.0.qualifier"
       provider-name="Eclipse.org">
 
@@ -29,14 +29,14 @@ GDB-MI Implementation
    </requires>
 
    <plugin
-         id="org.eclipse.dd.dsf.gdb"
+         id="org.eclipse.dd.gdb"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.dd.dsf.gdb.ui"
+         id="org.eclipse.dd.gdb.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.dd.dsf.sdk-feature/feature.xml b/features/org.eclipse.dd.dsf.sdk-feature/feature.xml
index b62d68de3fe..00cdaeddd1a 100644
--- a/features/org.eclipse.dd.dsf.sdk-feature/feature.xml
+++ b/features/org.eclipse.dd.dsf.sdk-feature/feature.xml
@@ -60,7 +60,7 @@ Core SDK
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.dd.dsf.mi.core"
+         id="org.eclipse.dd.mi"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.dd.dsf.test-feature/feature.xml b/features/org.eclipse.dd.dsf.test-feature/feature.xml
index 8506c43062a..0b547d277e5 100644
--- a/features/org.eclipse.dd.dsf.test-feature/feature.xml
+++ b/features/org.eclipse.dd.dsf.test-feature/feature.xml
@@ -25,12 +25,19 @@ Tests
    </url>
 
    <requires>
-      <import feature="org.eclipse.dd.dsf.mi" version="0.9.0"/>
-      <import feature="org.eclipse.dd.dsf.sdk" version="0.9.0"/>
+      <import feature="org.eclipse.dd.dsf.gdb" version="1.0.0"/>
+      <import feature="org.eclipse.dd.dsf.sdk" version="1.0.0"/>
    </requires>
 
    <plugin
-         id="org.eclipse.dd.dsf.test"
+         id="org.eclipse.dd.test.dsf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dd.test.gdb"
          download-size="0"
          install-size="0"
          version="0.0.0"