Index: releng/org.jboss.ide.eclipse.releng/builders/richfaces/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/richfaces/build.properties	(revision 6565)
+++ releng/org.jboss.ide.eclipse.releng/builders/richfaces/build.properties	(working copy)
@@ -41,13 +41,13 @@
 xulrunner-plugins-linux_64=org.mozilla.xpcom,org.mozilla.xulrunner.gtk.linux.x86_64
 xulrunner-plugins-macosx=org.mozilla.xpcom,org.mozilla.xulrunner.cocoa.macosx.x86
 
-win32-zipFile=RichFaces-VPE-win32-x86-${versionTag}.zip
+win32-x86-zipFile=RichFaces-VPE-win32-x86-${versionTag}.zip
 win32-nodeps-zipFile=RichFaces-VPE-win32-x86-nodeps-${versionTag}.zip
-linux-zipFile=RichFaces-VPE-linux-gtk-x86-${versionTag}.zip
+linux-gtk-x86-zipFile=RichFaces-VPE-linux-gtk-x86-${versionTag}.zip
 linux-nodeps-zipFile=RichFaces-VPE-linux-gtk-x86-nodeps-${versionTag}.zip
 linux_64-zipFile=RichFaces-VPE-linux-gtk-x86_64-${versionTag}.zip
 linux_64-nodeps-zipFile=RichFaces-VPE-linux-gtk-x86_64-nodeps-${versionTag}.zip
-#macosx-carbon-zipFile=RichFaces-VPE-macosx-carbon-x86-${versionTag}.zip
+#macosx-carbon-x86-zipFile=RichFaces-VPE-macosx-carbon-x86-${versionTag}.zip
 #macosx-carbon-nodeps-zipFile=RichFaces-VPE-macosx-carbon-x86-nodeps-${versionTag}.zip
-macosx-cocoa-zipFile=RichFaces-VPE-macosx-cocoa-x86-${versionTag}.zip
+macosx-cocoa-x86-zipFile=RichFaces-VPE-macosx-cocoa-x86-${versionTag}.zip
 macosx-cocoa-nodeps-zipFile=RichFaces-VPE-macosx-cocoa-x86-nodeps-${versionTag}.zip
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/builders/richfaces/customTargets.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/richfaces/customTargets.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/richfaces/customTargets.xml	(working copy)
@@ -22,10 +22,10 @@
 <!-- ===================================================================== -->
 
 	<target name="assemble.org.jboss.tools.richfaces.feature.win32.win32.x86">
-		<property name="zipFileProperty" value="win32-zipFile"/>
+		<property name="zipFileProperty" value="win32-x86-zipFile"/>
 		<property name="nodeps-zipFileProperty" value="win32-nodeps-zipFile"/>
 		
-		<property name="archiveName" value="${win32-zipFile}"/>
+		<property name="archiveName" value="${win32-x86-zipFile}"/>
 		<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		
@@ -42,10 +42,10 @@
 	</target>
 
 	<target name="assemble.org.jboss.tools.richfaces.feature.linux.gtk.x86">
-		<property name="zipFileProperty" value="linux-zipFile"/>
+		<property name="zipFileProperty" value="linux-gtk-x86-zipFile"/>
 		<property name="nodeps-zipFileProperty" value="linux-nodeps-zipFile"/>
 		
-		<property name="archiveName" value="${linux-zipFile}"/>
+		<property name="archiveName" value="${linux-gtk-x86-zipFile}"/>
 		<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		
@@ -80,10 +80,10 @@
 	</target>
 		
 	<target name="assemble.org.jboss.tools.richfaces.feature.macosx.carbon.ppc">
-		<property name="zipFileProperty" value="macosx-carbon-zipFile"/>
+		<property name="zipFileProperty" value="macosx-carbon-x86-zipFile"/>
 		<property name="nodeps-zipFileProperty" value="macosx-carbon-nodeps-zipFile"/>
 		
-		<property name="archiveName" value="${macosx-carbon-zipFile}"/>
+		<property name="archiveName" value="${macosx-carbon-x86-zipFile}"/>
 		<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		
@@ -99,10 +99,10 @@
 	</target>
 				
 	<target name="assemble.org.jboss.tools.richfaces.feature.macosx.cocoa.ppc">
-		<property name="zipFileProperty" value="macosx-cocoa-zipFile"/>
+		<property name="zipFileProperty" value="macosx-cocoa-x86-zipFile"/>
 		<property name="nodeps-zipFileProperty" value="macosx-cocoa-nodeps-zipFile"/>
 		
-		<property name="archiveName" value="${macosx-cocoa-zipFile}"/>
+		<property name="archiveName" value="${macosx-cocoa-x86-zipFile}"/>
 		<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(revision 6565)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(working copy)
@@ -79,7 +79,7 @@
 						                            nodeps-zipFileProperty="linux_64-nodeps-zipFile"
 						                            property-suffix="-linux-gtk-x86_64-" />
 						<!-- <get.properties.for.builder builder="richfaces"
-						                            zipFileProperty="macosx-carbon-zipFile"
+						                            zipFileProperty="macosx-carbon-x86-zipFile"
 						                            nodeps-zipFileProperty="macosx-carbon-nodeps-zipFile"
 						                            property-suffix="-macosx-carbon-x86-"
 						/> -->
@@ -105,7 +105,7 @@
 								                            nodeps-zipFileProperty="linux_64-nodeps-zipFile"
 								                            property-suffix="-linux-gtk-x86_64-" />
 								<!-- <get.properties.for.builder builder="xulrunner"
