diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index afa249437c0c1dcc9fab29f5c994bca70a5f7334..6e871f061607bd5d91cf39b824ecee20c721237c 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -154,7 +154,7 @@
         <modificationset quietperiod="120">
             <cvs
                 tag="R1_5_maintenance"
-                module="${env.releng}"
+                module="${env.RELENG}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
 
@@ -193,15 +193,15 @@
         <modificationset quietperiod="120">
             <cvs
                 tag="R2_0_maintenance"
-                module="${env.releng}"
+                module="${env.RELENG}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
-                module="${env.relengdali}"
+                module="${env.RELENGDALI}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
-                module="${env.relengjsf}"
+                module="${env.RELENGJSF}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
 
@@ -239,15 +239,15 @@
         <modificationset quietperiod="120">
             <cvs
                 tag="R2_0_maintenance"
-                module="${env.releng}"
+                module="${env.RELENG}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
-                module="${env.relengdali}"
+                module="${env.RELENGDALI}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
-                module="${env.relengjsf}"
+                module="${env.RELENGJSF}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
 
@@ -284,13 +284,13 @@
 
         <modificationset quietperiod="120">
             <cvs
-                module="${env.releng}"
+                module="${env.RELENG}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
-                module="${env.relengjsf}"
+                module="${env.RELENGJSF}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
-                module="${env.relengdali}"
+                module="${env.RELENGDALI}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
 
@@ -365,13 +365,13 @@
 
         <modificationset quietperiod="120">
             <cvs
-                module="${env.releng}"
+                module="${env.RELENG}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
-                module="${env.relengjsf}"
+                module="${env.RELENGJSF}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
-                module="${env.relengdali}"
+                module="${env.RELENGDALI}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
 
@@ -417,13 +417,13 @@
 
         <modificationset quietperiod="120">
             <cvs
-                module="${env.releng}"
+                module="${env.RELENG}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
-                module="${env.relengjsf}"
+                module="${env.RELENGJSF}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
-                module="${env.relengdali}"
+                module="${env.RELENGDALI}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
 
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 081bdf86bb78a88ec812d567db4df8c7e0f2d94b..a3fd32b86d1eba3a761eb078a994363ceb93b51a 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -65,14 +65,14 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengjsf}"
+            package="${env.RELENGJSF}"
             dest="${codir}"
             tag="HEAD" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengdali}"
+            package="${env.RELENGDALI}"
             dest="${codir}"
             tag="HEAD" />
     </target>
@@ -85,14 +85,14 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengjsf}"
+            package="${env.RELENGJSF}"
             dest="${codir}"
             tag="HEAD" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengdali}"
+            package="${env.RELENGDALI}"
             dest="${codir}"
             tag="HEAD" />
     </target>
@@ -105,14 +105,14 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengjsf}"
+            package="${env.RELENGJSF}"
             dest="${codir}"
             tag="HEAD" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengdali}"
+            package="${env.RELENGDALI}"
             dest="${codir}"
             tag="HEAD" />
     </target>
@@ -126,7 +126,7 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="$${env.releng}"
+            package="${env.RELENG}"
             dest="${codir}"
             tag="R1_5_maintenance" />
     </target>
@@ -138,21 +138,21 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="$${env.releng}"
+            package="${env.RELENG}"
             dest="${codir}"
             tag="R2_0_maintenance" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengdali}"
+            package="${env.RELENGDALI}"
             dest="${codir}"
             tag="R1_0_maintenance" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengjsf}"
+            package="${env.RELENGJSF}"
             dest="${codir}"
             tag="R1_0_maintenance" />
     </target>
@@ -161,21 +161,21 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="$${env.releng}"
+            package="${env.RELENG}"
             dest="${codir}"
             tag="R2_0_maintenance" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengdali}"
+            package="${env.RELENGDALI}"
             dest="${codir}"
             tag="R1_0_maintenance" />
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengjsf}"
+            package="${env.RELENGJSF}"
             dest="${codir}"
             tag="R1_0_maintenance" />
     </target>
@@ -188,7 +188,7 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="$${env.releng}"
+            package="${env.RELENG}"
             dest="${codir}"
             tag="R1_5_maintenance" />
     </target>
@@ -197,7 +197,7 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="$${env.releng}"
+            package="${env.RELENG}"
             dest="${codir}"
             tag="R1_5_maintenance_patches" />
     </target>
@@ -226,7 +226,7 @@
         <!-- This is a special property file, that contains (only) the
             value of wtpBuilderVersion. 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}/releng.wtpbuilder"
             failonerror="false" />
@@ -236,7 +236,7 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.relengwtpbuilder}"
+            package="${env.RELENGWTPBUILDER}"
             dest="${codir}"
             tag="${wtpBuilderVersion}" />
     </target>
@@ -257,11 +257,11 @@
         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}"
-            package="$${env.releng}"
+            package="${env.RELENG}"
             dest="${codir}"
             tag="${mapVersionTag}" />
     </target>
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
index 66c4aa8939d0f508225b8cfa1ea8aadb72f4b792..c7af5fa2577921c7aff398c8a1ff01aa71e3b655 100644
--- a/releng.control/commonComputedVariables.shsource
+++ b/releng.control/commonComputedVariables.shsource
@@ -80,10 +80,10 @@ export JAVADOC_COMMAND="${JAVA_5_HOME}/bin/javadoc"
 export TZ='UTC-0';
 
 
-export releng=webtools.maps/releng
-export relengjsf=webtools.maps/releng-jsf
-export relengdali=webtools.maps/releng.dali
-export relengwtpbuilder=webtools.releng/releng.wtpbuilder
+export RELENG=webtools.maps/releng
+export RELENGJSF=webtools.maps/releng-jsf
+export RELENGDALI=webtools.maps/releng.dali
+export RELENGWTPBUILDER=webtools.releng/releng.wtpbuilder
 
 export BUILD_INITIALIZED="true"
 
diff --git a/releng.control/whatisfixed.xml b/releng.control/whatisfixed.xml
index 677328dea60658584c20f8333eeb8cda96818116..3ea8b06a8e774b41d65ef7e4de6686b72dc13d78 100644
--- a/releng.control/whatisfixed.xml
+++ b/releng.control/whatisfixed.xml
@@ -69,7 +69,7 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.releng}/maps/build.cfg"
+            package="${env.RELENG}/maps/build.cfg"
             dest="${whatisfixed.workdir}"
             tag="${wtp.cvsTag}" />
     </target>
@@ -87,7 +87,7 @@
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
             cvsRoot="${mapCvsRoot}"
-            package="${env.releng.wtpbuilder}"
+            package="${env.RELENGWTPBUILDER}"
             dest="${whatisfixed.workdir}"
             tag="${wtpBuilderVersion}" />
     </target>