*** empty log message ***
diff --git a/org.eclipse.e4.builder/builder/general/tests/test.xml b/org.eclipse.e4.builder/builder/general/tests/test.xml
index e4ea2da..4eb0288 100644
--- a/org.eclipse.e4.builder/builder/general/tests/test.xml
+++ b/org.eclipse.e4.builder/builder/general/tests/test.xml
@@ -107,119 +107,119 @@
 	</target>
 
 	<target name="setRuntimeArchive">
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${buildId}-win32.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${buildId}-win32.zip">
 			<and>
 				<equals arg1="${os}" arg2="win32" />
 				<equals arg1="${ws}" arg2="win32" />
 				<equals arg1="${arch}" arg2="x86" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${buildId}-win32-wpf.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${buildId}-win32-wpf.zip">
 			<and>
 				<equals arg1="${os}" arg2="win32" />
 				<equals arg1="${ws}" arg2="wpf" />
 				<equals arg1="${arch}" arg2="x86" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${buildId}-win32-win32-x86_64.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${buildId}-win32-win32-x86_64.zip">
 			<and>
 				<equals arg1="${os}" arg2="win32" />
 				<equals arg1="${ws}" arg2="win32" />
 				<equals arg1="${arch}" arg2="x86_64" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-linux-gtk.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK--${e4.buildLabel}-linux-gtk.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="linux" />
 				<equals arg1="${ws}" arg2="gtk" />
 				<equals arg1="${arch}" arg2="x86" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-linux-motif.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-linux-motif.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="linux" />
 				<equals arg1="${ws}" arg2="motif" />
 				<equals arg1="${arch}" arg2="x86" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-linux-gtk-ppc.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-linux-gtk-ppc.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="linux" />
 				<equals arg1="${ws}" arg2="gtk" />
 				<equals arg1="${arch}" arg2="ppc" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-linux-gtk-x86_64.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-linux-gtk-x86_64.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="linux" />
 				<equals arg1="${ws}" arg2="gtk" />
 				<equals arg1="${arch}" arg2="ppc" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-macosx-carbon.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-macosx-carbon.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="macosx" />
 				<equals arg1="${ws}" arg2="carbon" />
 				<equals arg1="${arch}" arg2="ppc" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-macosx-carbon.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-macosx-carbon.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="macosx" />
 				<equals arg1="${ws}" arg2="carbon" />
 				<equals arg1="${arch}" arg2="x86" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-macosx-cocoa-ppc.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-macosx-cocoa-ppc.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="macosx" />
 				<equals arg1="${ws}" arg2="cocoa" />
 				<equals arg1="${arch}" arg2="ppc" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-macosx-cocoa.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-macosx-cocoa.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="macosx" />
 				<equals arg1="${ws}" arg2="cocoa" />
 				<equals arg1="${arch}" arg2="x86" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-macosx-cocoa-x86_64.tar.gz">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-macosx-cocoa-x86_64.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="macosx" />
 				<equals arg1="${ws}" arg2="cocoa" />
 				<equals arg1="${arch}" arg2="x86_64" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-hpux-motif.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-hpux-motif.zip">
 			<and>
 				<equals arg1="${os}" arg2="hpux" />
 				<equals arg1="${ws}" arg2="motif" />
 				<equals arg1="${arch}" arg2="PA_RISC" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-hpux-motif.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-hpux-motif.zip">
 			<and>
 				<equals arg1="${os}" arg2="hpux" />
 				<equals arg1="${ws}" arg2="motif" />
 				<equals arg1="${arch}" arg2="ia64_32" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-solaris-motif.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-solaris-motif.zip">
 			<and>
 				<equals arg1="${os}" arg2="solaris" />
 				<equals arg1="${ws}" arg2="motif" />
 				<equals arg1="${arch}" arg2="sparc" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-solaris-gtk.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-solaris-gtk.zip">
 			<and>
 				<equals arg1="${os}" arg2="solaris" />
 				<equals arg1="${ws}" arg2="gtk" />
 				<equals arg1="${arch}" arg2="sparc" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-e4-SDK${e4.buildLabel}-aix-motif.zip">
+		<condition property="runtimeArchive" value="eclipse-e4-SDK-${e4.buildLabel}-aix-motif.zip">
 			<and>
 				<equals arg1="${os}" arg2="aix" />
 				<equals arg1="${ws}" arg2="motif" />