diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 7835ea230..989590817 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -1,6 +1,6 @@
-= Contributing to Spring Tools 4
+= Contributing to Spring Tools
 
-Spring Tools 4 is released under the Eclipse Public License 1.0 (EPL). If you would like to contribute
+Spring Tools is released under the Eclipse Public License 1.0 (EPL). If you would like to contribute
 something, or simply want to hack on the code this document should help you get started.
 
 == Code of Conduct
@@ -8,7 +8,7 @@ Please see our https://github.com/spring-projects/.github/blob/master/CODE_OF_CO
 
 == Using GitHub issues
 We use GitHub issues to track bugs and enhancements. If you have a general usage question
-please ask on https://stackoverflow.com[Stack Overflow]. The Spring Tools 4 team and the
+please ask on https://stackoverflow.com[Stack Overflow]. The Spring Tools team and the
 broader community monitor the https://stackoverflow.com/tags/spring-tools-4[`spring-tools-4`]
 tag.
 
diff --git a/README.md b/README.md
index b7eb9a1ed..f93be4083 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # STS4
 
-The all-new Spring Tools 4 for Eclipse, Visual Studio Code, and Theia. Learn more at https://spring.io/tools.
+The all-new Spring Tools for Eclipse, Visual Studio Code, and Theia. Learn more at https://spring.io/tools.
 
 ## Getting started
 
@@ -8,8 +8,8 @@ The all-new Spring Tools 4 for Eclipse, Visual Studio Code, and Theia. Learn mor
 
 Depending on your development environment, you can choose between:
 
-- __Spring Tools 4 for Eclipse distribution:__ a ready-to-use distribution of the latest Eclipse Desktop IDE, prepackaged with Spring Tools 4 and a few additional third-party extensions. Download, unpack, and start.
-- __Spring Tools 4 for Eclipse extensions:__ you can install the Spring Tools 4 for Eclipse into an existing Eclipse Desktop IDE installation and use it from there.
+- __Spring Tools for Eclipse distribution:__ a ready-to-use distribution of the latest Eclipse Desktop IDE, prepackaged with Spring Tools and a few additional third-party extensions. Download, unpack, and start.
+- __Spring Tools for Eclipse extensions:__ you can install the Spring Tools for Eclipse into an existing Eclipse Desktop IDE installation and use it from there.
 - __Visual Studio Code:__ We provide extensions for Visual Studio Code if you prefer this lightweight editor for your development.
 - __Eclipse Theia:__ You can install the same extensions into Theia-based environments like gitpod.
 
diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html
index 8eb98cc5d..f9f90c994 100644
--- a/eclipse-distribution/common/html/nightly-distributions.html
+++ b/eclipse-distribution/common/html/nightly-distributions.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-	<title>Spring Tools 4 - Internal CI builds</title>
+	<title>Spring Tools - Internal CI builds</title>
 	<link rel="shortcut icon" type="image/x-icon" href="https://www.springsource.org/sites/all/themes/s2org11/favicon.ico"/>
 	<link rel="stylesheet" href="stylesheet.css" type="text/css">
 	<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
@@ -13,7 +13,7 @@
 
 	<div style="margin:40px;">
 	
-	<h1>Spring Tools 4 - Internal CI builds</h1>
+	<h1>Spring Tools - Internal CI builds</h1>
 
 	<h2>Eclipse p2 repositories</h2>
 
@@ -58,7 +58,7 @@
 		$('#e433').load('sts4-nightly-e4.33.html');
 	</script>
 
-	<h2>Spring Tools 4 - Visual Studio Code Extensions</h2>
+	<h2>Spring Tools - Visual Studio Code Extensions</h2>
 
 	<div id="vsix"></div>
 	<script type="text/javascript">
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e433/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e433/p2.inf
index e17decfa6..371133bb8 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e433/p2.inf
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e433/p2.inf
@@ -3,8 +3,8 @@ instructions.configure=\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e434/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e434/p2.inf
index e17decfa6..371133bb8 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e434/p2.inf
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e434/p2.inf
@@ -3,8 +3,8 @@ instructions.configure=\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e435/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e435/p2.inf
index e17decfa6..371133bb8 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e435/p2.inf
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e435/p2.inf
@@ -3,8 +3,8 @@ instructions.configure=\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations,name:Spring Tools Language Servers for Eclipse);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
index 0d64db3eb..3d76bdcd7 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<category-def name="Spring Tools 4 Language Server Integrations for Eclipse" label="Spring Tools 4 Language Server Integrations for Eclipse"/>
+	<category-def name="Spring Tools Language Server Integrations for Eclipse" label="Spring Tools Language Server Integrations for Eclipse"/>
 
    <feature id="org.springframework.tooling.boot.ls.feature">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.boot.ls.feature.source">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature.source">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature.source">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.bosh.ls.feature">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.bosh.ls.feature.source">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.concourse.ls.feature">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
    <feature id="org.springframework.tooling.concourse.ls.feature.source">
