diff --git a/share/efi.tmpl b/share/efi.tmpl
index 7a2a53ed..d4354e94 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -1,4 +1,4 @@
-<%page args="ANABOOTDIR, KERNELDIR, efiarch"/>
+<%page args="configdir, KERNELDIR, efiarch"/>
 <% EFIBOOTDIR="EFI/BOOT" %>
 
 mkdir ${EFIBOOTDIR}
@@ -21,7 +21,7 @@ ${make_efiboot("images/efiboot.img", include_kernel=False)}
         copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR}
         copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
     %endif
-    install ${ANABOOTDIR}/grub.conf ${eficonf}
+    install ${configdir}/grub.conf ${eficonf}
     replace @PRODUCT@ ${product.name} ${eficonf}
     replace @VERSION@ ${product.version} ${eficonf}
     replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
diff --git a/share/ppc.tmpl b/share/ppc.tmpl
index 06163a94..a65f42b2 100644
--- a/share/ppc.tmpl
+++ b/share/ppc.tmpl
@@ -1,13 +1,13 @@
 <%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product"/>
 <%
-ANABOOTDIR="tmp/config_files"
+configdir="tmp/config_files"
 BOOTDIR="ppc"
 MACDIR=BOOTDIR+"/mac"
 NETBOOTDIR="images/netboot"
 
 WRAPPER="usr/sbin/wrapper"
 WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper"
-MAPPING=ANABOOTDIR+"/mapping"
+MAPPING=configdir+"/mapping"
 
 bitsizes = set()
 prepboot = ""
@@ -17,14 +17,14 @@ mkdir images
 install ${runtime_img} images/install.img
 
 mkdir ${BOOTDIR} ${BOOTDIR}/chrp etc
-install ${ANABOOTDIR}/bootinfo.txt ${BOOTDIR}
+install ${configdir}/bootinfo.txt ${BOOTDIR}
 install boot/efika.forth ${BOOTDIR}
 install usr/lib/yaboot/yaboot ${BOOTDIR}/chrp
 
 ## boot dir for PowerMacs
 mkdir ${MACDIR}
 install usr/lib/yaboot/yaboot ${MACDIR}
-install ${ANABOOTDIR}/ofboot.b ${MACDIR}
+install ${configdir}/ofboot.b ${MACDIR}
 
 %for kernel in kernels:
     <%
@@ -34,7 +34,7 @@ install ${ANABOOTDIR}/ofboot.b ${MACDIR}
       bitsizes.add(bits)
     %>
     mkdir ${KERNELDIR} ${NETBOOTDIR}
-    install ${ANABOOTDIR}/yaboot.conf.in ${KERNELDIR}/yaboot.conf
+    install ${configdir}/yaboot.conf.in ${KERNELDIR}/yaboot.conf
     installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz
     installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
 
@@ -62,7 +62,7 @@ runcmd ${inroot}/usr/lib/yaboot/addnote ${outroot}/${BOOTDIR}/chrp/yaboot
 ## copy yaboot.conf into /etc
 %if len(bitsizes) == 2:
     ## magic ppc biarch tree! we need magic ppc biarch config.
-    install ${ANABOOTDIR}/yaboot.conf.3264 etc/yaboot.conf
+    install ${configdir}/yaboot.conf.3264 etc/yaboot.conf
     replace @PRODUCT@ ${product.name}      etc/yaboot.conf
     replace @VERSION@ ${product.version}   etc/yaboot.conf
     replace @ROOT@ root=live:CDLABEL=PBOOT etc/yaboot.conf
diff --git a/share/s390.tmpl b/share/s390.tmpl
index 483a067f..2a8b34e4 100644
--- a/share/s390.tmpl
+++ b/share/s390.tmpl
@@ -1,6 +1,6 @@
 <%page args="kernels, runtime_img, basearch, outroot"/>
 <%
-ANABOOTDIR="tmp/config_files"
+configdir="tmp/config_files"
 BOOTDIR="images"
 KERNELDIR=BOOTDIR
 INITRD_ADDRESS="0x02000000"
@@ -12,9 +12,9 @@ kernel = kernels[0]
 mkdir images
 install ${runtime_img} images
 
-install ${ANABOOTDIR}/redhat.exec ${BOOTDIR}
-install ${ANABOOTDIR}/generic.prm ${BOOTDIR}
-install ${ANABOOTDIR}/generic.ins .
+install ${configdir}/redhat.exec ${BOOTDIR}
+install ${configdir}/generic.prm ${BOOTDIR}
+install ${configdir}/generic.ins .
 
 replace @INITRD_LOAD_ADDRESS@ ${INITRD_ADDRESS} generic.ins
 
diff --git a/share/sparc.tmpl b/share/sparc.tmpl
index 9a53c942..2802809e 100644
--- a/share/sparc.tmpl
+++ b/share/sparc.tmpl
@@ -1,6 +1,6 @@
 <%page args="kernels, runtime_img, basearch, outroot, product"/>
 <%
-ANABOOTDIR="tmp/config_files"
+configdir="tmp/config_files"
 BOOTDIR="boot"
 KERNELDIR=BOOTDIR
 %>
@@ -9,8 +9,8 @@ mkdir images
 install ${runtime_img} images/install.img
 
 install boot/*.b ${BOOTDIR}
-install ${ANABOOTDIR}/silo.conf ${BOOTDIR}
-install ${ANABOOTDIR}/boot.msg.sparc ${BOOTDIR}/boot.msg
+install ${configdir}/silo.conf ${BOOTDIR}
+install ${configdir}/boot.msg.sparc ${BOOTDIR}/boot.msg
 
 replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
 replace @PRODUCT@ ${product.name} ${BOOTDIR}/boot.msg
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 6a93ba8b..91d09acf 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -1,6 +1,6 @@
 <%page args="kernels, runtime_img, basearch, outroot, product"/>
 <%
-ANABOOTDIR="tmp/config_files"
+configdir="tmp/config_files"
 SYSLINUXDIR="usr/share/syslinux"
 PXEBOOTDIR="images/pxeboot"
 BOOTDIR="isolinux"
@@ -12,11 +12,11 @@ install ${runtime_img} images/install.img
 
 mkdir ${BOOTDIR} ${KERNELDIR}
 install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
-install ${ANABOOTDIR}/syslinux.cfg ${BOOTDIR}/isolinux.cfg
+install ${configdir}/syslinux.cfg ${BOOTDIR}/isolinux.cfg
 install usr/share/anaconda/boot/syslinux-vesa-splash.jpg ${BOOTDIR}/splash.jpg
-install ${ANABOOTDIR}/boot.msg.x86 ${BOOTDIR}/boot.msg
+install ${configdir}/boot.msg.x86 ${BOOTDIR}/boot.msg
 install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR}
-install ${ANABOOTDIR}/grub.conf ${BOOTDIR}
+install ${configdir}/grub.conf ${BOOTDIR}
 
 replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
 replace @PRODUCT@ ${product.name}    ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
@@ -56,7 +56,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
     efiargs="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot"
     efigraft="EFI/BOOT={0}/EFI/BOOT images/efiboot.img={0}/images/efiboot.img".format(outroot)
     %>
-    <%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
+    <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
 %endif
 
 runcmd mkisofs -o ${outroot}/images/boot.iso \