streamline build scripts
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index 8e2dc8b..929e178 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -77,7 +77,7 @@
 
 #############################################################
 # Other inline resolved properties
-pde.builder.path=${env.BUILD_HOME}/builders/${eclipse.builder.version}/${eclipse.builder}
+pde.builder.path=${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}
 # Beginning with 33M5, the startup.jar was removed. Currently, in basebuilder,
 # this launcher is provided without version number. If we ever move to use plain
 # eclipse, we'll need a bit of script find and rename (or set the variable).
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
index 3a31bb4..9d67785 100644
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ b/releng.wtpbuilder/components/jst/dependency.xml
@@ -27,7 +27,7 @@
 
         <property
             name="pde.builder.path"
-            value="${env.BUILD_HOME}/builders/${eclipse.builder.version}/${eclipse.builder}" />
+            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" />
         <echo
             level="debug"
             message="pde.builder.path: ${pde.builder.path}" />
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index f9d56a7..69d8a74 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -27,7 +27,7 @@
 
         <property
             name="pde.builder.path"
-            value="${env.BUILD_HOME}/builders/${eclipse.builder.version}/${eclipse.builder}" />
+            value="${env.BASE_BUIDERS}/${eclipse.builder.version}/${eclipse.builder}" />
         <echo
             level="debug"
             message="pde.builder.path: ${pde.builder.path}" />
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 0eb96df..6a39df9 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -27,7 +27,7 @@
 
     <property
         name="basebuilder.path"
-        value="${env.BUILD_HOME}/builders/${eclipse.builder.version}" />
+        value="${env.BASE_BUILDERS}/${eclipse.builder.version}" />
 
 
 
@@ -182,7 +182,7 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${builderCvsRoot}"
-            package="org.eclipse.releng.basebuilder"
+            package="${eclipse.builder}"
             dest="${basebuilder.path}"
             tag="${eclipse.builder.version}" />
 
@@ -346,6 +346,8 @@
             <jvmarg
                 value="-Declipse.builder.version=${eclipse.builder.version}" />
             <jvmarg
+                value="-Declipse.builder=${eclipse.builder}" />
+            <jvmarg
                 value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}" />
             <jvmarg
                 value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />