diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index 79ac730..8e2dc8b 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -51,15 +51,6 @@
 javacVerbose=true
 #############################################################
 
-
-# 	Set this to the relative path for the
-# 	directory to be use for the current build.
-# 	It must be relative to the build home
-# 	Final name will include the ditribution name and build type
-# 	e.g:  projects/wtp-R3.0-I
-build.current=projects
-
-
 # 	Set this to the relative path for the
 # 	directory to be use for the current test pass.
 # 	It must be relative to the build home
@@ -97,5 +88,5 @@
 # in 3.2 based builds, pde's directory no longer has version number
 #pde.build.scripts=${pde.builder.path}/plugins/org.eclipse.pde.build_${eclipse.base.version}/scripts
 pde.build.scripts=${pde.builder.path}/plugins/org.eclipse.pde.build/scripts
-buildDirectory=${env.BUILD_HOME}/${build.current}/${build.distribution}-${buildBranch}-${buildType}/${build.directory}
-pde.builder.path=${env.BUILD_HOME}/builders/${eclipse.builder.version}/${eclipse.builder}
+buildDirectory=${env.PROJECT_PROJECTS}/${projectname}/${build.directory}
+pde.builder.path=${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index d65cc9b..7880713 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -88,7 +88,7 @@
                 value="${build.pack-all-in-one}" />
             <property
                 name="testRoot"
-                value="${env.BUILD_HOME}/${build.tests}/${build.distribution}-${buildBranch}-${buildType}" />
+                value="${env.PROJECT_TESTS}/${projectname}" />
             <property
                 name="dependencyTargets"
                 value="${wtp.builder.home}/scripts/dependency/build.xml" />
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index c47e982..e509bf5 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -130,13 +130,13 @@
                 value="${env.LOCAL_PREREQS_CACHE}" />
             <property
                 name="baseLocation"
-                value="${env.BUILD_HOME}/${build.current}/${build.distribution}-${buildBranch}-${buildType}/${base.location}" />
+                value="${env.BUILD_PROJ/${projectname}/${base.location}" />
             <property
                 name="buildRoot"
-                value="${env.BUILD_HOME}/${build.current}/${build.distribution}-${buildBranch}-${buildType}" />
+                value="${env.PROJECT_PROJECTS}/${projectname}" />
             <property
                 name="testRoot"
-                value="${env.BUILD_HOME}/${build.tests}/${build.distribution}-${buildBranch}-${buildType}" />
+                value="${env.PROJECT_TESTS}/${projectname}" />
             <property
                 name="performanceRoot"
                 value="${env.BUILD_HOME}/${build.perf.tests}-${buildType}" />
@@ -338,7 +338,7 @@
         	<jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}" />
         	<jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}" />
         	<jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
-          <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
+            <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
             <jvmarg value="-Dbuild.trial=${build.trial}" />
             <jvmarg value="-DbuildType=${buildType}" />
             <jvmarg value="-DbuildId=${buildId}" />