diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index a637ef1a1..26439641b 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="binutils-pass1.html"?>
 
   <sect1info condition="script">
-    <productname>binutils</productname>
+    <productname>binutils-pass1</productname>
     <productnumber>&binutils-version;</productnumber>
     <address>&binutils-url;</address>
   </sect1info>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 88fda3f25..39f5f2f99 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="binutils-pass2.html"?>
 
   <sect1info condition="script">
-    <productname>binutils</productname>
+    <productname>binutils-pass2</productname>
     <productnumber>&binutils-version;</productnumber>
     <address>&binutils-url;</address>
   </sect1info>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 7f03edbd0..e4a199324 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-pass1.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-pass1</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 28604b11b..687befbc7 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-pass2.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-pass2</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index b357ee57a..8139a85bd 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-libstdc++.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-libstdc++</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>
diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml
index 6d233a7a6..7f066c712 100644
--- a/chapter05/linux-headers.xml
+++ b/chapter05/linux-headers.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="linux-headers.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>linux-headers</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index c67b48355..a190f6046 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="linux-headers.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>linux-headers</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>
diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml
index 31bea4376..e443f334d 100644
--- a/chapter06/pkgconfig.xml
+++ b/chapter06/pkgconfig.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="pkg-config.html"?>
 
   <sect1info condition="script">
-    <productname>pkgconfig</productname>
+    <productname>pkg-config</productname>
     <productnumber>&pkgconfig-version;</productnumber>
     <address>&pkgconfig-url;</address>
   </sect1info>
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 7c7933bfa..94809cc27 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="bootscripts.html"?>
 
   <sect1info condition="script">
-    <productname>lfs-bootscripts</productname>
+    <productname>bootscripts</productname>
     <productnumber>&lfs-bootscripts-version;</productnumber>
     <address>&lfs-bootscripts-url;</address>
   </sect1info>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 83c7d10bd..8835b7697 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="kernel.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>kernel</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>