diff --git a/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF
index b4153937b1f..c5427507c6e 100644
--- a/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: GCC support for CDT Build Core
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.build.gcc.core;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.cdt.build.gcc.core.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.10.0",
  org.eclipse.cdt.core;bundle-version="5.12.0",
@@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.cdt.build.gcc.core,
  org.eclipse.cdt.build.gcc.core.internal;x-internal:=true
 Automatic-Module-Name: org.eclipse.cdt.build.gcc.core
+Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.build.gcc.core/build.properties b/build/org.eclipse.cdt.build.gcc.core/build.properties
index e5a949cc43c..7b3c227b84a 100644
--- a/build/org.eclipse.cdt.build.gcc.core/build.properties
+++ b/build/org.eclipse.cdt.build.gcc.core/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
+               plugin.properties,\
                about.html
 src.includes = about.html
diff --git a/build/org.eclipse.cdt.build.gcc.core/plugin.properties b/build/org.eclipse.cdt.build.gcc.core/plugin.properties
new file mode 100644
index 00000000000..bd22dec05f7
--- /dev/null
+++ b/build/org.eclipse.cdt.build.gcc.core/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = GCC support for CDT Build Core
+providerName = Eclipse CDT
diff --git a/build/org.eclipse.cdt.build.gcc.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.build.gcc.ui/META-INF/MANIFEST.MF
index 073cb6252e6..505fb12c26b 100644
--- a/build/org.eclipse.cdt.build.gcc.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.build.gcc.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: GCC ToolChain Support UI
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.build.gcc.ui;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.cdt.build.gcc.ui.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.cdt.ui;bundle-version="6.3.0",
@@ -14,3 +14,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.cdt.build.gcc.ui
 Export-Package: org.eclipse.cdt.build.gcc.ui.internal;x-internal:=true
+Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.build.gcc.ui/build.properties b/build/org.eclipse.cdt.build.gcc.ui/build.properties
index ef90c57fc04..6751059433d 100644
--- a/build/org.eclipse.cdt.build.gcc.ui/build.properties
+++ b/build/org.eclipse.cdt.build.gcc.ui/build.properties
@@ -3,6 +3,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
+               plugin.properties,\
                about.html,\
                cdt_logo_icon32.png,\
                about.properties,\
diff --git a/build/org.eclipse.cdt.build.gcc.ui/plugin.properties b/build/org.eclipse.cdt.build.gcc.ui/plugin.properties
new file mode 100644
index 00000000000..1c265fb6a49
--- /dev/null
+++ b/build/org.eclipse.cdt.build.gcc.ui/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = GCC ToolChain Support UI
+providerName = Eclipse CDT
diff --git a/build/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF
index e976189ac47..c7e426c65d2 100644
--- a/build/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.cmake.ui.tests
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.swtbot.go;bundle-version="2.7.0",
  org.eclipse.cdt.core;bundle-version="6.4.0",
  org.eclipse.core.resources;bundle-version="3.12.0",
  org.eclipse.cdt.cmake.core;bundle-version="1.2.0"
 Automatic-Module-Name: org.eclipse.cdt.cmake.ui.tests
+Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.cmake.ui.tests/build.properties b/build/org.eclipse.cdt.cmake.ui.tests/build.properties
index 8f7b5a7f00c..4d08392689a 100644
--- a/build/org.eclipse.cdt.cmake.ui.tests/build.properties
+++ b/build/org.eclipse.cdt.cmake.ui.tests/build.properties
@@ -2,6 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                about.html,\
                swtbot-test-plugin.properties
 src.includes = about.html
diff --git a/build/org.eclipse.cdt.cmake.ui.tests/plugin.properties b/build/org.eclipse.cdt.cmake.ui.tests/plugin.properties
new file mode 100644
index 00000000000..1f398852583
--- /dev/null
+++ b/build/org.eclipse.cdt.cmake.ui.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Tests
+providerName = Eclipse CDT
diff --git a/build/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF
index fafc6b701d4..2d2f4b2a50d 100644
--- a/build/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.cmake.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDT CMake UI
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.cmake.ui;singleton:=true
 Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.cdt.cmake.ui.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.11.0",
  org.eclipse.ui,
diff --git a/build/org.eclipse.cdt.cmake.ui/plugin.properties b/build/org.eclipse.cdt.cmake.ui/plugin.properties
index a6b63ff6661..3e6af6a3941 100644
--- a/build/org.eclipse.cdt.cmake.ui/plugin.properties
+++ b/build/org.eclipse.cdt.cmake.ui/plugin.properties
@@ -9,4 +9,7 @@
 # SPDX-License-Identifier: EPL-2.0
 ###############################################################################
 
+pluginName = CDT CMake UI
+providerName = Eclipse CDT
+
 cmake.preferences.name = CMake
diff --git a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
index 1e43c69f94d..a27d314f9e5 100644
--- a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Make Core Tests Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.make.core.tests;singleton:=true
 Bundle-Version: 7.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.make.core.tests.MakeTestsPlugin
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.cdt.core.tests
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.eclipse.core.filesystem
 Automatic-Module-Name: org.eclipse.cdt.make.core.tests
+Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.make.core.tests/build.properties b/build/org.eclipse.cdt.make.core.tests/build.properties
index 1eb4b524a16..af6f966439f 100644
--- a/build/org.eclipse.cdt.make.core.tests/build.properties
+++ b/build/org.eclipse.cdt.make.core.tests/build.properties
@@ -15,5 +15,6 @@ source.. = src/
 output.. = bin/
 bin.includes = .,\
                META-INF/,\
+               plugin.properties,\
                data/
 src.includes = about.html
diff --git a/build/org.eclipse.cdt.make.core.tests/plugin.properties b/build/org.eclipse.cdt.make.core.tests/plugin.properties
new file mode 100644
index 00000000000..0deeb62c93d
--- /dev/null
+++ b/build/org.eclipse.cdt.make.core.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Make Core Tests Plug-in
+providerName = Eclipse.org
diff --git a/build/org.eclipse.cdt.make.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui.tests/META-INF/MANIFEST.MF
index 711cc644206..b5b4a23f36a 100644
--- a/build/org.eclipse.cdt.make.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.ui.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.cdt.make.ui.tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.make.ui.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.make.ui.tests.MakeUITestsPlugin
@@ -11,5 +11,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.core.tests
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.cdt.make.ui.tests
+Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.make.ui.tests/build.properties b/build/org.eclipse.cdt.make.ui.tests/build.properties
index 9cbab3c135e..2b112c46131 100644
--- a/build/org.eclipse.cdt.make.ui.tests/build.properties
+++ b/build/org.eclipse.cdt.make.ui.tests/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                about.html
 src.includes = about.html
diff --git a/build/org.eclipse.cdt.make.ui.tests/plugin.properties b/build/org.eclipse.cdt.make.ui.tests/plugin.properties
new file mode 100644
index 00000000000..15839497399
--- /dev/null
+++ b/build/org.eclipse.cdt.make.ui.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = org.eclipse.cdt.make.ui.tests
+providerName = Eclipse.org
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
index fbeb4ede9b6..2b8134ae390 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core.tests; singleton:=true
 Bundle-Version: 8.2.100.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.managedbuilder.core.tests,
  org.eclipse.cdt.managedbuilder.language.settings.providers.tests,
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties
index 3ec7bbc986a..9ff55a2cd19 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties
@@ -12,4 +12,8 @@
 #     QNX Software Systems - initial API and implementation
 #	  IBM Corporation
 ###############################################################################
+
+pluginName = Tests
+providerName = Eclipse CDT
+
 GNUMakeBuilder.name=Gnu Make Builder
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
index 3e9c66fef38..5e6fbc608dc 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Managed Build UI Tests Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui.tests; singleton:=true
 Bundle-Version: 8.2.1.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.tests.testplugin.TestsPlugin
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties b/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
index ab8f20d2598..c4dee840643 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
@@ -15,6 +15,7 @@ source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                .,\
+               plugin.properties,\
                about.html,\
                META-INF/
 src.includes = about.html
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.properties
new file mode 100644
index 00000000000..d5ace30a63f
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Managed Build UI Tests Plug-in
+providerName = Eclipse CDT
diff --git a/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF
index b607a751785..705bc164367 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.meson.ui.tests
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-Version: 1.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.cdt.meson.core;bundle-version="1.0.0",
@@ -23,3 +23,4 @@ Require-Bundle: org.eclipse.cdt.meson.core;bundle-version="1.0.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.8.100"
 Import-Package: org.assertj.core.api;version="1.7.1"
 Automatic-Module-Name: org.eclipse.cdt.meson.ui.tests
+Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.meson.ui.tests/build.properties b/build/org.eclipse.cdt.meson.ui.tests/build.properties
index 774eb143934..2c160b4d6f8 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/build.properties
+++ b/build/org.eclipse.cdt.meson.ui.tests/build.properties
@@ -1,5 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               plugin.properties,\
                .
 src.includes = about.html
diff --git a/build/org.eclipse.cdt.meson.ui.tests/plugin.properties b/build/org.eclipse.cdt.meson.ui.tests/plugin.properties
new file mode 100644
index 00000000000..1f398852583
--- /dev/null
+++ b/build/org.eclipse.cdt.meson.ui.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Tests
+providerName = Eclipse CDT
diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.ui.cfgview/META-INF/MANIFEST.MF
index a9aedcbc32d..f99a6a5d81e 100644
--- a/codan/org.eclipse.cdt.codan.ui.cfgview/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.ui.cfgview/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Control Flow Graph
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.codan.ui.cfgview;singleton:=true
 Bundle-Version: 3.2.0.qualifier
 Bundle-Activator: org.eclipse.cdt.codan.ui.cfgview.ControlFlowGraphPlugin
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.cdt.codan.core;bundle-version="1.0.0",
@@ -18,3 +18,4 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.cdt.codan.ui.cfgview;x-internal:=true,
  org.eclipse.cdt.codan.ui.cfgview.views;x-internal:=true
 Automatic-Module-Name: org.eclipse.cdt.codan.ui.cfgview
+Bundle-Localization: plugin
diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/build.properties b/codan/org.eclipse.cdt.codan.ui.cfgview/build.properties
index c5f6323d811..9a982cb723a 100644
--- a/codan/org.eclipse.cdt.codan.ui.cfgview/build.properties
+++ b/codan/org.eclipse.cdt.codan.ui.cfgview/build.properties
@@ -17,6 +17,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
+               plugin.properties,\
                about.html,\
                icons/
 src.includes = about.html
diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/plugin.properties b/codan/org.eclipse.cdt.codan.ui.cfgview/plugin.properties
new file mode 100644
index 00000000000..1177cc15162
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.ui.cfgview/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Control Flow Graph
+providerName = Eclipse CDT
diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index dccc687071e..451761d5474 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.cdt.core.tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core.tests; singleton:=true
 Bundle-Version: 5.4.0.qualifier
 Bundle-Activator: org.eclipse.cdt.core.testplugin.CTestPlugin
@@ -44,6 +44,7 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ltk.core.refactoring;bundle-version="3.4.0",
  org.hamcrest
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.core.tests
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties
index fe05959b56d..edc11222857 100644
--- a/core/org.eclipse.cdt.core.tests/build.properties
+++ b/core/org.eclipse.cdt.core.tests/build.properties
@@ -12,6 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
+               plugin.properties,\
                about.html,\
                .,\
                test.xml,\
diff --git a/core/org.eclipse.cdt.core.tests/plugin.properties b/core/org.eclipse.cdt.core.tests/plugin.properties
new file mode 100644
index 00000000000..862a907dddb
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = org.eclipse.cdt.core.tests
+providerName = Eclipse CDT
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
index 5297c32a8bf..a23c820e594 100644
--- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.cdt.ui.tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.ui.tests; singleton:=true
 Bundle-Version: 5.5.300.qualifier
 Bundle-Activator: org.eclipse.cdt.ui.testplugin.CTestPlugin
@@ -42,6 +42,6 @@ Require-Bundle: org.eclipse.jface.text,
  org.mockito,
  org.hamcrest
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.ui.tests
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.properties b/core/org.eclipse.cdt.ui.tests/plugin.properties
index 539b3adfb34..b436c948a08 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.properties
+++ b/core/org.eclipse.cdt.ui.tests/plugin.properties
@@ -11,6 +11,10 @@
 # Contributors:
 #	  Sergey Prigogin (Google) - initial implementation
 ###############################################################################
