diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index 57dd3579144..0bfc409d369 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -156,7 +156,7 @@
 							<groupId>org.eclipse.remote</groupId>
 							<artifactId>org.eclipse.remote.target</artifactId>
 							<version>3.0.0-SNAPSHOT</version>
-							<classifier>neon</classifier>
+							<classifier>oxygen</classifier>
 						</artifact>
 				  </target>
 				</configuration>
diff --git a/releng/org.eclipse.remote.target/mars.target b/releng/org.eclipse.remote.target/mars.target
index c848db9d253..17f384367f1 100644
--- a/releng/org.eclipse.remote.target/mars.target
+++ b/releng/org.eclipse.remote.target/mars.target
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="mars" sequenceNumber="0">
+<?pde version="3.8"?><target name="remote-mars" sequenceNumber="0">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/releng/org.eclipse.remote.target/neon.target b/releng/org.eclipse.remote.target/neon.target
index 616d8f07fc6..f6329af9b68 100644
--- a/releng/org.eclipse.remote.target/neon.target
+++ b/releng/org.eclipse.remote.target/neon.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="neon" sequenceNumber="0">
+<target name="remote-neon" sequenceNumber="0">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/releng/org.eclipse.remote.target/oxygen.target b/releng/org.eclipse.remote.target/oxygen.target
index 6bddb262cb8..6a90b7efd75 100644
--- a/releng/org.eclipse.remote.target/oxygen.target
+++ b/releng/org.eclipse.remote.target/oxygen.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="oxygen" sequenceNumber="0">
+<target name="remote-oxygen" sequenceNumber="0">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/releng/org.eclipse.remote.target/pom.xml b/releng/org.eclipse.remote.target/pom.xml
index 05b79a8db7f..b61c33fcf0c 100644
--- a/releng/org.eclipse.remote.target/pom.xml
+++ b/releng/org.eclipse.remote.target/pom.xml
@@ -30,9 +30,9 @@
 						<configuration>
 							<artifacts>
 								<artifact>
-									<file>neon.target</file>
+									<file>oxygen.target</file>
 									<type>target</type>
-									<classifier>neon</classifier>
+									<classifier>remote-oxygen</classifier>
 								</artifact>
 							</artifacts>
 						</configuration>