diff --git a/releng/org.eclipse.tm.repo/category.xml b/releng/org.eclipse.tm.repo/category.xml
index c8c97a004f1..e4bed8b68e9 100644
--- a/releng/org.eclipse.tm.repo/category.xml
+++ b/releng/org.eclipse.tm.repo/category.xml
@@ -15,6 +15,9 @@
    <feature url="features/org.eclipse.rse.useractions_0.0.0.jar" id="org.eclipse.rse.useractions" version="0.0.0">
       <category name="tm_37_main"/>
    </feature>
+   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.0.0.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.0.0">
+      <category name="tm_37_optional"/>
+   </feature>
    <feature url="features/org.eclipse.rse.examples_0.0.0.jar" id="org.eclipse.rse.examples" version="0.0.0">
       <category name="tm_37_optional"/>
    </feature>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.properties b/rse/examples/org.eclipse.rse.examples-feature/feature.properties
index 29c3bef4943..e1b8d53fa75 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.properties
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Remote System Explorer Examples
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse-feature/feature.properties b/rse/features/org.eclipse.rse-feature/feature.properties
index 938fda2852b..693797664f0 100644
--- a/rse/features/org.eclipse.rse-feature/feature.properties
+++ b/rse/features/org.eclipse.rse-feature/feature.properties
@@ -24,7 +24,7 @@ on remote systems through SSH, FTP or dstore protocols.
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties
index 38e244849bb..84e828cb383 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.core-feature/feature.properties
@@ -24,7 +24,7 @@ user documentation.
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
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 9184be0e670..52395a3cfaa 100644
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE Core Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=Remote System Explorer (RSE) core including \
diff --git a/rse/features/org.eclipse.rse.core.source/feature.properties b/rse/features/org.eclipse.rse.core.source/feature.properties
index 9184be0e670..52395a3cfaa 100644
--- a/rse/features/org.eclipse.rse.core.source/feature.properties
+++ b/rse/features/org.eclipse.rse.core.source/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE Core Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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 2375988d4d5..5753e185583 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
@@ -19,7 +19,7 @@ featureName=RSE DStore Services
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
index c179e251a64..fb3e535c83e 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE DStore Services Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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.source/feature.properties b/rse/features/org.eclipse.rse.dstore.source/feature.properties
index c179e251a64..fb3e535c83e 100644
--- a/rse/features/org.eclipse.rse.dstore.source/feature.properties
+++ b/rse/features/org.eclipse.rse.dstore.source/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE DStore Services Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=RSE DStore is an extensible tooling communication layer.
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/feature.properties
index b81d76373e0..77a656fda4d 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.properties
@@ -19,7 +19,7 @@ featureName=RSE FTP Service
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
index b90ce56aff8..bdd31913374 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE FTP Service Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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.source/feature.properties b/rse/features/org.eclipse.rse.ftp.source/feature.properties
index b90ce56aff8..bdd31913374 100644
--- a/rse/features/org.eclipse.rse.ftp.source/feature.properties
+++ b/rse/features/org.eclipse.rse.ftp.source/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE FTP Service Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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.local-feature/feature.properties b/rse/features/org.eclipse.rse.local-feature/feature.properties
index 5ac0154949e..a525eff7785 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.local-feature/feature.properties
@@ -19,7 +19,7 @@ featureName=RSE Local Services
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
index fec9715eb84..3a00e5b2d08 100644
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE Local Services Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 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.source/feature.properties b/rse/features/org.eclipse.rse.local.source/feature.properties
index fec9715eb84..3a00e5b2d08 100644
--- a/rse/features/org.eclipse.rse.local.source/feature.properties
+++ b/rse/features/org.eclipse.rse.local.source/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE Local Services Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=Remote System Explorer (RSE) Local Services provides an \
diff --git a/rse/features/org.eclipse.rse.scp-feature/feature.properties b/rse/features/org.eclipse.rse.scp-feature/feature.properties
index a3e78c76ddd..059c6f39a2b 100644
--- a/rse/features/org.eclipse.rse.scp-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.scp-feature/feature.properties
@@ -20,7 +20,7 @@ featureName=RSE SCP File Services (Incubation)
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=SCP file services for the Remote System Explorer (RSE). \
diff --git a/rse/features/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties
index 0d505b283c0..8fa9876a726 100644
--- a/rse/features/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties
@@ -26,7 +26,7 @@ featureName=RSE SCP Files Services Source (Incubation)
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=SCP file services for the Remote System Explorer (RSE). \
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.properties b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
index da24a4a6c8a..57c68f6e783 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
@@ -24,7 +24,7 @@ for the core RSE frameworks, SSH, FTP or dstore protocols.
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
index e95050a0f8b..ce1d8a7758b 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
@@ -19,7 +19,7 @@ featureName=RSE SSH Services
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=An SSH-based \
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 72edcb60803..78f9592def5 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE SSH Services Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=An SSH-based \
diff --git a/rse/features/org.eclipse.rse.ssh.source/feature.properties b/rse/features/org.eclipse.rse.ssh.source/feature.properties
index 72edcb60803..78f9592def5 100644
--- a/rse/features/org.eclipse.rse.ssh.source/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh.source/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE SSH Services Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=An SSH-based \
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.properties b/rse/features/org.eclipse.rse.telnet-feature/feature.properties
index 9909fd413b0..002c20895b3 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.properties
@@ -19,7 +19,7 @@ featureName=RSE Telnet Service
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=The Remote System Explorer (RSE) telnet feature contains \
diff --git a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.properties
index e0b348a4b21..7a07e279052 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE Telnet Service Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=The Remote System Explorer (RSE) telnet feature contains \
diff --git a/rse/features/org.eclipse.rse.telnet.source/feature.properties b/rse/features/org.eclipse.rse.telnet.source/feature.properties
index e0b348a4b21..7a07e279052 100644
--- a/rse/features/org.eclipse.rse.telnet.source/feature.properties
+++ b/rse/features/org.eclipse.rse.telnet.source/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE Telnet Service Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=The Remote System Explorer (RSE) telnet feature contains \
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/feature.properties
index 02eff2f1c0c..e51cfad6e5e 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.properties
@@ -19,10 +19,12 @@ featureName=RSE Terminals UI (Deprecated)
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
-description=A Terminal View Integration for RSE Shell and Terminal Services. Includes Source.
+description=A Terminal View Integration for RSE Shell and Terminal Services. Includes Source.\n\
+\n\
+Note: This feature is deprecated. Use the "Remote System Explorer Terminals View add-in" feature from the "Mobile and Device Development" category instead.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties
index 70a706369ca..021daf1c6ab 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties
@@ -25,10 +25,12 @@ featureName=RSE Terminals UI Source (Deprecated)
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
-description=A Terminal View Integration for RSE Shell and Terminal Services.
+description=A Terminal View Integration for RSE Shell and Terminal Services.\n\
+\n\
+Note: This feature is deprecated. Use the "Remote System Explorer Terminals View add-in" feature from the "Mobile and Device Development" category instead.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.terminals.source/feature.properties b/rse/features/org.eclipse.rse.terminals.source/feature.properties
index 70a706369ca..021daf1c6ab 100644
--- a/rse/features/org.eclipse.rse.terminals.source/feature.properties
+++ b/rse/features/org.eclipse.rse.terminals.source/feature.properties
@@ -25,10 +25,12 @@ featureName=RSE Terminals UI Source (Deprecated)
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
-description=A Terminal View Integration for RSE Shell and Terminal Services.
+description=A Terminal View Integration for RSE Shell and Terminal Services.\n\
+\n\
+Note: This feature is deprecated. Use the "Remote System Explorer Terminals View add-in" feature from the "Mobile and Device Development" category instead.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/features/org.eclipse.rse.useractions-feature/feature.properties b/rse/features/org.eclipse.rse.useractions-feature/feature.properties
index 0086de031a9..5a2a16225b7 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.useractions-feature/feature.properties
@@ -20,7 +20,7 @@ featureName=Remote System Explorer User Actions
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A framework for contributing user-defined actions and compile commands to RSE.
diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/feature.properties
index 4680bf64801..ff9aaf1c9c4 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplateFeature/feature.properties
@@ -22,7 +22,7 @@ featureName=Remote System Explorer User Actions Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A framework for contributing user-defined actions and compile commands to RSE.
diff --git a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.properties b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.properties
index a2829f33cb6..e3f6cffb1df 100644
--- a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.properties
@@ -24,7 +24,7 @@ for the user actions framework.
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.properties b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
index d5190330ac7..25bf5e77223 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.properties
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
@@ -21,7 +21,7 @@ featureName=RSE Unit Tests
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=RSE Unit Tests. Includes Source.
diff --git a/terminal/features/org.eclipse.tm.terminal-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal-feature/feature.properties
index 76d4220c4b5..fb2c19a00fc 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal-feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal Widget
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=An ANSI (vt102) compatible Terminal widget \
diff --git a/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
index cf408dcf5a8..af36110a80d 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal Widget Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=An ANSI (vt102) compatible Terminal widget.
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties
index fe4fd1a2e41..90a5aa59467 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties
@@ -1,5 +1,5 @@
 ####################################################################################################
