diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index 3a28e657208..ffab16382d0 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -1,4 +1,4 @@
-pluginName=C Development Tools Core
+pluginName=C/C++ Development Tools Core
 providerName=Eclipse.org
 
 cnature.name=C Nature
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 4e3ec24c8d2..c8975dc1371 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -1,4 +1,4 @@
-pluginName=C Development Tools UI
+pluginName=C/C++ Development Tools UI
 providerName=Eclipse.org
 
 elementFiltersName=CElement Filters
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.properties b/debug/org.eclipse.cdt.debug.core/plugin.properties
index f54c0db4013..29baeaa2cfd 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.core/plugin.properties
@@ -1,4 +1,4 @@
-pluginName=CDT Debug Core Plug-in
+pluginName=CDT Debug Model
 providerName=Eclipse.org
 
 CDTDebugger.name=C/C++ Core Debugger Extension
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.properties b/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
index 3b561cb6e64..11be80f158e 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.properties
@@ -1,4 +1,4 @@
-pluginName=GDB/MI CDT Debugger Core
+pluginName=GDB/MI CDI Debugger Core
 providerName=Eclipse.org
 
 GDBDebugger.name=GDB Debugger
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index 83d3192901a..bef9d6ec5e0 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -3,7 +3,7 @@
 #  All Rights Reserved.
 ######################################################################
 
-pluginName=C/C++ Debug UI
+pluginName=CDT Debug UI
 providerName=Eclipse.org
 
 RegistersView.name=Registers
diff --git a/launch/org.eclipse.cdt.launch/plugin.properties b/launch/org.eclipse.cdt.launch/plugin.properties
index 9d6813f5c25..7e9fe58bdff 100644
--- a/launch/org.eclipse.cdt.launch/plugin.properties
+++ b/launch/org.eclipse.cdt.launch/plugin.properties
@@ -8,7 +8,7 @@
 # Contributors:
 #   QNX Software Systems Ltd. - Initial implementation
 ######################################################################
-pluginName=CDT Launch Plug-in
+pluginName=CDT Launching Support
 providerName=Eclipse.org
 
 LocalCDTLaunch.name= Local C/C++ Application