diff --git a/headless-services/.vscode/settings.json b/headless-services/.vscode/settings.json
new file mode 100644
index 000000000..e0f15db2e
--- /dev/null
+++ b/headless-services/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
\ No newline at end of file
diff --git a/headless-services/boot-language-server/build.sh b/headless-services/boot-language-server/build.sh
deleted file mode 100755
index 536346853..000000000
--- a/headless-services/boot-language-server/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -e
-../mvnw -f ../pom.xml -pl boot-language-server -am clean install
diff --git a/headless-services/bosh-language-server/.classpath b/headless-services/bosh-language-server/.classpath
index fae1a2b37..002ad570e 100644
--- a/headless-services/bosh-language-server/.classpath
+++ b/headless-services/bosh-language-server/.classpath
@@ -15,11 +15,13 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
diff --git a/headless-services/concourse-language-server/.classpath b/headless-services/concourse-language-server/.classpath
index fae1a2b37..002ad570e 100644
--- a/headless-services/concourse-language-server/.classpath
+++ b/headless-services/concourse-language-server/.classpath
@@ -15,11 +15,13 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
diff --git a/headless-services/pom.xml b/headless-services/pom.xml
index b677104e2..08675cf44 100644
--- a/headless-services/pom.xml
+++ b/headless-services/pom.xml
@@ -13,7 +13,7 @@
 		<module>commons</module>
 		<module>manifest-yaml-language-server</module>
 		<module>concourse-language-server</module>
-		<module>boot-language-server</module>
+		<module>spring-boot-language-server</module>
 		<module>boot-properties-language-server</module>
 		<module>boot-java-language-server</module>
 		<module>bosh-language-server</module>
diff --git a/headless-services/boot-language-server/.classpath b/headless-services/spring-boot-language-server/.classpath
similarity index 100%
rename from headless-services/boot-language-server/.classpath
rename to headless-services/spring-boot-language-server/.classpath
diff --git a/headless-services/boot-language-server/.project b/headless-services/spring-boot-language-server/.project
similarity index 100%
rename from headless-services/boot-language-server/.project
rename to headless-services/spring-boot-language-server/.project
diff --git a/headless-services/boot-language-server/.settings/org.eclipse.core.resources.prefs b/headless-services/spring-boot-language-server/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from headless-services/boot-language-server/.settings/org.eclipse.core.resources.prefs
rename to headless-services/spring-boot-language-server/.settings/org.eclipse.core.resources.prefs
diff --git a/headless-services/boot-language-server/.settings/org.eclipse.jdt.core.prefs b/headless-services/spring-boot-language-server/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from headless-services/boot-language-server/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/spring-boot-language-server/.settings/org.eclipse.jdt.core.prefs
diff --git a/headless-services/boot-language-server/.settings/org.eclipse.m2e.core.prefs b/headless-services/spring-boot-language-server/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from headless-services/boot-language-server/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/spring-boot-language-server/.settings/org.eclipse.m2e.core.prefs
diff --git a/headless-services/boot-language-server/.settings/org.springframework.ide.eclipse.prefs b/headless-services/spring-boot-language-server/.settings/org.springframework.ide.eclipse.prefs
similarity index 100%
rename from headless-services/boot-language-server/.settings/org.springframework.ide.eclipse.prefs
rename to headless-services/spring-boot-language-server/.settings/org.springframework.ide.eclipse.prefs
diff --git a/headless-services/spring-boot-language-server/build.sh b/headless-services/spring-boot-language-server/build.sh
new file mode 100755
index 000000000..af3ef70a0
--- /dev/null
+++ b/headless-services/spring-boot-language-server/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -e
+../mvnw -f ../pom.xml -pl spring-boot-language-server -am clean install
diff --git a/headless-services/boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml
similarity index 90%
rename from headless-services/boot-language-server/pom.xml
rename to headless-services/spring-boot-language-server/pom.xml
index 5ba4a7bc8..3fb9f6ebb 100644
--- a/headless-services/boot-language-server/pom.xml
+++ b/headless-services/spring-boot-language-server/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>boot-language-server</artifactId>
+	<artifactId>spring-boot-language-server</artifactId>
 	<packaging>jar</packaging>
 	
 	<parent>
@@ -19,10 +19,10 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>boot-java-language-server</artifactId>
-			<version>${dependencies.version}</version>
+			<artifactId>commons-boot</artifactId>
+			<version>0.1.4-SNAPSHOT</version>
 		</dependency>
-		
+
 		<!-- Test harness -->
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
@@ -37,12 +37,6 @@
 			<version>${mockito-version}</version>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>commons-boot</artifactId>
-			<version>0.1.4-SNAPSHOT</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/headless-services/boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
similarity index 100%
rename from headless-services/boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
diff --git a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
index 4d2e09b1d..e45045e16 100755
--- a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
@@ -12,7 +12,7 @@ curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YA
 curl https://raw.githubusercontent.com/textmate/java.tmbundle/master/Syntaxes/JavaProperties.plist > properties-support/java-properties.tmLanguage
 
 # Use maven to build fat jar of the language server
-cd ../../headless-services/boot-language-server
+cd ../../headless-services/spring-boot-language-server
 ./build.sh
 
 mkdir -p ${workdir}/jars