diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index fda2847210f..e7822c3aa5d 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -8,101 +8,116 @@
    </description>
 <!-- BEGIN_2_0 -->
    <feature url="features/org.eclipse.rse.core_2.0.0.v20070609-7P--EB7sQRxRjbc.jar" id="org.eclipse.rse.core" version="2.0.0.v20070609-7P--EB7sQRxRjbc">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.dstore_2.0.0.v20070609-7F--DUUEF6Ez0L1.jar" id="org.eclipse.rse.dstore" version="2.0.0.v20070609-7F--DUUEF6Ez0L1">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070609-77378_kE77Y7U9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070609-77378_kE77Y7U9K5G7A">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.local_2.0.0.v20070609-7_--AgI99h9c9c.jar" id="org.eclipse.rse.local" version="2.0.0.v20070609-7_--AgI99h9c9c">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse_2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.ssh_2.0.0.v20070609-78--_kE77Y7U7U.jar" id="org.eclipse.rse.ssh" version="2.0.0.v20070609-78--_kE77Y7U7U">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.telnet_2.0.0.v20070609-6378AgI99h9cEU5G7A.jar" id="org.eclipse.rse.telnet" version="2.0.0.v20070609-6378AgI99h9cEU5G7A">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.remotecdt_2.0.0.v20070609-4--8s733G3E3G.jar" id="org.eclipse.rse.remotecdt" version="2.0.0.v20070609-4--8s733G3E3G">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_2.0.0.v20070609-6--9oA55P5M7J.jar" id="org.eclipse.rse.tests" version="2.0.0.v20070609-6--9oA55P5M7J">
-      <category name="TM/RSE 2.0"/>
+      <category name="TM and RSE 2.0"/>
    </feature>
-   <category-def name="TM/RSE 2.0" label="TM/RSE 2.0">
+   <category-def name="TM and RSE 2.0" label="TM and RSE 2.0">
       <description>
          Features and add-ons of the 2.0 release of Target Management / RSE.
       </description>
    </category-def>
 <!-- END_2_0 -->
 <!-- BEGIN_2_0_patches -->
-   <feature url="features/org.eclipse.rse.ftp.2.0.0.patch_2.0.1.200707021623.jar" id="org.eclipse.rse.ftp.2.0.0.patch" version="2.0.1.200707021623" patch="true">
-      <category name="TM/RSE 2.0 patches"/>
+   <feature url="features/org.eclipse.rse.core_2.0.0.v20070706-7P--EB7sQRxRkbd.jar" id="org.eclipse.rse.core" version="2.0.0.v20070706-7P--EB7sQRxRkbd">
+      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
    </feature>
-   <category-def name="TM/RSE 2.0 patches" label="TM/RSE 2.0 patches">
+   <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070706-77378_kE77Y7V9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070706-77378_kE77Y7V9K5G7A">
+      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
+   </feature>
+   <feature url="features/org.eclipse.rse_2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB">
+      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq">
+      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.ftp.patch_2.0.0.v20070706-2--7w31181817.jar" id="org.eclipse.rse.ftp.patch" version="2.0.0.v20070706-2--7w31181817" patch="true">
+      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.core.patch_2.0.0.v20070706-2--7w31181817.jar" id="org.eclipse.rse.core.patch" version="2.0.0.v20070706-2--7w31181817" patch="true">
+      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
+   </feature>
+   <category-def name="TM and RSE 2.0 patches (aka 2.0.0.1)" label="TM and RSE 2.0 patches (aka 2.0.0.1)">
       <description>
-         Patches for features and add-ons of the 2.0 release of Target Management / RSE.
+         Patches for features and add-ons of the 2.0 release of Target Management / RSE.  Pick EITHER the patch-features OR the standard updated features, but not both.
       </description>
    </category-def>
 <!-- END_2_0_patches -->
 <!-- BEGIN_2_0_1 -->
    <feature url="features/org.eclipse.rse.core_2.0.1.qualifier.jar" id="org.eclipse.rse.core" version="2.0.1.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.dstore_2.0.1.qualifier.jar" id="org.eclipse.rse.dstore" version="2.0.1.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.ftp_2.0.1.qualifier.jar" id="org.eclipse.rse.ftp" version="2.0.1.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.local_2.0.1.qualifier.jar" id="org.eclipse.rse.local" version="2.0.1.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse_2.0.1.qualifier.jar" id="org.eclipse.rse" version="2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.sdk_2.0.1.qualifier.jar" id="org.eclipse.rse.sdk" version="2.0.1.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.ssh_2.0.1.qualifier.jar" id="org.eclipse.rse.ssh" version="2.0.1.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.telnet_2.0.1.qualifier.jar" id="org.eclipse.rse.telnet" version="2.0.1.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_2.0.0.qualifier.jar" id="org.eclipse.rse.examples" version="2.0.0.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.remotecdt_2.0.0.qualifier.jar" id="org.eclipse.rse.remotecdt" version="2.0.0.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.tm.discovery_2.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="2.0.0.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_2.0.0.qualifier.jar" id="org.eclipse.rse.tests" version="2.0.0.qualifier">
-      <category name="TM/RSE 2.0.1"/>
+      <category name="TM and RSE 2.0.1"/>
    </feature>
-   <category-def name="TM/RSE 2.0.1" label="TM/RSE 2.0.1">
+   <category-def name="TM and RSE 2.0.1" label="TM and RSE 2.0.1">
       <description>
          Features and add-ons of the 2.0.1 release of Target Management / RSE.
       </description>