diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index be02b4b3106..649a433d22c 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -52,7 +52,7 @@
 
         <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
 
-        <tm-stream>luna</tm-stream>
+        <tm-stream>mars</tm-stream>
         <tm-zipfile>${project.artifactId}.zip</tm-zipfile>
         <tm-install>/home/data/httpd/download.eclipse.org/tm/builds/${tm-stream}/nightly</tm-install>
         <sdk-version>4.4</sdk-version>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index 2251e6c0f08..31b541b1e8a 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.examples"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.examples.tutorial"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/examples/org.eclipse.rse.examples-feature/pom.xml b/rse/examples/org.eclipse.rse.examples-feature/pom.xml
index ee47d54d0f3..6f0620c6836 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/pom.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.examples</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index ae30f48b65a..b0543545c58 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
@@ -66,15 +66,6 @@
          version="0.0.0"
          search-location="both"/>
 
-<!-- Do not include the Terminals feature here. The Terminals feature
-     is superseeded by the TCF Terminals feature. All Terminals related
-     functionality is provided by the TCF project.
-   <includes
-         id="org.eclipse.rse.terminals"
-         version="0.0.0"
-         search-location="both"/>
--->
-
    <plugin
          id="org.eclipse.rse"
          download-size="7"
diff --git a/rse/features/org.eclipse.rse-feature/pom.xml b/rse/features/org.eclipse.rse-feature/pom.xml
index c60cd7f5299..22dcaa76f8c 100644
--- a/rse/features/org.eclipse.rse-feature/pom.xml
+++ b/rse/features/org.eclipse.rse-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index 27a6920f34a..38879ddf341 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.core"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.core-feature/pom.xml b/rse/features/org.eclipse.rse.core-feature/pom.xml
index f8201437370..e391cd80e7a 100644
--- a/rse/features/org.eclipse.rse.core-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.core-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.core</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index 8e2c5c43ca8..c04a73b2a89 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -19,7 +19,7 @@
 <feature
       id="org.eclipse.rse.dstore"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.dstore"
       license-feature="org.eclipse.license"
@@ -38,7 +38,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.dstore-feature/pom.xml b/rse/features/org.eclipse.rse.dstore-feature/pom.xml
index a5ed60bd565..663d990a9c3 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.dstore</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 02ebe850ea4..3be79d81cf1 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.ftp"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.files.ftp"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.ftp-feature/pom.xml b/rse/features/org.eclipse.rse.ftp-feature/pom.xml
index 9cd51fce370..8696b6f94dd 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ftp</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index 34de8351540..4368c135629 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.local"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.local"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.local-feature/pom.xml b/rse/features/org.eclipse.rse.local-feature/pom.xml
index 46e64cf6bc9..0546f99d4ae 100644
--- a/rse/features/org.eclipse.rse.local-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.local-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.local</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.scp-feature/feature.xml b/rse/features/org.eclipse.rse.scp-feature/feature.xml
index e1cfca769c5..0af8b40aa68 100644
--- a/rse/features/org.eclipse.rse.scp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.scp-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rse.scp"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.subsystems.files.scp"
       image="eclipse_update_120.jpg"
@@ -33,7 +33,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.scp-feature/pom.xml b/rse/features/org.eclipse.rse.scp-feature/pom.xml
index 09b83b7e2fa..13f2993dae6 100644
--- a/rse/features/org.eclipse.rse.scp-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.scp-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.scp</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index c3d9c3ac030..2efd5790733 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.sdk"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
@@ -63,14 +63,6 @@
          id="org.eclipse.rse.telnet.source"
          version="0.0.0"/>
 
-<!-- Do not include the Terminals feature here. The Terminals feature
-     is superseeded by the TCF Terminals feature. All Terminals related
-     functionality is provided by the TCF project.
-   <includes
-         id="org.eclipse.rse.terminals.source"
-         version="0.0.0"/>
--->
-
    <plugin
          id="org.eclipse.rse.sdk"
          download-size="7"
diff --git a/rse/features/org.eclipse.rse.sdk-feature/pom.xml b/rse/features/org.eclipse.rse.sdk-feature/pom.xml
index 480c0c7de82..2d839aca201 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.sdk</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index 2d4ccc09c64..1ab07567a44 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.ssh"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.ssh"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.ssh-feature/pom.xml b/rse/features/org.eclipse.rse.ssh-feature/pom.xml
index d56d949e428..a95e79ab2d9 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ssh</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index 4c69f515258..9832c103cfd 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.telnet"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.telnet"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.telnet-feature/pom.xml b/rse/features/org.eclipse.rse.telnet-feature/pom.xml
index b0897dff7bd..e0b9a25a81e 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.telnet</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index a59ece8f36a..ca98cad72bc 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.terminals"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.terminals.ui"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.terminals-feature/pom.xml b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
index 4a37522a785..b323bbbc3ac 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.terminals</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.useractions-feature/feature.xml b/rse/features/org.eclipse.rse.useractions-feature/feature.xml
index 3c3f5ce5ea7..da77a4b7112 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.useractions-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.useractions"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.useractions"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.useractions-feature/pom.xml b/rse/features/org.eclipse.rse.useractions-feature/pom.xml
index b81da077d8a..b0a8ffacf1d 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.useractions-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.useractions</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
index fab89c4155d..3f0caf142bb 100644
--- a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.useractions.sdk"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml b/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
index 5cdf73bce78..04cce7544d0 100644
--- a/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.useractions.sdk</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
index 2234544d1fb..61657eb56d8 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
index e5f473fce2b..67af8894dd8 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
index 11578877e5d..3166627b905 100644
--- a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.core.sdk"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
index 3aaaa7f189b..a08009edc55 100644
--- a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.core.sdk</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
index 65fbbc4272e..855f121dbe4 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.local"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
index 83b40907d93..be91b64974a 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
index 45716fbb3a4..3ca9d8ef761 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.local.sdk"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
index 016ef3c140d..2b013a9d578 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local.sdk</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.remote-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.remote-feature/feature.xml
index 46ffdefffda..73c3587227d 100644
--- a/terminal/features/org.eclipse.tm.terminal.remote-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.remote-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tm.terminal.remote.feature"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -30,7 +30,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.remote-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.remote-feature/pom.xml
index 6f4bfe93ad1..db3f4eba50e 100644
--- a/terminal/features/org.eclipse.tm.terminal.remote-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.remote-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.remote.feature</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/feature.xml
index 424ef3985b0..7f91c521e8e 100644
--- a/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tm.terminal.remote.sdk.feature"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -30,7 +30,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/pom.xml
index 64ce0cd11cc..23827bd677b 100644
--- a/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.remote.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.remote.sdk.feature</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
index 5b8d7c918b8..50dfb626704 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
index c797a1c8dfb..81a7bfaacd8 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.sdk</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
index d7939c87a65..864a0edeab8 100644
--- a/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.serial"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
index eb61dabde0e..d283a7da65a 100644
--- a/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.serial</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
index 189124c5fab..18fb09d318c 100644
--- a/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.ssh"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
index 60ba8d2db66..20e2e993aa4 100644
--- a/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.ssh</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
index a4f39c1252a..fc674ce79e0 100644
--- a/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.telnet"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
index a4ac202bbb6..2d5e57b6afe 100644
--- a/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.telnet</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
index 76c2333727c..e279ca16736 100644
--- a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.test"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
index 851c9116917..625bb965588 100644
--- a/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.test</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
index c540c0a6e8b..378b4cc70f0 100644
--- a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.view"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
index eeb809b681a..cdf0e8fbd9e 100644
--- a/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.view</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/wince/org.eclipse.rse.wince-feature/feature.xml b/wince/org.eclipse.rse.wince-feature/feature.xml
index b146321ee08..27b5ad48da8 100644
--- a/wince/org.eclipse.rse.wince-feature/feature.xml
+++ b/wince/org.eclipse.rse.wince-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.wince"
       label="%featureName"
-      version="0.3.200.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.subsystems.wince"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/4.0"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/wince/org.eclipse.rse.wince-feature/pom.xml b/wince/org.eclipse.rse.wince-feature/pom.xml
index 1db30e543cf..22bbf166cb8 100644
--- a/wince/org.eclipse.rse.wince-feature/pom.xml
+++ b/wince/org.eclipse.rse.wince-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.wince</artifactId>
-  <version>0.3.200-SNAPSHOT</version>
+  <version>4.0.0.qualifier</version>
   <packaging>eclipse-feature</packaging>
   <build>
           <plugins>