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 6edeba41a..b016fd9e6 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
@@ -3,7 +3,7 @@
 	id="org.springframework.boot.ide.branding.feature"
 	label="Spring Tool Suite 4 Branding Feature"
 	version="4.9.1.qualifier"
-	provider-name="Pivotal, Inc.">
+	provider-name="VMware, Inc.">
 
 	<plugin
 		id="org.springframework.boot.ide.branding"
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/about.properties b/eclipse-distribution/org.springframework.boot.ide.branding/about.properties
index 7cd0c78f9..d99434e36 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/about.properties
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/about.properties
@@ -9,7 +9,7 @@ title=Spring Tool Suite 4\n\
 Version: @QUALIFIER@\n\
 Build Id: @BUILD_ID@\n\
 \n\
-Copyright (c) 2007 - 2020 Pivotal, Inc.\n\
+Copyright (c) 2007 - 2021 VMware, Inc.\n\
 All rights reserved. Visit https://spring.io/tools\n\
 \n\
 This product includes software developed by the\n\
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/plugin.properties b/eclipse-distribution/org.springframework.boot.ide.branding/plugin.properties
index 465f81fbd..3cdb27a90 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/plugin.properties
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/plugin.properties
@@ -1,5 +1,5 @@
 pluginName=Spring Tool Suite 4
-providerName=Pivotal, Inc.
+providerName=VMware, Inc.
 
 productName=Spring Tool Suite 4
 productBlurb=Spring Tool Suite 4 \n\
@@ -7,7 +7,7 @@ productBlurb=Spring Tool Suite 4 \n\
 Version: @QUALIFIER@\n\
 Build Id: @BUILD_ID@\n\
 \n\
-Copyright (c) 2007 - 2020 Pivotal, Inc.\n\
+Copyright (c) 2007 - 2021 VMware, Inc.\n\
 All rights reserved. Visit https://spring.io/tools\n\
 \n\
 This product includes software developed by the\n\
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index a7703a3a0..44be9973b 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -8,7 +8,7 @@
 	<packaging>pom</packaging>
 
 	<organization>
-		<name>Pivotal Software, Inc.</name>
+		<name>VMware, Inc.</name>
 		<url>https://spring.io</url>
 	</organization>
 	<url>https://spring.io/tools</url>
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.properties b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.properties
index f0d60b019..f6aa56858 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.properties
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.properties
@@ -4,7 +4,7 @@ This feature contains the Eclipse-UI-specific STS 4 components
 
 # "copyright" property - text of the Copyright
 copyright=\
-Copyright (c) 2019 Pivotal, Inc.
+Copyright (c) 2021 VMware, Inc.
 
 ################ end of copyright property ####################################
 
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 0eec674cc..8ddea27cd 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
@@ -3,7 +3,7 @@
 	id="org.springframework.boot.ide.main.feature"
 	label="Spring Tool Suite 4 Main Feature"
 	version="4.9.1.qualifier"
-	provider-name="Pivotal, Inc.">
+	provider-name="VMware, Inc.">
 
     <description>
        %description
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.azure/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.azure/META-INF/MANIFEST.MF
index b2605aa71..31342d648 100755
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.azure/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.azure/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.dash.azure;singleton:=true
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Inc
+Bundle-Vendor: VMware, Inc
 Bundle-Name: Spring Boot Dash CF Support
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/META-INF/MANIFEST.MF
index c400369c8..8ee6cdfdc 100755
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.dash.cf;singleton:=true
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Inc
+Bundle-Vendor: VMware, Inc
 Bundle-Name: Spring Boot Dash CF Support
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF
index 553d139d1..83e809a59 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.dash.test
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Inc
+Bundle-Vendor: VMware, Inc
 Require-Bundle: org.junit,
  org.eclipse.core.resources,
  org.springsource.ide.eclipse.commons.tests.util,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF
index c901e63be..ebbb49d95 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Spring Boot Dashboard View
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.dash;singleton:=true
 Bundle-Version: 4.9.1.qualifier
 Bundle-Activator: org.springframework.ide.eclipse.boot.dash.BootDashActivator
-Bundle-Vendor: Pivotal Inc
+Bundle-Vendor: VMware, Inc
 Require-Bundle: org.eclipse.ui,
  org.springsource.ide.eclipse.commons.ui,
  org.eclipse.core.resources,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF
index f9c9b09f3..5b2accedd 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF
@@ -23,4 +23,4 @@ Require-Bundle: org.eclipse.ui,
  org.springframework.ide.eclipse.buildship30
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: GoPivotal Inc.
+Bundle-Vendor: GoVMware, Inc.
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/META-INF/MANIFEST.MF
index 205ccf778..b71faf0dd 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Boot Launch
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.launch;singleton:=true
-Bundle-Vendor: Pivotal Software Inc.
+Bundle-Vendor: VMware, Inc
 Bundle-Version: 4.9.1.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF
index 48dd9425f..ea4490b2b 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Test
 Fragment-Host: org.springframework.ide.eclipse.boot.refactoring;bundle-version="3.7.3"
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.refactoring.test
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Inc
+Bundle-Vendor: VMware, Inc
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.core.resources,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/plugin.properties b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/plugin.properties
index 0bfa90e34..b8a0906ef 100755
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/plugin.properties
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/plugin.properties
@@ -1,2 +1,2 @@
 pluginName=Spring Boot Refactoring
-providerName=Pivotal Software, Inc.
+providerName=VMware, Inc.
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/META-INF/MANIFEST.MF
index e99f759fd..324162add 100755
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.restart;singleton:=true
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Inc
+Bundle-Vendor: VMware, Inc
 Bundle-Name: Spring Boot Devtools Easy Restart
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/META-INF/MANIFEST.MF
index 35afb36f2..f4a1738f6 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.jdt.core,
  org.eclipse.ui.workbench,
  com.google.guava,
  org.springframework.ide.eclipse.boot
-Bundle-Vendor: Pivotal Inc
+Bundle-Vendor: VMware, Inc
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF
index f4a06d6d7..1b90bf62a 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.ui,
  org.hamcrest.library;bundle-version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Pivotal Inc.
+Bundle-Vendor: VMware, Inc.
 Export-Package: org.springframework.ide.eclipse.boot.test,
  org.springframework.ide.eclipse.boot.test.util
 Import-Package: org.eclipse.core.runtime,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.validation/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.validation/META-INF/MANIFEST.MF
index cf1afa906..4f51f107f 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.validation/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Validation
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot.validation;singleton:=true
-Bundle-Vendor: Pivotal Software Inc.
+Bundle-Vendor: VMware, Inc
 Bundle-Version: 4.9.1.qualifier
 Bundle-Activator: org.springframework.ide.eclipse.boot.validation.BootValidationActivator
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF
index 3f9ccbef8..eebb193dd 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF
@@ -45,7 +45,7 @@ Export-Package: org.springframework.ide.eclipse.boot.wizard,
  org.springframework.ide.eclipse.boot.wizard.importing,
  org.springframework.ide.eclipse.boot.wizard.starters,
  org.springframework.ide.eclipse.boot.wizard.util
-Bundle-Vendor: Pivotal Inc.
+Bundle-Vendor: VMware, Inc.
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
  org.eclipse.osgi.util,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
index 6ac7b397d..5242ac3ba 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Boot
 Bundle-SymbolicName: org.springframework.ide.eclipse.boot;singleton:=true
-Bundle-Vendor: Pivotal Software Inc.
+Bundle-Vendor: VMware, Inc
 Bundle-Version: 4.9.1.qualifier
 Bundle-Activator: org.springframework.ide.eclipse.boot.core.BootActivator
 Require-Bundle: org.eclipse.core.resources,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.maven.pom.tests/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.maven.pom.tests/META-INF/MANIFEST.MF
index 49bad1f47..ca920fdc5 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.maven.pom.tests/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.maven.pom.tests/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Require-Bundle: org.junit,
  org.springframework.ide.eclipse.maven.pom,
  org.springsource.ide.eclipse.commons.livexp,
  org.eclipse.compare
