Index: BOOK/bootable/arm/kernel.xml
===================================================================
--- BOOK/bootable/arm/kernel.xml	(revision 3322dab0f34c94058bb3886617e1c2fa46db5728)
+++ BOOK/bootable/arm/kernel.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -54,5 +54,5 @@
     url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
 
-<screen os="i"><userinput>make ARCH=arm CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen os="i"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <para os="j">Alternatively, <command>make oldconfig</command> may be more
@@ -69,5 +69,5 @@
     <para os="m">Compile the kernel image and modules:</para>
 
-<screen os="n"><userinput>make ARCH=arm CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen os="n"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <para os="o">If using kernel modules, an
@@ -97,14 +97,14 @@
     them:</para>
 
-<screen os="t"><userinput>make ARCH=arm CROSS_COMPILE=${LFS_TARGET}- \
-    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+<screen os="t"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- \
+    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <para os="u">After kernel compilation is complete, additional steps are
     required to complete the installation. Some files need to be copied to
-    the <filename class="directory">${LFS}/boot</filename> directory.</para>
+    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
 
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage ${CLFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
@@ -113,5 +113,5 @@
     kernel. Issue the following command to install the map file:</para>
 
-<screen os="w1"><userinput>cp System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
 
     <para os="x">The kernel configuration file <filename>.config</filename>
@@ -120,5 +120,5 @@
     It is a good idea to keep this file for future reference:</para>
 
-<screen os="x1"><userinput>cp .config ${LFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
 
     <warning os="z">
Index: BOOK/bootable/common/chowning.xml
===================================================================
--- BOOK/bootable/common/chowning.xml	(revision 3322dab0f34c94058bb3886617e1c2fa46db5728)
+++ BOOK/bootable/common/chowning.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -19,7 +19,7 @@
     <para>The commands in the remainder of this book must be performed while
     logged in as <systemitem class="username">root</systemitem>. Check that
-    $LFS is still set:</para>
+    $CLFS is still set:</para>
 
-    <screen><userinput>echo $LFS</userinput></screen>
+    <screen><userinput>echo $CLFS</userinput></screen>
 
   </important>
@@ -28,22 +28,22 @@
   entire lfs system.</para>
 
-<screen><userinput>chown -Rv root:root ${LFS}</userinput></screen>
+<screen><userinput>chown -Rv root:root ${CLFS}</userinput></screen>
 
   <para>The following files are not the be owned by
   <systemitem class="username">root</systemitem>.</para>
 
-<screen><userinput>chgrp -v utmp ${LFS}/var/run/utmp ${LFS}/var/log/lastlog</userinput></screen>
+<screen><userinput>chgrp -v utmp ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog</userinput></screen>
 
   <para>The following device nodes need to be created for the system to
   boot.</para>
 
-<screen><userinput>mknod -m 0666 ${LFS}/dev/null c 1 3
-mknod -m 0600 ${LFS}/dev/console c 5 1</userinput></screen>
+<screen><userinput>mknod -m 0666 ${CLFS}/dev/null c 1 3
+mknod -m 0600 ${CLFS}/dev/console c 5 1</userinput></screen>
 
   <para>If you did not create the following rules in <xref linkend="ch-scripts-udev-rules"/>. You
   need to create them now.</para>
 
-<screen><userinput>mknod -m 0666 ${LFS}/lib/udev/devices/null c 1 3
-mknod -m 0600 ${LFS}/lib/udev/devices/console c 5 1</userinput></screen>
+<screen><userinput>mknod -m 0666 ${CLFS}/lib/udev/devices/null c 1 3
+mknod -m 0600 ${CLFS}/lib/udev/devices/console c 5 1</userinput></screen>
 
 </sect1>
Index: BOOK/bootable/common/fstab.xml
===================================================================
--- BOOK/bootable/common/fstab.xml	(revision 3322dab0f34c94058bb3886617e1c2fa46db5728)
+++ BOOK/bootable/common/fstab.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -20,5 +20,5 @@
   to mounting. Create a new file systems table like this:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/fstab &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/fstab &lt;&lt; "EOF"
 <literal># Begin /etc/fstab
 
