diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF
index 14d2cbb6e15..5e3bec37213 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.cmake.is.arm.tests/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Fragment-Host: org.eclipse.cdt.cmake.is.arm
 Import-Package: org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.cmake.is.arm.tests
+Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
index b50628cce2e..8f0e3b6067b 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.arm.tests/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,5 @@
 #Properties file for org.eclipse.cdt.cmake.is.arm.tests
+Bundle-Name = org.eclipse.cdt.cmake.is.arm.tests
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2020 Martin Weber\n\
 \n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.core.tests/META-INF/MANIFEST.MF
index e00933b0358..6b63d1285c0 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.cmake.is.core.tests/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Fragment-Host: org.eclipse.cdt.cmake.is.core
 Import-Package: org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.cmake.is.core.tests
+Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.core.tests/OSGI-INF/l10n/bundle.properties
index e3ef9ff5414..0fa6190fca1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.core.tests/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,5 @@
 #Properties file for org.eclipse.cdt.cmake.is.core.tests
+Bundle-Name = org.eclipse.cdt.cmake.is.core.tests
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2020 Martin Weber\n\
 \n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/META-INF/MANIFEST.MF
index 36052811602..f97562b472c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Fragment-Host: org.eclipse.cdt.cmake.is.hpenonstop
 Import-Package: org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.cmake.is.hpenonstop.tests
+Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
index 0c002fd6d54..f0a6c97f3a8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,5 @@
 #Properties file for org.eclipse.cdt.cmake.is.hpenonstop.tests
+Bundle-Name = org.eclipse.cdt.cmake.is.hpenonstop.tests
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2020 Martin Weber\n\
 \n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/META-INF/MANIFEST.MF
index 12970cb72f4..ed0377ef0a5 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Fragment-Host: org.eclipse.cdt.cmake.is.microsoft
 Import-Package: org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.cmake.is.microsoft.tests
+Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/OSGI-INF/l10n/bundle.properties
index 0ece1aecd54..4fcf3426ac5 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,5 @@
 #Properties file for org.eclipse.cdt.cmake.is.microsoft.tests
+Bundle-Name = org.eclipse.cdt.cmake.is.microsoft.tests
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2020 Martin Weber\n\
 \n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/META-INF/MANIFEST.MF
index 3d7f2504086..1ac831e5078 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@ Import-Package: org.eclipse.cdt.core.settings.model,
  org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.cmake.is.nvidia.tests
+Bundle-Name: %Bundle-Name
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/OSGI-INF/l10n/bundle.properties b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/OSGI-INF/l10n/bundle.properties
index a2bd52f983b..4e3deab650c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/OSGI-INF/l10n/bundle.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,5 @@
 #Properties file for org.eclipse.cdt.cmake.is.nvidia.tests
+Bundle-Name = org.eclipse.cdt.cmake.is.nvidia.tests
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2020 Martin Weber\n\
 \n\
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/plugin.properties b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/plugin.properties
index a23d154d675..90dac2f70d3 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/plugin.properties
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/plugin.properties
@@ -11,4 +11,4 @@
 ##################################################################################
 
 pluginName = GDB/MI reference application tests
-providerName = Ericsson
+providerName = Eclipse CDT
diff --git a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
index 3c5730321d3..c3005b548a3 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
+++ b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-Vendor: %pluginProvider
+Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.cdt.tests.dsf;singleton:=true
 Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.cdt.tests.dsf.DsfTestPlugin
diff --git a/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
index 0c5f514356a..b1dff2c5487 100644
--- a/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.mockito;bundle-version="2.23.0"
 Automatic-Module-Name: org.eclipse.launchbar.core.tests
 Bundle-Localization: fragment
+Bundle-Vendor: %providerName
diff --git a/launchbar/org.eclipse.launchbar.core.tests/fragment.properties b/launchbar/org.eclipse.launchbar.core.tests/fragment.properties
index 85b0c256db6..2b7fc27c60b 100644
--- a/launchbar/org.eclipse.launchbar.core.tests/fragment.properties
+++ b/launchbar/org.eclipse.launchbar.core.tests/fragment.properties
@@ -11,3 +11,4 @@
 ##################################################################################
 
 pluginName = Launch Bar Core Tests
+providerName = Eclipse CDT
diff --git a/launchbar/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF
index 0fdeae2a4ea..dc82d3eb626 100644
--- a/launchbar/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Export-Package: org.eclipse.launchbar.remote.core,
  org.eclipse.launchbar.remote.core.internal;x-friends:="org.eclipse.launchbar.remote.ui"
 Automatic-Module-Name: org.eclipse.launchbar.remote.core
 Bundle-Localization: plugin
+Bundle-Vendor: %providerName
diff --git a/launchbar/org.eclipse.launchbar.remote.core/plugin.properties b/launchbar/org.eclipse.launchbar.remote.core/plugin.properties
index af12dd547c9..6202a705fde 100644
--- a/launchbar/org.eclipse.launchbar.remote.core/plugin.properties
+++ b/launchbar/org.eclipse.launchbar.remote.core/plugin.properties
@@ -11,3 +11,4 @@
 ##################################################################################
 
 pluginName = LaunchBar Remote Core
+providerName = Eclipse CDT
diff --git a/qt/org.eclipse.cdt.qt.ui.tests/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.ui.tests/META-INF/MANIFEST.MF
index a36adf85aa2..f717b9f9003 100644
--- a/qt/org.eclipse.cdt.qt.ui.tests/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.ui.tests/META-INF/MANIFEST.MF
@@ -20,5 +20,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.search
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Vendor: %vendorName
+Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.cdt.qt.ui.tests
+Bundle-Localization: plugin