Index: INSTALL
===================================================================
--- INSTALL	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ INSTALL	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -1,3 +1,3 @@
-LFS Book Conversion Tools Installation Instructions
+CLFS Book Conversion Tools Installation Instructions
 
 After downloading the SVN source, there are some things that need to be set up 
@@ -5,5 +5,5 @@
 read (e.g. HTML, TXT, or PDF).  If you are interested in this, then keep 
 reading.  If you are only interested in editing the XML source for re- 
-submission to the lfs-book or lfs-dev mailing lists, then you do not need this 
+submission to the clfs-commits or clfs-dev mailing lists, then you do not need this 
 document.  Instead, you need to read the LFS Editor's Manual.  See the LFS 
 website at http://www.linuxfromscratch.org for more information.
Index: boot/alpha/kernel.xml
===================================================================
--- boot/alpha/kernel.xml	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ boot/alpha/kernel.xml	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -92,5 +92,5 @@
 
 <screen><userinput>make ARCH=alpha 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,5 +102,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/common/pwdgroup.xml
===================================================================
--- boot/common/pwdgroup.xml	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ boot/common/pwdgroup.xml	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -117,5 +117,5 @@
   </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>
 
Index: bootscripts/common/hostname.xml
===================================================================
--- bootscripts/common/hostname.xml	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ bootscripts/common/hostname.xml	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -22,7 +22,7 @@
   and enter a hostname by running:</para>
 
-  <screen><userinput>echo "HOSTNAME=<replaceable>[lfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
+  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
 
-  <para><replaceable>[lfs]</replaceable> needs to be replaced with the
+  <para><replaceable>[clfs]</replaceable> needs to be replaced with the
   name given to the computer. Do not enter the Fully Qualified
   Domain Name (FQDN) here. That information will be put in the
Index: bootscripts/common/setclock.xml
===================================================================
--- bootscripts/common/setclock.xml	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ bootscripts/common/setclock.xml	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -50,5 +50,5 @@
 EOF</userinput></screen>
 
-  <para os="e">A good hint explaining how to deal with time on LFS is available
+  <para os="e">A good hint explaining how to deal with time on CLFS is available
   at <ulink url="&hints-root;time.txt"/>. It explains issues such as
   time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
Index: chroot/common/changingowner.xml
===================================================================
--- chroot/common/changingowner.xml	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ chroot/common/changingowner.xml	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -13,5 +13,5 @@
     <para os="a">Currently, the <filename class="directory">/tools</filename>
     and <filename class="directory">/cross-tools</filename> directories
-    are owned by the user <emphasis>lfs</emphasis>, a user that
+    are owned by the user <emphasis>clfs</emphasis>, a user that
     exists only on the host system. Although the <filename
     class="directory">/tools</filename> and <filename
@@ -27,5 +27,5 @@
 
     <para os="b">To avoid this issue, add the <systemitem
-    class="username">lfs</systemitem> user to the new CLFS system later when
+    class="username">clfs</systemitem> user to the new CLFS system later when
     creating the <filename>/etc/passwd</filename> file, taking care to assign
     it the same user and group IDs as on the host system. Alternatively,
Index: partitioning/common/mounting.xml
===================================================================
--- partitioning/common/mounting.xml	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ partitioning/common/mounting.xml	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -18,5 +18,5 @@
   to you.</para>
 
-  <para>Choose a mount point and assign it to the <envar>LFS</envar>
+  <para>Choose a mount point and assign it to the <envar>CLFS</envar>
   environment variable by running:</para>
 
Index: the-end/getcounted.xml
===================================================================
--- the-end/getcounted.xml	(revision 2e6f100c987ce01f4722507ac64547cb935a191e)
+++ the-end/getcounted.xml	(revision 0f12103ec21717eec234fb48d83741e41cbba26a)
@@ -12,9 +12,7 @@
 
   <para>Now that you have finished the book, do you want to be counted
-  as an LFS user? Head over to <ulink
-  url="&lfs-root;cgi-bin/lfscounter.cgi"/> and register as an LFS user
-  by entering your name and the first LFS version you have used.</para>
-
-  <para>Let's reboot into LFS now.</para>
+  as a CLFS user? Head over to <ulink
+  url="&lfs-root;cgi-bin/lfscounter.cgi"/> and register as a CLFS user
+  by entering your name and the first CLFS version you have used.</para>
 
 </sect1>
