diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties
index ab5010df177..bbf641bc198 100644
--- a/releng/org.eclipse.rse.build/build.properties
+++ b/releng/org.eclipse.rse.build/build.properties
@@ -5,7 +5,7 @@ archivePrefix=eclipse
 collectingFolder=${archivePrefix}
 buildType=P
 buildId=unknown
-buildLabel=${buildType}-${release}-${buildId}
+buildLabel=${buildId}
 mapVersionTag=HEAD
 
 #this is set to the tag from the map file unless forced here
diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb
index 9b9410b80a9..9a81b31c0f5 100644
--- a/releng/org.eclipse.rse.build/build.rb
+++ b/releng/org.eclipse.rse.build/build.rb
@@ -46,8 +46,8 @@ packageDirectory = "#{working}/package"
 publishDirectory = "#{working}/publish"
 
 tag = ask("Enter tag to fetch from CVS", "HEAD")
-buildType = ask("Enter build type (N=Nightly, I=Integration, M=Milestone)", "N")
-buildId = ask("Enter the build id", Time.now.strftime("%Y%m%d-%H%M"))
+buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P")
+buildId = ask("Enter the build id", buildType + Time.now.strftime("%Y%m%d-%H%M"))
 
 command = "java -cp #{eclipse}/startup.jar org.eclipse.core.launcher.Main "
 command += "-application org.eclipse.ant.core.antRunner "
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 236d27b2d47..c33b2886aa8 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -183,6 +183,14 @@
 	<!-- Steps to do after the build is done. -->
 	<!-- ===================================================================== -->
 	<target name="postBuild">
+		<move todir="${buildDirectory}/${buildLabel}">
+			<fileset dir="${buildDirectory}/${buildLabel}" includes="org.eclipse.rse.sdk-*"/>
+			<mapper type="glob" from="org.eclipse.rse.sdk-*" to="RSE-SDK-*"/>
+		</move>
+		<move todir="${buildDirectory}/${buildLabel}">
+			<fileset dir="${buildDirectory}/${buildLabel}" includes="org.eclipse.rse.*" excludes="org.eclipse.rse.sdk-*"/>
+			<mapper type="glob" from="org.eclipse.rse.*" to="RSE-runtime-*"/>
+		</move>
 	</target>
 
 	<!-- ===================================================================== -->