diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties b/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties
index 55bd62cbcfd..ed4e14151ac 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties
@@ -21,8 +21,3 @@ TargetOptionsPage.label=GDB/MI Options
 
 VerboseMode.label=Verbose Mode
 VerboseMode.tooltip=Verbose Mode For gdb Console
-
-category.description = C/C++ debugging with the CDI (legacy) GDB debugger
-category.name = CDT CDI-GDB - GDB Debugging (Legacy)
-activity.description = C/C++ debugging with the CDI (legacy) GDB debugger
-activity.name = CDT CDI-GDB - GDB Debugging (Legacy)
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index f8a1a277081..6d9b721cda6 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -84,38 +84,5 @@
          </enablement>
       </consolePageParticipant>
    </extension>
-    <extension
-         point="org.eclipse.ui.activities">
- 
-      <category
-            name="%category.name"
-            description="%category.description"
-            id="org.eclipse.cdt.debug.cdigdbCategory">
-      </category>
-  
-       <categoryActivityBinding
-            activityId="org.eclipse.cdt.debug.cdigdbActivity"
-            categoryId="org.eclipse.cdt.debug.cdigdbCategory">
-      </categoryActivityBinding>
-  
-      <activity
-            name="%activity.name"
-            description="%activity.description"
-            id="org.eclipse.cdt.debug.cdigdbActivity">
-       </activity>
-
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.cdigdbActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.debug.mi.ui/org.eclipse.cdt.debug.mi.ui.MIPreferencePage">
-      </activityPatternBinding>
-   
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.cdigdbActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.DebuggerTypesPreferencePage">
-      </activityPatternBinding>
-        
-     </extension>
 
 </plugin>
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index ae575feb60a..24251dce153 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -246,8 +246,3 @@ sourceNotFoundEditor.name = C/C++ Source Not Found Editor
 displayMode.name = displayMode
 CastingCategory.description = Set of commands for displaying variables and expressions as other types or arrays.
 CastingCategory.name = Cast to Type or Array
-
-category.description = Commands for C/C++ debugging
-category.name = CDT Debug - C/C++ Development Tools
-activity.description = Commands for C/C++ debugging
-activity.name = CDT Debug - C/C++ Development Tools
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 69b7223759d..9e46217d06c 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -2376,48 +2376,5 @@
             commandId="org.eclipse.cdt.debug.ui.command.castToArray">
       </handler>
 	</extension>	
-
- 
-    <extension
-         point="org.eclipse.ui.activities">
- 
-      <category
-            name="%category.name"
-            description="%category.description"
-            id="org.eclipse.cdt.debug.ui.cdtCategory">
-      </category>
-  
-       <categoryActivityBinding
-            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
-            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
-      </categoryActivityBinding>
-  
-      <activity
-            name="%activity.name"
-            description="%activity.description"
-            id="org.eclipse.cdt.debug.ui.cdtActivity">
-       </activity>
-
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.CDebugPreferencePage">
-      </activityPatternBinding>
-   
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.breakpointactions.ActionsPreferencePage">
-      </activityPatternBinding>
-   
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SourcePreferencePage">
-      </activityPatternBinding>
-      
-		<defaultEnablement id="org.eclipse.cdt.debug.ui.cdtActivity" /> 
-       
-     </extension>
  
 </plugin>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
index 5a4c78d4733..642aa5b1d3f 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
@@ -41,8 +41,3 @@ command.nextTraceRecord.name=Next Trace Record
 command.prevTraceRecord.name=Previous Trace Record
 command.nextTraceRecord.description=Select Next Trace Record
 command.prevTraceRecord.description=Select Previous Trace Record
-
-category.description = C/C++ debugging with the DSF GDB debugger
-category.name = CDT DSF-GDB - GDB Debugging
-activity.description = C/C++ debugging with the DSF GDB debugger
-activity.name = CDT DSF-GDB - GDB Debugging
\ No newline at end of file
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
index 4c6e9675bb7..e1280bc9d31 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
@@ -447,40 +447,7 @@
              name="%tracepointActionsPrefPage.name">
       </page> 
    </extension>