+
+pluginName = org.eclipse.cdt.ui.tests
+providerName = Eclipse CDT
+
 category.CodeReduction=C++ Code Reduction
 command.RemoveFunctionBodies.name=Remove Function Bodies
 command.RemoveFunctionBodies.label=Remove &Function Bodies
diff --git a/cross/org.eclipse.cdt.launch.serial.core/META-INF/MANIFEST.MF b/cross/org.eclipse.cdt.launch.serial.core/META-INF/MANIFEST.MF
index afff19a6674..86ebe17be34 100644
--- a/cross/org.eclipse.cdt.launch.serial.core/META-INF/MANIFEST.MF
+++ b/cross/org.eclipse.cdt.launch.serial.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Launch over Serial Core Plugin
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.launch.serial.core;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0",
  org.eclipse.debug.core;bundle-version="3.11.0",
@@ -15,3 +15,4 @@ Export-Package: org.eclipse.cdt.launch.serial
 Bundle-Activator: org.eclipse.cdt.launch.serial.internal.Activator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.cdt.launch.serial.core
+Bundle-Localization: plugin
diff --git a/cross/org.eclipse.cdt.launch.serial.core/build.properties b/cross/org.eclipse.cdt.launch.serial.core/build.properties
index e5a949cc43c..7b3c227b84a 100644
--- a/cross/org.eclipse.cdt.launch.serial.core/build.properties
+++ b/cross/org.eclipse.cdt.launch.serial.core/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
+               plugin.properties,\
                about.html
 src.includes = about.html
diff --git a/cross/org.eclipse.cdt.launch.serial.core/plugin.properties b/cross/org.eclipse.cdt.launch.serial.core/plugin.properties
new file mode 100644
index 00000000000..381e742c9f9
--- /dev/null
+++ b/cross/org.eclipse.cdt.launch.serial.core/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Launch over Serial Core Plugin
+providerName = Eclipse CDT
diff --git a/cross/org.eclipse.cdt.launch.serial.ui/META-INF/MANIFEST.MF b/cross/org.eclipse.cdt.launch.serial.ui/META-INF/MANIFEST.MF
index 7b2b106d32d..872eaf1326d 100644
--- a/cross/org.eclipse.cdt.launch.serial.ui/META-INF/MANIFEST.MF
+++ b/cross/org.eclipse.cdt.launch.serial.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ui
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.launch.serial.ui;singleton:=true
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-Version: 1.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0",
@@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0",
 Bundle-Activator: org.eclipse.cdt.launch.serial.ui.internal.Activator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.cdt.launch.serial.ui
+Bundle-Localization: plugin
diff --git a/cross/org.eclipse.cdt.launch.serial.ui/build.properties b/cross/org.eclipse.cdt.launch.serial.ui/build.properties
index 0574d9f1623..4d9e9263e78 100644
--- a/cross/org.eclipse.cdt.launch.serial.ui/build.properties
+++ b/cross/org.eclipse.cdt.launch.serial.ui/build.properties
@@ -4,6 +4,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
+               plugin.properties,\
                about.html,\
                cdt_logo_icon32.png,\
                about.properties,\
diff --git a/cross/org.eclipse.cdt.launch.serial.ui/plugin.properties b/cross/org.eclipse.cdt.launch.serial.ui/plugin.properties
new file mode 100644
index 00000000000..00ece3210fd
--- /dev/null
+++ b/cross/org.eclipse.cdt.launch.serial.ui/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Ui
+providerName = Eclipse CDT
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/META-INF/MANIFEST.MF
index aa248648559..e900467ff4c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: DSF-GDB test fragment
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests;singleton:=true
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit
 Automatic-Module-Name: org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests
-
+Bundle-Localization: fragment
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/build.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/build.properties
index 8ce195fb7bd..7f5203c2173 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/build.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/build.properties
@@ -15,5 +15,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               fragment.properties,\
                about.html
 src.includes = about.html
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/fragment.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/fragment.properties
new file mode 100644
index 00000000000..c8b196ea741
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/fragment.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = DSF-GDB test fragment
+providerName = Eclipse CDT
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF
index 3d7334de1c9..706cee8ee77 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: DSF-GDB test fragment
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb.tests;singleton:=true
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.cdt.dsf.gdb
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.8.1"
 Automatic-Module-Name: org.eclipse.cdt.dsf.gdb.tests
+Bundle-Localization: fragment
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/build.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/build.properties
index 3c35b53126e..9dd6ce760aa 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/build.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/build.properties
@@ -15,5 +15,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               fragment.properties,\
                about.html
 src.includes = about.html
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/fragment.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/fragment.properties
new file mode 100644
index 00000000000..c8b196ea741
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/fragment.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = DSF-GDB test fragment
+providerName = Eclipse CDT
diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF
index 85f40154a9b..31fd1f0ad35 100644
--- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: GDB DSF Debugger Extension Example
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.examples.dsf.gdb;singleton:=true
 Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.cdt.examples.dsf.gdb.GDBExamplePlugin
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.tm.terminal.control
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Export-Package: org.eclipse.cdt.examples.dsf.gdb;x-internal:=true,
  org.eclipse.cdt.examples.dsf.gdb.launch;x-internal:=true,
  org.eclipse.cdt.examples.dsf.gdb.service;x-internal:=true,
@@ -28,3 +28,4 @@ Export-Package: org.eclipse.cdt.examples.dsf.gdb;x-internal:=true,
  org.eclipse.cdt.examples.dsf.gdb.service.command.commands;x-internal:=true,
  org.eclipse.cdt.examples.dsf.gdb.viewmodel;x-internal:=true
 Automatic-Module-Name: org.eclipse.cdt.examples.dsf.gdb
+Bundle-Localization: plugin
diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/build.properties b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/build.properties
index 72c892905d1..53af5143475 100644
--- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/build.properties
+++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                plugin.xml
 src.includes = about.html
diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/plugin.properties b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/plugin.properties
new file mode 100644
index 00000000000..6d3c04f009a
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = GDB DSF Debugger Extension Example
+providerName = Eclipse CDT
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
index 5dcf115b429..fd51297975b 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: GDB/MI reference application tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.tests.dsf.gdb;singleton:=true
 Bundle-Version: 2.3.100.qualifier
 Bundle-Activator: org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin
-Bundle-Vendor: Ericsson
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.dsf,
  org.eclipse.cdt.core,
@@ -27,3 +27,4 @@ Export-Package: org.eclipse.cdt.dsf.mi.service;x-internal:=true,
  org.eclipse.cdt.tests.dsf.gdb.tests;x-internal:=true,
  org.eclipse.cdt.tests.dsf.gdb.tests.nonstop;x-internal:=true
 Automatic-Module-Name: org.eclipse.cdt.tests.dsf.gdb
+Bundle-Localization: plugin
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/build.properties b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/build.properties
index cc6772ab01e..29199d6236a 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/build.properties
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/build.properties
@@ -17,6 +17,7 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                data/,\
+               plugin.properties,\
                about.html
 source.. = src/
 src.includes = about.html
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/plugin.properties b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/plugin.properties
new file mode 100644
index 00000000000..a23d154d675
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = GDB/MI reference application tests
+providerName = Ericsson
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/META-INF/MANIFEST.MF
index e098d65c682..b1872fb771a 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: GDB Hardware Debugging Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.core.tests;singleton:=true
 Bundle-Version: 1.0.200.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.tests.Activator
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.launch,
  org.eclipse.debug.core
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.cdt.debug.gdbjtag.core.tests
+Bundle-Localization: plugin
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/build.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/build.properties
index 798d17d9722..3948c330454 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/build.properties
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                data/,\
+               plugin.properties,\
                about.html
 src.includes = about.html
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/plugin.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/plugin.properties
new file mode 100644
index 00000000000..466c9a6f317
--- /dev/null
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = GDB Hardware Debugging Tests
+providerName = Eclipse CDT
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 917c77fc4dd..0c5f514356a 100644
--- a/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Launch Bar Core Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.core.tests;singleton:=true
 Bundle-Version: 1.0.100.qualifier
 Fragment-Host: org.eclipse.launchbar.core;bundle-version="1.0.0"
@@ -8,3 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 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
diff --git a/launchbar/org.eclipse.launchbar.core.tests/build.properties b/launchbar/org.eclipse.launchbar.core.tests/build.properties
index c5c94d909b1..41c721a1130 100644
--- a/launchbar/org.eclipse.launchbar.core.tests/build.properties
+++ b/launchbar/org.eclipse.launchbar.core.tests/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                fragment.xml,\
+               fragment.properties,\
                about.html
