streamline build scripts
diff --git a/releng.control/ant.bat b/releng.control/ant.bat
deleted file mode 100644
index 00f7346..0000000
--- a/releng.control/ant.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-setlocal
-set PROJECT_HOME=%~dp0
-set BUILD_HOME=/home/shared/webtools
-call %ANT_HOME%\bin\ant.bat %*
-endlocal
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index d7f1e46..4172dda 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -7,16 +7,13 @@
 

 if [ -n $BUILD_INITIALIZED ] 

 then

-   source commonVariations.shsource 

-   source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource

+   pushd .
+   cd ${RELENG_CONTROL}
+   source commonVariations.shsource
+   source ${RELENG_CONTROL}/commonComputedVariables.shsource
+   popd
 fi

 

-# For most ant tasks, we want Java 4 to be default, 

-# so if not desired (such as for WTP 2.0 unit tests), 

-# then we have to spec Java 5 right there where we run 

-# the tests. 

-export JAVA_HOME=${JAVA_4_HOME}

-

 

 ANT_CMD=${ANT_HOME}/bin/ant

 

diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 3fac3bc..f80ef0f 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -6,7 +6,7 @@
 if [ -n $BUILD_INITIALIZED ] 
 then
    source commonVariations.shsource 
-   source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource  
+   source ${RELENG_CONTROL}/commonComputedVariables.shsource  
 fi
 
 jmxport="7000"
@@ -24,5 +24,5 @@
 # We want to execute CC itself in Java 5
 export JAVA_HOME=${JAVA_5_HOME}
 
-sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome ${CCDIR} -ccname ${CCNAME} 1>out.txt 2>err.txt &
+sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} 1>out.txt 2>err.txt &
 
diff --git a/releng.control/cc_copyArtifacts.xml b/releng.control/cc_copyArtifacts.xml
index c27842f..e380e32 100644
--- a/releng.control/cc_copyArtifacts.xml
+++ b/releng.control/cc_copyArtifacts.xml
@@ -1,6 +1,7 @@
-<project name="cc_copyArtifacts"
-         default="copyArtifacts"
-         basedir=".">
+<project
+    name="cc_copyArtifacts"
+    default="copyArtifacts"
+    basedir=".">
 
 
     <!-- = = = standard properties pattern = = = -->
@@ -9,44 +10,54 @@
       some variables, e.g. ones we set, since properties are case sensitive, even if 
       the environment variables on your operating system are not, e.g. it will 
       be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
+    <property
+        environment="env" />
 
     <!-- 
     Let users override standard properties, if desired.
     If directory, file, or some properties do not exist,  
     then standard properties will be used.
    -->
-    <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+    <property
+        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
 
     <!-- = = = end standard properties pattern = = = -->
-
-
-
-    <property name="checkoutprojectname"
-              value="${projectname}" />
-
-
-    <target name="copyArtifacts" depends="init">
-        <mkdir dir="${localStampedArtifactsDirectory}" />
-        <mkdir dir="${localStampedArtifactsDirectory}/${buildLabel}" />
-        <copy todir="${localStampedArtifactsDirectory}/${buildLabel}"
-              overwrite="true">
-            <fileset dir="${env.BUILD_HOME}/projects/${projectname}/workdir/${buildLabel}" />
+    <property
+        name="checkoutprojectname"
+        value="${projectname}" />
+    <target
+        name="copyArtifacts"
+        depends="init"
+        if="buildLabel">
+        <mkdir
+            dir="${localStampedArtifactsDirectory}" />
+        <mkdir
+            dir="${localStampedArtifactsDirectory}/${buildLabel}" />
+        <copy
+            todir="${localStampedArtifactsDirectory}/${buildLabel}"
+            overwrite="true">
+            <fileset
+                dir="${env.PROJECT_PROJECTS}/${projectname}/workdir/${buildLabel}" />
+            <fileset
+                dir="${env.ANT_WORKING}" />
         </copy>
     </target>