-       <extension
-         point="org.eclipse.ui.activities">
- 
-      <category
-            name="%category.name"
-            description="%category.description"
-            id="org.eclipse.cdt.debug.dsfgdbCategory">
-      </category>
-  
-       <categoryActivityBinding
-            activityId="org.eclipse.cdt.debug.dsfgdbActivity"
-            categoryId="org.eclipse.cdt.debug.dsfgdbCategory">
-      </categoryActivityBinding>
-  
-      <activity
-            name="%activity.name"
-            description="%activity.description"
-            id="org.eclipse.cdt.debug.dsfgdbActivity">
-       </activity>
-
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.dsfgdbActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.dsf.gdb.ui/org.eclipse.cdt.dsf.gdb.ui.preferences">
-      </activityPatternBinding>
-      
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.dsfgdbActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.dsf.gdb.ui/org.eclipse.cdt.dsf.gdb.ui.preferences.TracepointActionsPreferencePage">
-      </activityPatternBinding>
-         
-     </extension>
-   <extension
+    <extension
          point="org.eclipse.ui.console.consolePageParticipants">
       <consolePageParticipant
             class="org.eclipse.cdt.dsf.gdb.internal.ui.console.ConsolePageParticipant"
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
index f37e87ec369..2c24784f98b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
@@ -66,8 +66,3 @@ StaleData.background.description=This color is used to indicate that a given ele
 
 debugUpdateModes.label = Debug Update Modes
 
-activity.name = Debug Update Modes
-category.description = Debug Services Framework
-category.name = CDT-DSF Debug Services Framework
-activity.description = Debug Services Framework
-activity.name.0 = CDT-DSF Debug Services Framework
\ No newline at end of file
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
index 73d37bb1f19..c9072e8599f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
@@ -671,48 +671,6 @@
          </description>
       </colorDefinition>
    </extension>
-   <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            id="org.eclipse.cdt.dsf.ui.activity.updateModes"
-            name="%activity.name">
-         <enabledWhen>
-	        <reference definitionId="org.eclipse.cdt.dsf.debug.ui.testIsUpdateModesActionSetActive"/>
-         </enabledWhen>
-      </activity>
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.dsf.ui.activity.updateModes"
-            pattern="org\.eclipse\.cdt\.dsf\.ui/org\.eclipse\.cdt\.dsf\.debug\.ui\.[A-Za-z]+\.viewmodel\.update\.actions\.refresh">
-      </activityPatternBinding>
-      
-   </extension>
-       <extension
-         point="org.eclipse.ui.activities">
- 
-      <category
-            name="%category.name"
-            description="%category.description"
-            id="org.eclipse.cdt.dsf.ui.dsfCategory">
-      </category>
-  
-       <categoryActivityBinding
-            activityId="org.eclipse.cdt.dsf.ui.dsfActivity"
-            categoryId="org.eclipse.cdt.dsf.ui.dsfCategory">
-      </categoryActivityBinding>
-  
-      <activity
-            name="%activity.name.0"
-            description="%activity.description"
-            id="org.eclipse.cdt.dsf.ui.dsfActivity">
-       </activity>
-
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
-           	isEqualityPattern="true" 
-            pattern="org.eclipse.cdt.dsf.ui/org.eclipse.cdt.dsf.debug.ui.preferences">
-      </activityPatternBinding>
-       
-     </extension>
    
    <extension point="org.eclipse.core.runtime.adapters">
       <factory 
diff --git a/releng/org.eclipse.cdt/plugin.properties b/releng/org.eclipse.cdt/plugin.properties
index 7946cf96ff5..b6b5840555b 100644
--- a/releng/org.eclipse.cdt/plugin.properties
+++ b/releng/org.eclipse.cdt/plugin.properties
@@ -12,3 +12,14 @@ pluginName=Eclipse C/C++ Development Tools
 providerName=Eclipse CDT
 cheatsheet.helloworld.desc=Create a Hello World Program in C++
 cheatsheet.helloworld.name=Hello World