diff --git a/launchbar/org.eclipse.launchbar.core.tests/fragment.properties b/launchbar/org.eclipse.launchbar.core.tests/fragment.properties
new file mode 100644
index 00000000000..85b0c256db6
--- /dev/null
+++ b/launchbar/org.eclipse.launchbar.core.tests/fragment.properties
@@ -0,0 +1,13 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Launch Bar Core Tests
diff --git a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
index a284f1323dc..054003311cb 100644
--- a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: LaunchBar Core
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
 Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.core.expressions
@@ -15,3 +15,4 @@ Export-Package: org.eclipse.launchbar.core,
  org.eclipse.launchbar.core.target,
  org.eclipse.launchbar.core.target.launch
 Automatic-Module-Name: org.eclipse.launchbar.core
+Bundle-Localization: plugin
diff --git a/launchbar/org.eclipse.launchbar.core/build.properties b/launchbar/org.eclipse.launchbar.core/build.properties
index e34cf111400..a0791e50481 100644
--- a/launchbar/org.eclipse.launchbar.core/build.properties
+++ b/launchbar/org.eclipse.launchbar.core/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
+               plugin.properties,\
                about.html,\
                schema/
diff --git a/launchbar/org.eclipse.launchbar.core/plugin.properties b/launchbar/org.eclipse.launchbar.core/plugin.properties
new file mode 100644
index 00000000000..f571f35d922
--- /dev/null
+++ b/launchbar/org.eclipse.launchbar.core/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = LaunchBar Core
+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 67e09e84587..0fdeae2a4ea 100644
--- a/launchbar/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: LaunchBar Remote Core
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.remote.core;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.launchbar.remote.core.internal.Activator
@@ -13,3 +13,4 @@ Bundle-ActivationPolicy: lazy
 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
diff --git a/launchbar/org.eclipse.launchbar.remote.core/build.properties b/launchbar/org.eclipse.launchbar.remote.core/build.properties
index bdcc25a2886..1500166975d 100644
--- a/launchbar/org.eclipse.launchbar.remote.core/build.properties
+++ b/launchbar/org.eclipse.launchbar.remote.core/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                about.html,\
                plugin.xml
diff --git a/launchbar/org.eclipse.launchbar.remote.core/plugin.properties b/launchbar/org.eclipse.launchbar.remote.core/plugin.properties
new file mode 100644
index 00000000000..af12dd547c9
--- /dev/null
+++ b/launchbar/org.eclipse.launchbar.remote.core/plugin.properties
@@ -0,0 +1,13 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = LaunchBar Remote Core
diff --git a/launchbar/org.eclipse.launchbar.remote.ui/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.remote.ui/META-INF/MANIFEST.MF
index 460f735c64e..a694591ce71 100644
--- a/launchbar/org.eclipse.launchbar.remote.ui/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.remote.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Remote Launch Target UI
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.remote.ui;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.launchbar.remote.ui.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.remote.core;bundle-version="2.0.0",
@@ -16,3 +16,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.launchbar.remote.ui
 Automatic-Module-Name: org.eclipse.launchbar.remote.ui
+Bundle-Localization: plugin
diff --git a/launchbar/org.eclipse.launchbar.remote.ui/build.properties b/launchbar/org.eclipse.launchbar.remote.ui/build.properties
index 5e9fdac40c5..13b6f75ccc6 100644
--- a/launchbar/org.eclipse.launchbar.remote.ui/build.properties
+++ b/launchbar/org.eclipse.launchbar.remote.ui/build.properties
@@ -2,6 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                about.html,\
                about.ini,\
                about.mappings,\
diff --git a/launchbar/org.eclipse.launchbar.remote.ui/plugin.properties b/launchbar/org.eclipse.launchbar.remote.ui/plugin.properties
new file mode 100644
index 00000000000..cfa8aa9d13f
--- /dev/null
+++ b/launchbar/org.eclipse.launchbar.remote.ui/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Remote Launch Target UI
+providerName = Eclipse CDT
diff --git a/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
index 6cca97c0cf7..cc953ca898c 100644
--- a/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Launch Bar UI Controls
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.osgi.services;bundle-version="3.5.0",
  org.eclipse.core.runtime,
  org.eclipse.ui,
