diff --git a/BldHelper-32-release.sh b/BldHelper-32-release.sh
index 844c9b55..33fde466 100755
--- a/BldHelper-32-release.sh
+++ b/BldHelper-32-release.sh
@@ -31,7 +31,7 @@ cd ./My-distro-configs-debian && git pull --ff-only
 
 # Timing matters, don't destroy the old one without a replacement.
 # Check for the ISO to appear and wait for things to settle.
-until [ -e build32/*.iso ]
+until [ -e build32pae/*.iso ]
       do ((++_break))
 	 [ $_break -gt $_wait ] && break || sleep 1
 done
@@ -40,10 +40,10 @@ if [ ${_break} -lt ${_wait} ] ; then
 ### 10 June, 2022 - After 17 June, this comment and the following line can be removed
 echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out
 
-mv build32/*.iso build32/${FileName}.iso
+mv build32pae/*.iso build32pae/${FileName}.iso
 
 # Make the checksum file.
-cd build32
+cd build32pae
 echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
 sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
 
diff --git a/build-32.sh b/build-32.sh
index d7cc7ee0..ad075fad 100755
--- a/build-32.sh
+++ b/build-32.sh
@@ -2,18 +2,18 @@
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
-build32="$(pwd)"
+build32pae="$(pwd)"
 
 
-# Create the build32 folder, move into it removing stale mountpoints and files there.
-[ -e build32 ] && [ ! -d build32 ] && rm -f build32 || [ ! -e build32 ] && mkdir build32
-cd build32
+# Create the build32pae folder, move into it removing stale mountpoints and files there.
+[ -e build32pae ] && [ ! -d build32pae ] && rm -f build32pae || [ ! -e build32pae ] && mkdir build32pae
+cd build32pae
 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null
 for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done
 
 
 # Set of the structure to be used for the ISO and Live system.
-# See /usr/lib/live/build32/config for a full list of examples.
+# See /usr/lib/live/build32pae/config for a full list of examples.
 # Up above is the manual description of what options I used so far.
 
 lb config noauto \
@@ -51,8 +51,8 @@ lb config noauto \
 
 
 # Install the Xfce Desktop 
-mkdir -p $build32/build32/config/package-lists
-echo xfce4 xfce4-goodies > $build32/build32/config/package-lists/desktop.list.chroot 
+mkdir -p $build32pae/build32pae/config/package-lists
+echo xfce4 xfce4-goodies > $build32pae/build32pae/config/package-lists/desktop.list.chroot 
 
 # Install software
 echo "# Install software to the squashfs for calamares to unpack to the OS.
@@ -195,7 +195,7 @@ ffmpegthumbnailer
 xterm
 grub-pc
 
-" > $build32/build32/config/package-lists/packages.list.chroot 
+" > $build32pae/build32pae/config/package-lists/packages.list.chroot 
 
 
 # Packages to be stored in /pool but not installed in the OS .
@@ -213,53 +213,53 @@ shim-helpers-i386-signed
 shim-signed
 shim-signed-common
 shim-unsigned
-" > $build32/build32/config/package-lists/installer.list.binary 
+" > $build32pae/build32pae/config/package-lists/installer.list.binary 
 
 
 # Setup the chroot structure
-mkdir -p $build32/build32/config/archives
-mkdir -p $build32/build32/config/includes.binary
-mkdir -p $build32/build32/config/hooks/live
-mkdir -p $build32/build32/config/hooks/normal
-mkdir -p $build32/build32/config/bootloaders
-mkdir -p $build32/build32/config/packages.chroot
-mkdir -p $build32/build32/config/includes.chroot/etc
-mkdir -p $build32/build32/config/includes.chroot/usr/share/applications
-mkdir -p $build32/build32/config/includes.chroot/usr/share/backgrounds
-mkdir -p $build32/build32/config/includes.chroot/etc/calamares
-mkdir -p $build32/build32/config/includes.chroot/usr/share/icons
-mkdir -p $build32/build32/config/includes.chroot/usr/share/themes
-mkdir -p $build32/build32/config/includes.chroot/etc/live/config.conf.d
-mkdir -p $build32/build32/config/includes.chroot/etc/dpkg/origins
-mkdir -p $build32/build32/config/includes.chroot/usr/sbin
-mkdir -p $build32/build32/config/includes.chroot/etc/lightdm
-mkdir -p $build32/build32/config/includes.chroot/usr/share/pixmaps
-mkdir -p $build32/build32/config/includes.chroot/usr/share/plymouth
-mkdir -p $build32/build32/config/includes.chroot/usr/share/desktop-base
-mkdir -p $build32/build32/config/includes.chroot/etc/skel/Desktop
-mkdir -p $build32/build32/config/includes.chroot/etc/default
+mkdir -p $build32pae/build32pae/config/archives
+mkdir -p $build32pae/build32pae/config/includes.binary
+mkdir -p $build32pae/build32pae/config/hooks/live
+mkdir -p $build32pae/build32pae/config/hooks/normal
+mkdir -p $build32pae/build32pae/config/bootloaders
+mkdir -p $build32pae/build32pae/config/packages.chroot
+mkdir -p $build32pae/build32pae/config/includes.chroot/etc
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/applications
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/backgrounds
+mkdir -p $build32pae/build32pae/config/includes.chroot/etc/calamares
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/icons
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/themes
+mkdir -p $build32pae/build32pae/config/includes.chroot/etc/live/config.conf.d
+mkdir -p $build32pae/build32pae/config/includes.chroot/etc/dpkg/origins
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/sbin
+mkdir -p $build32pae/build32pae/config/includes.chroot/etc/lightdm
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/pixmaps
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/plymouth
+mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/desktop-base
+mkdir -p $build32pae/build32pae/config/includes.chroot/etc/skel/Desktop
+mkdir -p $build32pae/build32pae/config/includes.chroot/etc/default
 
 # Copy Configs to the chroot
-cp $build32/userconfig/* $build32/build32/config/includes.chroot/etc/live/config.conf.d
-cp $build32/applications/* $build32/build32/config/includes.chroot/usr/share/applications
-cp $build32/hooks/live/* $build32/build32/config/hooks/live
-cp $build32/hooks/normal/* $build32/build32/config/hooks/normal
-cp $build32/install-debian/* $build32/build32/config/includes.chroot/usr/share/pixmaps
-cp $build32/sources-final/* $build32/build32/config/includes.chroot/usr/sbin
-cp $build32/bootloader-config-32bit/* $build32/build32/config/includes.chroot/usr/sbin
-cp $build32/grub/* $build32/build32/config/includes.chroot/etc/default
+cp $build32pae/userconfig/* $build32pae/build32pae/config/includes.chroot/etc/live/config.conf.d
+cp $build32pae/applications/* $build32pae/build32pae/config/includes.chroot/usr/share/applications
+cp $build32pae/hooks/live/* $build32pae/build32pae/config/hooks/live
+cp $build32pae/hooks/normal/* $build32pae/build32pae/config/hooks/normal
+cp $build32pae/install-debian/* $build32pae/build32pae/config/includes.chroot/usr/share/pixmaps
+cp $build32pae/sources-final/* $build32pae/build32pae/config/includes.chroot/usr/sbin
+cp $build32pae/bootloader-config-32bit/* $build32pae/build32pae/config/includes.chroot/usr/sbin
+cp $build32pae/grub/* $build32pae/build32pae/config/includes.chroot/etc/default
 
-cp -r $build32/lightdm/* $build32/build32/config/includes.chroot/etc/lightdm
-cp -r $build32/bootloaders/* $build32/build32/config/bootloaders
-cp -r $build32/repos/* $build32/build32/config/archives
-cp -r $build32/backgrounds/* $build32/build32/config/includes.chroot/usr/share/backgrounds
-cp -r $build32/calamares/* $build32/build32/config/includes.chroot/etc/calamares
-cp -r $build32/configs/* $build32/build32/config/includes.chroot/etc/
-cp -r $build32/icons/* $build32/build32/config/includes.chroot/usr/share/icons
-cp -r $build32/themes/* $build32/build32/config/includes.chroot/usr/share/themes
-cp -r $build32/desktop-base/* $build32/build32/config/includes.chroot/usr/share/desktop-base
-cp -r $build32/plymouth/* $build32/build32/config/includes.chroot/usr/share/plymouth
-cp -r $build32/packages32/* $build32/build32/config/packages.chroot
+cp -r $build32pae/lightdm/* $build32pae/build32pae/config/includes.chroot/etc/lightdm
+cp -r $build32pae/bootloaders/* $build32pae/build32pae/config/bootloaders
+cp -r $build32pae/repos/* $build32pae/build32pae/config/archives
+cp -r $build32pae/backgrounds/* $build32pae/build32pae/config/includes.chroot/usr/share/backgrounds
+cp -r $build32pae/calamares/* $build32pae/build32pae/config/includes.chroot/etc/calamares
+cp -r $build32pae/configs/* $build32pae/build32pae/config/includes.chroot/etc/
+cp -r $build32pae/icons/* $build32pae/build32pae/config/includes.chroot/usr/share/icons
+cp -r $build32pae/themes/* $build32pae/build32pae/config/includes.chroot/usr/share/themes
+cp -r $build32pae/desktop-base/* $build32pae/build32pae/config/includes.chroot/usr/share/desktop-base
+cp -r $build32pae/plymouth/* $build32pae/build32pae/config/includes.chroot/usr/share/plymouth
+cp -r $build32pae/packages32/* $build32pae/build32pae/config/packages.chroot
 
 # build the ISO #
 lb build  #--debug --verbose