diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.sdk/build.properties b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/build.properties
similarity index 100%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.sdk/build.properties
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/build.properties
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.sdk/feature.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/feature.xml
similarity index 85%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.sdk/feature.xml
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/feature.xml
index 832415b8c..71c90e2b2 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.sdk/feature.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.xtext.example.eclipsePluginP2.sdk"
-	label="MyDsl SDK Feature "
+<feature id="org.xtext.example.eclipsePluginP2.feature"
+	label="MyDsl Feature "
 	version="1.0.0.qualifier">
 	<plugin
 			id="org.xtext.example.eclipsePluginP2"
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml
index b7012422f..69497b5f8 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.repository/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature id="org.xtext.example.eclipsePluginP2.sdk" version="0.0.0">
+	<feature id="org.xtext.example.eclipsePluginP2.feature" version="0.0.0">
 		<category name="main"/>
 	</feature>
-	<feature id="org.xtext.example.eclipsePluginP2.sdk.source" version="0.0.0">
+	<feature id="org.xtext.example.eclipsePluginP2.feature.source" version="0.0.0">
 		<category name="main.source"/>
 	</feature>
 	<category-def name="main" label="MyDsl"/>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/build.properties b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/build.properties
similarity index 100%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/build.properties
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/build.properties
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/feature.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/feature.xml
similarity index 86%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/feature.xml
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/feature.xml
index 02a90f230..1b7586a59 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/feature.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.xtext.example.full.sdk"
-	label="MyDsl SDK Feature "
+<feature id="org.xtext.example.full.feature"
+	label="MyDsl Feature "
 	version="1.0.0.qualifier">
 	<plugin
 			id="org.xtext.example.full"
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/pom.xml
similarity index 89%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/pom.xml
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/pom.xml
index ca25b9ae9..43ae0aba5 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.sdk/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.feature/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>org.xtext.example.full.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.xtext.example.full.sdk</artifactId>
+	<artifactId>org.xtext.example.full.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 
 
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml
index 2b1419105..dbfd1288b 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.repository/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature id="org.xtext.example.full.sdk" version="0.0.0">
+	<feature id="org.xtext.example.full.feature" version="0.0.0">
 		<category name="main"/>
 	</feature>
-	<feature id="org.xtext.example.full.sdk.source" version="0.0.0">
+	<feature id="org.xtext.example.full.feature.source" version="0.0.0">
 		<category name="main.source"/>
 	</feature>
 	<category-def name="main" label="MyDsl"/>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml
index 245f1b37c..a1d819db7 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml
@@ -18,7 +18,7 @@
 		<module>org.xtext.example.full.ide</module>
 		<module>org.xtext.example.full.ui</module>
 		<module>org.xtext.example.full.target</module>
-		<module>org.xtext.example.full.sdk</module>
+		<module>org.xtext.example.full.feature</module>
 		<module>org.xtext.example.full.repository</module>
 		<module>org.xtext.example.full.ui.tests</module>
 	</modules>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/build.properties b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/build.properties
similarity index 100%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/build.properties
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/build.properties
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/feature.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/feature.xml
similarity index 85%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/feature.xml
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/feature.xml
index 2202bbf7f..3f042670b 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/feature.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.xtext.example.mavenTychoP2.sdk"
-	label="MyDsl SDK Feature "
+<feature id="org.xtext.example.mavenTychoP2.feature"
+	label="MyDsl Feature "
 	version="1.0.0.qualifier">
 	<plugin
 			id="org.xtext.example.mavenTychoP2"
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/pom.xml
similarity index 88%
rename from tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/pom.xml
rename to tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/pom.xml
index 5d5416ebf..df4f0a399 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.sdk/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.feature/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>org.xtext.example.mavenTychoP2.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.xtext.example.mavenTychoP2.sdk</artifactId>
+	<artifactId>org.xtext.example.mavenTychoP2.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 
 
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml
index e2f6e8c48..fe3d69873 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.repository/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature id="org.xtext.example.mavenTychoP2.sdk" version="0.0.0">
+	<feature id="org.xtext.example.mavenTychoP2.feature" version="0.0.0">
 		<category name="main"/>
 	</feature>
-	<feature id="org.xtext.example.mavenTychoP2.sdk.source" version="0.0.0">
+	<feature id="org.xtext.example.mavenTychoP2.feature.source" version="0.0.0">
 		<category name="main.source"/>
 	</feature>
 	<category-def name="main" label="MyDsl"/>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml
index 832063a25..635adbbc0 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml
@@ -19,7 +19,7 @@
 		<module>org.xtext.example.mavenTychoP2.ui</module>
 		<module>org.xtext.example.mavenTychoP2.web</module>
 		<module>org.xtext.example.mavenTychoP2.target</module>
-		<module>org.xtext.example.mavenTychoP2.sdk</module>
+		<module>org.xtext.example.mavenTychoP2.feature</module>
 		<module>org.xtext.example.mavenTychoP2.repository</module>
 		<module>org.xtext.example.mavenTychoP2.tests</module>
 		<module>org.xtext.example.mavenTychoP2.ui.tests</module>