diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
index 1fa7cf4fc91..c905c057d94 100644
--- a/releng/org.eclipse.rse.updatesite/category.xml
+++ b/releng/org.eclipse.rse.updatesite/category.xml
@@ -10,16 +10,16 @@
       <category name="TM and RSE Main Features"/>
    </feature>
    <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
-      <category name="TM and RSE Add-Ons"/>
+      <category name="TM and RSE Optional Add-Ons"/>
    </feature>
    <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier">
-      <category name="TM and RSE Add-Ons"/>
+      <category name="TM and RSE Optional Add-Ons"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_3.2.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.2.0.qualifier">
-      <category name="TM and RSE Add-Ons"/>
+      <category name="TM and RSE Optional Add-Ons"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_3.1.100.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.100.qualifier">
-      <category name="TM and RSE Add-Ons"/>
+      <category name="TM and RSE Optional Add-Ons"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_3.1.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.0.qualifier">
       <category name="TM and RSE Main Features"/>
@@ -32,7 +32,7 @@
          Remote System Explorer (RSE)
       </description>
    </category-def>
-   <category-def name="TM and RSE Add-Ons" label="TM and RSE Add-Ons">
+   <category-def name="TM and RSE Optional Add-Ons" label="TM and RSE Optional Add-Ons">
       <description>
          Examples, Tests and Incubation Plug-ins.
       </description>
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index c78f1d45208..16db223c581 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -631,57 +631,57 @@
 <!-- END_3_1_1 -->
 <!-- BEGIN_3_2 -->
    <feature url="features/org.eclipse.rse.core_3.2.0.qualifier.jar" id="org.eclipse.rse.core" version="3.2.0.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.dstore_3.2.0.qualifier.jar" id="org.eclipse.rse.dstore" version="3.2.0.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.ftp_3.0.200.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.200.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.local_2.1.200.qualifier.jar" id="org.eclipse.rse.local" version="2.1.200.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse_3.2.0.qualifier.jar" id="org.eclipse.rse" version="3.2.0.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.sdk_3.2.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.2.0.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.ssh_3.0.100.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.100.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.telnet_2.2.100.qualifier.jar" id="org.eclipse.rse.telnet" version="2.2.100.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_3.1.100.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.100.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.terminals_1.0.100.qualifier.jar" id="org.eclipse.rse.terminals" version="1.0.100.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_3.2.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.2.0.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.useractions_1.1.200.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.200.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier" os="win32" arch="x86">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_3.1.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.0.qualifier">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.local_0.1.0.qualifier.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.qualifier" os="linux,macosx,solaris">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.local.sdk_0.1.0.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.1.0.qualifier" os="linux,macosx,solaris">
-      <category name="TM and RSE 3.2 (uncategorized)"/>
+      <category name="TM and RSE Uncategorized 3.2"/>
    </feature>
-   <category-def name="TM and RSE 3.2 (uncategorized)" label="TM and RSE 3.2 (uncategorized)">
+   <category-def name="TM and RSE Uncategorized 3.2" label="TM and RSE Uncategorized 3.2">
       <description>
          Features and add-ons of the 3.2 release of Target Management / RSE.
       </description>