diff --git a/vscode-extensions/commons/language-server-commons/.classpath b/vscode-extensions/commons/commons-language-server/.classpath
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/.classpath
rename to vscode-extensions/commons/commons-language-server/.classpath
diff --git a/vscode-extensions/commons/language-server-commons/.project b/vscode-extensions/commons/commons-language-server/.project
similarity index 93%
rename from vscode-extensions/commons/language-server-commons/.project
rename to vscode-extensions/commons/commons-language-server/.project
index 095feb2a9..35631c242 100644
--- a/vscode-extensions/commons/language-server-commons/.project
+++ b/vscode-extensions/commons/commons-language-server/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>language-server-commons</name>
+	<name>commons-language-server</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/vscode-extensions/commons/language-server-commons/.settings/org.eclipse.jdt.core.prefs b/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/.settings/org.eclipse.jdt.core.prefs
rename to vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/language-server-commons/.settings/org.eclipse.jdt.ui.prefs b/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/.settings/org.eclipse.jdt.ui.prefs
rename to vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs
diff --git a/vscode-extensions/commons/language-server-commons/.settings/org.eclipse.m2e.core.prefs b/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/.settings/org.eclipse.m2e.core.prefs
rename to vscode-extensions/commons/commons-language-server/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-language-server/pom.xml b/vscode-extensions/commons/commons-language-server/pom.xml
new file mode 100644
index 000000000..0376556b6
--- /dev/null
+++ b/vscode-extensions/commons/commons-language-server/pom.xml
@@ -0,0 +1,83 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>commons-language-server</artifactId>
+	<name>commons-language-server</name>
+	<description>Shared utilities for building vscode language servers in Java</description>
+
+	<parent>
+		<groupId>org.springframework.ide.vscode</groupId>
+		<artifactId>commons-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<repositories>
+		<!-- Sonatype snapshots repository -->
+		<repository>
+			<id>oss-sonatype</id>
+			<name>oss-sonatype</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>commons-util</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!--  testing -->
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>language-server-test-harness</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- Java implementation of VS Code language server protocol -->
+		<dependency>
+			<groupId>io.typefox.lsapi</groupId>
+			<artifactId>io.typefox.lsapi</artifactId>
+			<version>${lsapi-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.typefox.lsapi</groupId>
+			<artifactId>io.typefox.lsapi.services</artifactId>
+			<version>${lsapi-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.typefox.lsapi</groupId>
+			<artifactId>io.typefox.lsapi.annotations</artifactId>
+			<version>${lsapi-version}</version>
+		</dependency>
+		<!-- JSON -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jdk8</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/vscode-extensions/commons/language-server-commons/pom.xml b/vscode-extensions/commons/commons-language-server/pom.xml~
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/pom.xml
rename to vscode-extensions/commons/commons-language-server/pom.xml~
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/DocumentEdits.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/DocumentEdits.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/DocumentEdits.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/DocumentEdits.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionEngine.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionEngine.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionEngine.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionEngine.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionProposal.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionProposal.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionProposal.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/ICompletionProposal.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/ProposalApplier.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/ProposalApplier.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/completion/ProposalApplier.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/completion/ProposalApplier.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/IProblemCollector.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/IProblemCollector.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/IProblemCollector.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/IProblemCollector.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/IReconcileEngine.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/IReconcileEngine.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/IReconcileEngine.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/IReconcileEngine.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemSeverity.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemSeverity.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemSeverity.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemSeverity.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemType.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemType.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemType.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ProblemType.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblem.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblem.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblem.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblem.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblemImpl.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblemImpl.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblemImpl.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/reconcile/ReconcileProblemImpl.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/BadLocationException.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/BadLocationException.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/BadLocationException.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/BadLocationException.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/CompletionHandler.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/CompletionHandler.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/CompletionHandler.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/CompletionHandler.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/CompletionResolveHandler.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/CompletionResolveHandler.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/CompletionResolveHandler.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/CompletionResolveHandler.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/DocumentUtil.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/DocumentUtil.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/DocumentUtil.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/DocumentUtil.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/IDocument.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/IDocument.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/IDocument.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/IDocument.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/IRegion.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/IRegion.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/IRegion.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/IRegion.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/JSON.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/JSON.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/JSON.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/JSON.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/ListenerList.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/ListenerList.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/ListenerList.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/ListenerList.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/LoggingFormat.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/LoggingFormat.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/LoggingFormat.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/LoggingFormat.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/PrefixFinder.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/PrefixFinder.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/PrefixFinder.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/PrefixFinder.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/Region.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/Region.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/Region.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/Region.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/Settings.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/Settings.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/Settings.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/Settings.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/ShowMessageException.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/ShowMessageException.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/ShowMessageException.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/ShowMessageException.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/SimpleLanguageServer.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/SimpleLanguageServer.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/SimpleLanguageServer.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/SimpleLanguageServer.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/SimpleTextDocumentService.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/SimpleTextDocumentService.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/SimpleTextDocumentService.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/SimpleTextDocumentService.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/SimpleWorkspaceService.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/SimpleWorkspaceService.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/SimpleWorkspaceService.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/SimpleWorkspaceService.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/TextDocument.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/TextDocument.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/TextDocument.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/TextDocument.java
diff --git a/vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/TextDocumentContentChange.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/TextDocumentContentChange.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/main/java/org/springframework/ide/vscode/util/TextDocumentContentChange.java
rename to vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/util/TextDocumentContentChange.java
diff --git a/vscode-extensions/commons/language-server-commons/src/test/java/org/springframework/ide/vscode/commons/completion/DocumentEditsTest.java b/vscode-extensions/commons/commons-language-server/src/test/java/org/springframework/ide/vscode/commons/completion/DocumentEditsTest.java
similarity index 100%
rename from vscode-extensions/commons/language-server-commons/src/test/java/org/springframework/ide/vscode/commons/completion/DocumentEditsTest.java
rename to vscode-extensions/commons/commons-language-server/src/test/java/org/springframework/ide/vscode/commons/completion/DocumentEditsTest.java
diff --git a/vscode-extensions/commons/commons-yaml/pom.xml b/vscode-extensions/commons/commons-yaml/pom.xml
index 5f72488af..d7443a099 100644
--- a/vscode-extensions/commons/commons-yaml/pom.xml
+++ b/vscode-extensions/commons/commons-yaml/pom.xml
@@ -20,7 +20,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>language-server-commons</artifactId>
+			<artifactId>commons-language-server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/vscode-extensions/commons/pom.xml b/vscode-extensions/commons/pom.xml
index 804cc7c4e..fcd31ef6e 100644
--- a/vscode-extensions/commons/pom.xml
+++ b/vscode-extensions/commons/pom.xml
@@ -10,7 +10,7 @@
 	<name>commons-parent</name>
 
 	<modules>
-		<module>language-server-commons</module>
+		<module>commons-language-server</module>
 		<module>language-server-test-harness</module>
 		<module>commons-yaml</module>
 		<module>commons-util</module>
diff --git a/vscode-extensions/vscode-application-properties/pom.xml b/vscode-extensions/vscode-application-properties/pom.xml
index 93cef0be8..1c6eac947 100644
--- a/vscode-extensions/vscode-application-properties/pom.xml
+++ b/vscode-extensions/vscode-application-properties/pom.xml
@@ -55,7 +55,7 @@
 		<!-- Language Servers -->
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>language-server-commons</artifactId>
+			<artifactId>commons-language-server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- Test harness -->
diff --git a/vscode-extensions/vscode-application-yaml/pom.xml b/vscode-extensions/vscode-application-yaml/pom.xml
index e4d278e72..4cb086205 100644
--- a/vscode-extensions/vscode-application-yaml/pom.xml
+++ b/vscode-extensions/vscode-application-yaml/pom.xml
@@ -43,7 +43,7 @@
 		<!-- Language Servers -->
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>language-server-commons</artifactId>
+			<artifactId>commons-language-server</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<!-- Yaml -->
diff --git a/vscode-extensions/vscode-manifest-yaml/pom.xml b/vscode-extensions/vscode-manifest-yaml/pom.xml
index 1faa3713a..de178b687 100644
--- a/vscode-extensions/vscode-manifest-yaml/pom.xml
+++ b/vscode-extensions/vscode-manifest-yaml/pom.xml
@@ -33,7 +33,7 @@
 		<!-- Language Servers -->
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>language-server-commons</artifactId>
+			<artifactId>commons-language-server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- Yaml -->