diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
index f97a23b930..ce6c88f167 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
@@ -1087,7 +1087,7 @@ scsibus1:
 
       <para>Floppy disks are accessed through entries in
         <filename>/dev</filename> (like any other device). To access the
-        raw floppy disk you can use <filename>/dev/rfd<replaceable>X</replaceable></filename>,
+        raw floppy disk you can use <filename>/dev/fd<replaceable>X</replaceable></filename>,
         where <replaceable>X</replaceable> stands for the drive number, usually 0. When the disk is
         formatted you can use <filename>/dev/fd<replaceable>X</replaceable></filename>, or
         whichever of the other devices named
@@ -1120,7 +1120,7 @@ scsibus1:
         to format the floppy to its real size, or force them.  So you
         insert a new 3.5inch floppy disk in your drive and issue:</para>
 
-      <screen>&prompt.root; <userinput>/usr/sbin/fdformat /dev/rfd0.1440</userinput></screen>
+      <screen>&prompt.root; <userinput>/usr/sbin/fdformat /dev/fd0.1440</userinput></screen>
 
       <para>This will take a while... You should notice any disk error
         here (this can help you determining which disks are good or
@@ -1129,7 +1129,7 @@ scsibus1:
       <para>To force the floppy disk size, we will use other entries
         in <filename>/dev</filename>.  Get the same floppy and issue:
 
-      <screen>&prompt.root; <userinput>/usr/sbin/fdformat /dev/rfd0.1720</userinput></screen>
+      <screen>&prompt.root; <userinput>/usr/sbin/fdformat /dev/fd0.1720</userinput></screen>
 
       <para>It will take some more time than before (forced disks are
         slower).  When it finishes, you will have a 1720kb floppy disk,
@@ -1155,7 +1155,7 @@ scsibus1:
       <para>You can run now &man.disklabel.8;
         like:</para>
 
-      <screen>&prompt.root; <userinput>/sbin/disklabel -B -r -w /dev/rfd0 <replaceable>fdsize</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>/sbin/disklabel -B -r -w /dev/fd0 <replaceable>fdsize</replaceable></userinput></screen>
 
       <para>Replace <replaceable>fdsize</replaceable> with <literal>fd1440</literal>, <literal>fd1720</literal> or whichever size you
         want.  The last field instructs disklabel which entry to take
@@ -1573,7 +1573,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
         Exabyte tape drive connected to a Sun called
         <hostid>komodo</hostid>, use:</para>
 
-      <screen>&prompt.root; <userinput>/sbin/rdump 0dsbfu 54000 13000 126 komodo:/dev/nrsa8 /dev/da0a 2>&amp;1</userinput></screen>
+      <screen>&prompt.root; <userinput>/sbin/rdump 0dsbfu 54000 13000 126 komodo:/dev/nsa8 /dev/da0a 2>&amp;1</userinput></screen>
 
       <para>Beware: there are security implications to
         allowing <filename>.rhosts</filename> authentication.  Evaluate your
@@ -1615,7 +1615,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	<command>tar</command> to an Exabyte tape drive connected to a
 	Sun called <hostid>komodo</hostid>, use:</para>
 
-      <screen>&prompt.root; <userinput>/usr/bin/tar cf komodo:/dev/nrsa8 . 2>&amp;1</userinput></screen>
+      <screen>&prompt.root; <userinput>/usr/bin/tar cf komodo:/dev/nsa8 . 2>&amp;1</userinput></screen>
 
       <para>For versions without
 	remote device support, you can use a pipeline and
@@ -1660,7 +1660,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	<replaceable>user</replaceable>@<replaceable>host</replaceable> is the
 	user/hostname combination that will be performing the backups, and
 	<replaceable>backup_device</replaceable> is where the backups should
-	be written to (e.g., <filename>/dev/nrsa0</filename>).</para>
+	be written to (e.g., <filename>/dev/nsa0</filename>).</para>
     </sect2>
 
     <sect2>
@@ -1807,8 +1807,8 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	  procedure.  Store these notes with the bootable floppy, the
 	  printouts and the backup tapes.  You will be so distraught when
 	  restoring that the notes may prevent you from destroying your backup
-	  tapes (How? In place of <command>tar xvf /dev/rsa0</command>, you
-	  might accidentally type <command>tar cvf /dev/rsa0</command> and
+	  tapes (How? In place of <command>tar xvf /dev/sa0</command>, you
+	  might accidentally type <command>tar cvf /dev/sa0</command> and
 	  over-write your backup tape).</para>
 
 	<para>For an added measure of security, make bootable floppies and two
@@ -2106,7 +2106,7 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
 &prompt.root; <userinput>disklabel -r -w vn<replaceable>0</replaceable> auto</userinput>
 &prompt.root; <userinput>newfs vn<replaceable>0</replaceable>c</userinput>
 Warning: 2048 sector(s) in last cylinder unallocated
-/dev/rvn0c:     10240 sectors in 3 cylinders of 1 tracks, 4096 sectors
+/dev/vn0c:     10240 sectors in 3 cylinders of 1 tracks, 4096 sectors
         5.0MB in 1 cyl groups (16 c/g, 32.00MB/g, 1280 i/g)
 super-block backups (for fsck -b #) at:
  32