-      <category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+      <category name="Spring Tools Language Server Integrations for Eclipse"/>
    </feature>
 
 <!--   <feature id="org.eclipse.mylyn.wikitext.feature"/> -->
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
index 257ff1c9b..dde312ead 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<category-def name="Spring Tools 4 Language Server Integrations for Eclipse" label="Spring Tools 4 Language Server Integrations for Eclipse"/>
+	<category-def name="Spring Tools Language Server Integrations for Eclipse" label="Spring Tools Language Server Integrations for Eclipse"/>
 
 	<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature">
-		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+		<category name="Spring Tools Language Server Integrations for Eclipse"/>
 	</feature>
 
 	<category-def name="deps" label="Dependencies"/>
diff --git a/vscode-extensions/boot-dev-pack/README.md b/vscode-extensions/boot-dev-pack/README.md
index ff6956b2a..97ae5c6e3 100644
--- a/vscode-extensions/boot-dev-pack/README.md
+++ b/vscode-extensions/boot-dev-pack/README.md
@@ -1,6 +1,6 @@
 # VS Code Spring Boot Application Development Extension Pack
 
-(also known as [Spring Tools 4](https://spring.io/tools) for Visual Studio Code)  
+(also known as [Spring Tools](https://spring.io/tools) for Visual Studio Code)  
 Collection of extensions for developing and deploying Spring Boot Application
 
 ## Spring Boot
diff --git a/vscode-extensions/vscode-spring-boot/README.md b/vscode-extensions/vscode-spring-boot/README.md
index 9bd73c3f6..eafb9ac6d 100644
--- a/vscode-extensions/vscode-spring-boot/README.md
+++ b/vscode-extensions/vscode-spring-boot/README.md
@@ -48,9 +48,9 @@ Easy navigation to the provided request mappings of running apps.
 * `//` shows all request mappings of all running Spring Boot apps and opens a browser for the selected endpoint
 
 ## Live application information hovers
-The Spring Tools 4 can connect to running Spring processes to visualize internal information of those running Spring processes inline with your source code. This allows you to see, for example, which beans have bean created at runtime, how they are wired, and more.
+The Spring Tools can connect to running Spring processes to visualize internal information of those running Spring processes inline with your source code. This allows you to see, for example, which beans have bean created at runtime, how they are wired, and more.
 
-The Spring Tools 4 shows hints by highlighting sections of source code with a light green background. Hovering over the highlights with the mouse pointer, data from the running app is displayed in a popup.
+The Spring Tools shows hints by highlighting sections of source code with a light green background. Hovering over the highlights with the mouse pointer, data from the running app is displayed in a popup.
 
 For some types of information, STS 4 may also show a 'quick summary' as a codelens. Codelenses are only supported in Eclipse and Vscode at the moment, not in atom. For Eclipse this has to be enabled via *Preferences >> Language Servers >> Spring Language Servers >> Spring Boot Language Server*.
 
@@ -69,7 +69,7 @@ Live information is scraped from running apps using JMX to connect to [Spring Bo
 
 #### Spring Boot 2.2 and beyond
 
-⚠️ The JMX versions of the actuator endpoints (which the tooling uses under the hood to retrieve live data from the running applications) is not enabled by default anymore since Spring Boot 2.2. In order to allow Spring Tools 4 to continue to visualize live data from the running applications, you need to start the boot app with `-Dspring.jmx.enabled=true` in order to activate the JMX endpoints.
+⚠️ The JMX versions of the actuator endpoints (which the tooling uses under the hood to retrieve live data from the running applications) is not enabled by default anymore since Spring Boot 2.2. In order to allow Spring Tools to continue to visualize live data from the running applications, you need to start the boot app with `-Dspring.jmx.enabled=true` in order to activate the JMX endpoints.
 
 ### Managing Live Data Connections
 
