diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalRelease-code.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh
similarity index 70%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalRelease-code.sh
rename to org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh
index 6d3bc64..5d9c602 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalRelease-code.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh
@@ -18,12 +18,12 @@
 
 echo ""
 echo "    Copying new plugins and features "
-echo "        from  ${milestoneDir}"
+echo "        from  ${milestoneDirectory}"
 echo "          to  ${releaseDir}"
 echo ""
 
-rsync ${doit}  --ignore-existing -rv -p ${milestoneDir}/features ${releaseDir}
-rsync ${doit}  --ignore-existing -rv -p ${milestoneDir}/plugins ${releaseDir}
+rsync ${doit}  --ignore-existing -rv -p ${milestoneDirectory}/features ${releaseDir}
+rsync ${doit}  --ignore-existing -rv -p ${milestoneDirectory}/plugins ${releaseDir}
 
 if [ "${doit}" = "--dry-run" ] ; then
    echo ""
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh
new file mode 100644
index 0000000..aa9226c
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./copyToMilestoneDirectory-code.sh $1
+./copyToMilestoneDirectory-SiteFile.sh $1
+
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh
new file mode 100644
index 0000000..d8b8e40
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# script to copy site files 
+
+source ./parseSiteArg.shsource
+
+# important: make sure digest is updated same time as site.xml's
+# TODO: should digest be recreated on final site? No for "exact" sites, yes, if "merged" sites. 
+rsync -p ${testUpdateSite}/digest.zip ${milestoneDirectory}
+
+
+rsync -p ${testUpdateSite}/*.html ${milestoneDirectory}
+rsync -p ${testUpdateSite}/*.jpg ${milestoneDirectory}
+rsync -p ${testUpdateSite}/*.xml ${milestoneDirectory}
+
+# Typically, as of this writing
+# Europa: 'testTempUpdates' to 'milestones' 
+
+
+# compute last segment in directory names, as a heurisic to update internal URL links
+fromLastSegment=${testUpdateSite##*/}
+toLastSegment=${milestoneDirectory##*/}
+
+echo ""
+echo "  Updating site files:"
+echo "    from: ${fromLastSegment}"
+echo "      to: ${toLastSegment}"
+echo ""
+
+fromString="webtools/${fromLastSegment}"
+toString="webtools/${toLastSegment}"
+replaceCommand="s!${fromString}!${toString}!g"
+
+#echo ${replaceCommand};
+
+perl -pi -e ${replaceCommand} ${milestoneDirectory}/*.html
+perl -pi -e ${replaceCommand} ${milestoneDirectory}/*.xml
+
+# now re-run the digester and P2 Generator
+ant  -f createDigests.xml  -Declipse.home=${eclipseLocation} -Dupdate.site=${milestoneDirectory}  
+# create P2 repository metadata
+ant  -f createP2Repo.xml  -Declipse.home=${eclipseLocation} -Dupdate.site=${milestoneDirectory}  
+
+
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh
similarity index 63%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
rename to org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh
index f31db42..a50e71a 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh
@@ -18,17 +18,18 @@
 
 echo ""
 echo "    Copying new plugins and features "
-echo "        from  ${fromDir}"
-echo "          to  ${toDir}"
+echo "        from  ${testUpdateSite}"
+echo "          to  ${milestoneDirectory}"
 echo ""
 
-rsync ${doit}  --ignore-existing -rv -p ${fromDir}/features ${toDir}
-rsync ${doit}  --ignore-existing -rv -p ${fromDir}/plugins ${toDir}
+rsync ${doit}  --ignore-existing -rv -p ${testUpdateSite}/features ${milestoneDirectory}
+rsync ${doit}  --ignore-existing -rv -p ${testUpdateSite}/plugins ${milestoneDirectory}
 
 if [ "${doit}" = "--dry-run" ] ; then
    echo ""
    echo "    This was a dry run. Add -doit to actually copy"
    echo ""
+   exit 1
 fi
 
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh
deleted file mode 100644
index 6a8bc27..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# script to copy site files 
-
-source ./parseSiteArg.shsource
-
-# important: make sure digest is updated same time as site.xml's
-# TODO: should digest be recreated on final site? No for "exact" sites, yes, if "merged" sites. 
-rsync -p ${fromDir}/digest.zip ${toDir}
-
-
-rsync -p ${fromDir}/*.html ${toDir}
-rsync -p ${fromDir}/*.jpg ${toDir}
-rsync -p ${fromDir}/*.xml ${toDir}
-
-# Typically, as of this writing
-# Europa: 'declaredUpdates' to 'milestones' 
-# Callisto: 'testUpdates' to 'updates'
-
-# compute last segment in directory names, as a heurisic to update internal URL links
-fromLastSegment=${fromDir##*/}
-toLastSegment=${toDir##*/}
-
-echo ""
-echo "  Updating site files:"
-echo "    from: ${fromLastSegment}"
-echo "      to: ${toLastSegment}"
-echo ""
-
-fromString="webtools/${fromLastSegment}"
-toString="webtools/${toLastSegment}"
-replaceCommand="s!${fromString}!${toString}!g"
-
-#echo ${replaceCommand};
-
-perl -pi -e ${replaceCommand} ${toDir}/*.html
-perl -pi -e ${replaceCommand} ${toDir}/*.xml
-
-
-
-
-
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
index 0256caa..124eead 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
@@ -14,46 +14,31 @@
 
 elif [ "${1}" = "Europa" ] 
 then 
-  fromDir=${HOME}/downloads/webtools/declaredUpdates
-  toDir=${HOME}/downloads/webtools/testUpdates
-  milestoneDir=${HOME}/downloads/webtools/testUpdates
+  testUpdateSite=${HOME}/downloads/webtools/tempTestUpdates
+  milestoneDirectory=${HOME}/downloads/webtools/milestones
   releaseDir=${HOME}/downloads/webtools/updates
-  updateSite=${HOME}/downloads/webtools/testUpdates
   mainSiteFileName=siteEuropa.xml
   mainIndexFileName=indexEuropa.html
   fileListFile=updateEuropaMirrorAll.xml 
 
 elif [ "${1}" = "Ganymede" ] 
 then 
-  fromDir=${HOME}/downloads/webtools/declaredUpdates
-  toDir=${HOME}/downloads/webtools/tempTestUpdates
-  milestoneDir=${HOME}/downloads/webtools/milestones
+  testUpdateSite=${HOME}/downloads/webtools/tempTestUpdates
+  milestoneDirectory=${HOME}/downloads/webtools/milestones
   releaseDir=${HOME}/downloads/webtools/updates
-  updateSite=${HOME}/downloads/webtools/tempTestUpdates
   mainSiteFileName=siteGanymede.xml
   mainIndexFileName=indexGanymede.html
   fileListFile=updateGanymedeMirrorAll.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 ""
   echo "    Unrecognized argument: ${1}" 
   echo "        Usage: ${0} <stream>"
-  echo "        where <stream> is one of Ganymede, Europa, Callisto"
+  echo "        where <stream> is one of Ganymede, Europa"
   echo ""
   exit 1
 fi 
 
-mkdir -p $fromDir
-mkdir -p $toDir
-mkdir -p $milestoneDir
+mkdir -p $testUpdateSite
+mkdir -p $milestoneDirectory
 mkdir -p $releaseDir
-mkdir -p $updateSite
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOnMilestones.sh
similarity index 83%
copy from org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
copy to org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOnMilestones.sh
index 3412c11..ec9134c 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOnMilestones.sh
@@ -5,5 +5,5 @@
 source properties.shsource
 source parseSiteArg.shsource
 
-ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
+ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${milestoneDirectory}
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOnReleasedUpdates.sh
similarity index 86%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
rename to org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOnReleasedUpdates.sh
index 3412c11..fa1445c 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOnReleasedUpdates.sh
@@ -5,5 +5,5 @@
 source properties.shsource
 source parseSiteArg.shsource
 
-ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
+ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${releaseDir}
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOntestUpdateSite.sh
similarity index 84%
copy from org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
copy to org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOntestUpdateSite.sh
index 3412c11..9656fc5 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200sOntestUpdateSite.sh
@@ -5,5 +5,5 @@
 source properties.shsource
 source parseSiteArg.shsource
 
-ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
+ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite}
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
index a2c13b0..f0ede8c 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
@@ -7,33 +7,33 @@
 
 if [ "${2}" == "-clean" ] ; then
 
-	 echo "   Removing ${updateSite}/features/"
-	 rm -fr ${updateSite}/features/
+	 echo "   Removing ${testUpdateSite}/features/"
+	 rm -fr ${testUpdateSite}/features/
 	
-	 echo "   Removing ${updateSite}/plugins/"
-	 rm -fr ${updateSite}/plugins/
+	 echo "   Removing ${testUpdateSite}/plugins/"
+	 rm -fr ${testUpdateSite}/plugins/
 	
 	 echo "   Removing index and site xml files"
-	 rm -fr ${updateSite}/*
+	 rm -fr ${testUpdateSite}/*
 
 fi
 	
  echo "   Updating index and web site files, but not site xml files (yet)"
- rsync -pua ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${updateSite}/index.html
- rsync -pua ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite}
+ rsync -pua ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${testUpdateSite}/index.html
+ rsync -pua ${HOME}/${updateToolsDir}/WebContent/*.jpg ${testUpdateSite}
 
 
 
-ant  -f ${fileListFile} -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
+ant  -f ${fileListFile} -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite}
 
 # merge authored site.xml files with the most recent auto generated one
-./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${updateSite}
+./runtestUpdateSiteXmlFiles.sh ${mainSiteFileName} ${testUpdateSite}
 
 # do create pack's later ... takes a long time
-# ant  -f createPack200s.xml     -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
+# ant  -f createPack200s.xml     -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite}
 
 # run create Digests now, it's a good check if all is well
-ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
+ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite}
 
 # create P2 repository metadata
-ant  -f createP2Repo.xml  -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}  
+ant  -f createP2Repo.xml  -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite}