diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml
index 6def1606c..2b386fb4c 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 	id="org.springframework.tooling.boot.java.ls.feature"
-	label="Spring Boot IDE Java Editing Language Server Feature"
+	label="Spring Boot Java Language Server Feature"
 	version="4.0.0.qualifier"
 	provider-name="Pivotal, Inc.">
 
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/META-INF/MANIFEST.MF
index eebaa526c..a81db164e 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Spring Boot Java Language Server
+Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.boot.java.ls;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
index f84aa822a..cfd874491 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 	id="org.springframework.tooling.bosh.ls.feature"
-	label="Spring Boot IDE Property Editing Language Server Feature"
+	label="BOSH Language Server Feature"
 	version="4.0.0.qualifier"
 	provider-name="Pivotal, Inc.">
 
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
index e447f04ab..edd524f1c 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Servers
+Bundle-Name: BOSH Manifest Language Server
+Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.bosh.ls;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
index 256fb7292..f07be0ab1 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 	id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature"
-	label="Spring Boot IDE Cloud Foundry Manifest Language Server Integration"
+	label="Cloud Foundry Manifest Language Server Generic Editor Integration Feature"
 	version="4.0.0.qualifier"
 	provider-name="Pivotal, Inc.">
 
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
index 1a1d742bc..77835433f 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Server
+Bundle-Name: Cloud Foundry Manifest Language Server Generic Editor Integration
+Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls.integration;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
index 37632754d..999f003be 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Server
+Bundle-Name: Cloud Foundry Manifest Language Server
+Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls;singleton:=true
 Bundle-Version: 0.0.9.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
index fb169bf4b..349505733 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 	id="org.springframework.tooling.concourse.ls.feature"
-	label="Spring Boot IDE Property Editing Language Server Feature"
+	label="Concourse Pipeline Language Server Feature"
 	version="4.0.0.qualifier"
 	provider-name="Pivotal, Inc.">
 
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
index 79b325123..dfeac777c 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Servers
+Bundle-Name: Concourse Pipeline Language Server
+Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.concourse.ls;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/feature.xml
index 5a6af9039..568524d00 100644
--- a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 	id="org.springframework.tooling.properties.ls.feature"
-	label="Spring Boot IDE Property Editing Language Server Feature"
+	label="Spring Boot Property Editing Language Server Feature"
 	version="4.0.0.qualifier"
 	provider-name="Pivotal, Inc.">
 
diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.properties.ls/META-INF/MANIFEST.MF
index 68c3ead13..4e8b8a8d0 100644
--- a/eclipse-language-servers/org.springframework.tooling.properties.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.properties.ls/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Servers
+Bundle-Name: Spring Boot Properties Language Server
+Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.properties.ls;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8