diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/GenericRemoteAppElement.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/GenericRemoteAppElement.java
index 6a082724d..45a6290de 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/GenericRemoteAppElement.java
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/GenericRemoteAppElement.java
@@ -102,7 +102,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 
 	final private List<LiveExpression<?>> summaries = new ArrayList<>();
 
-	DisposingFactory<String, GenericRemoteAppElement> childFactory = new DisposingFactory<String, GenericRemoteAppElement>(existingChildIds) {
+	DisposingFactory<String, GenericRemoteAppElement> childFactory = new DisposingFactory<>(existingChildIds) {
 		@Override
 		protected GenericRemoteAppElement create(String appId) {
 			GenericRemoteAppElement parent = GenericRemoteAppElement.this;
@@ -182,7 +182,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 		}
 	}
 
-	LiveExpression<RunState> baseRunState = new AsyncLiveExpression<RunState>(RunState.UNKNOWN) {
+	LiveExpression<RunState> baseRunState = new AsyncLiveExpression<>(RunState.UNKNOWN) {
 		{
 			dependsOn(app);
 			dependsOn(children);
@@ -253,7 +253,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 		livePorts.dependsOn(getRunStateExp());
 	}
 
-	private LiveExpression<Integer> debugPort = new AsyncLiveExpression<Integer>(0) {
+	private LiveExpression<Integer> debugPort = new AsyncLiveExpression<>(0) {
 
 		//it is important that events for this exp are fired asynchronously to avoid starving ui thread
 		// causing deadlock. (I.e. the important thing is to have the event listeners not be doing things
@@ -270,7 +270,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 		};
 	};
 
-	private LiveExpression<String> remoteDevtoolsUrl = new AsyncLiveExpression<String>(null) {
+	private LiveExpression<String> remoteDevtoolsUrl = new AsyncLiveExpression<>(null) {
 
 		//it is important that events for this exp are fired asynchronously to avoid starving ui thread
 		// causing deadlock. (I.e. the important thing is to have the event listeners not be doing things
@@ -314,7 +314,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 	private OldValueDisposer<LogConnection> logConnection = new OldValueDisposer<>(this);
 
 	private <T> LiveExpression<T> sumarizeFromChildren(AppDataSummarizer<T> sumarizer) {
-		AsyncLiveExpression<T> sumary = new AsyncLiveExpression<T>(sumarizer.zero()) {
+		AsyncLiveExpression<T> sumary = new AsyncLiveExpression<>(sumarizer.zero()) {
 			@Override
 			protected T compute() {
 				T sum = sumarizer.getHere(GenericRemoteAppElement.this);
@@ -687,7 +687,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 		synchronized (this) {
 			if (liveRequestMappings==null) {
 				final LiveExpression<Set<String>> actuatorUrls = getActuatorUrls();
-				liveRequestMappings = new AsyncLiveExpression<Failable<ImmutableList<RequestMapping>>>(Failable.error(MissingLiveInfoMessages.NOT_YET_COMPUTED), "Fetch request mappings for '"+getStyledName(null).getString()+"'") {
+				liveRequestMappings = new AsyncLiveExpression<>(Failable.error(MissingLiveInfoMessages.NOT_YET_COMPUTED), "Fetch request mappings for '"+getStyledName(null).getString()+"'") {
 					@Override
 					protected Failable<ImmutableList<RequestMapping>> compute() {
 						Set<String> targets = actuatorUrls.getValue();
@@ -720,7 +720,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 		synchronized (this) {
 			if (liveEnv == null) {
 				final LiveExpression<Set<String>> actuatorUrls = getActuatorUrls();
-				liveEnv = new AsyncLiveExpression<Failable<LiveEnvModel>>(Failable.error(MissingLiveInfoMessages.NOT_YET_COMPUTED), "Fetch env for '"+getStyledName(null).getString()+"'") {
+				liveEnv = new AsyncLiveExpression<>(Failable.error(MissingLiveInfoMessages.NOT_YET_COMPUTED), "Fetch env for '"+getStyledName(null).getString()+"'") {
 					@Override
 					protected Failable<LiveEnvModel> compute() {
 						Set<String> targets = actuatorUrls.getValue();
@@ -757,7 +757,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 		synchronized (this) {
 			if (liveBeans == null) {
 				LiveExpression<Set<String>> actuatorUrls = getActuatorUrls();
-				liveBeans = new AsyncLiveExpression<Failable<LiveBeansModel>>(Failable.error(MissingLiveInfoMessages.NOT_YET_COMPUTED), "Fetch beans for '"+getStyledName(null).getString()+"'") {
+				liveBeans = new AsyncLiveExpression<>(Failable.error(MissingLiveInfoMessages.NOT_YET_COMPUTED), "Fetch beans for '"+getStyledName(null).getString()+"'") {
 					@Override
 					protected Failable<LiveBeansModel> compute() {
 						Set<String> targets = actuatorUrls.getValue();
@@ -787,7 +787,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 
 	public CompletableFuture<Void> enableDevtools(boolean enable) {
 		if (enable) {
-			return refreshTracker.runAsync("Enable Devtools Support for application '" + getStyledName(null).getString() + "'", () -> {
+			return refreshTracker.runAsync("Enable DevTools Support for application '" + getStyledName(null).getString() + "'", () -> {
 				App app = getAppData();
 				if (app instanceof SystemPropertySupport) {
 					SystemPropertySupport sysprops = (SystemPropertySupport) app;
@@ -798,7 +798,7 @@ public class GenericRemoteAppElement extends WrappingBootDashElement<String> imp
 				}
 			});
 		} else {
-			return refreshTracker.runAsync("Disable Devtools Support for application '" + getStyledName(null).getString() + "'", () -> {
+			return refreshTracker.runAsync("Disable DevTools Support for application '" + getStyledName(null).getString() + "'", () -> {
 				App app = getAppData();
 				if (app instanceof SystemPropertySupport) {
 					SystemPropertySupport sysprops = (SystemPropertySupport) app;
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/plugin.xml b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/plugin.xml
index f1dea13e0..ed7ec551c 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/plugin.xml
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/plugin.xml
@@ -45,10 +45,10 @@
     
     <shortcut
           class="org.springframework.ide.eclipse.boot.launch.devtools.BootDevtoolsClientLaunchShortcut"
-          description="Connect Spring Devtools Client to a Remote Spring Boot Application"
+          description="Connect Spring DevTools Client to a Remote Spring Boot Application"
           id="org.springframework.ide.eclipse.boot.launch.devtools.BootDevtoolsClientLaunchShortcut"
           icon="platform:/plugin/org.springframework.ide.eclipse.boot/resources/icons/boot-devtools-icon.png"
-          label="Spring Devtools Client"
+          label="Spring DevTools Client"
           modes="run, debug">
         <contextualLaunch>
            <enablement>
@@ -64,11 +64,11 @@
                id="org.springframework.ide.eclipse.boot.devtools.client.launch">
          </configurationType>
         <description
-               description="Run as Spring Devtools Client"
+               description="Run as Spring DevTools Client"
                mode="run">
          </description>
          <description
-               description="Debug as Spring Devtools Client"
+               description="Debug as Spring DevTools Client"
                mode="debug">
          </description>
     </shortcut>
@@ -93,7 +93,7 @@
     </launchConfigurationType>
     <launchConfigurationType
           id="org.springframework.ide.eclipse.boot.devtools.client.launch"
-          name="Spring Boot Devtools Client"
+          name="Spring Boot DevTools Client"
           delegate="org.springframework.ide.eclipse.boot.launch.devtools.BootDevtoolsClientLaunchConfigurationDelegate"
           modes="run,debug"
           sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchConfigurationDelegate.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchConfigurationDelegate.java
index 9ca113e0e..438c187f0 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchConfigurationDelegate.java
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchConfigurationDelegate.java
@@ -96,7 +96,7 @@ public class BootDevtoolsClientLaunchConfigurationDelegate extends AbstractBootL
 			throws CoreException {
 		boolean isDebug = ILaunchManager.DEBUG_MODE.equals(mode);
 		int work =  isDebug ? 2 : 1;
-		mon.beginTask("Launching Devtools Client for"+getProjectName(conf), work);
+		mon.beginTask("Launching DevTools Client for"+getProjectName(conf), work);
 		if (isDebug) {
 			localDebugPort.set(findFreePort());
 		}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchShortcut.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchShortcut.java
index 5fb356b9d..0321d1fba 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchShortcut.java
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientLaunchShortcut.java
@@ -127,7 +127,7 @@ public class BootDevtoolsClientLaunchShortcut implements ILaunchShortcut {
 		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
 		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
 		dialog.setElements(configList.toArray());
-		dialog.setTitle("Several Devtools Client Configs found for "+project.getName());
+		dialog.setTitle("Several DevTools Client Configs found for "+project.getName());
 		dialog.setMessage("Select an existing configuration");
 		dialog.setMultipleSelection(false);
 		int result = dialog.open();
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientMainTab.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientMainTab.java
index e440cde40..6b4fc426f 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientMainTab.java
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/devtools/BootDevtoolsClientMainTab.java
@@ -29,7 +29,7 @@ public class BootDevtoolsClientMainTab extends LaunchConfigurationTabWithSection
 
 	@Override
 	public String getName() {
-		return "Devtools Client";
+		return "DevTools Client";
 	}
 
 	@Override
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot/src/org/springframework/ide/eclipse/boot/ui/EnableDisableBootDevtools.java b/eclipse-extensions/org.springframework.ide.eclipse.boot/src/org/springframework/ide/eclipse/boot/ui/EnableDisableBootDevtools.java
index 48921f8dc..583c77c2b 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot/src/org/springframework/ide/eclipse/boot/ui/EnableDisableBootDevtools.java
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot/src/org/springframework/ide/eclipse/boot/ui/EnableDisableBootDevtools.java
@@ -65,10 +65,10 @@ public class EnableDisableBootDevtools extends AbstractHandler {
 			return "Project '"+project.getProject().getName()+"' does not seem to be a Spring Boot project";
 		} else if (!project.hasNature(SpringBootCore.M2E_NATURE)) {
 			return "Project '"+project.getProject().getName()+"' is not an Maven/m2e enabled project. This action's implementation requires m2e to add/remove "
-					+ "the Devtools as a dependency to your project.";
+					+ "the DevTools as a dependency to your project.";
 		} else {
 			String version = bootProject.getBootVersion();
-			return "Boot Devtools are provided by Spring Boot version 1.3.0 or later. "
+			return "Boot DevTools are provided by Spring Boot version 1.3.0 or later. "
 					+ "Project '"+project.getProject().getName()+"' uses Boot Version "+version;
 		}
 	}
@@ -132,7 +132,7 @@ public class EnableDisableBootDevtools extends AbstractHandler {
 							bootProject.addMavenDependency(devtools.getDependency(), /*preferManaged*/true);
 						} else {
 							if (shell != null) {
-								MessageDialog.openError(shell, "Boot Devtools Dependency could not be added", explainFailure(bootProject));
+								MessageDialog.openError(shell, "Boot DevTools Dependency could not be added", explainFailure(bootProject));
 							}
 						}
 					}