diff --git a/fortiss-std-env/buckminster/af3-micro.cquery b/fortiss-std-env/buckminster/af3-micro.cquery
index 45eee20897fca057d1fe44a83c4377a1336102bf..0c546ee2487b33780e2834691174d4deb4b09fb9 100644
--- a/fortiss-std-env/buckminster/af3-micro.cquery
+++ b/fortiss-std-env/buckminster/af3-micro.cquery
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="fortiss.rmap" shortDesc="Fortiss Tooling Kernel Developer Workspace Materialization">
     <cq:documentation xmlns="http://www.w3.org/1999/xhtml">Buckminster materialization of the tooling kernel 2.0 workspace.</cq:documentation>
-    <cq:rootRequest name="org.fortiss.af3.micro_feature" componentType="eclipse.feature"/>
+    <cq:rootRequest name="org.fortiss.af3.micro.ui" componentType="osgi.bundle"/>
     <cq:advisorNode namePattern="^org\.conqat\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
     <cq:advisorNode namePattern="^org\.fortiss\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
 </cq:componentQuery>
diff --git a/fortiss-std-env/buckminster/fortiss.rmap b/fortiss-std-env/buckminster/fortiss.rmap
index c40822529ee9cecc28611064b34cf563d646f520..3d405b16b4f9d2b892c743ff23036f780e1eed52 100644
--- a/fortiss-std-env/buckminster/fortiss.rmap
+++ b/fortiss-std-env/buckminster/fortiss.rmap
@@ -47,44 +47,6 @@
 		</rm:provider>
 	</rm:searchPath>
 
-	<rm:searchPath name="emfstore">
-		<rm:provider
-			readerType="svn"
-			componentTypes="osgi.bundle"
-			source="true" mutable="false">
-			<rm:uri format="http://unicase.googlecode.com/svn/trunk/core/{0}">
-				<bc:propertyRef key="buckminster.component"/>
-			</rm:uri>
-		</rm:provider>
-
-		<rm:provider
-			readerType="svn"
-			componentTypes="osgi.bundle"
-			source="true" mutable="false">
-			<rm:uri format="http://unicase.googlecode.com/svn/trunk/emfstore/{0}">
-				<bc:propertyRef key="buckminster.component"/>
-			</rm:uri>
-		</rm:provider>
-
-		<rm:provider
-			readerType="svn"
-			componentTypes="osgi.bundle"
-			source="true" mutable="false">
-			<rm:uri format="http://unicase.googlecode.com/svn/trunk/ecp/{0}">
-				<bc:propertyRef key="buckminster.component"/>
-			</rm:uri>
-		</rm:provider>
-
-		<rm:provider
-			readerType="svn"
-			componentTypes="osgi.bundle"
-			source="true" mutable="false">
-			<rm:uri format="http://unicase.googlecode.com/svn/trunk/other/backchannel/{0}">
-				<bc:propertyRef key="buckminster.component"/>
-			</rm:uri>
-		</rm:provider>
-	</rm:searchPath>
-	
 	<rm:searchPath name="conqat">
 		<rm:provider
 			readerType="p2"
@@ -130,9 +92,6 @@
 	</rm:searchPath>
   
   <rm:locator pattern="^org\.fortiss\..*" searchPathRef="fortiss"/>
-  <rm:locator pattern="^org\.unicase\..*" searchPathRef="emfstore"/>
-  <rm:locator pattern="^org\.eclipse\.emf\.emfstore\..*" searchPathRef="emfstore"/>
-  <rm:locator pattern="^org\.eclipse\.emf\.ecp\..*" searchPathRef="emfstore"/>
   <rm:locator pattern="^org\.conqat\..*" searchPathRef="conqat"/>
   <rm:locator pattern="^edu\.tum\.cs\.cope\..*" searchPathRef="cope"/>
   <rm:locator searchPathRef="helios"/>
diff --git a/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery b/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
index 235983ca094a274ca6ff7d16b6bd45e84f5790d3..eb4c54c055e2ab606869a1595beebadce5170079 100644
--- a/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
+++ b/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="fortiss.rmap" shortDesc="Fortiss Tooling Kernel Developer Workspace Materialization">
     <cq:documentation xmlns="http://www.w3.org/1999/xhtml">Buckminster materialization of the tooling kernel 2.0 workspace.</cq:documentation>
-    <cq:rootRequest name="org.fortiss.tooling.kernel_feature" componentType="eclipse.feature"/>
+    <cq:rootRequest name="org.fortiss.tooling.kernel.ui" componentType="osgi.bundle"/>
     <cq:advisorNode namePattern="^org\.conqat\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
     <cq:advisorNode namePattern="^org\.fortiss\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
 </cq:componentQuery>