diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml
index 9fe509c23..3133ebc7f 100644
--- a/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml
@@ -7,7 +7,7 @@
 
    <requires>
       <import plugin="org.eclipse.ui.genericeditor"/>
-      <import plugin="org.eclipse.languageserver"/>
+      <import plugin="org.eclipse.lsp4e"/>
    </requires>
 
    <plugin
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml
index f4ff2fe3b..ce72bbd8a 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="Pivotal, Inc.">
 
    <requires>
-      <import plugin="org.eclipse.languageserver"/>
+      <import plugin="org.eclipse.lsp4e"/>
    </requires>
 
    <plugin
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml b/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml
index 47529ea86..0bb23464f 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="Pivotal, Inc.">
 
    <requires>
-      <import plugin="org.eclipse.languageserver"/>
+      <import plugin="org.eclipse.lsp4e"/>
    </requires>
 
    <plugin
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
index 2d4a8b30b..ea0dc52f9 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
@@ -13,6 +13,10 @@
             contentType="org.springframework.boot.ide.properties.application.properties"
             id="org.eclipse.languageserver.languages.springbootproperties">
       </contentTypeMapping>
+      <contentTypeMapping
+            contentType="org.springframework.boot.ide.properties.application.yml"
+            id="org.eclipse.languageserver.languages.springbootproperties">
+      </contentTypeMapping>
    </extension>
 
 </plugin>
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 49a34b40d..9955f1759 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
@@ -51,7 +51,7 @@ public class SpringBootPropertiesLanguageServer extends ProcessStreamConnectionP
 	}
 	
 	protected String getLanguageServerJARLocation() {
-		String languageServer = "vscode-application-properties-0.0.1-SNAPSHOT.jar";
+		String languageServer = "vscode-boot-properties-0.0.1-SNAPSHOT.jar";
 
 		Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID);
 		File dataFile = bundle.getDataFile(languageServer);
@@ -74,9 +74,9 @@ public class SpringBootPropertiesLanguageServer extends ProcessStreamConnectionP
 	
 	protected void copyLanguageServerJAR() throws Exception {
 		Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID);
-		InputStream stream = FileLocator.openStream( bundle, new Path("servers/vscode-application-properties-0.0.1-SNAPSHOT.jar"), false );
+		InputStream stream = FileLocator.openStream( bundle, new Path("servers/vscode-boot-properties-0.0.1-SNAPSHOT.jar"), false );
 		
-		File dataFile = bundle.getDataFile("vscode-application-properties-0.0.1-SNAPSHOT.jar");
+		File dataFile = bundle.getDataFile("vscode-boot-properties-0.0.1-SNAPSHOT.jar");
 		Files.copy(stream, dataFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 	}