-# Copyright (c) 2008, 2013 Mirko Raner and others.
+# Copyright (c) 2008, 2014 Mirko Raner and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -16,21 +16,23 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Local Terminal (Incubation)
+featureName=Local Terminal (Deprecated)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A terminal emulation for local shells and external tools.\n\
-Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac.
+Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac.\n\
+\n\
+Note: This feature is deprecated. Use the "Terminals View" feature from the "Mobile and Device Development" category instead.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2008, 2013 Mirko Raner and others.\n\
+Copyright (c) 2008, 2014 Mirko Raner and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
index 4284998b4cb..531aa31338e 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
@@ -1,5 +1,5 @@
 ####################################################################################################
-# Copyright (c) 2008, 2013 Mirko Raner and others.
+# Copyright (c) 2008, 2014 Mirko Raner and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -16,22 +16,24 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Local Terminal SDK (Incubation)
+featureName=Local Terminal SDK (Deprecated)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A terminal emulation for local shells and external tools.\n\
 Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac. Includes Source,\
-and the Terminal View required to drive the plugin.
+and the Terminal View required to drive the plugin.\n\
+\n\
+Note: This feature is deprecated. Use the "Terminals View" feature from the "Mobile and Device Development" category instead.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2008, 2013 Mirko Raner and others.\n\
+Copyright (c) 2008, 2014 Mirko Raner and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
index bd23f56c4e7..4d52ee3a86c 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2013 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2014 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -15,21 +15,23 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Target Management Terminal
+featureName=Target Management Terminal (Deprecated)
 
 # "description" property - description of the feature
 description=An ANSI (vt102) compatible Terminal including \