-								                            zipFileProperty="macosx-carbon-zipFile"
+								                            zipFileProperty="macosx-carbon-x86-zipFile"
 								                            nodeps-zipFileProperty="macosx-carbon-nodeps-zipFile"
 								                            property-suffix="-macosx-carbon-"
 								/> -->
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml	(working copy)
@@ -35,13 +35,13 @@
 					<equals arg1="@{current-builder}" arg2="richfaces" />
 					<then>
 						<get.properties.for.builder builder="richfaces"
-						                            zipFileProperty="win32-zipFile"
+						                            zipFileProperty="win32-x86-zipFile"
 						                            nodeps-zipFileProperty="win32-nodeps-zipFile"
 						                            property-suffix="-win32-"
 						                            dir-prefix="/win32/"
 						/>
 						<get.properties.for.builder builder="richfaces"
-						                            zipFileProperty="linux-zipFile"
+						                            zipFileProperty="linux-gtk-x86-zipFile"
 						                            nodeps-zipFileProperty="linux-nodeps-zipFile"
 						                            property-suffix="-linux-gtk-"
 						                            dir-prefix="/linux-gtk/"
@@ -52,12 +52,12 @@
 							<equals arg1="@{current-builder}" arg2="xulrunner" />
 							<then>
 								<get.properties.for.builder builder="xulrunner"
-								                            zipFileProperty="win32-zipFile"
+								                            zipFileProperty="win32-x86-zipFile"
 								                            nodeps-zipFileProperty="win32-nodeps-zipFile"
 								                            property-suffix="-win32-"
 								/>
 								<get.properties.for.builder builder="xulrunner"
-								                            zipFileProperty="linux-zipFile"
+								                            zipFileProperty="linux-gtk-x86-zipFile"
 								                            nodeps-zipFileProperty="linux-nodeps-zipFile"
 								                            property-suffix="-linux-gtk-"
 								/>
Index: releng/org.jboss.ide.eclipse.releng/builders/xulrunner/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/xulrunner/build.properties	(revision 6565)
+++ releng/org.jboss.ide.eclipse.releng/builders/xulrunner/build.properties	(working copy)
@@ -31,15 +31,15 @@
 buildTypeDescription.I=integration
 buildTypeDescription.R=release
 
-win32-zipFile=XulRunner-win32-x86-${versionTag}.zip
+win32-x86-zipFile=XulRunner-win32-x86-${versionTag}.zip
 win32-nodeps-zipFile=XulRunner-win32-x86-nodeps-${versionTag}.zip
-linux-zipFile=XulRunner-linux-gtk-x86-${versionTag}.zip
+linux-gtk-x86-zipFile=XulRunner-linux-gtk-x86-${versionTag}.zip
 linux-nodeps-zipFile=XulRunner-linux-gtk-x86-nodeps-${versionTag}.zip
 linux_64-zipFile=XulRunner-linux-gtk-x86_64-${versionTag}.zip
 linux_64-nodeps-zipFile=XulRunner-linux-gtk-x86_64-nodeps-${versionTag}.zip
-#macosx-carbon-zipFile=XulRunner-macosx-carbon-x86-${versionTag}.zip
+#macosx-carbon-x86-zipFile=XulRunner-macosx-carbon-x86-${versionTag}.zip
 #macosx-carbon-nodeps-zipFile=XulRunner-macosx-carbon-x86-nodeps-${versionTag}.zip
-macosx-cocoa-zipFile=XulRunner-macosx-cocoa-x86-${versionTag}.zip
+macosx-cocoa-x86-zipFile=XulRunner-macosx-cocoa-x86-${versionTag}.zip
 macosx-cocoa-nodeps-zipFile=XulRunner-macosx-cocoa-x86-nodeps-${versionTag}.zip
 
 defaultSvnUrl=http://anonsvn.jboss.org/repos/jbosstools
Index: releng/org.jboss.ide.eclipse.releng/builders/xulrunner/customTargets.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/xulrunner/customTargets.xml	(revision 6565)
+++ releng/org.jboss.ide.eclipse.releng/builders/xulrunner/customTargets.xml	(working copy)
@@ -11,7 +11,7 @@
 <!-- ===================================================================== -->
 
 <target name="assemble.org.jboss.tools.xulrunner.feature.win32.win32.x86">
-	<property name="archiveName" value="${win32-zipFile}"/>
+	<property name="archiveName" value="${win32-x86-zipFile}"/>
 	<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 	<zip update="yes" destfile="${archiveFullPath}">
@@ -39,7 +39,7 @@
 </target>
 
 <target name="assemble.org.jboss.tools.xulrunner.feature.linux.gtk.x86">
-	<property name="archiveName" value="${linux-zipFile}"/>
+	<property name="archiveName" value="${linux-gtk-x86-zipFile}"/>
 	<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>	
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 	<zip update="yes" destfile="${archiveFullPath}">
@@ -53,7 +53,7 @@
 </target>
 	
 <target name="assemble.org.jboss.tools.xulrunner.feature.macosx.carbon.x86">
-	<property name="archiveName" value="${macosx-carbon-zipFile}"/>
+	<property name="archiveName" value="${macosx-carbon-x86-zipFile}"/>
 	<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>	
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 	<zip update="yes" destfile="${archiveFullPath}">
@@ -67,7 +67,7 @@
 </target>
 
 <target name="assemble.org.jboss.tools.xulrunner.feature.macosx.cocoa.x86">
-	<property name="archiveName" value="${macosx-cocoa-zipFile}"/>
+	<property name="archiveName" value="${macosx-cocoa-x86-zipFile}"/>
 	<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>	
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 	<zip update="yes" destfile="${archiveFullPath}">