diff --git a/launchbar/org.eclipse.launchbar.ui.controls/plugin.properties b/launchbar/org.eclipse.launchbar.ui.controls/plugin.properties
index 1a942c2caa3..96d32888b5e 100644
--- a/launchbar/org.eclipse.launchbar.ui.controls/plugin.properties
+++ b/launchbar/org.eclipse.launchbar.ui.controls/plugin.properties
@@ -1,3 +1,6 @@
+pluginName = Launch Bar UI Controls
+providerName = Eclipse CDT
+
 launchToolBar.label = LaunchBar
 targetsView.name = Launch Targets
 targetsContent.name = Launch Targets
diff --git a/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF
index c74e244bd71..eae30467195 100644
--- a/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Launch Bar UI Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.ui.tests
 Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.12.0",
@@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.launchbar.ui.controls.internal
 Bundle-Activator: org.eclipse.launchbar.ui.tests.internal.Activator
 Automatic-Module-Name: org.eclipse.launchbar.ui.tests
+Bundle-Localization: plugin
diff --git a/launchbar/org.eclipse.launchbar.ui.tests/build.properties b/launchbar/org.eclipse.launchbar.ui.tests/build.properties
index 17daa5b49ca..b67aba1a416 100644
--- a/launchbar/org.eclipse.launchbar.ui.tests/build.properties
+++ b/launchbar/org.eclipse.launchbar.ui.tests/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                about.html
diff --git a/launchbar/org.eclipse.launchbar.ui.tests/plugin.properties b/launchbar/org.eclipse.launchbar.ui.tests/plugin.properties
new file mode 100644
index 00000000000..573511b45e3
--- /dev/null
+++ b/launchbar/org.eclipse.launchbar.ui.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Launch Bar UI Tests
+providerName = Eclipse CDT
diff --git a/launchbar/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
index 6239bf69290..b5c04486b54 100644
--- a/launchbar/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: LaunchBar UI
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.ui;singleton:=true
 Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.launchbar.ui.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.ide,
diff --git a/launchbar/org.eclipse.launchbar.ui/plugin.properties b/launchbar/org.eclipse.launchbar.ui/plugin.properties
index 1a942c2caa3..cd8c044c4dc 100644
--- a/launchbar/org.eclipse.launchbar.ui/plugin.properties
+++ b/launchbar/org.eclipse.launchbar.ui/plugin.properties
@@ -1,3 +1,6 @@
+pluginName = LaunchBar UI
+providerName = Eclipse CDT
+
 launchToolBar.label = LaunchBar
 targetsView.name = Launch Targets
 targetsContent.name = Launch Targets
diff --git a/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF b/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF
index 7f7f7b471a9..0b71926c558 100644
--- a/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF
+++ b/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Serial Port
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.native.serial
 Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.cdt.serial
 Automatic-Module-Name: org.eclipse.cdt.native.serial
+Bundle-Localization: plugin
diff --git a/native/org.eclipse.cdt.native.serial/build.properties b/native/org.eclipse.cdt.native.serial/build.properties
index 8d185293761..8dd5348ff3c 100644
--- a/native/org.eclipse.cdt.native.serial/build.properties
+++ b/native/org.eclipse.cdt.native.serial/build.properties
@@ -3,6 +3,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                os/,\
+               plugin.properties,\
                about.html,\
                cdt_logo_icon32.png
 src.includes = native_src/,\
diff --git a/native/org.eclipse.cdt.native.serial/plugin.properties b/native/org.eclipse.cdt.native.serial/plugin.properties
new file mode 100644
index 00000000000..c2a40a95aee
--- /dev/null
+++ b/native/org.eclipse.cdt.native.serial/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = Serial Port
+providerName = Eclipse CDT
diff --git a/qt/org.eclipse.cdt.qt.core.tests/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core.tests/META-INF/MANIFEST.MF
index f057762877b..01c4a49a33b 100644
--- a/qt/org.eclipse.cdt.qt.core.tests/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.core.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: QML Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.qt.core.tests
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.osgi;bundle-version="3.10.100",
@@ -12,3 +12,4 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.cdt.qt.core.tests.Activator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.cdt.qt.core.tests
+Bundle-Localization: plugin
diff --git a/qt/org.eclipse.cdt.qt.core.tests/build.properties b/qt/org.eclipse.cdt.qt.core.tests/build.properties
index 9cbab3c135e..2b112c46131 100644
--- a/qt/org.eclipse.cdt.qt.core.tests/build.properties
+++ b/qt/org.eclipse.cdt.qt.core.tests/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                about.html
 src.includes = about.html
diff --git a/qt/org.eclipse.cdt.qt.core.tests/plugin.properties b/qt/org.eclipse.cdt.qt.core.tests/plugin.properties
new file mode 100644
index 00000000000..c425c9670f4
--- /dev/null
+++ b/qt/org.eclipse.cdt.qt.core.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = QML Tests
+providerName = Eclipse CDT
diff --git a/visualizer/org.eclipse.cdt.visualizer.examples/build.properties b/visualizer/org.eclipse.cdt.visualizer.examples/build.properties
index aff27c032a4..6a311293fd8 100644
--- a/visualizer/org.eclipse.cdt.visualizer.examples/build.properties
+++ b/visualizer/org.eclipse.cdt.visualizer.examples/build.properties
@@ -3,5 +3,6 @@ source.. = src/,\
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
                plugin.xml
 src.includes = about.html
diff --git a/windows/org.eclipse.cdt.msw.build.tests/META-INF/MANIFEST.MF b/windows/org.eclipse.cdt.msw.build.tests/META-INF/MANIFEST.MF
index 2c1b051ff50..9e7fd218125 100644
--- a/windows/org.eclipse.cdt.msw.build.tests/META-INF/MANIFEST.MF
+++ b/windows/org.eclipse.cdt.msw.build.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: MSVC Build Integration Plug-in Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.msw.build.tests
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.cdt.msw.build.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.0",
@@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.0",
  org.junit,
  org.eclipse.cdt.msw.build
 Export-Package: org.eclipse.cdt.internal.msw.build.tests;x-internal:=true
+Bundle-Localization: plugin
diff --git a/windows/org.eclipse.cdt.msw.build.tests/build.properties b/windows/org.eclipse.cdt.msw.build.tests/build.properties
index 774eb143934..2c160b4d6f8 100644
--- a/windows/org.eclipse.cdt.msw.build.tests/build.properties
+++ b/windows/org.eclipse.cdt.msw.build.tests/build.properties
@@ -1,5 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               plugin.properties,\
                .
 src.includes = about.html
diff --git a/windows/org.eclipse.cdt.msw.build.tests/plugin.properties b/windows/org.eclipse.cdt.msw.build.tests/plugin.properties
new file mode 100644
index 00000000000..5374456e6ab
--- /dev/null
+++ b/windows/org.eclipse.cdt.msw.build.tests/plugin.properties
@@ -0,0 +1,14 @@
+##################################################################################
+# Copyright (c) 2020 Torbjörn Svensson and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License 2.0 which accompanies this distribution, and is
+# available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Torbjörn Svensson - initial API and implementation
+##################################################################################
+
+pluginName = MSVC Build Integration Plug-in Tests
+providerName = Eclipse CDT
diff --git a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF b/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
index 8ceb183c8ac..da0cd0ebbd8 100644
--- a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
+++ b/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: MSVC Build Integration Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.msw.build;singleton:=true
 Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.cdt.msw.build.Activator
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.cdt.msw.build
 Export-Package: org.eclipse.cdt.msw.build,
  org.eclipse.cdt.msw.build.core
diff --git a/windows/org.eclipse.cdt.msw.build/plugin.properties b/windows/org.eclipse.cdt.msw.build/plugin.properties
index c1e4cfe0a14..272a006cae7 100644
--- a/windows/org.eclipse.cdt.msw.build/plugin.properties
+++ b/windows/org.eclipse.cdt.msw.build/plugin.properties
@@ -1,3 +1,6 @@
+pluginName = MSVC Build Integration Plug-in
+providerName = Eclipse CDT
+
 toolchain.name=Microsoft Visual C++
 
 compiler.name.abstract=Abstract Compiler