-
-    <target name="init">
-
-        <property name="labelfile"
-                  value="${env.BUILD_HOME}/projects/${projectname}/workdir/label.properties" />
-
-        <available file="${labelfile}"
-                   property="labelfileavailable" />
-        <fail unless="labelfileavailable" />
-        <property file="${labelfile}" />
-        <property name="localStampedArtifactsDirectory"
-                  value="${localArtifactsDirectory}/${cctimestamp}" />
-
+    <target
+        name="init">
+        <fail unless="env.PROJECT_PROJECTS" />
+        <fail unless="projectname" />
+        <property
+            name="labelfile"
+            value="${env.PROJECT_PROJECTS}/${projectname}/workdir/label.properties" />
+        <available
+            file="${labelfile}"
+            property="labelfileavailable" />
+        <fail
+            unless="labelfileavailable" />
+        <property
+            file="${labelfile}" />
+        <property
+            name="localStampedArtifactsDirectory"
+            value="${localArtifactsDirectory}/${cctimestamp}" />
     </target>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/releng.control/cc_project_build.xml b/releng.control/cc_project_build.xml
index 98da6c0..2f5e89b 100644
--- a/releng.control/cc_project_build.xml
+++ b/releng.control/cc_project_build.xml
@@ -1,93 +1,127 @@
-<project name="cc_project_build" default="Build" basedir=".">
+<project
+    name="cc_project_build"
+    default="Build"
+    basedir=".">
 
 
-	<!-- = = = standard properties pattern = = = -->
-	<!-- 
-    	Note to be cross-platform, "environment variables" are only appropriate for 
+    <!-- = = = standard properties pattern = = = -->
+    <!-- 
+        Note to be cross-platform, "environment variables" are only appropriate for 
         some variables, e.g. ones we set, since properties are case sensitive, even if 
         the environment variables on your operating system are not, e.g. it will 
         be ${env.Path} not ${env.PATH} on Windows -->
-	<property environment="env" />
+    <property
+        environment="env" />
 
-	<!-- 
-    	Let users override standard properties, if desired.
-    	If directory, file, or some properties do not exist,  
-    	then standard properties will be used.
+    <!-- 
+        Let users override standard properties, if desired.
+        If directory, file, or some properties do not exist,  
+        then standard properties will be used.
      -->
-	<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+    <property
+        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
 
-	<!-- = = = end standard properties pattern = = = -->
+    <!-- = = = end standard properties pattern = = = -->
 
+    <!-- if not otherwise set, build clean -->
+    <property
+        name="build.clean"
+        value="true" />
 
-	<!-- 
-    	If not set yet, by "caller", then we set checkoutprojectname here. 
-    	Normally this is literally the project name from CruiseControl, but 
-    	if running "standalone", we make this simplifying assumption.
+    <!-- 
+        If not set yet, by "caller", then we set checkoutprojectname here. 
+        Normally this is literally the project name from CruiseControl, but 
+        if running "standalone", we make this simplifying assumption.
     -->
-	<property name="build.distribution" value="wtp" />
-	<property name="buildBranch" value="R3.0" />
-	<property name="buildType" value="I" />
-	<property name="checkoutprojectname" value="${build.distribution}-${buildBranch}-${buildType}" />
+    <property
+        name="checkoutprojectname"
+        value="${projectname}" />
 
-	<target name="Build">
+    <!-- if not otherwise set, the following are good default values -->
+    <property
+        name="mapVersionTag"
+        value="HEAD" />
+    <target
+        name="Build">
 
-		<!-- set main builder file name, based on distribution, buildBranch and build type -->
-		<property name="wtpBuilder" value="${env.BUILD_HOME}/projectBuilders/${checkoutprojectname}/${env.RELENG_BUILDER}/build.xml" />
+        <!-- set main builder file name, based on distribution, buildBranch and build type -->
+        <property
+            name="builder"
+            value="${env.PROJECT_BUILDERS}/${checkoutprojectname}/${env.RELENG_BUILDER}/build.xml" />
+        <antcall
+            target="doCleanBuild" />
 
