diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/pom.xml b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/pom.xml
index c8b05813f..c78f2971f 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/pom.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/pom.xml
@@ -17,7 +17,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>vscode-manifest-yaml</artifactId>
+			<artifactId>manifest-yaml-language-server</artifactId>
 			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
@@ -39,7 +39,7 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
-									<artifactId>vscode-manifest-yaml</artifactId>
+									<artifactId>manifest-yaml-language-server</artifactId>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/../servers</outputDirectory>
 								</artifactItem>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
index bdec3425b..37e2f9a0d 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
@@ -56,7 +56,7 @@ public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionP
 	}
 	
 	protected String getLanguageServerJARLocation() {
-		String languageServer = "vscode-manifest-yaml-0.0.3-SNAPSHOT.jar";
+		String languageServer = "manifest-yaml-language-server-0.0.3-SNAPSHOT.jar";
 
 		Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID);
 		File dataFile = bundle.getDataFile(languageServer);
diff --git a/eclipse-language-servers/org.springframework.boot.ide.java.servers/pom.xml b/eclipse-language-servers/org.springframework.boot.ide.java.servers/pom.xml
index 1308d7ebd..95af7a1b2 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.java.servers/pom.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.java.servers/pom.xml
@@ -17,7 +17,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>vscode-boot-java</artifactId>
+			<artifactId>boot-java-language-server</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
@@ -39,7 +39,7 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
-									<artifactId>vscode-boot-java</artifactId>
+									<artifactId>boot-java-language-server</artifactId>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/../servers</outputDirectory>
 								</artifactItem>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.java.servers/src/org/springframework/boot/ide/java/servers/SpringBootJavaLanguageServer.java b/eclipse-language-servers/org.springframework.boot.ide.java.servers/src/org/springframework/boot/ide/java/servers/SpringBootJavaLanguageServer.java
index 4369f3e62..3355a17e3 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.java.servers/src/org/springframework/boot/ide/java/servers/SpringBootJavaLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.boot.ide.java.servers/src/org/springframework/boot/ide/java/servers/SpringBootJavaLanguageServer.java
@@ -94,7 +94,7 @@ public class SpringBootJavaLanguageServer extends ProcessStreamConnectionProvide
 	}
 	
 	protected String getLanguageServerJARLocation() {
-		String languageServer = "vscode-boot-java-0.0.1-SNAPSHOT.jar";
+		String languageServer = "boot-java-language-server-0.0.1-SNAPSHOT.jar";
 
 		Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID);
 		File dataFile = bundle.getDataFile(languageServer);
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/pom.xml b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/pom.xml
index 72c49d964..8747e890d 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/pom.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/pom.xml
@@ -17,7 +17,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>vscode-boot-properties</artifactId>
+			<artifactId>boot-properties-language-server</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
@@ -39,7 +39,7 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
-									<artifactId>vscode-boot-properties</artifactId>
+									<artifactId>boot-properties-language-server</artifactId>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/../servers</outputDirectory>
 								</artifactItem>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java
index 3d68a38e5..92d7de977 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringBootPropertiesLanguageServer.java
@@ -90,7 +90,7 @@ public class SpringBootPropertiesLanguageServer extends ProcessStreamConnectionP
 	}
 	
 	protected String getLanguageServerJARLocation() {
-		String languageServer = "vscode-boot-properties-0.0.1-SNAPSHOT.jar";
+		String languageServer = "boot-properties--language-server-0.0.1-SNAPSHOT.jar";
 
 		Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID);
 		File dataFile = bundle.getDataFile(languageServer);