diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
index fadb1c5346d..6a439f83c6e 100644
--- a/releng/org.eclipse.rse.updatesite/category.xml
+++ b/releng/org.eclipse.rse.updatesite/category.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.rse.sdk_3.3.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.3.0.qualifier">
-      <category name="TM and RSE Main Features"/>
-   </feature>
    <feature url="features/org.eclipse.rse_3.3.0.qualifier.jar" id="org.eclipse.rse" version="3.3.0.qualifier">
-      <category name="TM and RSE Main Features"/>
+      <category name="tm_33_main"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.sdk_3.3.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.3.0.qualifier">
+      <category name="tm_33_main"/>
    </feature>
    <feature url="features/org.eclipse.rse.useractions_1.1.300.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.300.qualifier">
-      <category name="TM and RSE Main Features"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.scp_0.1.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.1.0.qualifier">
-      <category name="TM and RSE Optional Add-Ons"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.3.0.qualifier.jar" id="org.eclipse.rse.wince" version="0.3.0.qualifier">
-      <category name="TM and RSE Optional Add-Ons"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.3.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.3.0.qualifier">
-      <category name="TM and RSE Optional Add-Ons"/>
+      <category name="tm_33_main"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_3.1.200.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.200.qualifier">
-      <category name="TM and RSE Optional Add-Ons"/>
+      <category name="tm_33_optional"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.2.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.2.0.qualifier"
-      <category name="TM and RSE Main Features"/>
+   <feature url="features/org.eclipse.rse.scp_0.1.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.1.0.qualifier">
+      <category name="tm_33_optional"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.tests_3.3.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.3.0.qualifier">
+      <category name="tm_33_optional"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.wince_0.3.0.qualifier.jar" id="org.eclipse.rse.wince" version="0.3.0.qualifier">
+      <category name="tm_33_optional"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.local.sdk_0.2.0.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.2.0.qualifier">
-      <category name="TM and RSE Optional Add-Ons"/>
+      <category name="tm_33_optional"/>
    </feature>
-   <category-def name="TM and RSE Main Features" label="TM and RSE Main Features">
+   <feature url="features/org.eclipse.tm.terminal.sdk_3.2.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.2.0.qualifier">
+      <category name="tm_33_main"/>
+   </feature>
+   <category-def name="tm_33_main" label="TM and RSE Main Features">
       <description>
-         Remote System Explorer (RSE)
+         TM and RSE Main Features
       </description>
    </category-def>
-   <category-def name="TM and RSE Optional Add-Ons" label="TM and RSE Optional Add-Ons">
+   <category-def name="tm_33_optional" label="TM and RSE Optional Add-Ons">
       <description>
          Examples, Tests and Incubation Plug-ins.
       </description>