-		<antcall target="doCleanBuild" />
-
-		<!-- and create preliminary download site files -->
-		<ant antfile="${wtpBuilder}" target="site" />
-		<!-- upload what we have so far -->
-		<ant antfile="${wtpBuilder}" target="upload" />
-
-		<antcall target="doTestPhase" />
+        <!-- and create preliminary download site files -->
+        <ant
+            antfile="${builder}"
+            target="site" />
+        <!-- upload what we have so far -->
+        <ant
+            antfile="${builder}"
+            target="upload" />
+        <antcall
+            target="doTestPhase" />
+    </target>
+    <target
+        name="doCleanBuild"
+        unless="skipCleanBuild">
+        <!-- clean previous build -->
+        <antcall
+            target="clean" />
 
 
-	</target>
-
-	<target name="doCleanBuild" unless="skipCleanBuild">
-		<!-- clean previous build -->
-		<antcall target="clean" />
-
-		<!-- check out fresh set of appropriate files  -->
-		<!-- this is to make sure maps and builders are correct, but also to 
-			 make sure the cruisecontrol triggered "diffs" are accurate next 
-			 time around -->
-		<ant antfile="checkout.xml">
-			<property name="checkoutprojectname" value="${checkoutprojectname}" />
-		</ant>
-		<!-- build  -->
-		<ant antfile="${wtpBuilder}" target="build" />
-
-	</target>
-
-	<target name="doTestPhase" unless="skipUnitTests">
-		<!-- test and create test summary files -->
-		<ant antfile="${wtpBuilder}" target="test" />
-
-		<ant antfile="${wtpBuilder}" target="site" />
-		<!-- upload what we have so far -->
-		<ant antfile="${wtpBuilder}" target="upload" />
-	</target>
-
-    <!-- TODO: projects and tests should be variables, see build.properties in wtpBuilder -->
-	<target name="clean" depends="check.clean" if="doClean">
-		<delete dir="${env.BUILD_HOME}/projects/${checkoutprojectname}" failonerror="false" />
-		<delete dir="${env.BUILD_HOME}/tests/${checkoutprojectname}" failonerror="false" />
-	</target>
-
-	<!-- if build.clean does not exist, set doClean to true -->
-	<target name="check.clean">
-		<condition property="doClean">
-			<or> 
-	      <not>
-	        <isset property="build.clean"/>
-	      </not>
-				<equals arg1="${build.clean}" arg2="true" />
-			</or>
-		</condition>
-	</target>
 
 
-</project>
+        <!-- check out fresh set of appropriate files for the builder -->
+        <ant
+            antfile="checkout.xml" />
+
+        <!-- build and create preliminary download site files -->
+        <ant
+            antfile="${builder}"
+            target="build" />
+    </target>
+    <target
+        name="doTestPhase"
+        unless="skipUnitTests">
+        <!-- test and create test summary files -->
+        <ant
+            antfile="${builder}"
+            target="test" />
+        <ant
+            antfile="${builder}"
+            target="site" />
+        <!-- upload what we have so far -->
+        <ant
+            antfile="${builder}"
+            target="upload" />
+    </target>
+    <target
+        name="clean"
+        depends="check.clean"
+        if="doClean">
+        <delete
+            dir="${env.PROJECT_PROJECTS}/${checkoutprojectname}"
+            failonerror="false" />
+        <delete
+            dir="${env.PROJECT_TESTS}/${checkoutprojectname}"
+            failonerror="false" />
+    </target>
+
+    <!-- if build.clean does not exist, set doClean to true -->
+    <target
+        name="check.clean">
+        <condition
+            property="doClean">
+            <or>
+                <not>
+                    <isset
+                        property="build.clean" />
+                </not>
+                <equals
+                    arg1="${build.clean}"
+                    arg2="true" />
+            </or>
+        </condition>
+    </target>
+</project>
\ No newline at end of file
diff --git a/releng.control/cc_project_retest.xml b/releng.control/cc_project_retest.xml
deleted file mode 100644
index 8a9cf28..0000000
--- a/releng.control/cc_project_retest.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<project name="cc_project_build" default="Build" basedir=".">
-
-    
-    <!-- = = = standard properties pattern = = = -->
-    <!-- 
-    	Note to be cross-platform, "environment variables" are only appropriate for 
-        some variables, e.g. ones we set, since properties are case sensitive, even if 
-        the environment variables on your operating system are not, e.g. it will 
-        be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
-     
-    <!-- 
-    	Let users override standard properties, if desired.
-    	If directory, file, or some properties do not exist,  
-    	then standard properties will be used.
-     -->
-    <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-    <!-- = = = end standard properties pattern = = = -->
-
-    
-    <!-- 
-    	If not set yet, by "caller", then we set checkoutprojectname here. 
-    	Normally this is literally the project name from CruiseControl, but 
-    	if running "standalone", we make this simplifying assumption.
-    -->
-    <property name="build.distribution" value="wtp" />
-    <property name="buildBranch" value="R3.0" />
-    <property name="buildType" value="I" />
-    <property name="checkoutprojectname" value="${build.distribution}-${buildBranch}-${buildType}" />
-
-    <target name="Build">
-
-        <!-- set main builder file name, based on distribution, buildBranch and build type -->
-        <property name="wtpBuilder"
-                  value="${env.BUILD_HOME}/projectBuilders/${checkoutprojectname}/${env.RELENG_BUILDER}/build.xml" />
-
-       
-
-        <!-- do not clean previous build for re-rest 
-        <antcall target="clean" />
-	-->
-
-
-
-        <!-- check out fresh set of appropriate files  -->
-        <!-- this is to make sure maps and builders are correct, but also to 
-			 make sure the cruisecontrol triggered "diffs" are accurate next 
-			 time around -->
-
-	<!-- do need to checkout builders for just re-test since stored in "retest-wtp" directory -->
-        <ant antfile="checkout.xml">
-            <property name="checkoutprojectname" value="${checkoutprojectname}"/>
-        </ant>
-	
-
-        <!-- no need to build, create site, or do initial upload for re-test --> 
-        <!-- build and create preliminary download site files -->
-
-        <!-- <ant antfile="${wtpBuilder}" target="build" /> -->
-
-        <!-- <ant antfile="${wtpBuilder}" target="site" /> -->
-        
-        <!-- upload what we have so far -->
-        <!-- <ant antfile="${wtpBuilder}" target="upload" /> -->
-
-
-        <!-- test and create test summary files -->
-        <ant antfile="${wtpBuilder}" target="test" />
-
-        <ant antfile="${wtpBuilder}" target="site" />
-        <!-- upload what we have so far -->
-        <ant antfile="${wtpBuilder}" target="upload" />
-
-    </target>
-
-
-
-    <target name="clean" depends="check.clean" if="doClean">
-        <delete dir="${env.BUILD_HOME}/projects/${checkoutprojectname}"
-                failonerror="false" />
-        <delete dir="${env.BUILD_HOME}/tests/${checkoutprojectname}"
-                failonerror="false" />
-    </target>
-
-
-    <target name="check.clean">
-        <condition property="doClean">
-            <equals arg1="${build.clean}" arg2="true" />
-        </condition>
-    </target>
-
-
-</project>
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 3819cae..1bd00f2 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -9,7 +9,8 @@
         some variables, e.g. ones we set, since properties are case sensitive, even if
         the environment variables on your operating system are not, e.g. it will
         be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