-Bundle-Vendor: Pivotal Inc.
+Bundle-Vendor: VMware, Inc.
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.maven.pom/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.maven.pom/META-INF/MANIFEST.MF
index 358fb5a0e..632c91308 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.maven.pom/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.maven.pom/META-INF/MANIFEST.MF
@@ -16,4 +16,4 @@ Require-Bundle: org.eclipse.compare,
 Bundle-Activator: org.springframework.ide.eclipse.maven.pom.PomPlugin
 Bundle-ActivationPolicy: lazy
 Export-Package: org.springframework.ide.eclipse.maven.pom
-Bundle-Vendor: Pivotal Inc.
+Bundle-Vendor: VMware, Inc.
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces.feature/feature.properties b/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces.feature/feature.properties
index 3c7e3e8e4..e8b419a1d 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces.feature/feature.properties
+++ b/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces.feature/feature.properties
@@ -8,7 +8,7 @@
 featureName=Spring XML Namespace Support
 
 # "providerName" property - name of the company that provides the feature
-providerName=Pivotal, Inc.
+providerName=VMware, Inc.
 
 # "updateSiteName" property - label for the update site
 updateSiteName=Spring IDE Update Site
diff --git a/eclipse-extensions/org.springsource.ide.eclipse.commons.cloudfoundry.client.v2/plugin.properties b/eclipse-extensions/org.springsource.ide.eclipse.commons.cloudfoundry.client.v2/plugin.properties
index df19d3758..766d19566 100644
--- a/eclipse-extensions/org.springsource.ide.eclipse.commons.cloudfoundry.client.v2/plugin.properties
+++ b/eclipse-extensions/org.springsource.ide.eclipse.commons.cloudfoundry.client.v2/plugin.properties
@@ -1,2 +1,2 @@
-providerName = Pivotal Inc.
+providerName = VMware, Inc.
 pluginName = Cloud Foundry Java Client Lib v2
\ No newline at end of file
diff --git a/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/plugin.properties b/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/plugin.properties
index 8faf64827..efa94d395 100644
--- a/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/plugin.properties
+++ b/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/plugin.properties
@@ -1,2 +1,2 @@
-providerName = Pivotal Inc.
+providerName = VMware, Inc.
 pluginName = Editor Support Components
\ No newline at end of file
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.properties b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.properties
index 416b1b995..c0951df0d 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.properties
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.properties
@@ -4,7 +4,7 @@ Spring Boot Language Server
 
 # "copyright" property - text of the Copyright
 copyright=\
-Copyright (c) 2019 Pivotal, Inc.
+Copyright (c) 2021 VMware, Inc.
 
 ################ end of copyright property ####################################
 
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml
index d49e09f8d..4721ea99e 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml
@@ -3,7 +3,7 @@
 	id="org.springframework.tooling.boot.ls.feature"
 	label="Spring Boot Language Server Feature"
 	version="4.9.1.qualifier"
-	provider-name="Pivotal, Inc.">
+	provider-name="VMware, Inc.">
 
     <description>
        %description
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
index ec3f9b890..26124af13 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Spring Boot Language Server
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
 Bundle-SymbolicName: org.springframework.tooling.boot.ls;singleton:=true
 Bundle-Version: 1.25.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.properties b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.properties
index 178929454..7f8806b1f 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.properties
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.properties
@@ -4,7 +4,7 @@ BOSH Manifest Language Server
 
 # "copyright" property - text of the Copyright
 copyright=\
-Copyright (c) 2019 Pivotal, Inc.
+Copyright (c) 2021 VMware, Inc.
 
 ################ end of copyright property ####################################
 
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
index 5277c1025..01633daef 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
@@ -3,7 +3,7 @@
 	id="org.springframework.tooling.bosh.ls.feature"
 	label="BOSH Language Server Feature"
 	version="4.9.1.qualifier"
-	provider-name="Pivotal, Inc.">
+	provider-name="VMware, Inc.">
 
     <description>
        %description
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
index 4568d0435..4440a554a 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BOSH Manifest Language Server
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
 Bundle-SymbolicName: org.springframework.tooling.bosh.ls;singleton:=true
 Bundle-Version: 1.25.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.properties b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.properties
