Index: boot/alpha/aboot-build.xml
===================================================================
--- boot/alpha/aboot-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/alpha/aboot-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -33,5 +33,5 @@
     <para>Install the package:</para>
 
-<screen><userinput>make root="${LFS}" bindir=/cross-tools/bin install</userinput></screen>
+<screen><userinput>make root="${CLFS}" bindir=/cross-tools/bin install</userinput></screen>
 
   </sect2>
Index: boot/alpha/aboot.xml
===================================================================
--- boot/alpha/aboot.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/alpha/aboot.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -21,5 +21,5 @@
 <screen><userinput>cat &gt; /etc/aboot.conf &lt;&lt; "EOF"
 <literal># Begin /etc/aboot.conf
-0:1/boot/lfskernel-&linux-version; root=/dev/sda1
+0:1/boot/clfskernel-&linux-version; root=/dev/sda1
 # End /etc/aboot.conf</literal>
 EOF</userinput></screen>
Index: boot/common/bootscripts.xml
===================================================================
--- boot/common/bootscripts.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/bootscripts.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -25,5 +25,5 @@
     <para>Install the package:</para>
 
-<screen><userinput>make ETCDIR=${LFS}/etc minimal</userinput></screen>
+<screen><userinput>make ETCDIR=${CLFS}/etc minimal</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -42,5 +42,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>cat &gt; ${LFS}/etc/sysconfig/clock &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/sysconfig/clock &lt;&lt; "EOF"
 <literal># Begin /etc/sysconfig/clock
 
Index: boot/common/changingowner.xml
===================================================================
--- boot/common/changingowner.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/changingowner.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -13,5 +13,5 @@
   <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
+  <systemitem class="username">clfs</systemitem>, a user that exists only
   on the host system. For security reasons, the $CLFS root directory and
   all of it subdirectories should be owned by
@@ -19,5 +19,5 @@
   for $CLFS and its subdirectories by running this command:</para>
 
-<screen os="b"><userinput>chown -Rv root:root ${LFS}</userinput></screen>
+<screen os="b"><userinput>chown -Rv root:root ${CLFS}</userinput></screen>
 
 </sect1>
Index: boot/common/createfiles.xml
===================================================================
--- boot/common/createfiles.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/createfiles.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -16,8 +16,8 @@
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} ${LFS}/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
-ln -sv /tools/lib/libstd* ${LFS}/usr/lib
-ln -sv bash ${LFS}/bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} ${CLFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
+ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
 </sect1>
Index: boot/common/creatingdirs.xml
===================================================================
--- boot/common/creatingdirs.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/creatingdirs.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,17 +14,17 @@
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv ${LFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
-mkdir -pv ${LFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
-install -dv -m 0750 ${LFS}/root
-install -dv -m 1777 ${LFS}{/var,}/tmp
-mkdir -pv ${LFS}/usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv ${LFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -v  ${LFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${LFS}/usr/{,local/}share/man/man{1..8}
-for dir in ${LFS}/usr{,/local}; do
+<screen><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
+mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
+install -dv -m 0750 ${CLFS}/root
+install -dv -m 1777 ${CLFS}{/var,}/tmp
+mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib,sbin,src}
+mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
+mkdir -v  ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1..8}
+for dir in ${CLFS}/usr{,/local}; do
   ln -sv share/{man,doc,info} $dir
 done
-mkdir -v ${LFS}/var/{lock,log,mail,run,spool}
-mkdir -pv ${LFS}/var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
+mkdir -v ${CLFS}/var/{lock,log,mail,run,spool}
+mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
 
   <para os="b">Directories are, by default, created with permission mode 755,
@@ -35,9 +35,9 @@
 
   <para os="c">The first mode change ensures that not just anybody can enter
-  the <filename class="directory">${LFS}/root</filename> directory&mdash;the
+  the <filename class="directory">${CLFS}/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
   second mode change makes sure that any user can write to the
-  <filename class="directory">${LFS}/tmp</filename> and
-  <filename class="directory">${LFS}/var/tmp</filename> directories, but
+  <filename class="directory">${CLFS}/tmp</filename> and
+  <filename class="directory">${CLFS}/var/tmp</filename> directories, but
   cannot remove another user's files from them. The latter is prohibited
   by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
Index: boot/common/devices.xml
===================================================================
--- boot/common/devices.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/devices.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -9,8 +9,8 @@
   <?dbhtml filename="devices.html"?>
 
-  <title>Populating ${LFS}/dev</title>
+  <title>Populating ${CLFS}/dev</title>
 
   <indexterm zone="ch-boot-devices">
-    <primary sortas="e-${LFS}/dev/*">${LFS}/dev/*</primary>
+    <primary sortas="e-${CLFS}/dev/*">${CLFS}/dev/*</primary>
   </indexterm>
 
@@ -35,6 +35,6 @@
     the following commands:</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>
 
   </sect2>
Index: boot/common/e2fsprogs.xml
===================================================================
--- boot/common/e2fsprogs.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/e2fsprogs.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -62,5 +62,5 @@
     <para os="h">Install the binaries and documentation:</para>
 
-<screen os="i"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="i"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <variablelist os="j">
@@ -68,5 +68,5 @@
 
       <varlistentry>
-        <term><parameter>DESTDIR=${LFS}</parameter></term>
+        <term><parameter>DESTDIR=${CLFS}</parameter></term>
         <listitem>
           <para>The Makefile for e2fsprogs hard-codes a path to the 
@@ -87,5 +87,5 @@
     <para os="ad">Create needed symlinks for a bootable system:</para>
 
-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,e2fsck} ${LFS}/sbin</userinput></screen>
+<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,e2fsck} ${CLFS}/sbin</userinput></screen>
 
   </sect2>
Index: boot/common/fstab.xml
===================================================================
--- boot/common/fstab.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/fstab.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -9,16 +9,16 @@
   <?dbhtml filename="fstab.html"?>
 
-  <title>Creating the ${LFS}/etc/fstab File</title>
+  <title>Creating the ${CLFS}/etc/fstab File</title>
 
   <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-${LFS}/etc/fstab">${LFS}/etc/fstab</primary>
+    <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
   </indexterm>
 
-  <para os="a">The <filename>${LFS}/etc/fstab</filename> file is used by some
+  <para os="a">The <filename>${CLFS}/etc/fstab</filename> file is used by some
   programs to determine where file systems are to be mounted by default,
   which must be checked, and in which order. 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
 
Index: boot/common/introduction.xml
===================================================================
--- boot/common/introduction.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/introduction.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -20,11 +20,11 @@
   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
+  <systemitem class="username">clfs</systemitem> user to have write access to
   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.
+  ownership of $CLFS to the <systemitem class="username">clfs</systemitem> user.
   Run the following command as <systemitem
   class="username">root</systemitem>:</para>
 
-<screen><userinput>chown -v lfs $CLFS</userinput></screen>
+<screen><userinput>chown -v clfs $CLFS</userinput></screen>
 
 </sect1>
Index: boot/common/module-init-tools.xml
===================================================================
--- boot/common/module-init-tools.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/module-init-tools.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -42,5 +42,5 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+<screen os="k"><userinput>make DESTDIR="${CLFS}" install</userinput></screen>
 
   </sect2>
Index: boot/common/pwdgroup.xml
===================================================================
--- boot/common/pwdgroup.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/pwdgroup.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -12,36 +12,36 @@
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/etc/passwd">${LFS}/etc/passwd</primary>
+    <primary sortas="e-${CLFS}/etc/passwd">${CLFS}/etc/passwd</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/etc/group">${LFS}/etc/group</primary>
+    <primary sortas="e-${CLFS}/etc/group">${CLFS}/etc/group</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/run/utmp">${LFS}/var/run/utmp</primary>
+    <primary sortas="e-${CLFS}/var/run/utmp">${CLFS}/var/run/utmp</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/btmp">${LFS}/var/log/btmp</primary>
+    <primary sortas="e-${CLFS}/var/log/btmp">${CLFS}/var/log/btmp</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/lastlog">${LFS}/var/log/lastlog</primary>
+    <primary sortas="e-${CLFS}/var/log/lastlog">${CLFS}/var/log/lastlog</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/wtmp">${LFS}/var/log/wtmp</primary>
+    <primary sortas="e-${CLFS}/var/log/wtmp">${CLFS}/var/log/wtmp</primary>
   </indexterm>
 
   <para>In order for user <systemitem class="username">root</systemitem> to
   be able to login and for the name <quote>root</quote> to be recognized,
-  there must be relevant entries in the <filename>${LFS}/etc/passwd</filename>
-  and <filename>${LFS}/etc/group</filename> files.</para>
+  there must be relevant entries in the <filename>${CLFS}/etc/passwd</filename>
+  and <filename>${CLFS}/etc/group</filename> files.</para>
 
-  <para>Create the <filename>${LFS}/etc/passwd</filename> file by running
+  <para>Create the <filename>${CLFS}/etc/passwd</filename> file by running
   the following command:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/passwd &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash</literal>
 EOF</userinput></screen>
@@ -51,74 +51,8 @@
   later.</para>
 
-  <variablelist os="b">
-  
-    <title>Additional users you may want to add:</title>
-
-    <varlistentry>
-      <term><literal>bin:x:1:1:bin:/bin:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>daemon:x:2:6:daemon:/sbin:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>adm:x:3:16:adm:/var/adm:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>lp:x:10:9:lp:/var/spool/lp:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>mail:x:30:30:mail:/var/mail:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>news:x:31:31:news:/var/spool/news:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>uucp:x:32:32:uucp:/var/spool/uucp:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>operator:x:50:0:operator:/root:/bin/bash</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>postmaster:x:51:30:postmaster:/var/spool/mail:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>nobody:x:65534:65534:nobody:/:/bin/false</literal></term>
-      <listitem>
-        <para>To be written</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-
-  <para>Create the <filename>${LFS}/etc/group</filename> file by running
+  <para>Create the <filename>${CLFS}/etc/group</filename> file by running
   the following command:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/group &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/group &lt;&lt; "EOF"
 <literal>root:x:0:
 bin:x:1:
@@ -217,13 +151,13 @@
   proper permissions:</para>
 
-<screen><userinput>touch ${LFS}/var/run/utmp ${LFS}/var/log/{btmp,lastlog,wtmp}
-chmod -v 664 ${LFS}/var/run/utmp ${LFS}/var/log/lastlog
-chmod -v 600 ${LFS}/var/log/btmp</userinput></screen>
+<screen><userinput>touch ${CLFS}/var/run/utmp ${CLFS}/var/log/{btmp,lastlog,wtmp}
+chmod -v 664 ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog
+chmod -v 600 ${CLFS}/var/log/btmp</userinput></screen>
 
-  <para>The <filename>${LFS}/var/run/utmp</filename> file records the users
-  that are currently logged in. The <filename>${LFS}/var/log/wtmp</filename>
+  <para>The <filename>${CLFS}/var/run/utmp</filename> file records the users
+  that are currently logged in. The <filename>${CLFS}/var/log/wtmp</filename>
   file records all logins and logouts. The
-  <filename>${LFS}/var/log/lastlog</filename> file records when
-  each user last logged in. The <filename>${LFS}/var/log/btmp</filename> file
+  <filename>${CLFS}/var/log/lastlog</filename> file records when
+  each user last logged in. The <filename>${CLFS}/var/log/btmp</filename> file
   records the bad login attempts.</para>
 
Index: boot/common/settingenviron.xml
===================================================================
--- boot/common/settingenviron.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/settingenviron.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -15,5 +15,5 @@
   <filename>.bash_profile</filename> file now:</para>
 
-<screen><userinput>cat &gt; ${LFS}/root/.bash_profile &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/root/.bash_profile &lt;&lt; "EOF"
 <literal>set +h
 PS1='\u:\w\$ '
Index: boot/common/sysvinit.xml
===================================================================
--- boot/common/sysvinit.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/sysvinit.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -28,5 +28,5 @@
 <screen os="ab"><userinput>cp -v src/Makefile src/Makefile.orig
 sed -e 's@root@0@g' \
-    -e "s@/dev/initctl@${LFS}&amp;@g" \
+    -e "s@/dev/initctl@${CLFS}&amp;@g" \
     -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
     -e "s@/usr/lib@/tools/lib@" \
@@ -44,5 +44,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ad"><userinput>make -C src install INSTALL="install" ROOT="${LFS}"</userinput></screen>
+<screen os="ad"><userinput>make -C src install INSTALL="install" ROOT="${CLFS}"</userinput></screen>
 
   </sect2>
@@ -57,11 +57,11 @@
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${LFS}/etc/inittab">${LFS}/etc/inittab</primary>
+      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
     </indexterm>
 
-    <para os="ae">Create a new file <filename>${LFS}/etc/inittab</filename> by
+    <para os="ae">Create a new file <filename>${CLFS}/etc/inittab</filename> by
     running the following:</para>
 
-<screen os="af"><userinput>cat &gt; ${LFS}/etc/inittab &lt;&lt; "EOF"
+<screen os="af"><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
 
Index: boot/common/udev-rules.xml
===================================================================
--- boot/common/udev-rules.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/udev-rules.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -9,5 +9,5 @@
   <?dbhtml filename="udev-rules.html"?>
 
-  <title>Udev Rules-&udev-cross-lfs-version;</title>
+  <title>Udev Rules-&udev-cross-CLFS-version;</title>
 
   <indexterm zone="ch-boot-udev-rules">
@@ -26,5 +26,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>rm -vf ${LFS}/etc/udev/rules.d/*</userinput></screen>
+<screen><userinput>rm -vf ${CLFS}/etc/udev/rules.d/*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -32,5 +32,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make DESTDIR=${LFS} install-minimal</userinput></screen>
+<screen><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
 
   </sect2>
Index: boot/common/udev.xml
===================================================================
--- boot/common/udev.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/udev.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -33,5 +33,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make DESTDIR=${LFS} udevdir=/dev install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} udevdir=/dev install</userinput></screen>
 
   </sect2>
Index: boot/common/util-linux.xml
===================================================================
--- boot/common/util-linux.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/util-linux.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -125,5 +125,5 @@
 <screen os="bi"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no \
     USE_TTY_GROUP=no CPUOPT="" ARCH="" \
-    CPU="" DESTDIR=${LFS} install</userinput></screen>
+    CPU="" DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: boot/common/whatnext.xml
===================================================================
--- boot/common/whatnext.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/common/whatnext.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -12,8 +12,8 @@
 
   <para>Now you're at the point to get your <filename
-  class="directory">${LFS}</filename> directory copied over to your target
+  class="directory">${CLFS}</filename> directory copied over to your target
   machine. The easiest method would be to tar it up and copy the file.</para>
 
-<screen><userinput>tar -jcvf ${LFS}.tar.bz2 ${LFS}</userinput></screen>
+<screen><userinput>tar -jcvf ${CLFS}.tar.bz2 ${CLFS}</userinput></screen>
 
   <para>Some others have came up with other ideas on how to do this.
Index: boot/mips/colo-build.xml
===================================================================
--- boot/mips/colo-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips/colo-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -40,6 +40,6 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="ab"><userinput>cp -v chain/colo-chain.elf ${LFS}/boot/vmlinux
-gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
+<screen os="ab"><userinput>cp -v chain/colo-chain.elf ${CLFS}/boot/vmlinux
+gzip -9 ${CLFS}/boot/vmlinux</userinput></screen>
 
   </sect2>
Index: boot/mips/colo.xml
===================================================================
--- boot/mips/colo.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips/colo.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -28,5 +28,5 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="aa"><userinput>cat &gt; ${LFS}/boot/default.colo &lt;&lt; "EOF"
+<screen os="aa"><userinput>cat &gt; ${CLFS}/boot/default.colo &lt;&lt; "EOF"
 #:CoLo:#
 #
Index: boot/mips/creatingdirs.xml
===================================================================
--- boot/mips/creatingdirs.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips/creatingdirs.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -15,28 +15,28 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${LFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
-install -dv ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${LFS}/root -m 0750
-install -dv ${LFS}/tmp ${LFS}/var/tmp -m 1777
-install -dv ${LFS}/media/{floppy,cdrom}
-install -dv ${LFS}/usr/{bin,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr
-install -dv ${LFS}/usr/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/usr/local/{bin,etc,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr/local
-install -dv ${LFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/var/{lock,log,mail,run,spool}
-install -dv ${LFS}/var/{opt,cache,lib/{misc,locate},local}
-install -dv ${LFS}/opt/{bin,doc,include,info}
-install -dv ${LFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
+install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+install -dv ${CLFS}/root -m 0750
+install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
+install -dv ${CLFS}/media/{floppy,cdrom}
+install -dv ${CLFS}/usr/{bin,include,lib,sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr
+install -dv ${CLFS}/usr/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/usr/local/{bin,etc,include,lib,sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr/local
+install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/var/{lock,log,mail,run,spool}
+install -dv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
+install -dv ${CLFS}/opt/{bin,doc,include,info}
+install -dv ${CLFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
 
    <para>These entries are needed for the RaQ2 bootloader. Only use these
    if you are utilizing the Colo bootloader:</para>
 
-<screen><userinput>cd /${LFS}/boot 
+<screen><userinput>cd /${CLFS}/boot 
 ln -svf . boot</userinput></screen>
 
Index: boot/mips/kernel.xml
===================================================================
--- boot/mips/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -92,5 +92,5 @@
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET)- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -102,6 +102,6 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/vmlinux-&linux-version;
-gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
+gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/mips/sysvinit.xml
===================================================================
--- boot/mips/sysvinit.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips/sysvinit.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -58,11 +58,11 @@
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${LFS}/etc/inittab">${LFS}/etc/inittab</primary>
+      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
     </indexterm>
 
-    <para>Create a new file <filename>${LFS}/etc/inittab</filename> by
+    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
     running the following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/inittab &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
 
Index: boot/mips64-64/flags.xml
===================================================================
--- boot/mips64-64/flags.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips64-64/flags.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,5 +14,5 @@
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: boot/mips64/createfiles.xml
===================================================================
--- boot/mips64/createfiles.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips64/createfiles.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -15,12 +15,12 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
-ln -sv /tools/lib32/libgcc_s.so{,.1} ${LFS}/usr/lib32
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${LFS}/usr/lib64
-ln -sv /tools/lib/libstd* ${LFS}/usr/lib
-ln -sv /tools/lib32/libstd* ${LFS}/usr/lib32
-ln -sv /tools/lib64/libstd* ${LFS}/usr/lib64
-ln -sv bash ${LFS}/bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
+ln -sv /tools/lib32/libstd* ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
+ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
 </sect1>
Index: boot/mips64/creatingdirs.xml
===================================================================
--- boot/mips64/creatingdirs.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips64/creatingdirs.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -15,31 +15,31 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${LFS}/{bin,boot,dev,etc/opt,home,lib{,32,64},mnt}
-install -dv ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${LFS}/root -m 0750
-install -dv ${LFS}/tmp ${LFS}/var/tmp -m 1777
-install -dv ${LFS}/media/{floppy,cdrom}
-install -dv ${LFS}/usr/{bin,include,lib{,32,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr
-install -dv ${LFS}/usr/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/usr/local/{bin,etc,include,lib{,32,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr/local
-install -dv ${LFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/var/{lock,log,mail,run,spool}
-install -dv ${LFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
-install -dv ${LFS}/opt/{bin,doc,include,info}
-install -dv ${LFS}/opt/{lib{,32,64},man/man{1,2,3,4,5,6,7,8}}
-install -dv ${LFS}/usr/lib/locale
-ln -sv ../lib/locale ${LFS}/usr/lib32
-ln -sv ../lib/locale ${LFS}/usr/lib64</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib{,32,64},mnt}
+install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+install -dv ${CLFS}/root -m 0750
+install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
+install -dv ${CLFS}/media/{floppy,cdrom}
+install -dv ${CLFS}/usr/{bin,include,lib{,32,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr
+install -dv ${CLFS}/usr/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/usr/local/{bin,etc,include,lib{,32,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr/local
+install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/var/{lock,log,mail,run,spool}
+install -dv ${CLFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
+install -dv ${CLFS}/opt/{bin,doc,include,info}
+install -dv ${CLFS}/opt/{lib{,32,64},man/man{1,2,3,4,5,6,7,8}}
+install -dv ${CLFS}/usr/lib/locale
+ln -sv ../lib/locale ${CLFS}/usr/lib32
+ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
 
    <para>These entries are needed for the RaQ2 bootloader. Only use these
    if you are utilizing the Colo bootloader:</para>
 
-<screen><userinput>cd /${LFS}/boot
+<screen><userinput>cd /${CLFS}/boot
 ln -svf . boot</userinput></screen>
 
Index: boot/mips64/flags.xml
===================================================================
--- boot/mips64/flags.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips64/flags.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,8 +14,8 @@
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
+echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: boot/mips64/kernel.xml
===================================================================
--- boot/mips64/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/mips64/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -96,5 +96,5 @@
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -106,6 +106,6 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/vmlinux-&linux-version;
-gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
+gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/multilib/createfiles.xml
===================================================================
--- boot/multilib/createfiles.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/multilib/createfiles.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -15,10 +15,10 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${LFS}/usr/lib64
-ln -sv /tools/lib/libstd* ${LFS}/usr/lib
-ln -sv /tools/lib64/libstd* ${LFS}/usr/lib64
-ln -sv bash ${LFS}/bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
+ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
+ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
 </sect1>
Index: boot/multilib/creatingdirs.xml
===================================================================
--- boot/multilib/creatingdirs.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/multilib/creatingdirs.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -15,25 +15,25 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${LFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt}
-install -dv ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${LFS}/root -m 0750
-install -dv ${LFS}/tmp ${LFS}/var/tmp -m 1777
-install -dv ${LFS}/media/{floppy,cdrom}
-install -dv ${LFS}/usr/{bin,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr
-install -dv ${LFS}/usr/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/usr/local/{bin,etc,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr/local
-install -dv ${LFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/var/{lock,log,mail,run,spool}
-install -dv ${LFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv ${LFS}/opt/{bin,doc,include,info}
-install -dv ${LFS}/opt/{lib{,64},man/man{1,2,3,4,5,6,7,8}}
-install -dv ${LFS}/usr/lib/locale
-ln -sv ../lib/locale ${LFS}/usr/lib64</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt}
+install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+install -dv ${CLFS}/root -m 0750
+install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
+install -dv ${CLFS}/media/{floppy,cdrom}
+install -dv ${CLFS}/usr/{bin,include,lib{,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr
+install -dv ${CLFS}/usr/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/usr/local/{bin,etc,include,lib{,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr/local
+install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/var/{lock,log,mail,run,spool}
+install -dv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
+install -dv ${CLFS}/opt/{bin,doc,include,info}
+install -dv ${CLFS}/opt/{lib{,64},man/man{1,2,3,4,5,6,7,8}}
+install -dv ${CLFS}/usr/lib/locale
+ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/ppc/kernel.xml
===================================================================
--- boot/ppc/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/ppc/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -89,5 +89,5 @@
 
 <screen><userinput>make ARCH=ppc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -99,5 +99,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/ppc/yaboot-build.xml
===================================================================
--- boot/ppc/yaboot-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/ppc/yaboot-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -48,5 +48,5 @@
     but it will try to use <command>strip</command> to strip the second-stage
     loader.  It also expects to be running as root for the install, and to
-    install for the root user, which user LFS cannot do.  The following command
+    install for the root user, which user CLFS cannot do.  The following command
     will fix this:</para>
 
Index: boot/ppc64/kernel.xml
===================================================================
--- boot/ppc64/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/ppc64/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -88,5 +88,5 @@
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -98,5 +98,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/ppc64/yaboot-build.xml
===================================================================
--- boot/ppc64/yaboot-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/ppc64/yaboot-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -50,5 +50,5 @@
     but it will try to use <command>strip</command> to strip the second-stage
     loader.  It also expects to be running as root for the install, and to
-    install for the root user, which user LFS cannot do.  We also need to use
+    install for the root user, which user CLFS cannot do.  We also need to use
     the 32-bit compiler, and to force <command>ld</command> to use a 32-bit
     emulation. The following commands will fix and achieve this:</para>
Index: boot/sparc/fstab.xml
===================================================================
--- boot/sparc/fstab.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc/fstab.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -9,8 +9,8 @@
   <?dbhtml filename="fstab.html"?>
 
-  <title>Creating the ${LFS}/etc/fstab File</title>
+  <title>Creating the ${CLFS}/etc/fstab File</title>
 
   <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-${LFS}/etc/fstab">${LFS}/etc/fstab</primary>
+    <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
   </indexterm>
 
@@ -19,5 +19,5 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cat &gt; ${LFS}/etc/fstab &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/fstab &lt;&lt; "EOF"
 <literal># Begin /etc/fstab
 
Index: boot/sparc/kernel.xml
===================================================================
--- boot/sparc/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -84,5 +84,5 @@
 
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -94,5 +94,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/sparc/silo-build.xml
===================================================================
--- boot/sparc/silo-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc/silo-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -41,5 +41,5 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: boot/sparc/silo.xml
===================================================================
--- boot/sparc/silo.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc/silo.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -19,5 +19,5 @@
   to what is in bootscripts.</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/silo.conf &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/silo.conf &lt;&lt; "EOF"
 <literal># Begin /etc/silo.conf
 partition = 1         # Boot partition (= root partition)
@@ -25,5 +25,5 @@
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/lfskernel-&linux-version;
+image = /boot/clfskernel-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>
Index: boot/sparc/sysvinit.xml
===================================================================
--- boot/sparc/sysvinit.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc/sysvinit.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -58,11 +58,11 @@
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${LFS}/etc/inittab">${LFS}/etc/inittab</primary>
+      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
     </indexterm>
 
-    <para>Create a new file <filename>${LFS}/etc/inittab</filename> by
+    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
     running the following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/inittab &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
 
Index: boot/sparc64-64/flags.xml
===================================================================
--- boot/sparc64-64/flags.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc64-64/flags.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,5 +14,5 @@
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: boot/sparc64-64/silo-build.xml
===================================================================
--- boot/sparc64-64/silo-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc64-64/silo-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -51,5 +51,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${CLFS}</userinput></screen>
 
   </sect2>
Index: boot/sparc64/flags.xml
===================================================================
--- boot/sparc64/flags.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc64/flags.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,7 +14,7 @@
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: boot/sparc64/kernel.xml
===================================================================
--- boot/sparc64/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/sparc64/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -85,5 +85,5 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make INSTALL_MOD_PATH=${LFS} ARCH=sparc64 \
+<screen><userinput>make INSTALL_MOD_PATH=${CLFS} ARCH=sparc64 \
    CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
 
@@ -96,5 +96,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/x86/grub-build.xml
===================================================================
--- boot/x86/grub-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86/grub-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -54,7 +54,7 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} install
-mkdir -v ${LFS}/boot/grub
-cp -v ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${CLFS} install
+mkdir -v ${CLFS}/boot/grub
+cp -v ${CLFS}/usr/lib/grub/i386-pc/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
 
     <para os="ac">The <filename class="directory">i386-pc</filename> directory
@@ -62,5 +62,5 @@
     ones for different file systems. Review the files available and copy
     the appropriate ones to the <filename
-    class="directory">${LFS}/boot/grub</filename> directory. Most users will
+    class="directory">${CLFS}/boot/grub</filename> directory. Most users will
     copy the <filename>e2fs_stage1_5</filename> and/or
     <filename>reiserfs_stage1_5</filename> files.</para>
Index: boot/x86/grub.xml
===================================================================
--- boot/x86/grub.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86/grub.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -24,6 +24,6 @@
   xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>dd if=${LFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=${LFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
+<screen os="d"><userinput>dd if=${CLFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
+dd if=${CLFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -64,5 +64,5 @@
 
   <para os="n">If all went well, GRUB will have reported finding its files
-  in <filename class="directory">${LFS}/boot/grub</filename>. That's
+  in <filename class="directory">${CLFS}/boot/grub</filename>. That's
   all there is to it. Quit the <command>grub</command> shell:</para>
 
@@ -75,5 +75,5 @@
   xpointer="xpointer(//*[@os='p'])"/>
 
-<screen><userinput>cat &gt; ${LFS}/boot/grub/menu.lst &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/boot/grub/menu.lst &lt;&lt; "EOF"
 <literal># Begin /boot/grub/menu.lst
 
@@ -90,5 +90,5 @@
 title CLFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
+kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
@@ -97,5 +97,5 @@
   xpointer="xpointer(//*[@os='q'])"/>
 
-<screen os="r"><userinput>cat &gt;&gt; ${LFS}/boot/grub/menu.lst &lt;&lt; "EOF"
+<screen os="r"><userinput>cat &gt;&gt; ${CLFS}/boot/grub/menu.lst &lt;&lt; "EOF"
 <literal>title Red Hat
 root (hd0,2)
Index: boot/x86/kernel.xml
===================================================================
--- boot/x86/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -72,5 +72,5 @@
 
     <para os="af">If the use of kernel modules can't be avoided, an
-    <filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
+    <filename>${CLFS}/etc/modprobe.conf</filename> file may be needed.
     Information pertaining to modules and kernel configuration is
     located in the kernel documentation in the <filename
@@ -92,9 +92,9 @@
 
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+    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>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -102,5 +102,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -108,5 +108,5 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen os="w1"><userinput>cp -v System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -114,5 +114,5 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen os="x1"><userinput>cp -v .config ${LFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
 
   </sect2>
Index: boot/x86_64-64/flags.xml
===================================================================
--- boot/x86_64-64/flags.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86_64-64/flags.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,5 +14,5 @@
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: boot/x86_64-64/lilo.xml
===================================================================
--- boot/x86_64-64/lilo.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86_64-64/lilo.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -54,5 +54,5 @@
   achieve this:</para> 
 
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >i${LFS}/boot/uk.ktl</userinput></screen>
+<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >i${CLFS}/boot/uk.ktl</userinput></screen>
 
   <para os="g">The argument to the command is the name of the keymap, or if
@@ -62,5 +62,5 @@
   <para os="i">The next step is to create /etc/lilo.conf</para>
 
-<screen os="j" role="nodump"><userinput>cat &gt; ${LFS}/etc/lilo.conf &lt;&lt; "EOF"
+<screen os="j" role="nodump"><userinput>cat &gt; ${CLFS}/etc/lilo.conf &lt;&lt; "EOF"
 <literal># Begin /etc/lilo.conf
 # lilo.conf
@@ -74,9 +74,9 @@
 
 # set the name of the default image to boot
-default=lfs
+default=clfs
 
 # define an image
-image=/boot/lfskernel
-    label=lfs
+image=/boot/clfskernel
+    label=clfs
     root=/dev/&lt;partition&gt;
     read-only
Index: boot/x86_64/flags.xml
===================================================================
--- boot/x86_64/flags.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86_64/flags.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,7 +14,7 @@
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${LFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>
Index: boot/x86_64/grub-build.xml
===================================================================
--- boot/x86_64/grub-build.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86_64/grub-build.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -46,7 +46,7 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} install
-mkdir -v ${LFS}/boot/grub
-cp -v ${LFS}/usr/lib/grub/x86_64-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${CLFS} install
+mkdir -v ${CLFS}/boot/grub
+cp -v ${CLFS}/usr/lib/grub/x86_64-pc/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -58,5 +58,5 @@
     files, different ones for different file systems. Review the files
     available and copy the appropriate ones to the <filename
-    class="directory">${LFS}/boot/grub</filename> directory. Most
+    class="directory">${CLFS}/boot/grub</filename> directory. Most
     users will copy the <filename>e2fs_stage1_5</filename> and/or
     <filename>reiserfs_stage1_5</filename> files.</para>
Index: boot/x86_64/kernel.xml
===================================================================
--- boot/x86_64/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ boot/x86_64/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -88,5 +88,5 @@
 
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -98,5 +98,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/alpha/aboot.xml
===================================================================
--- bootable/alpha/aboot.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/alpha/aboot.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -21,5 +21,5 @@
 <screen><userinput>cat &gt; /etc/aboot.conf &lt;&lt; "EOF"
 <literal># Begin /etc/aboot.conf
-0:1/boot/lfskernel-&linux-version; root=/dev/sda1
+0:1/boot/clfskernel-&linux-version; root=/dev/sda1
 # End /etc/aboot.conf</literal>
 EOF</userinput></screen>
Index: bootable/alpha/kernel.xml
===================================================================
--- bootable/alpha/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/alpha/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -110,5 +110,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/ppc/kernel.xml
===================================================================
--- bootable/ppc/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/ppc/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -113,5 +113,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/ppc/yaboot.xml
===================================================================
--- bootable/ppc/yaboot.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/ppc/yaboot.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -61,5 +61,5 @@
   <filename class="devicefile">device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:
   </filename> for the disk, and
-  <filename class="partition">image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/lfskernel-&linux-version;
+  <filename class="partition">image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;
   </filename> which definitely works.</para>
 
@@ -111,5 +111,5 @@
 # on which they are situated and can include at most one
 # directory
-image=/boot/lfskernel-&linux-version;
+image=/boot/clfskernel-&linux-version;
     label=&version;
     read-only</literal>
Index: bootable/ppc64/kernel.xml
===================================================================
--- bootable/ppc64/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/ppc64/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -106,5 +106,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/sparc/kernel.xml
===================================================================
--- bootable/sparc/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/sparc/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -106,5 +106,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/sparc/silo.xml
===================================================================
--- bootable/sparc/silo.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/sparc/silo.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -25,5 +25,5 @@
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/lfskernel-&linux-version;
+image = /boot/clfskernel-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>
Index: bootable/x86/grub.xml
===================================================================
--- bootable/x86/grub.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/x86/grub.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -104,5 +104,5 @@
 title CLFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
+kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
Index: bootable/x86/kernel.xml
===================================================================
--- bootable/x86/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/x86/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -105,5 +105,5 @@
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
@@ -164,5 +164,5 @@
 
       <seglistitem>
-        <seg>config-[linux-version], lfskernel-[linux-version],
+        <seg>config-[linux-version], clfskernel-[linux-version],
         and System.map-[linux-version]</seg>
       </seglistitem>
@@ -184,6 +184,6 @@
       </varlistentry>
 
-      <varlistentry id="lfskernel">
-        <term><filename>lfskernel-[linux-version]</filename></term>
+      <varlistentry id="clfskernel">
+        <term><filename>clfskernel-[linux-version]</filename></term>
         <listitem>
           <para>The engine of the Linux system. When turning on the
@@ -194,6 +194,6 @@
           a multitasking machine capable of running scores of programs
           seemingly at the same time.</para>
-          <indexterm zone="ch-bootable-kernel lfskernel">
-            <primary sortas="b-lfskernel">lfskernel-[linux-version]</primary>
+          <indexterm zone="ch-bootable-kernel clfskernel">
+            <primary sortas="b-clfskernel">clfskernel-[linux-version]</primary>
           </indexterm>
         </listitem>
Index: bootable/x86_64-64/lilo.xml
===================================================================
--- bootable/x86_64-64/lilo.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/x86_64-64/lilo.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -60,5 +60,5 @@
       whatever is appropriate for your keyboard.</para>
 
-    <para os="h">When the x86 LFS book used to include Lilo, it
+    <para os="h">When the x86 CLFS book used to include Lilo, it
     advised against running it from chroot in case the MBR became
     corrupted. Provided you have /proc mounted and have device special
@@ -82,9 +82,9 @@
 
 # set the name of the default image to boot
-default=lfs
+default=clfs
 
 # define an image
-image=/boot/lfskernel
-    label=lfs
+image=/boot/clfskernel
+    label=clfs
     root=/dev/&lt;partition&gt;
     read-only
Index: bootable/x86_64/kernel.xml
===================================================================
--- bootable/x86_64/kernel.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ bootable/x86_64/kernel.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -106,5 +106,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/x86_64/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: cross-tools/common/introduction.xml
===================================================================
--- cross-tools/common/introduction.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ cross-tools/common/introduction.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -14,5 +14,5 @@
 
   <para>If for some reason you have to stop and come back later, remember
-  to use the <command>su - lfs</command> command, and it will setup the
+  to use the <command>su - clfs</command> command, and it will setup the
   build environment that you left.</para>
 
@@ -22,5 +22,5 @@
     <important>
       <para>Before issuing the build instructions for a package, the package
-      should be unpacked as user <systemitem class="username">lfs</systemitem>,
+      should be unpacked as user <systemitem class="username">clfs</systemitem>,
       and a <command>cd</command> into the created directory should be
       performed. The build instructions assume that the <command>bash</command>
Index: general.ent
===================================================================
--- general.ent	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ general.ent	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -32,5 +32,5 @@
 <!ENTITY clfs-root "http:/trac.cross-lfs.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
-<!ENTITY faq-root "&lfs-root;faq/">
+<!ENTITY faq-root "&clfs-root;/wiki/faq">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
Index: introduction/common/askforhelp.xml
===================================================================
--- introduction/common/askforhelp.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ introduction/common/askforhelp.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -18,8 +18,5 @@
   <ulink url="&hints-root;errors.txt"/>.</para>
 
-  <para>If you cannot find your problem listed in the FAQ, search the mailing
-  lists at <ulink url="&lfs-root;search.html"/>.</para>
-
-  <para>We also have a wonderful LFS community that is willing to offer
+  <para>We also have a wonderful CLFS community that is willing to offer
   assistance through the mailing lists and IRC (see the <xref
   linkend="ch-intro-resources"/> section of this book). However, we
@@ -47,4 +44,7 @@
       </listitem>
       <listitem>
+        <para>The architecture of the target and host.</para>
+      </listitem>
+      <listitem>
         <para>The package or section the problem was encountered in</para>
       </listitem>
@@ -59,5 +59,5 @@
     <note>
       <para>Deviating from this book does <emphasis>not</emphasis>
-      mean that we will not help you. After all, the LFS project is
+      mean that we will not help you. After all, the CLFS project is
       about personal preference. Being upfront about any changes to
       the established procedure helps us evaluate and determine
@@ -89,8 +89,8 @@
     from the screen output from <command>make</command>:</para>
 
-<screen><computeroutput>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
--DLOCALEDIR=\"/mnt/lfs/usr/share/locale\"
--DLIBDIR=\"/mnt/lfs/usr/lib\"
--DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
+<screen><computeroutput>gcc -DALIASPATH=\"/mnt/clfs/usr/share/locale:.\"
+-DLOCALEDIR=\"/mnt/clfs/usr/share/locale\"
+-DLIBDIR=\"/mnt/clfs/usr/lib\"
+-DINCLUDEDIR=\"/mnt/clfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
 -g -O2 -c getopt1.c
 gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o
@@ -99,11 +99,11 @@
 default.o remote-stub.o version.o opt1.o
 -lutil job.o: In function `load_too_high':
-/lfs/tmp/make-3.79.1/job.c:1565: undefined reference
+/clfs/tmp/make-3.79.1/job.c:1565: undefined reference
 to `getloadavg'
 collect2: ld returned 1 exit status
 make[2]: *** [make] Error 1
-make[2]: Leaving directory `/lfs/tmp/make-3.79.1'
+make[2]: Leaving directory `/clfs/tmp/make-3.79.1'
 make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/lfs/tmp/make-3.79.1'
+make[1]: Leaving directory `/clfs/tmp/make-3.79.1'
 make: *** [all-recursive-am] Error 2</computeroutput></screen>
 
Index: introduction/common/resources.xml
===================================================================
--- introduction/common/resources.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ introduction/common/resources.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -24,14 +24,15 @@
     <title>Mailing Lists</title>
 
-    <para>The <uri>linuxfromscratch.org</uri> server hosts a number of
-    mailing lists used for the development of the LFS project. These lists
+    <para>The <uri>cross-lfs.org</uri> server hosts a number of
+    mailing lists used for the development of the CLFS project. These lists
     include the main development and support lists, among others. If the
-    FAQ does not solve the problem you are having, the next step would be to
-    search the mailing lists at <ulink url="&lfs-root;search.html"/>.</para>
+    FAQ does not contain your answer, you can search the CLFS lists via
+    The Mail Archive <ulink url="http://www.mail-archive.com"/>. You can
+    find the mail lists with the following link:</para>
 
+    <para><ulink url="http://www.mail-archive.com/index.php?hunt=clfs"/></para>
+   
     <para>For information on the different lists, how to subscribe, archive
-    locations, and additional information, visit
-    <ulink url="&lfs-root;mail.html"/>. For mailing lists specifically
-    for CLFS, visit <ulink url="&clfs-root;wiki/lists"/>.</para>
+    locations, and additional information, visit <ulink url="&clfs-root;wiki/lists"/>.</para>
 
   </sect2>
@@ -40,7 +41,10 @@
     <title>News Server</title>
 
-    <para> The Linux From Scratch News Server is no longer available.
-    Please use the other support methods listed on this page
-    </para>
+    <para>Cross-LFS does not maintain it's own News Server, but we do provide
+    access via <uri>gmane.org</uri> <ulink url="http://gmane.org"/>. If you want to subscribe
+    to the Cross-LFS via a newsreader you can utilize <uri>gmane.org</uri>.
+    You can find the game search for CLFS with the following link:</para>
+
+   <para><ulink url="http://dir.gmane.org/search.php?match=clfs"/></para>
 
   </sect2>
@@ -53,5 +57,5 @@
     please make sure that your question is not already answered in the LFS
     FAQ or the mailing list archives. You can find the IRC network at
-    <uri>irc.linuxfromscratch.org</uri>. The support channel for cross-lfs is
+    <uri>chat.freenode.net</uri>. The support channel for cross-lfs is
     named #cross-lfs. For support on the standard LFS the support channel
     is named #lfs-support. If you need to show people the output of your
@@ -61,22 +65,11 @@
   </sect2>
 
-  <sect2 id="ch-intro-references">
-    <title>References</title>
-
-    <para>For additional information on the packages, useful tips are
-    available in the LFS Package Reference page located at <ulink
-    url="&lfs-root;~matthew/LFS-references.html"/>.</para>
-
-  </sect2>
-
   <sect2 id="ch-intro-mirrors" xreflabel="Chapter 1 - Mirror sites">
     <title>Mirror Sites</title>
 
-    <para>The LFS project has a number of world-wide mirrors to make
+    <para>The CLFS project has a number of world-wide mirrors to make
     accessing the website and downloading the required packages more
-    convenient. Please visit the LFS website at <ulink
-    url="&lfs-root;mirrors.html"/> for a list of current mirrors of
-    the LFS website, or <ulink url="&clfs-root;wiki/mirrors"/> for
-    mirrors of CLFS.</para>
+    convenient. Please visit the CLFS website at
+    <ulink url="&clfs-root;wiki/mirrors"/> for mirrors of CLFS.</para>
 
   </sect2>
@@ -85,6 +78,6 @@
     <title>Contact Information</title>
 
-    <para>Please direct all your questions and comments to one of the LFS
-    or CLFS mailing lists (see above).</para>
+    <para>Please direct all your questions and comments to the
+    CLFS mailing lists (see above).</para>
 
   </sect2>
Index: materials/common/introduction.xml
===================================================================
--- materials/common/introduction.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ materials/common/introduction.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -25,5 +25,5 @@
   most packages. If this search is unsuccessful, try one of the
   alternative means of downloading discussed at <ulink
-  url="&lfs-root;lfs/packages.html"/>.</para>
+  url="&cfs-root;wiki/download"/>.</para>
 
   <para>Downloaded packages and patches will need to be stored somewhere
Index: temp-system/common/introduction.xml
===================================================================
--- temp-system/common/introduction.xml	(revision b18d234619cbbdb4fd280f6d19029b836430dda6)
+++ temp-system/common/introduction.xml	(revision f1fd69a6a413b21d8cfc438c183968fe1a1ffd8a)
@@ -25,5 +25,5 @@
   pollute the soon-to-be CLFS system.</para>
 
-  <para>Check one last time that the <envar>LFS</envar> environment
+  <para>Check one last time that the <envar>CLFS</envar> environment
   variable is set up properly:</para>
 
@@ -31,5 +31,5 @@
 
   <para>Make sure the output shows the path to the CLFS partition's mount
-  point, which is <filename class="directory">/mnt/lfs</filename>, using
+  point, which is <filename class="directory">/mnt/clfs</filename>, using
   our example.</para>
 
