diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index abcd3b6d88b..414f0fce7f9 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -59,7 +59,7 @@
         
         <!-- Set up the default target platform to build against -->
         <license-site>http://download.eclipse.org/cbi/updates/license</license-site>
-        <platform-site>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6RC4-201606031000</platform-site>
+        <platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
         <platform-release-site>http://download.eclipse.org/releases/neon</platform-release-site>
 		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository</orbit-site>
         <cdt-site>http://download.eclipse.org/tools/cdt/builds/neon/milestones</cdt-site>
diff --git a/admin/target-defs/eclipse-4.4.x-luna.target b/admin/target-defs/eclipse-4.4.x-luna.target
index 3ddc2aa1e4e..f027b3d359a 100644
--- a/admin/target-defs/eclipse-4.4.x-luna.target
+++ b/admin/target-defs/eclipse-4.4.x-luna.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.4.x (Luna)" sequenceNumber="70">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.4.x (Luna)" sequenceNumber="71">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -10,7 +10,7 @@
 <repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.4.1.M20140925-0400"/>
+<unit id="org.eclipse.sdk.ide" version="4.4.2.M20150204-1700"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -23,7 +23,7 @@
 <repository location="http://download.eclipse.org/tm/updates/3.7"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.1.v20140901-1055"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.2.v20150123-0452"/>
 <repository location="http://download.eclipse.org/releases/luna"/>
 </location>
 </locations>
diff --git a/admin/target-defs/eclipse-4.5.x-mars.target b/admin/target-defs/eclipse-4.5.x-mars.target
index ee854f512cc..d7202f7156f 100644
--- a/admin/target-defs/eclipse-4.5.x-mars.target
+++ b/admin/target-defs/eclipse-4.5.x-mars.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.5.x (Mars)" sequenceNumber="93">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.5.x (Mars)" sequenceNumber="95">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -15,14 +15,14 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.test.feature.group" version="3.7.0.v20150428-2048"/>
-<unit id="org.eclipse.sdk.ide" version="4.5.0.I20150603-2000"/>
+<unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jgit.feature.group" version="4.0.0.201506090130-r"/>
-<unit id="org.eclipse.egit.feature.group" version="4.0.0.201506090130-r"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="8.7.0.201506070905"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.0.v20150601-0402"/>
+<unit id="org.eclipse.jgit.feature.group" version="4.1.1.201511131810-r"/>
+<unit id="org.eclipse.egit.feature.group" version="4.1.1.201511131810-r"/>
+<unit id="org.eclipse.cdt.sdk.feature.group" version="8.8.1.201602051005"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
 <repository location="http://download.eclipse.org/releases/mars"/>
 </location>
 </locations>
diff --git a/admin/target-defs/eclipse-4.6.x-neon.target b/admin/target-defs/eclipse-4.6.x-neon.target
index aee4e37a639..942ae86493a 100644
--- a/admin/target-defs/eclipse-4.6.x-neon.target
+++ b/admin/target-defs/eclipse-4.6.x-neon.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.6.x (Neon)" sequenceNumber="101">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.6.x (Neon)" sequenceNumber="103">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -10,20 +10,20 @@
 <repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.test.feature.group" version="3.7.0.v20150826-1546"/>
-<unit id="org.eclipse.sdk.ide" version="4.6.0.I20150916-2000"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201505221634"/>
 <repository location="http://download.eclipse.org/tm/updates/4.0"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jgit.feature.group" version="4.1.0.201509280440-r"/>
-<unit id="org.eclipse.egit.feature.group" version="4.1.0.201509280440-r"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="8.8.0.201509291003"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20150928-0952"/>
+<unit id="org.eclipse.jgit.feature.group" version="4.4.0.201606070830-r"/>
+<unit id="org.eclipse.egit.feature.group" version="4.4.0.201606070830-r"/>
+<unit id="org.eclipse.cdt.sdk.feature.group" version="9.0.0.201606062011"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.test.feature.group" version="3.7.100.v20160503-1715"/>
+<unit id="org.eclipse.sdk.ide" version="4.6.0.I20160606-1100"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
+</location>
 </locations>
 </target>
diff --git a/terminals.psf b/terminals.psf
index 7f2eed4f935..02f70a51d89 100644
--- a/terminals.psf
+++ b/terminals.psf
@@ -24,9 +24,9 @@
 <project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.control.feature"/>
 <project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.control.sdk.feature"/>
 <project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.remote"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.remote.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.remote.sdk.feature"/>
+<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.remote"/>
+<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.remote.feature"/>
+<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.remote.sdk.feature"/>
 <project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,repos/org.eclipse.tm.terminal.repo"/>
 <project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.sdk.feature"/>
 <project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.test"/>
@@ -52,7 +52,7 @@
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.feature" type="4"/>
 </workingSets>
 <workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1429252903893_9" label="Terminal Connectors" name="Terminal Connectors">
-<item elementID="=org.eclipse.tm.terminal.remote" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=org.eclipse.tm.terminal.connector.remote" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.tm.terminal.connector.serial" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.tm.terminal.connector.telnet" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.tm.terminal.connector.process" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
@@ -63,13 +63,13 @@
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.telnet.sdk.feature" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.ssh.feature" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.ssh.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.remote.feature" type="4"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.remote.feature" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.serial.feature" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.local.feature" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.local.sdk.feature" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.telnet.feature" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.serial.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.remote.sdk.feature" type="4"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.remote.sdk.feature" type="4"/>
 </workingSets>
 <workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424167614352_4" label="Terminal Control" name="Terminal Control">
 <item elementID="=org.eclipse.tm.terminal.test" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>