diff --git a/eclipse-distribution/common/html/nightly-generic-snippet.html b/eclipse-distribution/common/html/nightly-generic-snippet.html
index a48497173..10f2975f6 100644
--- a/eclipse-distribution/common/html/nightly-generic-snippet.html
+++ b/eclipse-distribution/common/html/nightly-generic-snippet.html
@@ -1,7 +1,7 @@
 <ul>
 
-	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-boot-ide-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-boot-ide-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
-	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-boot-ide-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-boot-ide-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
-	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-boot-ide-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-boot-ide-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
+	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
+	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
+	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
 
 </ul>
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
index 75c204ba1..e3d2f300b 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 	id="org.springframework.boot.ide.branding.feature"
-	label="Spring Boot IDE Branding Feature"
+	label="Spring Tool Suite 4 Branding Feature"
 	version="4.0.0.qualifier"
 	provider-name="Pivotal, Inc.">
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/about.properties b/eclipse-distribution/org.springframework.boot.ide.branding/about.properties
index 171fd23c6..80e2eb3eb 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/about.properties
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/about.properties
@@ -4,7 +4,7 @@
 # fill-ins are supplied by about.mappings
 # This file should be translated.
 
-title=Spring Boot IDE \n\
+title=Spring Tool Suite 4\n\
 \n\
 Version: @QUALIFIER@\n\
 Build Id: @BUILD_ID@\n\
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 6e3ff5cbc..e7a2dc2f8 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,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
-<product name="Spring Boot IDE" 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" uid="org.springframework.boot.ide" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -30,7 +30,7 @@ openFile</programArgs>
       startupMessageRect="7,220,441,20"
       startupForegroundColor="c1d72e" />
 
-   <launcher name="SpringBootIDE">
+   <launcher name="SpringToolSuite4">
       <macosx icon="../org.springframework.boot.ide.branding/sts.icns"/>
       <solaris/>
       <win useIco="true">
@@ -93,7 +93,7 @@ openFile</programArgs>
 
    <configurations>
    	  <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}"/>
-   	  <property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}"/>
+   	  <property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}"/>
    	  <property name="osgi.splashPath" value="platform:/base/plugins/org.springframework.boot.ide.branding"/>
    	  
    	  <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
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 e0fb7eb55..517984a12 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
@@ -77,9 +77,9 @@
 							<id>org.springframework.boot.ide</id>
 							<rootFolder>sts-${unqualifiedVersion}.${p2.qualifier}</rootFolder>
 							<rootFolders>
-								<macosx>SpringBootIDE.app</macosx>
+								<macosx>SpringToolSuite4.app</macosx>
 							</rootFolders>
-							<archiveFileName>spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
+							<archiveFileName>spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
 						</product>
 					</products>
 					<formats>
@@ -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/SpringBootIDE.app"/>
+								    <arg value="${project.build.directory}/products/org.springframework.boot.ide/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
 								</exec>
 
 							</target>
@@ -127,11 +127,11 @@
 							<target>
 
 								<exec executable="/usr/local/bin/appdmg" failonerror="true">
-									<arg value="${project.build.directory}/../springbootide-dmg-config-${dist.target.major}.json"/>
-									<arg value="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
+									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}.json"/>
+									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
 								</exec>
 
-								<delete file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
+								<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
 								
 							</target>
 						</configuration>
@@ -149,7 +149,7 @@
 
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 
-								<property name="dmgName" value="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
+								<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
 
 								<exec executable="codesign" failonerror="true">
 									<arg value="--verbose"/>
@@ -176,41 +176,41 @@
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
 
-								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
-								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
-								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
-								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
 
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
 
 									<delete bucketName="${dist.bucket}">
 										<fileset dir="${dist.path.product}">
-											<include name="spring-boot-ide*.zip" />
-											<include name="spring-boot-ide*.zip.md5" />
-											<include name="spring-boot-ide*.zip.sha1" />
-											<include name="spring-boot-ide*.tar.gz" />
-											<include name="spring-boot-ide*.tar.gz.md5" />
-											<include name="spring-boot-ide*.tar.gz.sha1" />
-											<include name="spring-boot-ide*.dmg" />
-											<include name="spring-boot-ide*.dmg.md5" />
-											<include name="spring-boot-ide*.dmg.sha1" />
+											<include name="spring-tool-suite-4*.zip" />
+											<include name="spring-tool-suite-4*.zip.md5" />
+											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz" />
+											<include name="spring-tool-suite-4*.tar.gz.md5" />
+											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.dmg" />
+											<include name="spring-tool-suite-4*.dmg.md5" />
+											<include name="spring-tool-suite-4*.dmg.sha1" />
 										</fileset>
 									</delete>
 
 									<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
 										publicRead="true">
 										<fileset dir="${project.build.directory}/products">
-											<include name="spring-boot-ide*.zip" />
-											<include name="spring-boot-ide*.zip.md5" />
-											<include name="spring-boot-ide*.zip.sha1" />
-											<include name="spring-boot-ide*.tar.gz" />
-											<include name="spring-boot-ide*.tar.gz.md5" />
-											<include name="spring-boot-ide*.tar.gz.sha1" />
-											<include name="spring-boot-ide*.dmg" />
-											<include name="spring-boot-ide*.dmg.md5" />
-											<include name="spring-boot-ide*.dmg.sha1" />
+											<include name="spring-tool-suite-4*.zip" />
+											<include name="spring-tool-suite-4*.zip.md5" />
+											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz" />
+											<include name="spring-tool-suite-4*.tar.gz.md5" />
+											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.dmg" />
+											<include name="spring-tool-suite-4*.dmg.md5" />
+											<include name="spring-tool-suite-4*.dmg.sha1" />
 										</fileset>
 									</upload>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/springbootide-dmg-config-e4.7.json b/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json
similarity index 77%
rename from eclipse-distribution/org.springframework.boot.ide.product.e47/springbootide-dmg-config-e4.7.json
rename to eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json
index 3147cf622..77593155c 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/springbootide-dmg-config-e4.7.json
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json
@@ -1,8 +1,8 @@
 {
-  "title": "Spring Boot IDE",
+  "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/SpringBootIDE.app" },
+    { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide/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-extensions/org.springframework.boot.ide.main.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
index fe2e8e140..bc8ca7ac8 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 	id="org.springframework.boot.ide.main.feature"
-	label="Spring Boot IDE Main Feature"
+	label="Spring Tool Suite 4 Main Feature"
 	version="4.0.0.qualifier"
 	provider-name="Pivotal, Inc.">