diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 804e6f35a42..6fdf2eb475c 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -494,7 +494,8 @@ if [ x${DO_STATS} = x1 ]; then
     -compress \
     -p2.statsURI http://download.eclipse.org/stats/dsdp/tm \
     -p2.statsTrackedFeatures org.eclipse.rse.sdk,org.eclipse.rse.dstore,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples,org.eclipse.rse.tests,org.eclipse.rse.wince,org.eclipse.tm.discovery,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \
-    -p2.statsTrackedBundles org.eclipse.rse.core.source,org.eclipse.tm.terminal \
+    -p2.statsTrackedBundles org.eclipse.rse.core,org.eclipse.rse.core.source,org.eclipse.tm.terminal \
+    -p2.statsSuffix _tm320
     -vmargs -Xmx256M"
   echo $CMD
   $CMD
diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
index 56e6e020f21..1fa7cf4fc91 100644
--- a/releng/org.eclipse.rse.updatesite/category.xml
+++ b/releng/org.eclipse.rse.updatesite/category.xml
@@ -1,50 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
    <feature url="features/org.eclipse.rse.sdk_3.2.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.2.0.qualifier">
-      <category name="RSE"/>
+      <category name="TM and RSE Main Features"/>
    </feature>
    <feature url="features/org.eclipse.rse_3.2.0.qualifier.jar" id="org.eclipse.rse" version="3.2.0.qualifier">
-      <category name="RSE"/>
+      <category name="TM and RSE Main Features"/>
    </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="RSE"/>
-   </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 Terminal"/>
-   </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">
-      <category name="TM Terminal"/>
+      <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 Test and Incubation"/>
+      <category name="TM and RSE 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 Test and Incubation"/>
+      <category name="TM and RSE 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 Test and Incubation"/>
+      <category name="TM and RSE 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="RSE Examples"/>
+      <category name="TM and RSE Add-Ons"/>
    </feature>
-   <category-def name="RSE" label="RSE">
+   <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"/>
+   </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">
+      <category name="TM and RSE Main Features"/>
+   </feature>
+   <category-def name="TM and RSE Main Features" label="TM and RSE Main Features">
       <description>
          Remote System Explorer (RSE)
       </description>
    </category-def>
-   <category-def name="TM Terminal" label="TM Terminal">
+   <category-def name="TM and RSE Add-Ons" label="TM and RSE Add-Ons">
       <description>
-         Stand-alone Terminal View
-      </description>
-   </category-def>
-   <category-def name="TM Test and Incubation" label="TM Test and Incubation">
-      <description>
-         Test and Incubation Plug-ins.
-      </description>
-   </category-def>
-   <category-def name="RSE Examples" label="RSE Examples">
-      <description>
-         Example code for programming against the RSE API.
+         Examples, Tests and Incubation Plug-ins.
       </description>
    </category-def>
 </site>
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 344b388c3ea..c78f1d45208 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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </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"/>
+      <category name="TM and RSE 3.2 (uncategorized)"/>
    </feature>
-   <category-def name="TM and RSE 3.2" label="TM and RSE 3.2">
+   <category-def name="TM and RSE 3.2 (uncategorized)" label="TM and RSE 3.2 (uncategorized)">
       <description>
          Features and add-ons of the 3.2 release of Target Management / RSE.
       </description>