diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.properties b/discovery/org.eclipse.tm.discovery-feature/feature.properties
index de3419d5677..59047213356 100644
--- a/discovery/org.eclipse.tm.discovery-feature/feature.properties
+++ b/discovery/org.eclipse.tm.discovery-feature/feature.properties
@@ -24,8 +24,8 @@ detecting remote network services. Includes Source.
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml
index d187c90a333..817c7f7c043 100644
--- a/discovery/org.eclipse.tm.discovery-feature/feature.xml
+++ b/discovery/org.eclipse.tm.discovery-feature/feature.xml
@@ -20,8 +20,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.properties b/rse/examples/org.eclipse.rse.examples-feature/feature.properties
index 6fcf9c7cf2d..75c1cc7fcf9 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.properties
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.properties
@@ -20,8 +20,8 @@ featureName=Remote System Explorer Examples
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index 8400a702e87..626f5e63305 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse-feature/feature.properties b/rse/features/org.eclipse.rse-feature/feature.properties
index 02101763468..99fc0ea4dcb 100644
--- a/rse/features/org.eclipse.rse-feature/feature.properties
+++ b/rse/features/org.eclipse.rse-feature/feature.properties
@@ -23,8 +23,8 @@ on remote systems through SSH, FTP or dstore protocols.
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index 6daae3b6eb8..8c2fdfd1d7b 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -20,8 +20,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties
index e019a146131..b93ac701c32 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.core-feature/feature.properties
@@ -23,8 +23,9 @@ user documentation.
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
+epMilestoneSiteName=The Eclipse Project 3.3 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index 59bc7005862..d3f5ae1d34a 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -19,8 +19,8 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%epMilestoneSiteName" url="http://download.eclipse.org/eclipse/updates/3.3milestones/site.xml"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
index 682ae1daa7a..009c6df73e1 100644
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=Remote System Explorer Core Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=Remote System Explorer (RSE) core including \
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
index 174da64cf23..eece63423a9 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
@@ -18,8 +18,8 @@ featureName=RSE DStore Services
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=RSE DStore is an extensible tooling communication layer.
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index 7f23523715b..75a2b188907 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
index 3f25b1b1069..66b24388f13 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=RSE DStore Services Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=RSE DStore is an extensible tooling communication layer.
diff --git a/rse/features/org.eclipse.rse.efs-feature/feature.properties b/rse/features/org.eclipse.rse.efs-feature/feature.properties
index c7819ed43d2..f62d26568ab 100644
--- a/rse/features/org.eclipse.rse.efs-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.efs-feature/feature.properties
@@ -22,8 +22,8 @@ Does not work for Eclipse Workspace Projects yet. Includes Source.
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.efs-feature/feature.xml b/rse/features/org.eclipse.rse.efs-feature/feature.xml
index e8fc4a731ff..6738d3aaa84 100644
--- a/rse/features/org.eclipse.rse.efs-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.efs-feature/feature.xml
@@ -20,8 +20,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/feature.properties
index ed4f3821c87..bdfbc9cc7ff 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.properties
@@ -18,8 +18,8 @@ featureName=RSE FTP Services
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=The Remote System Explorer (RSE) ftp feature contains an FTP-based \
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 7037eaeba45..8a2fe5ad555 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
index bdf51122b71..52cd8166148 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=RSE FTP Services Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=The Remote System Explorer (RSE) stp contains an FTP-based \
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.properties b/rse/features/org.eclipse.rse.local-feature/feature.properties
index 88abe2b998b..aea3d07ef61 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.local-feature/feature.properties
@@ -18,8 +18,8 @@ featureName=RSE Local Services
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=Remote System Explorer (RSE) Local Services provides an \
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index 318b7b4b331..2844489055c 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
index e31df7cb044..21ce9236e64 100644
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=RSE Local Services Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=Remote System Explorer (RSE) Local Services provides an \
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.properties b/rse/features/org.eclipse.rse.remotecdt-feature/feature.properties
index 5cca335d5ac..352f8b41962 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.properties
@@ -23,8 +23,8 @@ Includes Source.
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
index 074779e0eab..73049483362 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
@@ -20,8 +20,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/feature.properties
index e2db97ba996..172ede1f908 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=RSE CDT Remote Launcher Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=A Launch Configuration \
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.properties b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
index 2a41cdedac0..00a2153f22e 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
@@ -23,8 +23,8 @@ for the core RSE frameworks, SSH, FTP or dstore protocols.
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index 7c1ba063dc1..cf6237ec1c5 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
index d158ad34240..62460a1e059 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
@@ -18,8 +18,8 @@ featureName=RSE SSH Services
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An SSH-based \
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index dd3ccb9bcf1..964976c61ae 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
index 638d573ac36..e4955952c43 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=RSE SSH Services Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An SSH-based \
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.properties b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
index bd746d2d707..c8485a15017 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.properties
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
@@ -20,8 +20,8 @@ featureName=RSE Unit Tests
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=RSE Unit Tests. Includes Source.
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 4cfd7a0c8dc..35f4e306436 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -18,8 +18,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal-feature/feature.properties b/terminal/org.eclipse.tm.terminal-feature/feature.properties
index 8e8e6c4a281..ab6eba28f5f 100644
--- a/terminal/org.eclipse.tm.terminal-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal-feature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal Widget
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An ANSI (vt102) compatible Terminal widget.
diff --git a/terminal/org.eclipse.tm.terminal-feature/feature.xml b/terminal/org.eclipse.tm.terminal-feature/feature.xml
index c0bdcb789f2..2fb55bfddfd 100644
--- a/terminal/org.eclipse.tm.terminal-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal-feature/feature.xml
@@ -18,8 +18,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties b/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
index 510af57e71b..bc2d7c3dcae 100644
--- a/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal Widget Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An ANSI (vt102) compatible Terminal widget.
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.properties b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.properties
index 86a05ae90c1..ced75dc8c2c 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.properties
@@ -24,8 +24,8 @@ plug-ins for Serial, SSH and Telnet connections. Includes Source Code.
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
index cb0f9087428..29b7367127e 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <includes
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/feature.properties b/terminal/org.eclipse.tm.terminal.serial-feature/feature.properties
index d314f4bba73..1470ea24b87 100644
--- a/terminal/org.eclipse.tm.terminal.serial-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.serial-feature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal Serial Connector
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=A serial line connector for the Terminal using javacomm API
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml b/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
index 35d2713223d..e9694bc7f7d 100644
--- a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
@@ -18,8 +18,10 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <!-- TODO reference the RXTX discovery site once it exists
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      -->
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties b/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
index dddd2ed8f76..31b3208feb9 100644
--- a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal Serial Connector Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=A serial line connector for the Terminal using javacomm API
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.properties b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.properties
index 08e38b95099..504a4030f17 100644
--- a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal Ssh Connector
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An SSH connector implementation for the Terminal.
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
index afb7a43c743..86fbe13a10b 100644
--- a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
@@ -18,8 +18,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties b/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
index 00f130d2662..e7bc59bac6c 100644
--- a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal Ssh Connector Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An SSH connector implementation for the Terminal.
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/feature.properties b/terminal/org.eclipse.tm.terminal.view-feature/feature.properties
index a9915fa03a1..404a41a3e14 100644
--- a/terminal/org.eclipse.tm.terminal.view-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.view-feature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal View
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An Eclipse Workbench standalone view for the Terminal widget.
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
index 820252946ab..b797c69d03f 100644
--- a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -18,8 +18,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties b/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
index 76934101653..418db1a8ae1 100644
--- a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
@@ -20,8 +20,8 @@ featureName=TM Terminal View Source
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 2.0 Milestone Updates
 
 # "description" property - description of the feature
 description=An Eclipse Workbench standalone view for the Terminal widget.