diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
index 8754cf4c8e..87ee9f8281 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
@@ -1035,12 +1035,12 @@
     </sect2>
   </sect1>
 
-  <sect1 id="skey">
-    <title>S/Key</title>
-    <indexterm><primary>S/Key</primary></indexterm>
+  <sect1 id="one-time-passwords">
+    <title>One-time Passwords</title>
+    <indexterm><primary>One-time Passwords</primary></indexterm>
     <indexterm>
       <primary>security</primary>
-      <secondary>S/Key</secondary>
+      <secondary>One-time Passwords</secondary>
     </indexterm>
 
     <para>S/Key is a one-time password scheme based on a one-way hash
@@ -1051,11 +1051,11 @@
       trademark of Bell Communications Research, Inc.</para>
 
     <para>From version 5.0 of FreeBSD, S/Key has been replaced with
-      the functionally equivalent OPIE (Onetime Passwords In
+      the functionally equivalent OPIE (One-time Passwords In
       Everything).  OPIE uses the MD5 hash by default.</para>
 
-    <para>There are three different sorts of passwords which we will talk
-      about in the discussion below.  The first is your usual Unix-style or
+    <para>There are three different sorts of passwords which we will discuss
+      below.  The first is your usual Unix-style or
       Kerberos password; we will call this a <quote>Unix password</quote>.
       The second sort is the one-time password which is generated by the
       S/Key <command>key</command> program or the OPIE