diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
index 7a2260299b49a7a594e3a4b3ab0689b8a98f39e9..68402de916aeca67122b707cf61b02265002d6a0 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
@@ -30,9 +30,9 @@ echo " "
 echo "    screen -D -RR -h 5000"
 echo "    cd ${updateToolsDir}/build-home/"
 echo "    #for Callisto"
-echo "    ./runUpdateAllCallistoProjects.sh -clean | tee out.txt"
+echo "    ./runUpdateAllProjects.sh Europa   -clean | tee out.txt"
 echo "    #for Europa"
-echo "    ./runUpdateAllEuropaProjects.sh   -clean | tee out.txt"
+echo "    ./runUpdateAllProjects.sh Callisto -clean | tee out.txt"
 echo "  "
 echo "    When complete, be sure to inspect or at least grep the out.txt file for anomilies, e.g. "
 echo "        grep failed     out.txt"
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
index a240c8a6c04b7ae9942a1afb32cbc1a7464ad357..f4b8205dac57fcdb79c7681ef0a8f847d0dafaa4 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
@@ -16,11 +16,19 @@ elif [ "${1}" = "Europa" ]
 then 
   fromDir=${HOME}/downloads/webtools/declaredUpdates
   toDir=${HOME}/downloads/webtools/milestones
+  updateSite=${HOME}/downloads/webtools/declaredUpdates
+  mainSiteFileName=siteEuropa.xml
+  mainIndexFileName=indexEuropa.html
+  fileListFile=updateEuropaMirrorAll.xml 
 
 elif [ "${1}" = "Callisto" ] 
 then
   fromDir=${HOME}/downloads/webtools/testUpdates
   toDir=${HOME}/downloads/webtools/updates
+  updateSite=${HOME}/downloads/webtools/testUpdates
+  mainSiteFileName=siteCallisto.xml
+  mainIndexFileName=indexCallisto.html
+  fileListFile=updateCallistoMirrorAll.xml
 
 else
   echo ""
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
index 7a033b048da1930935228adb762a90b99be42640..0f77fabf70fa06216bc2b7a61072e1d47b55bbf8 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
@@ -1,12 +1,9 @@
 #!/bin/sh
 
 # script to run update, setting properties, for all projects
-
-#updateSite=${HOME}/downloads/webtools/testUpdates
-
-updateSite=${HOME}/downloads/webtools/declaredUpdates
  
 source properties.shsource
+source parseSiteArg.shsource
 
 ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}  
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
index 228334df9317b94ba2ffe7b2069e37e9ce9daa56..3412c11dbcbf782e91c81755edbe8e94b49483a1 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
@@ -2,10 +2,8 @@
 
 # script to run update, setting properties, for all projects
 
-updateSite=${HOME}/downloads/webtools/testUpdates
-#updateSite=${HOME}/downloads/webtools/declaredUpdates
- 
 source properties.shsource
+source parseSiteArg.shsource
 
 ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
deleted file mode 100644
index 0e5471e08777e58f10afedc718fb7e83b0f9df0e..0000000000000000000000000000000000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# script to run update, setting properties, for all projects
-
-updateSite=${HOME}/downloads/webtools/testUpdates
-
-mainSiteFileName=siteCallisto.xml
-mainIndexFileName=indexCallisto.html
-fileListFile=updateCallistoMirrorAll.xml
- 
-source properties.shsource
-
-if [ "${1}" == "-clean" ] ; then
-
-	 echo "   Removing ${updateSite}/features/"
-	 rm -fr ${updateSite}/features/
-	
-	 echo "   Removing ${updateSite}/plugins/"
-	 rm -fr ${updateSite}/plugins/
-	
-	 echo "   Removing index and site xml files"
-	 rm -fr ${updateSite}/*
-	
-	 echo "   Updating index and web site files, but not site xml files (yet)"
-      rsync -p ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${updateSite}/index.html
-      rsync -p ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite}
-fi
-
-
-ant  -f  ${fileListFile} -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
-
-# merge authored site.xml files with the most recent auto generated one
-./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${updateSite}
-
-# do create pack's later ... takes a long time
-#ant  -f createPack200s.xml     -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
- 
-# run create Digests now, it's a good check if all is well
-ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}  
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
similarity index 84%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
rename to org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
index 6ed2385169edd456ccc93f008f678f30ed6ecb2f..48a6efaa5b6e46f18c5d10d1bef049fb2fb94b7b 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
@@ -2,16 +2,10 @@
 
 # script to run update, setting properties, for all projects
 
-updateSite=${HOME}/downloads/webtools/declaredUpdates
-
-mainSiteFileName=siteEuropa.xml
-mainIndexFileName=indexEuropa.html
-fileListFile=updateEuropaMirrorAll.xml 
- 
 source properties.shsource
+source parseSiteArg.shsource
 
-
-if [ "${1}" == "-clean" ] ; then
+if [ "${2}" == "-clean" ] ; then
 
 	 echo "   Removing ${updateSite}/features/"
 	 rm -fr ${updateSite}/features/