diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index 65cae3505..91e632294 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -8,16 +8,17 @@
 <sect1 id="ch-system-linux-headers" role="wrap">
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;</title>
+  <title>Linux-&linux-version; API Headers</title>
 
   <indexterm zone="ch-system-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
+    <primary sortas="a-Linux">Linux</primary>
+    <secondary>API headers</secondary>
   </indexterm>
 
   <sect2 role="package">
     <title/>
 
-    <para>The Linux-Headers expose the kernel's API for use by Glibc.</para>
+    <para>The Linux API Headers expose the kernel's API for use by Glibc.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -32,7 +33,7 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
+    <title>Installation of Linux API Headers</title>
 
     <para>The Linux kernel needs to expose an Application Programming Interface
     (API) for the system's C library (Glibc in LFS) to utilize.  This is done
@@ -57,7 +58,7 @@ find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;</userinput></scre
   </sect2>
 
   <sect2 id="contents-linux-headers" role="content">
-    <title>Contents of Linux-Headers</title>
+    <title>Contents of Linux API Headers</title>
 
     <segmentedlist>
       <segtitle>Installed headers</segtitle>