-plug-ins for Serial, SSH and Telnet connections. Includes Source Code.
+plug-ins for Serial, SSH and Telnet connections. Includes Source Code.\n\
+\n\
+Note: This feature is deprecated. Use the "Terminals View" feature from the "Mobile and Device Development" category instead.
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2013 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2014 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.properties
index a6a477dfe73..7def3abf561 100644
--- a/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal Serial Connector
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A serial line connector for the Terminal using RXTX API
diff --git a/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
index 5abb87f6cd4..e2c2abe8d81 100644
--- a/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal Serial Connector Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A serial line connector for the Terminal using RXTX API
diff --git a/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.properties
index 9d10cf376e5..2297493da30 100644
--- a/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal SSH Connector
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=An SSH connector implementation for the Terminal.
diff --git a/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
index 70727c1a91d..63809d638d4 100644
--- a/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal SSH Connector Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=An SSH connector implementation for the Terminal.
diff --git a/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.properties
index f2a3629ec18..40821dfaa52 100644
--- a/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal Telnet Connector
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A Telnet connector implementation for the Terminal.
diff --git a/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
index c15c856deec..38e216289fc 100644
--- a/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal Telnet Connector Source
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=A Telnet connector implementation for the Terminal.
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties
index 09a42466318..8a8bc026157 100644
--- a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Target Management Terminal Unit Tests
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
 description=TM Terminal Unit Tests. Includes Source.
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties
index 44187fc853a..0a6e4bdc5e7 100644
--- a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2013 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2014 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -15,16 +15,18 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Target Management Terminal View
+featureName=Target Management Terminal View (Deprecated)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
-description=An Eclipse Workbench standalone view for the Terminal widget.
+description=An Eclipse Workbench standalone view for the Terminal widget.\n\
+\n\
+Note: This feature is deprecated. Use the "Terminals View" feature from the "Mobile and Device Development" category instead.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
index 3682cb42a5e..7fec3cf2fbd 100644
--- a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2013 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2014 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -15,20 +15,22 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Target Management Terminal View Source
+featureName=Target Management Terminal View Source (Deprecated)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse TM Project
 
 # "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.5 Updates
+tmUpdateSiteName=Target Management 3.7 Updates
 
 # "description" property - description of the feature
-description=An Eclipse Workbench standalone view for the Terminal widget.
+description=An Eclipse Workbench standalone view for the Terminal widget.\n\
+\n\
+Note: This feature is deprecated. Use the "Terminals View" feature from the "Mobile and Device Development" category instead.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2013 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2014 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/about.properties b/terminal/plugins/org.eclipse.tm.terminal.view/about.properties
index 80d86be3092..ade0260762d 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view/about.properties
+++ b/terminal/plugins/org.eclipse.tm.terminal.view/about.properties
@@ -16,10 +16,10 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Target Management Terminal View\n\
+blurb=Target Management Terminal View (Deprecated)\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2013.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2014.  All rights reserved.\n\
 Visit http://www.eclipse.org/tm
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties
index d2d0bfc8108..a5e6493ad7f 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties
+++ b/terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties
@@ -1,5 +1,5 @@
 ##########################################################################
-# Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2014 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@
 # Martin Oberhuber (Wind River) - fixed copyright headers and beautified
 # Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
 ##########################################################################
-pluginName = Target Management Terminal View
+pluginName = Target Management Terminal View (Deprecated)
 providerName = Eclipse TM Project
 terminal.views.category.name = Terminal
 terminal.views.view.name = Terminal