Index: BOOK/materials/sparcv8-chapter.xml
===================================================================
--- BOOK/materials/sparcv8-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/materials/sparcv8-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -14,5 +14,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/packages.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/packages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/patches.xml"/>
Index: BOOK/temp-tools/alpha-chapter.xml
===================================================================
--- BOOK/temp-tools/alpha-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/alpha-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/mips-chapter.xml
===================================================================
--- BOOK/temp-tools/mips-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/mips-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-tools/mips64-64-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/mips64-64-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/mips64-chapter.xml
===================================================================
--- BOOK/temp-tools/mips64-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/mips64-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/ppc-chapter.xml
===================================================================
--- BOOK/temp-tools/ppc-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/ppc-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/sparc-chapter.xml
===================================================================
--- BOOK/temp-tools/sparc-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/sparc-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-tools/sparc64-64-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/sparc64-64-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/sparc64-chapter.xml
===================================================================
--- BOOK/temp-tools/sparc64-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/sparc64-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/x86-chapter.xml
===================================================================
--- BOOK/temp-tools/x86-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/x86-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-tools/x86_64-64-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/x86_64-64-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
Index: BOOK/temp-tools/x86_64-chapter.xml
===================================================================
--- BOOK/temp-tools/x86_64-chapter.xml	(revision 9456aeee942e6d47834657828402168478a861dd)
+++ BOOK/temp-tools/x86_64-chapter.xml	(revision 82d63618bd27dc240671aedcdd741cdb643cf762)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-temporary-tools" xreflabel="Constructing a Temporary Tools">
+<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
   <?dbhtml dir="temp-tools"?>
   <?dbhtml filename="chapter.html"?>
