diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index 29847a862..28e150199 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -79,12 +79,16 @@ openFile</programArgs>
 
       <feature id="org.springframework.boot.ide.branding.feature" installMode="root"/>
       <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
-      <feature id="org.springframework.boot.ide.properties.servers.feature" installMode="root"/>
-      <feature id="org.springframework.boot.ide.java.servers.feature" installMode="root"/>
+
+      <feature id="org.springframework.tooling.properties.ls.feature" installMode="root"/>
+      <feature id="org.springframework.tooling.boot.java.ls.feature" installMode="root"/>
 
       <feature id="org.springframework.boot.ide.cloudfoundry.manifest.integration.feature" installMode="root"/>
       <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
 
+      <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
+      <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
+
    </features>
 
    <configurations>
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
index 73142affe..13fe52d93 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
@@ -51,17 +51,27 @@
 	</feature>
 
 	<feature
-		id="org.springframework.boot.ide.cloudfoundry.manifest.integration.feature" version="0.0.0">
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" version="0.0.0">
 		<category name="Spring Boot IDE Language Servers for Eclipse" />
 	</feature>
 
 	<feature
-		id="org.springframework.boot.ide.properties.servers.feature" version="0.0.0">
+		id="org.springframework.tooling.properties.ls.feature" version="0.0.0">
 		<category name="Spring Boot IDE Language Servers for Eclipse" />
 	</feature>
 
 	<feature
-		id="org.springframework.boot.ide.java.servers.feature" version="0.0.0">
+		id="org.springframework.tooling.boot.java.ls.feature" version="0.0.0">
+		<category name="Spring Boot IDE Language Servers for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
+		<category name="Spring Boot IDE Language Servers for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
 		<category name="Spring Boot IDE Language Servers for Eclipse" />
 	</feature>