Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/bash.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&bash-ch5-sbu;</seg>
-        <seg>&bash-ch5-du;</seg>
+        <seg>&bash-tmp-sbu;</seg>
+        <seg>&bash-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/binutils-pass2.xml
===================================================================
--- chapter06/binutils-pass2.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/binutils-pass2.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&binutils-ch5p2-sbu;</seg>
-        <seg>&binutils-ch5p2-du;</seg>
+        <seg>&binutils-tmpp2-sbu;</seg>
+        <seg>&binutils-tmpp2-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/coreutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&coreutils-ch5-sbu;</seg>
-        <seg>&coreutils-ch5-du;</seg>
+        <seg>&coreutils-tmp-sbu;</seg>
+        <seg>&coreutils-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/diffutils.xml
===================================================================
--- chapter06/diffutils.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/diffutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&diffutils-ch5-sbu;</seg>
-        <seg>&diffutils-ch5-du;</seg>
+        <seg>&diffutils-tmp-sbu;</seg>
+        <seg>&diffutils-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/file.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&file-ch5-sbu;</seg>
-        <seg>&file-ch5-du;</seg>
+        <seg>&file-tmp-sbu;</seg>
+        <seg>&file-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/findutils.xml
===================================================================
--- chapter06/findutils.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/findutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&findutils-ch5-sbu;</seg>
-        <seg>&findutils-ch5-du;</seg>
+        <seg>&findutils-tmp-sbu;</seg>
+        <seg>&findutils-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/gawk.xml
===================================================================
--- chapter06/gawk.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/gawk.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&gawk-ch5-sbu;</seg>
-        <seg>&gawk-ch5-du;</seg>
+        <seg>&gawk-tmp-sbu;</seg>
+        <seg>&gawk-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/gcc-pass2.xml
===================================================================
--- chapter06/gcc-pass2.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/gcc-pass2.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&gcc-ch5p2-sbu;</seg>
-        <seg>&gcc-ch5p2-du;</seg>
+        <seg>&gcc-tmpp2-sbu;</seg>
+        <seg>&gcc-tmpp2-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/grep.xml
===================================================================
--- chapter06/grep.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/grep.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&grep-ch5-sbu;</seg>
-        <seg>&grep-ch5-du;</seg>
+        <seg>&grep-tmp-sbu;</seg>
+        <seg>&grep-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/gzip.xml
===================================================================
--- chapter06/gzip.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/gzip.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&gzip-ch5-sbu;</seg>
-        <seg>&gzip-ch5-du;</seg>
+        <seg>&gzip-tmp-sbu;</seg>
+        <seg>&gzip-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/m4.xml
===================================================================
--- chapter06/m4.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/m4.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&m4-ch5-sbu;</seg>
-        <seg>&m4-ch5-du;</seg>
+        <seg>&m4-tmp-sbu;</seg>
+        <seg>&m4-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/make.xml
===================================================================
--- chapter06/make.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/make.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&make-ch5-sbu;</seg>
-        <seg>&make-ch5-du;</seg>
+        <seg>&make-tmp-sbu;</seg>
+        <seg>&make-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/ncurses.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&ncurses-ch5-sbu;</seg>
-        <seg>&ncurses-ch5-du;</seg>
+        <seg>&ncurses-tmp-sbu;</seg>
+        <seg>&ncurses-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/patch.xml
===================================================================
--- chapter06/patch.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/patch.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&patch-ch5-sbu;</seg>
-        <seg>&patch-ch5-du;</seg>
+        <seg>&patch-tmp-sbu;</seg>
+        <seg>&patch-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/sed.xml
===================================================================
--- chapter06/sed.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/sed.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&sed-ch5-sbu;</seg>
-        <seg>&sed-ch5-du;</seg>
+        <seg>&sed-tmp-sbu;</seg>
+        <seg>&sed-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/tar.xml
===================================================================
--- chapter06/tar.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/tar.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&tar-ch5-sbu;</seg>
-        <seg>&tar-ch5-du;</seg>
+        <seg>&tar-tmp-sbu;</seg>
+        <seg>&tar-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/xz.xml
===================================================================
--- chapter06/xz.xml	(revision bc8cca581fed74c60e201a89acb38cb2344c9b1b)
+++ chapter06/xz.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&xz-ch5-sbu;</seg>
-        <seg>&xz-ch5-du;</seg>
+        <seg>&xz-tmp-sbu;</seg>
+        <seg>&xz-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
