diff --git a/atom-extensions/atom-boot-java/package.json b/atom-extensions/atom-boot-java/package.json
index b713a11f6..821a7fdfe 100644
--- a/atom-extensions/atom-boot-java/package.json
+++ b/atom-extensions/atom-boot-java/package.json
@@ -7,7 +7,7 @@
   "icon": "icon.png",
   "license": "MIT",
   "engines": {
-    "atom": ">=1.17.0"
+    "atom": ">=1.21.0"
   },
   "files": [
     "lib/",
@@ -17,7 +17,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.8"
+    "pivotal-atom-languageclient-commons": "0.0.10"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
@@ -35,9 +35,9 @@
         "2.0.0": "consumeLinterV2"
       }
     },
-    "nuclide-datatip.provider": {
+    "datatip": {
       "versions": {
-        "0.0.0": "consumeDatatip"
+        "0.1.0": "consumeDatatip"
       }
     }
   },
@@ -47,24 +47,34 @@
         "2.0.0": "provideAutocomplete"
       }
     },
-    "nuclide-code-format.provider": {
+    "code-actions": {
       "versions": {
-        "0.0.0": "provideCodeFormat"
+        "0.1.0": "provideCodeActions"
       }
     },
-    "nuclide-definition-provider": {
+    "code-format.range": {
       "versions": {
-        "0.0.0": "provideDefinitions"
+        "0.1.0": "provideCodeFormat"
       }
     },
-    "nuclide-find-references.provider": {
+    "code-highlight": {
       "versions": {
-        "0.0.0": "provideFindReferences"
+        "0.1.0": "provideCodeHighlight"
       }
     },
-    "nuclide-outline-view": {
+    "definitions": {
       "versions": {
-        "0.0.0": "provideOutlines"
+        "0.1.0": "provideDefinitions"
+      }
+    },
+    "find-references": {
+      "versions": {
+        "0.1.0": "provideFindReferences"
+      }
+    },
+    "outline-view": {
+      "versions": {
+        "0.1.0": "provideOutlines"
       }
     }
   }
diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json
index 993ce897a..5a4bf2dbf 100644
--- a/atom-extensions/atom-bosh/package.json
+++ b/atom-extensions/atom-bosh/package.json
@@ -7,7 +7,7 @@
   "icon": "icon.png",
   "license": "MIT",
   "engines": {
-    "atom": ">=1.17.0"
+    "atom": ">=1.21.0"
   },
   "files": [
     "grammars/",
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.8"
+    "pivotal-atom-languageclient-commons": "0.0.10"
   },
   "configSchema": {
     "bosh": {
@@ -66,9 +66,9 @@
         "2.0.0": "consumeLinterV2"
       }
     },
-    "nuclide-datatip.provider": {
+    "datatip": {
       "versions": {
-        "0.0.0": "consumeDatatip"
+        "0.1.0": "consumeDatatip"
       }
     }
   },
@@ -78,24 +78,34 @@
         "2.0.0": "provideAutocomplete"
       }
     },
-    "nuclide-code-format.provider": {
+    "code-actions": {
       "versions": {
-        "0.0.0": "provideCodeFormat"
+        "0.1.0": "provideCodeActions"
       }
     },
-    "nuclide-definition-provider": {
+    "code-format.range": {
       "versions": {
-        "0.0.0": "provideDefinitions"
+        "0.1.0": "provideCodeFormat"
       }
     },
-    "nuclide-find-references.provider": {
+    "code-highlight": {
       "versions": {
-        "0.0.0": "provideFindReferences"
+        "0.1.0": "provideCodeHighlight"
       }
     },
-    "nuclide-outline-view": {
+    "definitions": {
       "versions": {
-        "0.0.0": "provideOutlines"
+        "0.1.0": "provideDefinitions"
+      }
+    },
+    "find-references": {
+      "versions": {
+        "0.1.0": "provideFindReferences"
+      }
+    },
+    "outline-view": {
+      "versions": {
+        "0.1.0": "provideOutlines"
       }
     }
   }
diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json
index 71016234a..3afce4510 100644
--- a/atom-extensions/atom-cf-manifest-yaml/package.json
+++ b/atom-extensions/atom-cf-manifest-yaml/package.json
@@ -7,7 +7,7 @@
   "icon": "icon.png",
   "license": "MIT",
   "engines": {
-    "atom": ">=1.17.0"
+    "atom": ">=1.21.0"
   },
   "files": [
     "grammars/",
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.8"
+    "pivotal-atom-languageclient-commons": "0.0.10"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
@@ -37,9 +37,9 @@
         "2.0.0": "consumeLinterV2"
       }
     },
-    "nuclide-datatip.provider": {
+    "datatip": {
       "versions": {
-        "0.0.0": "consumeDatatip"
+        "0.1.0": "consumeDatatip"
       }
     }
   },
@@ -49,24 +49,34 @@
         "2.0.0": "provideAutocomplete"
       }
     },
-    "nuclide-code-format.provider": {
+    "code-actions": {
       "versions": {
-        "0.0.0": "provideCodeFormat"
+        "0.1.0": "provideCodeActions"
       }
     },
-    "nuclide-definition-provider": {
+    "code-format.range": {
       "versions": {
-        "0.0.0": "provideDefinitions"
+        "0.1.0": "provideCodeFormat"
       }
     },
-    "nuclide-find-references.provider": {
+    "code-highlight": {
       "versions": {
-        "0.0.0": "provideFindReferences"
+        "0.1.0": "provideCodeHighlight"
       }
     },
-    "nuclide-outline-view": {
+    "definitions": {
       "versions": {
-        "0.0.0": "provideOutlines"
+        "0.1.0": "provideDefinitions"
+      }
+    },
+    "find-references": {
+      "versions": {
+        "0.1.0": "provideFindReferences"
+      }
+    },
+    "outline-view": {
+      "versions": {
+        "0.1.0": "provideOutlines"
       }
     }
   }
diff --git a/atom-extensions/atom-commons/lib/jar-language-client.js b/atom-extensions/atom-commons/lib/jar-language-client.js
index 10ee372f9..edfb288d6 100644
--- a/atom-extensions/atom-commons/lib/jar-language-client.js
+++ b/atom-extensions/atom-commons/lib/jar-language-client.js
@@ -20,6 +20,17 @@ export class JarLanguageClient extends AutoLanguageClient {
         this.serverLauncherJar = serverLauncherJar;
     }
 
+    getInitializeParams(projectPath, process) {
+        const initParams = super.getInitializeParams(projectPath, process);
+        initParams.capabilities = {
+            workspace: {
+                executeCommand: {
+                }
+            }
+        };
+        return initParams;
+    }
+
     startServerProcess () {
         // //TODO: Remove when debugging is over
         atom.config.set('core.debugLSP', true);
diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json
index 615a6c76d..f33cff919 100644
--- a/atom-extensions/atom-commons/package.json
+++ b/atom-extensions/atom-commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pivotal-atom-languageclient-commons",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Atom language client commons for STS4 language servers",
   "repository": "https://github.com/spring-projects/sts4",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "atom": ">=1.17.0"
   },
   "dependencies": {
-    "atom-languageclient": "0.6.2",
+    "atom-languageclient": "0.6.4",
     "decompress": "^4.2.0",
     "portfinder": "^1.0.13",
     "remote-file-size": "^3.0.3",
diff --git a/atom-extensions/atom-concourse/package.json b/atom-extensions/atom-concourse/package.json
index f786fd6f5..601fc20d7 100644
--- a/atom-extensions/atom-concourse/package.json
+++ b/atom-extensions/atom-concourse/package.json
@@ -7,7 +7,7 @@
   "icon": "icon.png",
   "license": "MIT",
   "engines": {
-    "atom": ">=1.17.0"
+    "atom": ">=1.21.0"
   },
   "files": [
     "grammars/",
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.8"
+    "pivotal-atom-languageclient-commons": "0.0.10"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
@@ -37,9 +37,9 @@
         "2.0.0": "consumeLinterV2"
       }
     },
-    "nuclide-datatip.provider": {
+    "datatip": {
       "versions": {
-        "0.0.0": "consumeDatatip"
+        "0.1.0": "consumeDatatip"
       }
     }
   },
@@ -49,25 +49,36 @@
         "2.0.0": "provideAutocomplete"
       }
     },
-    "nuclide-code-format.provider": {
+    "code-actions": {
       "versions": {
-        "0.0.0": "provideCodeFormat"
+        "0.1.0": "provideCodeActions"
       }
     },
-    "nuclide-definition-provider": {
+    "code-format.range": {
       "versions": {
-        "0.0.0": "provideDefinitions"
+        "0.1.0": "provideCodeFormat"
       }
     },
-    "nuclide-find-references.provider": {
+    "code-highlight": {
       "versions": {
-        "0.0.0": "provideFindReferences"
+        "0.1.0": "provideCodeHighlight"
       }
     },
-    "nuclide-outline-view": {
+    "definitions": {
       "versions": {
-        "0.0.0": "provideOutlines"
+        "0.1.0": "provideDefinitions"
+      }
+    },
+    "find-references": {
+      "versions": {
+        "0.1.0": "provideFindReferences"
+      }
+    },
+    "outline-view": {
+      "versions": {
+        "0.1.0": "provideOutlines"
       }
     }
   }
+
 }
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml b/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml
index b0b8f241f..e57cdb141 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.2"?>
 <plugin>
 
-   <extension id="org.springframework.boot.ide" point="org.eclipse.core.runtime.products"> 
+   <extension id="sts4" point="org.eclipse.core.runtime.products"> 
       <product name="%productName" application="org.eclipse.ui.ide.workbench" description="%productBlurb"> 
           <property name="windowImages" value="sts16.png,sts32.png,sts48.png,sts64.png,sts128.png"/> 
           <property name="aboutImage" value="sts_lg.gif"/> 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index e7a2dc2f8..443c15599 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
-<product name="Spring Tool Suite 4" id="org.springframework.boot.ide" uid="org.springframework.boot.ide" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
 
    <launcherArgs>
-      <programArgs>-product org.springframework.boot.ide
+      <programArgs>-product org.springframework.boot.ide.branding.sts4
 --launcher.defaultAction
 openFile</programArgs>
       <vmArgs>-Dosgi.requiredJavaVersion=1.8
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
index 517984a12..05241cd15 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
@@ -74,7 +74,7 @@
 				<configuration>
 					<products>
 						<product>
-							<id>org.springframework.boot.ide</id>
+							<id>org.springframework.boot.ide.branding.sts4</id>
 							<rootFolder>sts-${unqualifiedVersion}.${p2.qualifier}</rootFolder>
 							<rootFolders>
 								<macosx>SpringToolSuite4.app</macosx>
@@ -110,7 +110,7 @@
 								    <arg value="${env.KEYCHAIN}"/>
 								    <arg value="-s"/>
 								    <arg value="Developer ID Application: Trevor Marshall"/>
-								    <arg value="${project.build.directory}/products/org.springframework.boot.ide/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
+								    <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
 								</exec>
 
 							</target>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json b/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json
index 77593155c..e92ee67f1 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json
@@ -2,7 +2,7 @@
   "title": "Spring Tool Suite 4",
   "icon": "../org.springframework.boot.ide.branding/sts.icns",
   "contents": [
-    { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide/macosx/cocoa/x86_64/SpringToolSuite4.app" },
+    { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app" },
     { "x": 448, "y": 100, "type": "link", "path": "/Applications" },
     { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts.icns", "name": ".VolumeIcon.icns" }
   ],
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
index 13fe52d93..f90833096 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site pack200="true">
-	<description url="http://www.springsource.com/products/sts">
-		The Spring Boot Tool Suite description
+	<description url="http://spring.io/tools">
+		Spring Tool Suite 4
 	</description>
 
 	<!-- Eclipse Integration Commons -->
@@ -43,36 +43,36 @@
 	</feature>
 
 	<!-- Language Server -->
-	<category-def name="Spring Boot IDE Language Servers for Eclipse" label="Spring Boot IDE Language Servers for Eclipse"/>
+	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
 
 	<feature
 		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
-		<category name="Spring Boot IDE Language Servers for Eclipse" />
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" version="0.0.0">
-		<category name="Spring Boot IDE Language Servers for Eclipse" />
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.properties.ls.feature" version="0.0.0">
-		<category name="Spring Boot IDE Language Servers for Eclipse" />
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.boot.java.ls.feature" version="0.0.0">
-		<category name="Spring Boot IDE Language Servers for Eclipse" />
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
-		<category name="Spring Boot IDE Language Servers for Eclipse" />
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
-		<category name="Spring Boot IDE Language Servers for Eclipse" />
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
 </site>
diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java
index 15a6c9947..004bab450 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java
@@ -19,6 +19,7 @@ public enum ProblemSeverity {
 	IGNORE,
 	INFO,
 	WARNING,
+	HINT,
 	ERROR;
 
 }
diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
index d76497ad0..3bbfcadeb 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
@@ -428,6 +428,8 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl
 			return DiagnosticSeverity.Warning;
 		case INFO:
 			return DiagnosticSeverity.Information;
+		case HINT:
+			return DiagnosticSeverity.Hint;
 		case IGNORE:
 			return null;
 		default: