diff --git a/org.eclipse.tm.terminal-feature/feature.properties b/org.eclipse.tm.terminal-feature/feature.properties
index 8e8e6c4a281..ab6eba28f5f 100644
--- a/org.eclipse.tm.terminal-feature/feature.properties
+++ b/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/org.eclipse.tm.terminal-feature/feature.xml b/org.eclipse.tm.terminal-feature/feature.xml
index c0bdcb789f2..2fb55bfddfd 100644
--- a/org.eclipse.tm.terminal-feature/feature.xml
+++ b/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/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
index 510af57e71b..bc2d7c3dcae 100644
--- a/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
+++ b/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/org.eclipse.tm.terminal.sdk-feature/feature.properties b/org.eclipse.tm.terminal.sdk-feature/feature.properties
index 86a05ae90c1..ced75dc8c2c 100644
--- a/org.eclipse.tm.terminal.sdk-feature/feature.properties
+++ b/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/org.eclipse.tm.terminal.sdk-feature/feature.xml b/org.eclipse.tm.terminal.sdk-feature/feature.xml
index cb0f9087428..29b7367127e 100644
--- a/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/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/org.eclipse.tm.terminal.serial-feature/feature.properties b/org.eclipse.tm.terminal.serial-feature/feature.properties
index d314f4bba73..1470ea24b87 100644
--- a/org.eclipse.tm.terminal.serial-feature/feature.properties
+++ b/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/org.eclipse.tm.terminal.serial-feature/feature.xml b/org.eclipse.tm.terminal.serial-feature/feature.xml
index 35d2713223d..e9694bc7f7d 100644
--- a/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/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/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
index dddd2ed8f76..31b3208feb9 100644
--- a/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
+++ b/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/org.eclipse.tm.terminal.ssh-feature/feature.properties b/org.eclipse.tm.terminal.ssh-feature/feature.properties
index 08e38b95099..504a4030f17 100644
--- a/org.eclipse.tm.terminal.ssh-feature/feature.properties
+++ b/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/org.eclipse.tm.terminal.ssh-feature/feature.xml b/org.eclipse.tm.terminal.ssh-feature/feature.xml
index afb7a43c743..86fbe13a10b 100644
--- a/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/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/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
index 00f130d2662..e7bc59bac6c 100644
--- a/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/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/org.eclipse.tm.terminal.view-feature/feature.properties b/org.eclipse.tm.terminal.view-feature/feature.properties
index a9915fa03a1..404a41a3e14 100644
--- a/org.eclipse.tm.terminal.view-feature/feature.properties
+++ b/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/org.eclipse.tm.terminal.view-feature/feature.xml b/org.eclipse.tm.terminal.view-feature/feature.xml
index 820252946ab..b797c69d03f 100644
--- a/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/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/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
index 76934101653..418db1a8ae1 100644
--- a/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
+++ b/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.