Index: BOOK/Makefile
===================================================================
--- BOOK/Makefile	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/Makefile	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -76,5 +76,5 @@
 endef
 
-lfs: toplevel render common
+clfs: toplevel render common
 
 toplevel:
@@ -132,3 +132,41 @@
 	done
 
-.PHONY: lfs toplevel common render nochunk nochunk_render pdf text validate trouble dump-commands download-list
+target-list:
+	@printf "%-15s %-10s\n" "Architecture" "Build Type" ;\
+	for arch in $(ARCH) ; do \
+	MULTILIB=0 ;\
+	PURE64=0 ;\
+	TEST="`echo $$arch | grep -c -e '-64'`" ;\
+	if [ "$$TEST" = "1" ]; then \
+		PURE64=1 ;\
+	else \
+		TEST="`echo $$arch | grep -c -e '64'`" ;\
+		if [ "$$TEST" = "1" ]; then \
+			MULTILIB=1 ;\
+		fi; \
+	fi; \
+	if [ "$$PURE64" = "1" ]; then \
+		printf "%-15s %-10s\n" $$arch "Pure 64" ;\
+	else \
+		if [ "$$MULTILIB" = "1" ]; then \
+			printf "%-15s %-10s\n" $$arch "Multilib" ;\
+		else \
+			printf "%-15s %-10s\n" $$arch "Default" ;\
+		fi; \
+	fi; \
+	done
+
+help:
+	@printf "%-25s %-20s\n" "Command" "Function"
+	@printf "%-25s %-20s\n" "make download-list" "Create download file lists"
+	@printf "%-25s %-20s\n" "make dump-commands" "Dump all the commands from the book"
+	@printf "%-25s %-20s\n" "make clfs" "Make the standard multilib page book"
+	@printf "%-25s %-20s\n" "make nochunks" "Make single html file book"
+	@printf "%-25s %-20s\n" "make pdf" "Make pdf copy of the book"
+	@printf "%-25s %-20s\n" "make target-list" "Get List of Architecture targets"
+	@printf "%-25s %-20s\n" "make test" "Make a text copy of the book"
+	@printf "%-25s %-20s\n" "make trouble" "Make a copy tha's easy to troubleshoot"
+	@printf "%-25s %-20s\n" "make validate" "Run book validation"
+
+.PHONY: clfs toplevel common render nochunks nochunk_render pdf text validate trouble dump-commands download-list \
+	target-list help
Index: BOOK/README
===================================================================
--- BOOK/README	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/README	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -1,3 +1,3 @@
-LFS Book README
+CLFS Book README
 
 This document is meant to instruct the user on how to convert the book's XML 
@@ -7,4 +7,8 @@
 INSTALL file, then continue reading for examples how to convert these files into
 various other formats.
+
+By default all books will be generated, to only generate the target your want
+you can specify ARCH={target} to create a particular book to any of the command
+lines below. To get a list of targets use make target-list
 
 XML to XHTML:
Index: BOOK/boot/alpha/kernel.xml
===================================================================
--- BOOK/boot/alpha/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/alpha/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -67,5 +67,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -73,5 +73,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -91,5 +91,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/boot/common/changingowner.xml
===================================================================
--- BOOK/boot/common/changingowner.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/common/changingowner.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -11,11 +11,11 @@
   <title>Changing Ownership</title>
 
-  <para os="a">Currently, the <filename class="directory">$LFS</filename>
+  <para os="a">Currently, the <filename class="directory">$CLFS</filename>
   directory and all of its subdirectories  are owned by the user
   <systemitem class="username">lfs</systemitem>, a user that exists only
-  on the host system. For security reasons, the $LFS root directory and
+  on the host system. For security reasons, the $CLFS root directory and
   all of it subdirectories should be owned by
   <systemitem class="username">root</systemitem>. Change the ownership
-  for $LFS and its subdirectories by running this command:</para>
+  for $CLFS and its subdirectories by running this command:</para>
 
 <screen os="b"><userinput>chown -Rv root:root ${LFS}</userinput></screen>
Index: BOOK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/common/devices.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -21,5 +21,5 @@
       <para>The commands in the remainder of the book should be run as
       the <systemitem class="username">root</systemitem> user. Also,
-      double-check that $LFS is set as
+      double-check that $CLFS is set as
       <systemitem class="username">root</systemitem>.</para>
     </note>
Index: BOOK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/common/e2fsprogs.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -37,5 +37,5 @@
 <screen os="aa"><userinput>../configure --prefix=/tools \
     --enable-elf-shlibs --disable-evms \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="e">
Index: BOOK/boot/common/introduction.xml
===================================================================
--- BOOK/boot/common/introduction.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/common/introduction.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -18,13 +18,13 @@
   installed to allow you to boot the minimal system. Some of these
   packages will be installed onto the root or in /usr on the CLFS
-  partition ($LFS/bin, $LFS/usr/lib, etc...), rather than /tools, using the
+  partition ($CLFS/bin, $CLFS/usr/lib, etc...), rather than /tools, using the
   "DESTDIR" option with make. This will require the
   <systemitem class="username">lfs</systemitem> user to have write access to
-  the rest of the $LFS partition, so you will need to temporarily change the
-  ownership of $LFS to the <systemitem class="username">lfs</systemitem> user.
+  the rest of the $CLFS partition, so you will need to temporarily change the
+  ownership of $CLFS to the <systemitem class="username">lfs</systemitem> user.
   Run the following command as <systemitem
   class="username">root</systemitem>:</para>
 
-<screen><userinput>chown -v lfs $LFS</userinput></screen>
+<screen><userinput>chown -v lfs $CLFS</userinput></screen>
 
 </sect1>
