diff --git a/chapter02/stages.xml b/chapter02/stages.xml
index 830ec0c1f..7c151975f 100644
--- a/chapter02/stages.xml
+++ b/chapter02/stages.xml
@@ -71,8 +71,7 @@
         <para>A few operations, from <quote>Changing Ownership</quote> to
         <quote>Entering the Chroot Environment</quote> must be done as the
         <systemitem class="username">root</systemitem> user, with the LFS
-        environment variable set for the
-        <systemitem class="username">root</systemitem>user.</para>
+        environment variable set for the &root; user.</para>
       </listitem>
 
       <listitem>
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index 535f20b02..b659b4841 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -86,8 +86,8 @@ case $(uname -m) in
 esac</userinput></screen>
 
   <note><para>In some host systems, the following command does not complete
-  properly and suspends the login to the lfs user to the background.  If the
-  prompt "lfs:~$" does not appear immediately, entering the
+  properly and suspends the login to the &lfs-user; user to the background.
+  If the prompt "lfs:~$" does not appear immediately, entering the
   <command>fg</command> command will fix the issue.</para></note>
 
   <para>Next, login as user <systemitem class="username">lfs</systemitem>.
diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml
index 651f2e8d6..6ed78fb93 100644
--- a/chapter07/cleanup.xml
+++ b/chapter07/cleanup.xml
@@ -156,9 +156,9 @@ tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
      restore when they don't need to. -->
 
     <warning><para>The following commands are extremely dangerous.  If
-    you run <command>rm -rf ./*</command> as the root user and you
+    you run <command>rm -rf ./*</command> as the &root; user and you
     do not change to the $LFS directory or the <envar>LFS</envar>
-    environment variable is not set for the root user, it will destroy
+    environment variable is not set for the &root; user, it will destroy
     your entire host system.  YOU ARE WARNED.</para></warning>
 
 <screen role="nodump"><computeroutput>cd $LFS
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 2b0030d7b..6605ddea4 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -25,7 +25,7 @@
   <para>Until <xref linkend="ch-tools-chroot"/>, the commands must be
   run as <systemitem class="username">root</systemitem>, with the
   <envar>LFS</envar> variable set. After entering chroot, all commands
-  are run as root, fortunately without access to the OS of the computer
+  are run as &root;, fortunately without access to the OS of the computer
   you built LFS on. Be careful anyway, as it is easy to destroy the whole
   LFS system with badly formed commands.</para>
 
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index 787882b59..4ea981d5b 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -73,7 +73,7 @@
 
 <screen><userinput remap="test">chown -Rv tester .</userinput></screen>
 
-    <para>The testsuite of the package is designed to be run as a non-root
+    <para>The testsuite of the package is designed to be run as a non-&root;
     user that owns the terminal connected to standard input.  To satisfy the
     requirement, spawn a new pseudo terminal using
     <application>Expect</application> and run the tests as the <systemitem
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 9ae9993ce..b8551084f 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -124,8 +124,8 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
 
 <screen><userinput remap="test">echo "dummy:x:102:tester" &gt;&gt; /etc/group</userinput></screen>
 
-    <para>Fix some of the permissions so that the non-root user can compile and
-    run the tests:</para>
+    <para>Fix some of the permissions so that the non-&root; user can
+    compile and run the tests:</para>
 
 <screen><userinput remap="test">chown -Rv tester . </userinput></screen>
 
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 7aba82c85..d90936b78 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -84,7 +84,7 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>If desired, run the test suite as a non-root user:</para>
+    <para>If desired, run the test suite as a non-&root; user:</para>
 
     <warning><para>Running the test suite as the
     <systemitem class="username">root</systemitem> user can be harmful to
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 713bab93b..f1469f0b4 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -248,8 +248,8 @@ File systems  ---&gt;
     <caution>
       <para>If the host system has a separate /boot partition, the files copied
       below should go there. The easiest way to do that is to bind /boot on the
-      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the root
-      user in the <emphasis>host system</emphasis>:</para>
+      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the
+      &root; user in the <emphasis>host system</emphasis>:</para>
 
 <screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
     </caution>
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index 9166a8c49..3d7953897 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -46,8 +46,8 @@
 
     <listitem><para>Installing <ulink
     url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
-    building packages as a non-root user and easily installing the resulting
-    packages in your new system.</para></listitem>
+    building packages as a non-&root; user and easily installing the
+    resulting packages in your new system.</para></listitem>
 
     <listitem><para>If you want to access your new system from a remote system
     within a comfortable GUI environment, install <ulink