diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java
index 09673c972..741ee1a12 100644
--- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java
+++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java
@@ -23,7 +23,7 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage
 public class Main {
 
 	public static void main(String[] args) throws IOException, InterruptedException {
-		LaunguageServerApp.start("boot-java", () -> {
+		LaunguageServerApp.start("boot-java-language-server", () -> {
 			SimpleLanguageServer server = new BootJavaLanguageServer(
 					BootJavaLanguageServerParams.createDefault()
 			);
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
index e24f911f9..f0cac82e5 100644
--- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
+++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
@@ -24,7 +24,7 @@ import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp;
 public class Main {
 		
 	public static void main(String[] args) throws IOException, InterruptedException {
-		LaunguageServerApp.start("boot-properties",
+		LaunguageServerApp.start("boot-properties-language-server",
 				() -> new BootPropertiesLanguageServer(BootPropertiesLanguageServerParams.createDefault()));
 	}
 
diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java
index b2e5b02db..15fdee491 100644
--- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java
+++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java
@@ -20,7 +20,7 @@ import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp;
 public class Main {
 	public static void main(String[] args) throws IOException, InterruptedException {
 		BoshCliConfig cliConfig = new BoshCliConfig();
-		LaunguageServerApp.start("bosh", () -> new BoshLanguageServer(
+		LaunguageServerApp.start("bosh-language-server", () -> new BoshLanguageServer(
 				cliConfig,
 				new BoshCommandCloudConfigProvider(cliConfig),
 				new BoshCommandStemcellsProvider(cliConfig),
diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java
index 759d77d70..839e0cde3 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java
@@ -11,6 +11,7 @@
 
 package org.springframework.ide.vscode.commons.languageserver;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -62,6 +63,14 @@ public abstract class LaunguageServerApp {
 
 	public static void start(String name, Provider<SimpleLanguageServer> languageServerFactory) throws IOException, InterruptedException {
 		System.setProperty(STS4_LANGUAGESERVER_NAME, name); //makes it easy to recognize language server processes.
+		File logfile = null;
+		if (System.getProperty("org.slf4j.simpleLogger.logFile") == null) {
+			logfile = File.createTempFile(name, ".log");
+			System.setProperty("org.slf4j.simpleLogger.logFile", logfile.toString());
+		} else {
+			logfile = new File(System.getProperty("org.slf4j.simpleLogger.logFile"));
+		}
+		System.err.println("Redirecting log output to: "+logfile);
 		LaunguageServerApp app = new LaunguageServerApp() {
 			@Override
 			protected SimpleLanguageServer createServer() {
diff --git a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java
index 8d388d635..3284253c5 100644
--- a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java
+++ b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java
@@ -20,6 +20,6 @@ public class Main {
 	private static final YamlCompletionEngineOptions OPTIONS = YamlCompletionEngineOptions.DEFAULT;
 
    	public static void main(String[] args) throws IOException, InterruptedException {
-		LaunguageServerApp.start("concourse", () -> new ConcourseLanguageServer(OPTIONS));
+		LaunguageServerApp.start("concourse-language-server", () -> new ConcourseLanguageServer(OPTIONS));
 	}
 }
diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java
index 5684fea7e..5e9104ea1 100644
--- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java
+++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java
@@ -20,15 +20,7 @@ public class Main {
 	SimpleLanguageServer server = new ManifestYamlLanguageServer();
 
 	public static void main(String[] args) throws IOException, InterruptedException {
-		File logfile = null;
-		if (System.getProperty("org.slf4j.simpleLogger.logFile") == null) {
-			logfile = File.createTempFile("manifest-yaml-language-server", ".log");
-			System.setProperty("org.slf4j.simpleLogger.logFile", logfile.toString());
-		} else {
-			logfile = new File(System.getProperty("org.slf4j.simpleLogger.logFile"));
-		}
-		System.err.println("Redirecting log output to: "+logfile);
-		LaunguageServerApp.start("cloudfoundry", ManifestYamlLanguageServer::new);
+		LaunguageServerApp.start("manifest-yaml-language-server", ManifestYamlLanguageServer::new);
 	}
 
 }