Index: BOOK/boot/common/module-init-tools.xml
===================================================================
--- BOOK/boot/common/module-init-tools.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/common/module-init-tools.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="f"><userinput>./configure --prefix=/ \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/common/udev.xml
===================================================================
--- BOOK/boot/common/udev.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/common/udev.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CROSS_COMPILE="${LFS_TARGET}-" CC="${CC}" LD="${CC}" udevdir=/dev</userinput></screen>
+<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC}" LD="${CC}" udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips/colo-build.xml
===================================================================
--- BOOK/boot/mips/colo-build.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/mips/colo-build.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -34,5 +34,5 @@
 make CC=gcc
 cd ../..
-make CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
+make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/mips/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -67,5 +67,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -73,5 +73,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -91,5 +91,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET)- \
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET)- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/boot/mips64/colo-build.xml
===================================================================
--- BOOK/boot/mips64/colo-build.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/mips64/colo-build.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -38,5 +38,5 @@
 make CC=gcc
 cd ../..
-make CC="${CC} ${BUILD64}" CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
+make CC="${CC} ${BUILD64}" CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips64/flags.xml
===================================================================
--- BOOK/boot/mips64/flags.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/mips64/flags.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -17,5 +17,5 @@
 echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ${LFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/mips64/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -71,5 +71,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -77,5 +77,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -95,5 +95,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -44,5 +44,5 @@
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
 --enable-elf-shlibs --disable-evms \
---host=${LFS_TARGET}</userinput></screen>
+--host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/multilib/module-init-tools.xml
===================================================================
--- BOOK/boot/multilib/module-init-tools.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/multilib/module-init-tools.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="f"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/multilib/udev.xml
===================================================================
--- BOOK/boot/multilib/udev.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/multilib/udev.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CROSS_COMPILE="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
+<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
 	udevdir=/dev</userinput></screen>
 
Index: BOOK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/ppc/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -59,5 +59,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <warning>
@@ -70,5 +70,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -88,5 +88,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=ppc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/boot/ppc/mktemp.xml
===================================================================
--- BOOK/boot/ppc/mktemp.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/ppc/mktemp.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -35,5 +35,5 @@
 
 <screen os="e"><userinput>CC="${CC}" ./configure --prefix=/tools --with-libc\
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc/yaboot-build.xml
===================================================================
--- BOOK/boot/ppc/yaboot-build.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/ppc/yaboot-build.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -52,5 +52,5 @@
 
 <screen><userinput>cp Makefile,{.orig}
-sed -e "s/\(strip \)/${LFS_TARGET}-\1/" \
+sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
     -e 's/-o root -g root//' \
     Makefile.orig > Makefile</userinput></screen>
@@ -60,5 +60,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make CROSS=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make CROSS=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -66,5 +66,5 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make CROSS=${LFS_TARGET}- ROOT=/tools PREFIX= install</userinput></screen>
+<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install</userinput></screen>
 
   </sect2>
Index: BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/ppc64/e2fsprogs.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -56,5 +56,5 @@
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
 --enable-elf-shlibs --disable-evms \
---build=${LFS_HOST} --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
+--build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/ppc64/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -63,5 +63,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,5 +69,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -87,5 +87,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/boot/ppc64/mktemp.xml
===================================================================
--- BOOK/boot/ppc64/mktemp.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/ppc64/mktemp.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -43,5 +43,5 @@
 
 <screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --with-libc\
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc64/yaboot-build.xml
===================================================================
--- BOOK/boot/ppc64/yaboot-build.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/ppc64/yaboot-build.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -57,5 +57,5 @@
 sed -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
             -e "s/\(-Bstatic\)/-melf32ppclinux \1/" \
-            -e "s/\(strip \)/${LFS_TARGET}-\1/" \
+            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
             -e 's/-o root -g root//' \
     Makefile.orig > Makefile</userinput></screen>
@@ -65,5 +65,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CFLAGS=${BUILD32} make CROSS=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>CFLAGS=${BUILD32} make CROSS=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -75,5 +75,5 @@
     xpointer="xpointer(//*[@os='j0'])"/>
 
-<screen><userinput>make CROSS=${LFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
+<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/sparc/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -59,5 +59,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -65,5 +65,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -83,5 +83,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/boot/sparc/silo-build.xml
===================================================================
--- BOOK/boot/sparc/silo-build.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/sparc/silo-build.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>make CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen os="aa"><userinput>make CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc64/flags.xml
===================================================================
--- BOOK/boot/sparc64/flags.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/sparc64/flags.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -16,5 +16,5 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${LFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/sparc64/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -39,5 +39,5 @@
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -61,5 +61,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -67,5 +67,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -86,5 +86,5 @@
 
 <screen><userinput>make INSTALL_MOD_PATH=${LFS} ARCH=sparc64 \
-   CROSS_COMPILE=${LFS_TARGET}- modules_install</userinput></screen>
+   CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86/grub-build.xml
===================================================================
--- BOOK/boot/x86/grub-build.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/x86/grub-build.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -40,5 +40,5 @@
 
 <screen os="aa"><userinput>./configure --prefix=/usr \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/x86/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -63,5 +63,5 @@
     <para os="ae">Configure the kernel via a menu-driven interface:</para>
 
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,5 +69,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <para os="af">If the use of kernel modules can't be avoided, an
@@ -91,5 +91,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
     INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/boot/x86_64-64/bin86.xml
===================================================================
--- BOOK/boot/x86_64-64/bin86.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/x86_64-64/bin86.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -48,6 +48,6 @@
       output is not for a native system.</para>
 
-<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${LFS_TARGET}-as86
-install -v -m 755 -s ld/ld86 /cross-tools/bin/${LFS_TARGET}-ld86</userinput></screen>
+<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86
+install -v -m 755 -s ld/ld86 /cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
 
   </sect2>
Index: BOOK/boot/x86_64/flags.xml
===================================================================
--- BOOK/boot/x86_64/flags.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/x86_64/flags.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -16,5 +16,5 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${LFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/boot/x86_64/grub-build.xml
===================================================================
--- BOOK/boot/x86_64/grub-build.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/x86_64/grub-build.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -32,5 +32,5 @@
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/usr \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/boot/x86_64/kernel.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -63,5 +63,5 @@
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,5 +69,5 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -87,5 +87,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
Index: BOOK/chroot/common/chroot.xml
===================================================================
--- BOOK/chroot/common/chroot.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/chroot/common/chroot.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -17,5 +17,5 @@
   temporary tools:</para>
 
-<screen><userinput>chroot "$LFS" /tools/bin/env -i \
+<screen><userinput>chroot "$CLFS" /tools/bin/env -i \
     HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
@@ -38,5 +38,5 @@
   <envar>LFS</envar> variable anymore, because all work will be
   restricted to the CLFS file system.  This is because the Bash shell is
-  told that <filename class="directory">$LFS</filename> is now the root
+  told that <filename class="directory">$CLFS</filename> is now the root
   (<filename class="directory">/</filename>) directory.</para>
 
Index: BOOK/chroot/common/kernfs.xml
===================================================================
--- BOOK/chroot/common/kernfs.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/chroot/common/kernfs.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -23,10 +23,10 @@
   be mounted:</para>
 
-<screen><userinput>mkdir -pv $LFS/{dev,proc,sys}</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS/{dev,proc,sys}</userinput></screen>
 
   <para>Now mount the file systems:</para>
 
-<screen><userinput>mount -vt proc proc $LFS/proc
-mount -vt sysfs sysfs $LFS/sys</userinput></screen>
+<screen><userinput>mount -vt proc proc $CLFS/proc
+mount -vt sysfs sysfs $CLFS/sys</userinput></screen>
 
   <para>Remember that if for any reason you stop working on the CLFS system
@@ -38,6 +38,6 @@
   starting Udev early in the boot process, so we create them here:</para>
 
-<screen><userinput>mknod -m 600 $LFS/dev/console c 5 1
-mknod -m 666 $LFS/dev/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 600 $CLFS/dev/console c 5 1
+mknod -m 666 $CLFS/dev/null c 1 3</userinput></screen>
 
   <para>Once the system is complete and booting, the rest of our device
@@ -48,5 +48,5 @@
   appear in the new CLFS filesystem:</para>
 
-<screen><userinput>/tools/bin/mount -o bind /dev $LFS/dev</userinput></screen>
+<screen><userinput>/tools/bin/mount -o bind /dev $CLFS/dev</userinput></screen>
 
   <para>Additional file systems will soon be mounted from within the chroot 
@@ -54,6 +54,6 @@
   for each of these now:</para>
 
-<screen><userinput>mount -f -vt tmpfs tmpfs $LFS/dev/shm
-mount -f -vt devpts -o gid=10,mode=620 devpts $LFS/dev/pts</userinput></screen>
+<screen><userinput>mount -f -vt tmpfs tmpfs $CLFS/dev/shm
+mount -f -vt devpts -o gid=10,mode=620 devpts $CLFS/dev/pts</userinput></screen>
 
 </sect1>
Index: BOOK/chroot/mips64/flags.xml
===================================================================
--- BOOK/chroot/mips64/flags.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/chroot/mips64/flags.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -20,5 +20,5 @@
   <para>You will need to set your host target triplet for o32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="`echo ${MACH_TYPE}| sed -e 's/64//g'`"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="`echo ${MACH_TYPE}| sed -e 's/64//g'`"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
@@ -28,5 +28,5 @@
 echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/chroot/ppc64/flags.xml
===================================================================
--- BOOK/chroot/ppc64/flags.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/chroot/ppc64/flags.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -19,5 +19,5 @@
   <para>You will need to set your host target triplet for 32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
@@ -26,5 +26,5 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/chroot/sparc64/flags.xml
===================================================================
--- BOOK/chroot/sparc64/flags.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/chroot/sparc64/flags.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -19,5 +19,5 @@
   <para>You will need to set your host target triplet for 32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
@@ -26,5 +26,5 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/chroot/x86_64/flags.xml
===================================================================
--- BOOK/chroot/x86_64/flags.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/chroot/x86_64/flags.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -19,5 +19,5 @@
   <para>You will need to set your host target triplet for 32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
@@ -26,5 +26,5 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/64/binutils.xml
===================================================================
--- BOOK/cross-tools/64/binutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/64/binutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -48,5 +48,5 @@
 
 <screen os="ca"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
+   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
    --disable-nls --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
 
Index: BOOK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/64/glibc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -71,8 +71,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
Index: BOOK/cross-tools/alpha/gcc-static.xml
===================================================================
--- BOOK/cross-tools/alpha/gcc-static.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/alpha/gcc-static.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -81,5 +81,5 @@
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
Index: BOOK/cross-tools/alpha/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc-headers.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/alpha/glibc-headers.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -53,8 +53,8 @@
 
 <screen os="s3"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
-   --host=${LFS_TARGET} --build=${LFS_HOST} \
+   --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    --disable-sanity-checks --enable-kernel=2.6.0 \
    --with-headers=/tools/include --cache-file=config.cache \
-   --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
+   --with-binutils=/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
 
     <warning os="e1">
@@ -83,16 +83,16 @@
 	
          <varlistentry os="ca3">
-            <term><parameter>--build=${LFS_HOST}</parameter></term>
+            <term><parameter>--build=${CLFS_HOST}</parameter></term>
             <listitem>
                <para>When used with --host, this creates a cross-architecture
-                  executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+                  executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
             </listitem>
         </varlistentry>
  	
         <varlistentry os="ca4">
-           <term><parameter>--host=${LFS_TARGET}</parameter></term>
+           <term><parameter>--host=${CLFS_TARGET}</parameter></term>
            <listitem>
                <para>When used with --build, this creates a cross-architecture
-                  executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+                  executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
            </listitem>
         </varlistentry>
@@ -124,5 +124,5 @@
  	
        <varlistentry os="ca8">
-           <term><parameter>--with-binutils=/cross-tools/${LFS_TARGET}/bin</parameter></term>
+           <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
            <listitem>
               <para>This tells GLIBC to use the binutils for our specific target architecture.</para>
Index: BOOK/cross-tools/alpha/variables.xml
===================================================================
--- BOOK/cross-tools/alpha/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/alpha/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="alpha-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="alpha-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/common/binutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -46,5 +46,5 @@
 
 <screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
     --disable-nls --enable-shared --disable-multilib</userinput></screen>
 
@@ -62,16 +62,16 @@
 
       <varlistentry os="bd2">
-        <term><parameter>--host=${LFS_HOST}</parameter></term>
+        <term><parameter>--host=${CLFS_HOST}</parameter></term>
         <listitem>
           <para>When used with --target, this creates a cross-architecture
-          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
         </listitem>
       </varlistentry>
 
       <varlistentry os="bd3">
-        <term><parameter>--target=${LFS_TARGET}</parameter></term>
+        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
         <listitem>
           <para>When used with --host, this creates a cross-architecture
-          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
         </listitem>
       </varlistentry>
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/common/glibc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -65,8 +65,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
@@ -86,5 +86,5 @@
 
       <varlistentry os="dg2">
-        <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the GCC compiler that we made for our target
@@ -94,5 +94,5 @@
 
       <varlistentry os="dg3">
-        <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
+        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ar</command> utility
@@ -102,5 +102,5 @@
 
       <varlistentry os="dg4">
-        <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
+        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ranlib</command> utility
Index: BOOK/cross-tools/mips/variables.xml
===================================================================
--- BOOK/cross-tools/mips/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/mips/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -27,9 +27,9 @@
     <para os="aa">For a MIPS Little Endian Machine:</para>
 
-<screen os="ab"><userinput>export LFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
+<screen os="ab"><userinput>export CLFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
 
     <para os="ac">For a MIPS Big Endian Machine:</para>
 
-<screen os="ad"><userinput>export LFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -88,5 +88,5 @@
 
 <screen os="bf" ><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --with-abi=64 \
+    --target=${CLFS_TARGET} --host=${CLFS_HOST} --with-abi=64 \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c,c++ --enable-__cxa_atexit --disable-multilib \
Index: BOOK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-static.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/mips64-64/gcc-static.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -81,5 +81,5 @@
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-mutlilib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-mutlilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/mips64/glibc-n32.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -92,8 +92,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILDN32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILDN32}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib32 \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
@@ -105,5 +105,5 @@
 
       <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
Index: BOOK/cross-tools/mips64/variables.xml
===================================================================
--- BOOK/cross-tools/mips64/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/mips64/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -29,5 +29,5 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen os="ab"><userinput>export LFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
+<screen os="ab"><userinput>export CLFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='ac'])"/>
 
-<screen os="ad"><userinput>export LFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
+<screen os="ad"><userinput>export CLFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -41,5 +41,5 @@
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>export LFS_TARGET32="`echo ${LFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="`echo ${CLFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
Index: BOOK/cross-tools/multilib/binutils.xml
===================================================================
--- BOOK/cross-tools/multilib/binutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/multilib/binutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -56,5 +56,5 @@
 
 <screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
+   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
Index: BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -76,8 +76,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib64 \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
@@ -89,5 +89,5 @@
 
       <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
Index: BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/multilib/glibc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -71,8 +71,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET32} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
@@ -88,5 +88,5 @@
 
       <varlistentry os="ea1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD32}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
Index: BOOK/cross-tools/ppc/variables.xml
===================================================================
--- BOOK/cross-tools/ppc/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/ppc/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc-64bit.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/ppc64/glibc-64bit.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -85,8 +85,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib64 \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
@@ -98,5 +98,5 @@
 
       <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
Index: BOOK/cross-tools/ppc64/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/ppc64/glibc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -88,8 +88,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET32} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
@@ -105,5 +105,5 @@
 
       <varlistentry os="ea1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD32}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
Index: BOOK/cross-tools/ppc64/variables.xml
===================================================================
--- BOOK/cross-tools/ppc64/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/ppc64/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -31,5 +31,5 @@
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>export LFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc/variables.xml
===================================================================
--- BOOK/cross-tools/sparc/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/sparc/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/variables.xml
===================================================================
--- BOOK/cross-tools/sparc64/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/sparc64/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -31,5 +31,5 @@
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>export LFS_TARGET32="sparc-unknown-linux-gnu"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="sparc-unknown-linux-gnu"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/x86/gcc-final.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -94,5 +94,5 @@
 
 <screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
+    --target=${CLFS_TARGET} --host=${CLFS_HOST} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c,c++ --enable-__cxa_atexit \
@@ -145,6 +145,6 @@
     <para os="bh">Continue with compiling the package:</para>
 
-<screen os="bi"><userinput>make AS_FOR_TARGET="${LFS_TARGET}-as" \
-    LD_FOR_TARGET="${LFS_TARGET}-ld"</userinput></screen>
+<screen os="bi"><userinput>make AS_FOR_TARGET="${CLFS_TARGET}-as" \
+    LD_FOR_TARGET="${CLFS_TARGET}-ld"</userinput></screen>
 
     <para os="bj">Install the package:</para>
Index: BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-static.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/x86/gcc-static.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -73,5 +73,5 @@
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
Index: BOOK/cross-tools/x86/variables.xml
===================================================================
--- BOOK/cross-tools/x86/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/x86/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -20,5 +20,5 @@
   command:</para>
 
-<screen os="b"><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
+<screen os="b"><userinput>export CLFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
 
   <para os="c">Now you will need to set the target triplet for the target
@@ -28,5 +28,5 @@
   the command using the method listed below:</para>
 
-<screen os="d"><userinput>export LFS_TARGET="{target triplet}"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="{target triplet}"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
@@ -35,6 +35,6 @@
   case you have to exit and restart building later:</para>
 
-<screen os="f"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export LFS_TARGET=\""${LFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
   <table os="g">
Index: BOOK/cross-tools/x86_64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/gcc-static.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/x86_64-64/gcc-static.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -79,5 +79,5 @@
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
Index: BOOK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-final.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/x86_64/gcc-final.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -95,5 +95,5 @@
 
 <screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} \
+    --target=${CLFS_TARGET} --host=${CLFS_HOST} \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c,c++ --enable-__cxa_atexit \
Index: BOOK/cross-tools/x86_64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-static.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/x86_64/gcc-static.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -81,5 +81,5 @@
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
Index: BOOK/cross-tools/x86_64/variables.xml
===================================================================
--- BOOK/cross-tools/x86_64/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/cross-tools/x86_64/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -23,9 +23,9 @@
   <para os="c">Now we will set our Target Triplet:</para>
 
-<screen os="d"><userinput>export LFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
 
   <para os="m1">Now we will set our Target Triplet for 32 Bits:</para>
 
-<screen os="m2"><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
@@ -35,7 +35,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export LFS_TARGET=\""${LFS_TARGET}\"" &gt;&gt; ~/.bashrc
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
 </sect1>
Index: BOOK/final-preps/aboutlfs.xml
===================================================================
--- BOOK/final-preps/aboutlfs.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-preps/aboutlfs.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -9,5 +9,5 @@
   <?dbhtml filename="aboutlfs.html"?>
 
-  <title>About $LFS</title>
+  <title>About $CLFS</title>
 
   <para>Throughout this book, the environment variable <envar>LFS</envar> will
@@ -16,5 +16,5 @@
   Check that the <envar>LFS</envar> variable is set up properly with:</para>
 
-<screen><userinput>echo $LFS</userinput></screen>
+<screen><userinput>echo $CLFS</userinput></screen>
 
   <para>Make sure the output shows the path to the CLFS partition's mount
@@ -26,15 +26,15 @@
 
   <para>Having this variable set is beneficial in that commands such as
-  <command>install -dv $LFS/tools</command> can be typed literally. The shell
-  will automatically replace <quote>$LFS</quote> with
+  <command>install -dv $CLFS/tools</command> can be typed literally. The shell
+  will automatically replace <quote>$CLFS</quote> with
   <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
   processes the command line.</para>
 
-  <para>If you haven't created the <filename class="directory">$LFS</filename>
+  <para>If you haven't created the <filename class="directory">$CLFS</filename>
   directory, do so at this time by issuing the following commands:</para>
 
-<screen><userinput>install -dv $LFS</userinput></screen>
+<screen><userinput>install -dv $CLFS</userinput></screen>
 
-  <para>Do not forget to check that <envar>$LFS</envar> is set whenever
+  <para>Do not forget to check that <envar>$CLFS</envar> is set whenever
   you leave and reenter the current working environment (as when doing a
   <quote>su</quote> to <systemitem class="username">root</systemitem> or
Index: BOOK/final-preps/addinguser.xml
===================================================================
--- BOOK/final-preps/addinguser.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-preps/addinguser.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -79,15 +79,15 @@
 
   <para>Grant <systemitem class="username">lfs</systemitem> full access to
-  <filename class="directory">$LFS/cross-tools</filename> and
-  <filename class="directory">$LFS/tools</filename> by making <systemitem
+  <filename class="directory">$CLFS/cross-tools</filename> and
+  <filename class="directory">$CLFS/tools</filename> by making <systemitem
   class="username">lfs</systemitem> the directorys' owner:</para>
 
-<screen><userinput>chown -v lfs $LFS/tools
-chown -v lfs $LFS/cross-tools</userinput></screen>
+<screen><userinput>chown -v lfs $CLFS/tools
+chown -v lfs $CLFS/cross-tools</userinput></screen>
 
   <para>If a separate working directory was created as suggested, 
   give user <systemitem class="username">lfs</systemitem> ownership of this directory:</para>
 
-<screen><userinput>chown -v lfs $LFS/sources</userinput></screen>
+<screen><userinput>chown -v lfs $CLFS/sources</userinput></screen>
 
   <para>Next, login as user <systemitem class="username">lfs</systemitem>.
Index: BOOK/final-preps/creatingcrossdir.xml
===================================================================
--- BOOK/final-preps/creatingcrossdir.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-preps/creatingcrossdir.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -9,9 +9,9 @@
   <?dbhtml filename="creatingcrossdir.html"?>
 
-  <title>Creating the $LFS/cross-tools Directory</title>
+  <title>Creating the $CLFS/cross-tools Directory</title>
 
   <para>The cross-binutils and cross-compiler built in
   <xref linkend="chapter-cross-tools"/> will be installed under
-  <filename class="directory">$LFS/cross-tools</filename> to keep them
+  <filename class="directory">$CLFS/cross-tools</filename> to keep them
   separate from the host programs. The programs compiled here are
   cross-tools and will not be a part of the final CLFS system or the
@@ -22,5 +22,5 @@
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>install -dv $LFS/cross-tools</userinput></screen>
+<screen><userinput>install -dv $CLFS/cross-tools</userinput></screen>
 
   <para>The next step is to create a <filename
@@ -29,9 +29,9 @@
   Run this command as  <systemitem class="username">root</systemitem> as well:</para>
 
-<screen><userinput>ln -sv $LFS/cross-tools /</userinput></screen>
+<screen><userinput>ln -sv $CLFS/cross-tools /</userinput></screen>
 
   <para>The symlink isn't technically necessary (though the book's
   instructions do assume its existence), but is there mainly for
-  consistency (because /tools is also symlinked to $LFS/tools) and to
+  consistency (because /tools is also symlinked to $CLFS/tools) and to
   simplify the installation of the cross-compile tools.</para>
 
Index: BOOK/final-preps/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/creatingtoolsdir.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-preps/creatingtoolsdir.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -9,8 +9,8 @@
   <?dbhtml filename="creatingtoolsdir.html"?>
 
-  <title>Creating the $LFS/tools Directory</title>
+  <title>Creating the $CLFS/tools Directory</title>
 
   <para>All programs compiled in <xref linkend="chapter-temp-system"/>
-  will be installed under <filename class="directory">$LFS/tools</filename>
+  will be installed under <filename class="directory">$CLFS/tools</filename>
   to keep them separate from the programs compiled in <xref
   linkend="chapter-building-system"/>. The programs compiled here are
@@ -24,5 +24,5 @@
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>install -dv $LFS/tools</userinput></screen>
+<screen><userinput>install -dv $CLFS/tools</userinput></screen>
 
   <para>The next step is to create a <filename class="symlink">/tools</filename>
@@ -31,5 +31,5 @@
   class="username">root</systemitem> as well:</para>
 
-<screen><userinput>ln -sv $LFS/tools /</userinput></screen>
+<screen><userinput>ln -sv $CLFS/tools /</userinput></screen>
 
   <note>
Index: BOOK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-preps/settingenviron.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -56,5 +56,5 @@
   the shell will always search the <envar>PATH</envar> when a program is to
   be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">$LFS/cross-tools</filename> as soon as they are
+  <filename class="directory">$CLFS/cross-tools</filename> as soon as they are
   available without remembering a previous version of the same program in a
   different location.</para>
Index: BOOK/final-system/common/stripping.xml
===================================================================
--- BOOK/final-system/common/stripping.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-system/common/stripping.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -33,5 +33,5 @@
     <para os="e">Then reenter it with:</para>
 
-<screen os="f" role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
+<screen os="f" role="nodump"><userinput>chroot $CLFS /tools/bin/env -i \
     HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
Index: BOOK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-system/multilib/glibc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -70,5 +70,5 @@
     ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${LFS_TARGET32}</userinput></screen>
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64/glibc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/final-system/ppc64/glibc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -78,5 +78,5 @@
     ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${LFS_TARGET32}</userinput></screen>
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/introduction/common/changelog.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -38,4 +38,14 @@
 
     <listitem>
+      <para>July 1, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated the build to use CLFS in variables
+		instead of LFS. Also change /mnt/lfs to /mnt/clfs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 29, 2006</para>
       <itemizedlist>
@@ -1346,5 +1356,5 @@
       <itemizedlist>
         <listitem>
-          <para>[jim] - Change the LFS_HOST and LFS_TARGET pages to prevent
+          <para>[jim] - Change the CLFS_HOST and CLFS_TARGET pages to prevent
 	  further build issues.</para>
         </listitem>
@@ -1473,5 +1483,5 @@
 	</listitem>
 	<listitem>
-          <para>[Matt Darcy] - Updated creation of $LFSHOME parameter to a less
+          <para>[Matt Darcy] - Updated creation of $CLFSHOME parameter to a less
                 user error system. This change will will need to be validated by
                 by other devs</para>
Index: BOOK/introduction/sparc64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64/changelog.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/introduction/sparc64/changelog.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -80,5 +80,5 @@
 	   be correct at this point and point to /cross-tools first.
 	   Also, we've already set up a variable for AS and LD - no need to
-	   use \${LFS_TARGET}-{as,ld}.</para>
+	   use \${CLFS_TARGET}-{as,ld}.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/introduction/x86_64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64/changelog.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/introduction/x86_64/changelog.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -90,5 +90,5 @@
       <itemizedlist>
         <listitem>
-          <para>[jim] - Fixed type on kernel page. Had TARGET should of been LFS_TARGET.</para>
+          <para>[jim] - Fixed type on kernel page. Had TARGET should of been CLFS_TARGET.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/materials/common/introduction.xml
===================================================================
--- BOOK/materials/common/introduction.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/materials/common/introduction.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -30,5 +30,5 @@
   that is conveniently available throughout the entire build. A working
   directory is also required to unpack the sources and build them.
-  <filename class="directory">$LFS/sources</filename> can be used both
+  <filename class="directory">$CLFS/sources</filename> can be used both
   as the place to store the tarballs and patches and as a working
   directory. By using this directory, the required elements will be
@@ -40,5 +40,5 @@
   starting the download session:</para>
 
-<screen><userinput>mkdir -v $LFS/sources</userinput></screen>
+<screen><userinput>mkdir -v $CLFS/sources</userinput></screen>
 
   <para>Make this directory writable and sticky. <quote>Sticky</quote>
@@ -48,5 +48,5 @@
   sticky modes:</para>
 
-<screen><userinput>chmod -v a+wt $LFS/sources</userinput></screen>
+<screen><userinput>chmod -v a+wt $CLFS/sources</userinput></screen>
 
 </sect1>
Index: BOOK/partitioning/common/mounting.xml
===================================================================
--- BOOK/partitioning/common/mounting.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/partitioning/common/mounting.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -26,6 +26,6 @@
   running:</para>
 
-<screen><userinput>mkdir -pv $LFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $LFS</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> with the designation of
@@ -36,8 +36,8 @@
   class="directory">/usr</filename>), mount them using:</para>
 
-<screen><userinput>mkdir -pv $LFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $LFS
-mkdir -v $LFS/usr
-mount -v /dev/<replaceable>[yyy]</replaceable> $LFS/usr</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS
+mkdir -v $CLFS/usr
+mount -v /dev/<replaceable>[yyy]</replaceable> $CLFS/usr</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> and
Index: BOOK/prologue/common/typography.xml
===================================================================
--- BOOK/prologue/common/typography.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/prologue/common/typography.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -40,5 +40,5 @@
   and websites.</para>
 
-<screen role="nodump"><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; $CLFS/etc/group &lt;&lt; "EOF"
 <literal>root:x:0:
 bin:x:1:
@@ -48,5 +48,5 @@
   <para>This format is used when creating configuration files. The first
   command tells the system to create the file
-  <filename>$LFS/etc/group</filename> from whatever is typed on the
+  <filename>$CLFS/etc/group</filename> from whatever is typed on the
   following lines until the sequence end of file (EOF) is encountered.
   Therefore, this entire section is generally typed as seen.</para>
Index: BOOK/temp-system/64/binutils.xml
===================================================================
--- BOOK/temp-system/64/binutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/64/binutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -45,5 +45,5 @@
 <screen os="j"><userinput>CC="${CC} ${BUILD64}" \
      ../binutils-&binutils-version;/configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
      --disable-nls --enable-shared --enable-64-bit-bfd \
      --disable-multilib</userinput></screen>
Index: BOOK/temp-system/64/ncurses.xml
===================================================================
--- BOOK/temp-system/64/ncurses.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/64/ncurses.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,6 +28,6 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-shared --build=${LFS_HOST} \
-   --host=${LFS_TARGET} --without-debug --without-ada \
+   ./configure --prefix=/tools --with-shared --build=${CLFS_HOST} \
+   --host=${CLFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc</userinput></screen>
 
Index: BOOK/temp-system/common/bash.xml
===================================================================
--- BOOK/temp-system/common/bash.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/bash.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -32,5 +32,5 @@
 
 <screen os="h"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --without-bash-malloc --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/binutils.xml
===================================================================
--- BOOK/temp-system/common/binutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/binutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -44,5 +44,5 @@
 
 <screen os="j"><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --disable-nls --enable-shared --disable-multilib</userinput></screen>
 
Index: BOOK/temp-system/common/coreutils.xml
===================================================================
--- BOOK/temp-system/common/coreutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/coreutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -33,5 +33,5 @@
 
 <screen os="be"><userinput>./configure --prefix=/tools --cache-file=config.cache \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="bf">Compile the package:</para>
Index: BOOK/temp-system/common/diffutils.xml
===================================================================
--- BOOK/temp-system/common/diffutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/diffutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -26,5 +26,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/findutils.xml
===================================================================
--- BOOK/temp-system/common/findutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/findutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -33,5 +33,5 @@
 
 <screen os="ac"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/gawk.xml
===================================================================
--- BOOK/temp-system/common/gawk.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/gawk.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -26,5 +26,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/gettext.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -32,5 +32,5 @@
 
 <screen os="d"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --disable-shared --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/grep.xml
===================================================================
--- BOOK/temp-system/common/grep.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/grep.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="ca"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --disable-perl-regexp</userinput></screen>
 
Index: BOOK/temp-system/common/gzip.xml
===================================================================
--- BOOK/temp-system/common/gzip.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/gzip.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -27,5 +27,5 @@
 
 <screen os="ab"><userinput>cp -v configure{,.orig}
-sed -e "s@nm conftest@${LFS_TARGET}-&amp;@" configure.orig > configure</userinput></screen>
+sed -e "s@nm conftest@${CLFS_TARGET}-&amp;@" configure.orig > configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -34,5 +34,5 @@
 
 <screen os="ac"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/common/introduction.xml
===================================================================
--- BOOK/temp-system/common/introduction.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/introduction.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -19,5 +19,5 @@
   <para>The tools in this chapter are cross-compiled using the toolchain in
   /cross-tools and will be installed under the
-  <filename class="directory">$LFS/tools</filename> directory to keep
+  <filename class="directory">$CLFS/tools</filename> directory to keep
   them separate from the files installed in <xref
   linkend="chapter-building-system"/> and the host production directories.
@@ -28,5 +28,5 @@
   variable is set up properly:</para>
 
-<screen><userinput>echo $LFS</userinput></screen>
+<screen><userinput>echo $CLFS</userinput></screen>
 
   <para>Make sure the output shows the path to the CLFS partition's mount
Index: BOOK/temp-system/common/make.xml
===================================================================
--- BOOK/temp-system/common/make.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/make.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="aa"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/common/ncurses.xml
===================================================================
--- BOOK/temp-system/common/ncurses.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/ncurses.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools --with-shared \
-    --build=${LFS_HOST} --host=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --without-debug --without-ada \
     --enable-overwrite --with-build-cc=gcc</userinput></screen>
Index: BOOK/temp-system/common/patch.xml
===================================================================
--- BOOK/temp-system/common/patch.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/patch.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -26,5 +26,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/sed.xml
===================================================================
--- BOOK/temp-system/common/sed.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/sed.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -26,5 +26,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/tar.xml
===================================================================
--- BOOK/temp-system/common/tar.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/tar.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -33,5 +33,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/texinfo.xml
===================================================================
--- BOOK/temp-system/common/texinfo.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/texinfo.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/common/variables.xml
===================================================================
--- BOOK/temp-system/common/variables.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/common/variables.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -14,11 +14,11 @@
   and linkers:</para>
 
-<screen><userinput>export CC="${LFS_TARGET}-gcc"
-export CXX="${LFS_TARGET}-g++"
-export AR="${LFS_TARGET}-ar"
-export AS="${LFS_TARGET}-as"
-export RANLIB="${LFS_TARGET}-ranlib"
-export LD="${LFS_TARGET}-ld"
-export STRIP="${LFS_TARGET}-strip"</userinput></screen>
+<screen><userinput>export CC="${CLFS_TARGET}-gcc"
+export CXX="${CLFS_TARGET}-g++"
+export AR="${CLFS_TARGET}-ar"
+export AS="${CLFS_TARGET}-as"
+export RANLIB="${CLFS_TARGET}-ranlib"
+export LD="${CLFS_TARGET}-ld"
+export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
 
   <para>Then add the build variables to <filename>~/.bashrc</filename> to
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -101,5 +101,5 @@
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --with-abi=64 \
     --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -101,5 +101,5 @@
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} --with-abi=64 \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} --with-abi=64 \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
Index: BOOK/temp-system/multilib/bash.xml
===================================================================
--- BOOK/temp-system/multilib/bash.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/bash.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -37,5 +37,5 @@
 <screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --without-bash-malloc --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/binutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -54,5 +54,5 @@
      ../binutils-&binutils-version;/configure --prefix=/tools \
      --libdir=/tools/lib64 --with-lib-path=/tools/lib \
-     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
      --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
Index: BOOK/temp-system/multilib/coreutils.xml
===================================================================
--- BOOK/temp-system/multilib/coreutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/coreutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -37,5 +37,5 @@
 <screen os="be"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --cache-file=config.cache \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/diffutils.xml
===================================================================
--- BOOK/temp-system/multilib/diffutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/diffutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/findutils.xml
===================================================================
--- BOOK/temp-system/multilib/findutils.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/findutils.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -36,5 +36,5 @@
 
 <screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/gawk.xml
===================================================================
--- BOOK/temp-system/multilib/gawk.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/gawk.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -29,5 +29,5 @@
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/gettext.xml
===================================================================
--- BOOK/temp-system/multilib/gettext.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/gettext.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -37,5 +37,5 @@
 <screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} --disable-shared \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} --disable-shared \
    --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/multilib/grep.xml
===================================================================
--- BOOK/temp-system/multilib/grep.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/grep.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --disable-perl-regexp</userinput></screen>
 
Index: BOOK/temp-system/multilib/gzip.xml
===================================================================
--- BOOK/temp-system/multilib/gzip.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/gzip.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -36,5 +36,5 @@
 
 <screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/make.xml
===================================================================
--- BOOK/temp-system/multilib/make.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/make.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/ncurses.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -29,5 +29,5 @@
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc \
Index: BOOK/temp-system/multilib/patch.xml
===================================================================
--- BOOK/temp-system/multilib/patch.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/patch.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/sed.xml
===================================================================
--- BOOK/temp-system/multilib/sed.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/sed.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/tar.xml
===================================================================
--- BOOK/temp-system/multilib/tar.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/tar.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -36,5 +36,5 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/multilib/texinfo.xml
===================================================================
--- BOOK/temp-system/multilib/texinfo.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/multilib/texinfo.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/x86/gcc.xml
===================================================================
--- BOOK/temp-system/x86/gcc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/x86/gcc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -89,5 +89,5 @@
 
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
Index: BOOK/temp-system/x86_64-64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64-64/gcc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/x86_64-64/gcc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -101,5 +101,5 @@
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
     --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
Index: BOOK/temp-system/x86_64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64/gcc.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/temp-system/x86_64/gcc.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -101,5 +101,5 @@
 <screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
Index: BOOK/the-end/reboot.xml
===================================================================
--- BOOK/the-end/reboot.xml	(revision 51f139716be06666061dfff3bc934eefd1d52460)
+++ BOOK/the-end/reboot.xml	(revision 07114c98c9c8701aae236e09c7cc2c3f00636a45)
@@ -37,20 +37,20 @@
   <para>Then unmount the virtual file systems:</para>
 
-<screen><userinput>umount $LFS/dev/pts
-umount $LFS/dev/shm
-umount $LFS/dev
-umount $LFS/proc
-umount $LFS/sys</userinput></screen>
+<screen><userinput>umount $CLFS/dev/pts
+umount $CLFS/dev/shm
+umount $CLFS/dev
+umount $CLFS/proc
+umount $CLFS/sys</userinput></screen>
 
   <para>Unmount the CLFS file system itself:</para>
 
-<screen><userinput>umount $LFS</userinput></screen>
+<screen><userinput>umount $CLFS</userinput></screen>
 
   <para>If multiple partitions were created, unmount the other
   partitions before unmounting the main one, like this:</para>
 
-<screen><userinput>umount $LFS/usr
-umount $LFS/home
-umount $LFS</userinput></screen>
+<screen><userinput>umount $CLFS/usr
+umount $CLFS/home
+umount $CLFS</userinput></screen>
 
   <para>Now, reboot the system with:</para>
