diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index e5b2d04f773..4dc8680c423 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -102,10 +102,10 @@
 			<property name="builder" value="${basedir}/testing" />
 		</ant>
 		<antcall target="unpack">
-			<param name="srcPrefix" value="${zipsdir}/org.eclipse.cdt-${branchVersion}-${buildId}-${osgi.os}.${osgi.arch}"/>
+			<param name="srcPrefix" value="${zipsdir}/cdt-${branchVersion}-${buildId}-${osgi.os}.${osgi.arch}"/>
 			<param name="dest" value="${buildDirectory}"/>
 		</antcall>
-		<unzip src="${zipsdir}/org.eclipse.cdt.testing-${branchVersion}-${buildId}.zip" dest="${buildDirectory}"/>
+		<unzip src="${zipsdir}/cdt-testing-${branchVersion}-${buildId}.zip" dest="${buildDirectory}"/>
 		<ant antfile="test.xml" dir="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${forceContextQualifier}">
 			<property name="eclipse-home" value="${buildDirectory}/eclipse"/>
 			<property name="library-file" value="${buildDirectory}/eclipse/plugins/org.eclipse.test_3.1.0/library.xml"/>
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index 4e7babe650b..db357b3a223 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -16,60 +16,64 @@ integrations for build/debug, user documentation<br>
   <tbody>
     <tr>
       <td style="vertical-align: top;">AIX/ppc</td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz">cdt-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/x86<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-linux.x86.tar.gz">cdt-@branchVersion@-@buildId@-linux.x86.tar.gz</a>
+      </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/x86_64<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86_64.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86_64.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-linux.x86_64.tar.gz">cdt-@branchVersion@-@buildId@-linux.x86_64.tar.gz</a>
+      </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ppc<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-linux.ppc.tar.gz">cdt-@branchVersion@-@buildId@-linux.ppc.tar.gz</a>
+      </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ia64<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz">cdt-@branchVersion@-@buildId@-linux.ia64.tar.gz</a>
+      </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">MacOSX/ppc<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz">cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">QNX/x86<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-qnx.x86.tar.gz">cdt-cdt-@branchVersion@-@buildId@-qnx.x86.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Solaris/sparc<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz">cdt-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Win32/x86<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt-@branchVersion@-@buildId@-win32.x86.zip">org.eclipse.cdt-@branchVersion@-@buildId@-win32.x86.zip</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-@branchVersion@-@buildId@-win32.x86.zip">cdt-@branchVersion@-@buildId@-win32.x86.zip</a><br>
       </td>
     </tr>
   </tbody>
@@ -82,60 +86,63 @@ integrations for build/debug, user documentation<br>
   <tbody>
     <tr>
       <td style="vertical-align: top;">AIX/ppc</td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-aix.ppc.tar.gz">cdt-SDK-@branchVersion@-@buildId@-aix.ppc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/x86<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-linux.x86.tar.gz">cdt-SDK-@branchVersion@-@buildId@-linux.x86.tar.gz</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/x86_64<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86_64.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86_64.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-linux.x86_64.tar.gz">cdt-SDK-@branchVersion@-@buildId@-linux.x86_64.tar.gz</a>
+      </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ppc<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-linux.ppc.tar.gz">cdt-SDK-@branchVersion@-@buildId@-linux.ppc.tar.gz</a>
+      </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Linux/ia64<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.tar.gz</a></td>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-linux.ia64.tar.gz">cdt-SDK-@branchVersion@-@buildId@-linux.ia64.tar.gz</a>
+      </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">MacOSX/ppc<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-macosx.ppc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-macosx.ppc.tar.gz">cdt-SDK-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">QNX/x86<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-qnx.x86.tar.gz">cdt-SDK-@branchVersion@-@buildId@-qnx.x86.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Solaris/sparc<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-solaris.sparc.tar.gz">cdt-SDK-@branchVersion@-@buildId@-solaris.sparc.tar.gz</a><br>
       </td>
     </tr>
     <tr>
       <td style="vertical-align: top;">Win32/x86<br>
       </td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-win32.x86.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-win32.x86.zip</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-SDK-@branchVersion@-@buildId@-win32.x86.zip">cdt-SDK-@branchVersion@-@buildId@-win32.x86.zip</a><br>
       </td>
     </tr>
   </tbody>
@@ -147,8 +154,8 @@ integrations for build/debug, user documentation<br>
   <tbody>
     <tr>
       <td style="vertical-align: top;">All</td>
-      <td style="vertical-align: top;"><a
- href="org.eclipse.cdt.testing-@branchVersion@-@buildId@.zip">org.eclipse.cdt.testing-@branchVersion@-@buildId@.zip</a><br>
+      <td style="vertical-align: top;">
+        <a href="cdt-testing-@branchVersion@-@buildId@.zip">cdt-testing-@branchVersion@-@buildId@.zip</a><br>
       </td>
     </tr>
   </tbody>
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
index 329a1ce36a0..70812daab84 100644
--- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -20,55 +20,55 @@
 
 <target name="assemble.org.eclipse.cdt.aix.motif.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.linux.gtk.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.linux.gtk.x86_64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.linux.gtk.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.linux.gtk.ia64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.macosx.carbon.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.qnx.photon.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.solaris.motif.sparc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.win32.win32.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-win32.x86.zip"/>
+		<property name="archiveName" value="cdt-${branchVersion}-${buildId}-win32.x86.zip"/>
 	</ant>
 </target>
 
diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
index 8924964cf7a..e677c1d94b6 100644
--- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
@@ -25,55 +25,55 @@
 
 <target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86_64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.macosx.carbon.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
 	</ant>
 </target>
 
 <target name="assemble.org.eclipse.cdt.sdk.win32.win32.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-win32.x86.zip"/>
+		<property name="archiveName" value="cdt-SDK-${branchVersion}-${buildId}-win32.x86.zip"/>
 	</ant>
 </target>
 
diff --git a/releng/org.eclipse.cdt.releng/testing/customTargets.xml b/releng/org.eclipse.cdt.releng/testing/customTargets.xml
index 3cb75b69097..e053e593a05 100644
--- a/releng/org.eclipse.cdt.releng/testing/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/testing/customTargets.xml
@@ -25,7 +25,7 @@
 
 <target name="assemble.org.eclipse.cdt.testing">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="org.eclipse.cdt.testing-${branchVersion}-${buildId}.zip"/>
+		<property name="archiveName" value="cdt-testing-${branchVersion}-${buildId}.zip"/>
 	</ant>
 </target>