index a3e1e1635..8e03925f7 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.properties
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.properties
@@ -1,11 +1,11 @@
 featureName=Cloud Foundry Manifest Language Server Feature
-providerName=Pivotal, Inc.
+providerName=VMware, Inc.
 updateSiteName=Spring Tooling Language Servers for Eclipse
 description=\
 This feature provides the language server to support editing cloud foundry manifest files
 
 copyright=\
-Copyright (c) 2019 Pivotal, Inc.
+Copyright (c) 2021 VMware, Inc.
 
 ################ end of copyright property ####################################
 
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.properties b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.properties
index e7fea6e3c..6b7025a22 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.properties
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.properties
@@ -4,7 +4,7 @@ Integeation of the Cloud Foundry Manifest Language Server Extension into the Gen
 
 # "copyright" property - text of the Copyright
 copyright=\
-Copyright (c) 2019 Pivotal, Inc.
+Copyright (c) 2021 VMware, Inc.
 
 ################ end of copyright property ####################################
 
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
index ada2f6558..3040f01cb 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
@@ -3,7 +3,7 @@
 	id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature"
 	label="Cloud Foundry Manifest Language Server Generic Editor Integration Feature"
 	version="4.9.1.qualifier"
-	provider-name="Pivotal, Inc.">
+	provider-name="VMware, Inc.">
 
     <description>
        %description
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
index ffc960770..e444c84ce 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Foundry Manifest Language Server Generic Editor Integration
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
 Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls.integration;singleton:=true
 Bundle-Version: 4.9.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
index 7f3f0635f..541e57521 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Foundry Manifest Language Server
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
 Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls;singleton:=true
 Bundle-Version: 1.25.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.properties b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.properties
index ad0cce612..024a16411 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.properties
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.properties
@@ -4,7 +4,7 @@ Concourse Pipeline and Task Language Server
 
 # "copyright" property - text of the Copyright
 copyright=\
-Copyright (c) 2019 Pivotal, Inc.
+Copyright (c) 2021 VMware, Inc.
 
 ################ end of copyright property ####################################
 
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
index 4d8f39704..daf0f604c 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
@@ -3,7 +3,7 @@
 	id="org.springframework.tooling.concourse.ls.feature"
 	label="Concourse Pipeline Language Server Feature"
 	version="4.9.1.qualifier"
-	provider-name="Pivotal, Inc.">
+	provider-name="VMware, Inc.">
 
     <description>
        %description
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
index 44e6a8661..5d9ef9fbc 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Concourse Pipeline Language Server
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
 Bundle-SymbolicName: org.springframework.tooling.concourse.ls;singleton:=true
 Bundle-Version: 1.25.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
index af3fb7ab1..252c5d633 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Language Server Commons
 Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.commons;singleton:=true
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
index 109a4b28d..98ddfb54f 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
@@ -27,4 +27,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: org.springframework.tooling.ls.eclipse.gotosymbol.GotoSymbolPlugin
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.boot.ls/META-INF/MANIFEST.MF
index 8d7d5441c..2079cc4d4 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.boot.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.boot.ls/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Spring Tool Suite Common UI Components
 Bundle-SymbolicName: org.springsource.ide.eclipse.commons.boot.ls;singleton:=true
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Software, Inc.
+Bundle-Vendor: VMware, Inc.
 Require-Bundle: org.eclipse.core.resources,
  org.springsource.ide.eclipse.commons.livexp
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF
index 2babb7512..86ce17a07 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: SpringSource Tool Suite (Core)
 Bundle-SymbolicName: org.springsource.ide.eclipse.commons.core;singleton:=true
 Bundle-Version: 4.9.1.qualifier
 Bundle-Activator: org.springsource.ide.eclipse.commons.internal.core.CorePlugin
-Bundle-Vendor: Pivotal Software, Inc.
+Bundle-Vendor: VMware, Inc.
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.mylyn.commons.net;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.equinox.p2.core;resolution:=optional,
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/plugin.properties b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/plugin.properties
index baaecf126..f88538cc6 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/plugin.properties
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/plugin.properties
@@ -1,2 +1,2 @@
-pluginName=SpringSource Tool Suite Framework Support Core
-providerName=Pivotal Software, Inc.
+pluginName=SpringSource Tool Suite Framework Support Core
+providerName=VMware, Inc.
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF
index 6c1a0800b..7e1184831 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: com.springsource.sts.frameworks.test.util
 Bundle-SymbolicName: org.springsource.ide.eclipse.commons.frameworks.test.util;singleton:=true
 Bundle-Version: 4.9.1.qualifier
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Pivotal Software, Inc.
+Bundle-Vendor: VMware, Inc.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.swtbot.go,
  org.springsource.ide.eclipse.commons.tests.util,
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.ui/plugin.properties b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.ui/plugin.properties
index e064175c0..8627fb7de 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.ui/plugin.properties
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.ui/plugin.properties
@@ -1,2 +1,2 @@
-pluginName=SpringSource Tool Suite Framework Support (UI)
-providerName=Pivotal Software, Inc.
+pluginName=SpringSource Tool Suite Framework Support (UI)
+providerName=VMware, Inc.
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.jdk_tools/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.jdk_tools/META-INF/MANIFEST.MF
index 1fc9ce799..2a8edfa97 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.jdk_tools/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.jdk_tools/META-INF/MANIFEST.MF
@@ -6,4 +6,4 @@ Bundle-Version: 4.9.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: external:$java.home$/../lib/tools.jar
 Export-Package: com.sun.tools.attach
-Bundle-Vendor: Pivotal Software, Inc.
+Bundle-Vendor: VMware, Inc.
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/META-INF/MANIFEST.MF
index d6df98d32..0379c2265 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.jface,
  org.eclipse.text
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: Pivotal Software, Inc.
+Bundle-Vendor: VMware, Inc.
 Export-Package: org.springsource.ide.eclipse.commons.livexp.core;uses:="com.google.common.base",
  org.springsource.ide.eclipse.commons.livexp.core.validators,
  org.springsource.ide.eclipse.commons.livexp.ui,
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF
index c5d594781..f3aaae58c 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: SpringSource Tool Suite Test Utilities
 Bundle-SymbolicName: org.springsource.ide.eclipse.commons.tests.util;singleton:=true
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Software, Inc.
+Bundle-Vendor: VMware, Inc.
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.jdt.core,
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/META-INF/MANIFEST.MF
index eb2eeb03d..d582ca146 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Spring Tool Suite Common UI Components
 Bundle-SymbolicName: org.springsource.ide.eclipse.commons.ui;singleton:=true
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal Software, Inc.
+Bundle-Vendor: VMware, Inc.
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.ui.browser,
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index ea6b088bb..c1f938d01 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -8,7 +8,7 @@
 	<packaging>pom</packaging>
 
 	<organization>
-		<name>Pivotal Software, Inc.</name>
+		<name>VMware, Inc.</name>
 		<url>https://spring.io</url>
 	</organization>
 	<url>https://spring.io/tools</url>
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
index fca222f2f..49c12419c 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Client-side JDT extension for language servers
 Bundle-SymbolicName: org.springframework.tooling.jdt.ls.commons
 Bundle-Version: 4.9.1.qualifier
-Bundle-Vendor: Pivotal, Inc.
+Bundle-Vendor: VMware, Inc.
 Automatic-Module-Name: org.springframework.tooling.jdt.ls.commons
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF
index 6fc2f24ab..7bfcac5d4 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.springframework.tooling.jdt.ls.extension
 Bundle-SymbolicName: org.springframework.tooling.jdt.ls.extension;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Pivotal Inc.
+Bundle-Vendor: VMware, Inc.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.ls.core,
  org.eclipse.core.runtime,
diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml
index 2354737b9..18cdf5f0e 100644
--- a/headless-services/jdt-ls-extension/pom.xml
+++ b/headless-services/jdt-ls-extension/pom.xml
@@ -9,7 +9,7 @@
 	<name>jdt-ls-extension-parent</name>
 
 	<organization>
-		<name>Pivotal Software, Inc.</name>
+		<name>VMware, Inc.</name>
 		<url>https://spring.io</url>
 	</organization>
 	<url>https://spring.io/tools</url>