+
+activity.name = Debug Update Modes
+activity.description.dsf = Debug Services Framework
+activity.name.dsf = CDT-DSF Debug Services Framework
+
+activity.description.dsfgdb = C/C++ debugging with the DSF GDB debugger
+activity.name.dsfgdb = CDT DSF-GDB - GDB Debugging
+activity.description.cdtdebug = Commands for C/C++ debugging
+activity.name.cdtdebug = CDT Debug - C/C++ Development Tools
+activity.description.cdigdb = C/C++ debugging with the CDI (legacy) GDB debugger
+activity.name.cdigdb = CDT CDI-GDB - GDB Debugging (Legacy)
\ No newline at end of file
diff --git a/releng/org.eclipse.cdt/plugin.xml b/releng/org.eclipse.cdt/plugin.xml
index f20738b7c95..0b2fbd8f9a5 100644
--- a/releng/org.eclipse.cdt/plugin.xml
+++ b/releng/org.eclipse.cdt/plugin.xml
@@ -19,6 +19,101 @@
             configId="org.eclipse.platform.introConfig"
             content="$nl$/intro/whatsNewExtensionContent.xml"/>
 
+   </extension>
+ 
+  
+    <extension
+         point="org.eclipse.ui.activities">
+      <activity
+            id="org.eclipse.cdt.dsf.ui.activity.updateModes"
+            name="%activity.name">
+         <enabledWhen>
+	        <reference definitionId="org.eclipse.cdt.dsf.debug.ui.testIsUpdateModesActionSetActive"/>
+         </enabledWhen>
+      </activity>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.dsf.ui.activity.updateModes"
+            pattern="org\.eclipse\.cdt\.dsf\.ui/org\.eclipse\.cdt\.dsf\.debug\.ui\.[A-Za-z]+\.viewmodel\.update\.actions\.refresh">
+      </activityPatternBinding>
+   </extension>
+    
+     <extension
+         point="org.eclipse.ui.activities">
+  
+      <activity
+            name="%activity.name.dsf"
+            description="%activity.description.dsf"
+            id="org.eclipse.cdt.dsf.ui.dsfActivity">
+       </activity>
+
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.dsf.ui/org.eclipse.cdt.dsf.debug.ui.preferences">
+      </activityPatternBinding>
+ 
+      <activity
+            name="%activity.name.dsfgdb"
+            description="%activity.description.dsfgdb"
+            id="org.eclipse.cdt.debug.dsfgdbActivity">
+       </activity>
+
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.dsfgdbActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.dsf.gdb.ui/org.eclipse.cdt.dsf.gdb.ui.preferences">
+      </activityPatternBinding>
+      
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.dsfgdbActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.dsf.gdb.ui/org.eclipse.cdt.dsf.gdb.ui.preferences.TracepointActionsPreferencePage">
+      </activityPatternBinding>
+ 
+       <activity
+            name="%activity.name.cdtdebug"
+            description="%activity.description.cdtdebug"
+            id="org.eclipse.cdt.debug.ui.cdtActivity">
+       </activity>
+
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.CDebugPreferencePage">
+      </activityPatternBinding>
+   
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.breakpointactions.ActionsPreferencePage">
+      </activityPatternBinding>
+   
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.ui.cdtActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SourcePreferencePage">
+      </activityPatternBinding>
+      
+		<defaultEnablement id="org.eclipse.cdt.debug.ui.cdtActivity" /> 
+		
+        <activity
+            name="%activity.name.cdigdb"
+            description="%activity.description.cdigdb"
+            id="org.eclipse.cdt.debug.cdigdbActivity">
+       </activity>
+
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.cdigdbActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.debug.mi.ui/org.eclipse.cdt.debug.mi.ui.MIPreferencePage">
+      </activityPatternBinding>
+   
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.cdigdbActivity"
+           	isEqualityPattern="true" 
+            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.DebuggerTypesPreferencePage">
+      </activityPatternBinding>
+    
    </extension>
    
    <!--extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">