+    <property
+        environment="env" />
 
     <!--
         Let users override standard properties, if desired.
@@ -25,7 +26,6 @@
     <property
         name="checkout.builder.clean"
         value="true" />
-	
     <property
         name="mapVersionTag"
         value="HEAD" />
@@ -50,32 +50,31 @@
     <property
         name="mapCvsRoot"
         value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
-
     <property
         name="codir"
-        value="${env.BUILD_HOME}/projectBuilders/${checkoutprojectname}" />
-
-
-
-    <echo message="checkoutprojectname: ${checkoutprojectname}" />
+        value="${env.PROJECT_BUILDERS}/${checkoutprojectname}" />
+    <echo
+        message="checkoutprojectname: ${checkoutprojectname}" />
     <target
         name="checkout"
         if="checkoutprojectname">
         <!-- we always check and init the builder -->
-        <antcall target="getwtpbuilder" />
-        <!-- and projects can do more if needed. -->
-        <antcall target="${checkoutprojectname}" />
+        <antcall
+            target="getbuilder" />
+        <!-- and distribution projects can do more if needed. -->
+        <antcall
+            target="${checkoutprojectname}" />
     </target>
-
-    <target name="wtp-R3.0-N">
-
+    <target
+        name="wtp-R3.0-N">
     </target>
-
-    <target name="retest-wtp-R3.0-N">
-        <antcall target="wtp-R3.0-N" />
+    <target
+        name="retest-wtp-R3.0-N">
+        <antcall
+            target="wtp-R3.0-N" />
     </target>
-
-    <target name="wtp-R3.0-S">
+    <target
+        name="wtp-R3.0-S">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -91,11 +90,13 @@
             dest="${codir}"
             tag="HEAD" />
     </target>
-    <target name="retest-wtp-R3.0-S">
-        <antcall target="wtp-R3.0-S" />
+    <target
+        name="retest-wtp-R3.0-S">
+        <antcall
+            target="wtp-R3.0-S" />
     </target>
-
-    <target name="wtp-R3.0-I">
+    <target
+        name="wtp-R3.0-I">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -111,11 +112,13 @@
             dest="${codir}"
             tag="HEAD" />
     </target>
-    <target name="retest-wtp-R3.0-I">
-        <antcall target="wtp-R3.0-I" />
+    <target
+        name="retest-wtp-R3.0-I">
+        <antcall
+            target="wtp-R3.0-I" />
     </target>
-
-    <target name="wtp-R3.0-R">
+    <target
+        name="wtp-R3.0-R">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -131,12 +134,13 @@
             dest="${codir}"
             tag="HEAD" />
     </target>
-    <target name="retest-wtp-R3.0-R">
-        <antcall target="wtp-R3.0-R" />
+    <target
+        name="retest-wtp-R3.0-R">
+        <antcall
+            target="wtp-R3.0-R" />
     </target>
-
-
-    <target name="wtp-R1.5-M">
+    <target
+        name="wtp-R1.5-M">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -152,10 +156,13 @@
             dest="${codir}"
             tag="R1_5_maintenance" />
     </target>
-    <target name="retest-wtp-R1.5-M">
-        <antcall target="wtp-R1.5-M" />
+    <target
+        name="retest-wtp-R1.5-M">
+        <antcall
+            target="wtp-R1.5-M" />
     </target>
-    <target name="wtp-R2.0-M">
+    <target
+        name="wtp-R2.0-M">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -185,7 +192,8 @@
             dest="${codir}"
             tag="R1_0_maintenance" />
     </target>
-    <target name="wtp-R2.0-R">
+    <target
+        name="wtp-R2.0-R">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -215,11 +223,13 @@
             dest="${codir}"
             tag="R1_0_maintenance" />
     </target>
-    <target name="retest-wtp-R2.0-M">
-        <antcall target="wtp-R2.0-M" />
+    <target
+        name="retest-wtp-R2.0-M">
+        <antcall
+            target="wtp-R2.0-M" />
     </target>
-
-    <target name="jem-R1.5-M">
+    <target
+        name="jem-R1.5-M">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -235,8 +245,8 @@
             dest="${codir}"
             tag="R1_5_maintenance" />
     </target>
-
-    <target name="patches-R1.5-P">
+    <target
+        name="patches-R1.5-P">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -252,8 +262,8 @@
             dest="${codir}"
             tag="R1_5_5_patches" />
     </target>
-
-    <target name="wtp-buildTools-R3.0-T">
+    <target
+        name="wtp-buildTools-R3.0-T">
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -268,34 +278,36 @@
     <!--
         The order of execution of these three worker targets
         is critical, check.clean, initBuilders, and
-        then getwtpbuilder.
+        then getbuilder.
     -->
     <target
-        name="getwtpbuilder"
+        name="getbuilder"
         depends="check.clean,initBuilders"
         if="doClean">
         <!-- This is a special property file, that contains (only) the
-            value of wtpBuilderVersion. Then, that version of the builder
+            value of builderVersion. Then, that version of the builder
             is fetched to control the rest of the build -->
-        <property file="${codir}/${env.RELENG}/maps/build.cfg" />
+        <property
+            file="${codir}/${env.RELENG}/maps/build.cfg" />
         <delete
             dir="${codir}/${env.RELENG_BUILDER}"
             failonerror="false" />
         <echo
-            message="Version tag for ${env.RELENG_BUILDER} is: ${wtpBuilderVersion}" />
+            message="Version tag for ${env.RELENG_BUILDER} is: ${builderVersion}" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
             package="${env.RELENG_BUILDER}"
             dest="${codir}"
-            tag="${wtpBuilderVersion}" />
+            tag="${builderVersion}" />
     </target>
-
-    <target name="check.clean">
+    <target
+        name="check.clean">
         <echo
             message="checkout.builder.clean: ${checkout.builder.clean}" />
-        <condition property="doClean">
+        <condition
+            property="doClean">
             <equals
                 arg1="${checkout.builder.clean}"
                 arg2="true"
@@ -303,12 +315,12 @@
                 casesensitive="false" />
         </condition>
     </target>
-
     <target
         name="initBuilders"
         depends="check.clean"
         if="doClean">
-        <echo message="Version tag for ${env.RELENG}: ${mapVersionTag}" />
+        <echo
+            message="Version tag for ${env.RELENG}: ${mapVersionTag}" />
         <cvs
             quiet="true"
             cvsRoot="${mapCvsRoot}"
@@ -316,7 +328,4 @@
             dest="${codir}"
             tag="${mapVersionTag}" />
     </target>
-
-
-</project>
-
+</project>
\ No newline at end of file
diff --git a/releng.control/localBuildExample/checkout.properties b/releng.control/localBuildExample/checkout.properties
index 10817bc..f9e571b 100644
--- a/releng.control/localBuildExample/checkout.properties
+++ b/releng.control/localBuildExample/checkout.properties
@@ -1,12 +1,12 @@
 # 		checkout.propererties
 
 # 		Its handy to set this value to false, 
-# 		to test new versions of releng.wtpbuilder
-# 		If set to false, local edits to wtpbuilder files
+# 		to test new versions of releng.builder
+# 		If set to false, local edits to builder files
 # 		are not over written each time a 
 # 		build starts. 
 # 		Normally always 'true' for "production" builds, 
-# 		in which case the version of releng.wtpbuilder 
+# 		in which case the version of releng.builder 
 # 		specificed in releng/build.cfg is used for the build.
 
 checkout.builder.clean=true
diff --git a/releng.control/localBuildExample/whatisfixed.properties b/releng.control/localBuildExample/whatisfixed.properties
index 83e7f5e..08326b2 100644
--- a/releng.control/localBuildExample/whatisfixed.properties
+++ b/releng.control/localBuildExample/whatisfixed.properties
@@ -47,7 +47,7 @@
 buildRelease=${buildBranch}
 build.distribution=wtp
 
-wtpBuilder=${whatisfixed.workdir}/${env.RELENG_BUILDER}/distribution/${build.distribution}.whatisfixed/build.xml
+builder=${whatisfixed.workdir}/${env.RELENG_BUILDER}/distribution/${build.distribution}.whatisfixed/build.xml
 build.whatIsFixed=true
 build.trial=false
 
diff --git a/releng.control/whatisfixed.xml b/releng.control/whatisfixed.xml
index 334d208..5ee1abb 100644
--- a/releng.control/whatisfixed.xml
+++ b/releng.control/whatisfixed.xml
@@ -31,7 +31,7 @@
         <antcall target="releng" />
 
         <!-- create what-is-fixed summary files -->
-        <ant antfile="${wtpBuilder}">
+        <ant antfile="${builder}">
             <property
                 name="wtp.builder.home"
                 value="${whatisfixed.workdir}/${env.RELENG_BUILDER}" />
@@ -39,7 +39,7 @@
                 name="buildBranch"
                 value="${buildBranch}" />
             <property
-                name="wtpbuilder.whatisfixed.properties.file"
+                name="builder.whatisfixed.properties.file"
                 value="${basedir}/whatisfixed.properties" />
         </ant>
 
@@ -56,7 +56,7 @@
             file="${whatisfixed.workdir}/${env.RELENG_BUILDER}/scripts/dependency/build.xml"
             property="releng.exists" />
         <antcall target="checkout-maps" />
-        <antcall target="getwtpbuilder" />
+        <antcall target="getbuilder" />
     </target>
 
     <target
@@ -72,21 +72,21 @@
     </target>
 
     <target
-        name="getwtpbuilder"
+        name="getbuilder"
         unless="releng.exists">
         <property file="${whatisfixed.workdir}/${env.RELENG}/maps/build.cfg" />
         <delete
             dir="${whatisfixed.workdir}/${env.RELENG_BUILDER}"
             failonerror="false" />
         <echo
-            message="Version tag for ${env.RELENG_BUILDER} is: ${wtpBuilderVersion}" />
+            message="Version tag for ${env.RELENG_BUILDER} is: ${builderVersion}" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
             package="${env.RELENG_BUILDER}"
             dest="${whatisfixed.workdir}"
-            tag="${wtpBuilderVersion}" />
+            tag="${builderVersion}" />
     </target>
 
     <target name="clean">