Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter05/binutils-pass1.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&binutils-ch5p1-sbu;</seg>
-        <seg>&binutils-ch5p1-du;</seg>
+        <seg>&binutils-tmpp1-sbu;</seg>
+        <seg>&binutils-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter05/gcc-pass1.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&gcc-ch5p1-sbu;</seg>
-        <seg>&gcc-ch5p1-du;</seg>
+        <seg>&gcc-tmpp1-sbu;</seg>
+        <seg>&gcc-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter05/glibc.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&glibc-ch5-sbu;</seg>
-        <seg>&glibc-ch5-du;</seg>
+        <seg>&glibc-tmp-sbu;</seg>
+        <seg>&glibc-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter05/libstdc++.xml
===================================================================
--- chapter05/libstdc++.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter05/libstdc++.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -38,6 +38,6 @@
 
       <seglistitem>
-        <seg>&libstdcpp-ch5-sbu;</seg>
-        <seg>&libstdcpp-ch5-du;</seg>
+        <seg>&libstdcpp-tmp-sbu;</seg>
+        <seg>&libstdcpp-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter05/linux-headers.xml
===================================================================
--- chapter05/linux-headers.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter05/linux-headers.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&linux-headers-ch5-sbu;</seg>
-        <seg>&linux-headers-ch5-du;</seg>
+        <seg>&linux-headers-tmp-sbu;</seg>
+        <seg>&linux-headers-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ 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>
Index: chapter07/bison.xml
===================================================================
--- chapter07/bison.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/bison.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&bison-ch5-sbu;</seg>
-        <seg>&bison-ch5-du;</seg>
+        <seg>&bison-tmp-sbu;</seg>
+        <seg>&bison-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/dejagnu.xml
===================================================================
--- chapter07/dejagnu.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/dejagnu.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&dejagnu-ch5-sbu;</seg>
-        <seg>&dejagnu-ch5-du;</seg>
+        <seg>&dejagnu-tmp-sbu;</seg>
+        <seg>&dejagnu-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/expect.xml
===================================================================
--- chapter07/expect.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/expect.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -39,6 +39,6 @@
 
       <seglistitem>
-        <seg>&expect-ch5-sbu;</seg>
-        <seg>&expect-ch5-du;</seg>
+        <seg>&expect-tmp-sbu;</seg>
+        <seg>&expect-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/gettext.xml
===================================================================
--- chapter07/gettext.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/gettext.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&gettext-ch5-sbu;</seg>
-        <seg>&gettext-ch5-du;</seg>
+        <seg>&gettext-tmp-sbu;</seg>
+        <seg>&gettext-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/libstdc++-pass2.xml
===================================================================
--- chapter07/libstdc++-pass2.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/libstdc++-pass2.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -36,6 +36,6 @@
 
       <seglistitem>
-        <seg>&libstdcpp-ch5-sbu;</seg>
-        <seg>&libstdcpp-ch5-du;</seg>
+        <seg>&libstdcpp-tmp-sbu;</seg>
+        <seg>&libstdcpp-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/perl.xml
===================================================================
--- chapter07/perl.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/perl.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&perl-ch5-sbu;</seg>
-        <seg>&perl-ch5-du;</seg>
+        <seg>&perl-tmp-sbu;</seg>
+        <seg>&perl-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/python.xml
===================================================================
--- chapter07/python.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/python.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&python-ch5-sbu;</seg>
-        <seg>&python-ch5-du;</seg>
+        <seg>&python-tmp-sbu;</seg>
+        <seg>&python-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/stripping.xml
===================================================================
--- chapter07/stripping.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/stripping.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -141,5 +141,5 @@
     <para>
       In case some mistakes have been made and you need to start over, you can
-      use this backup to restore the temporary tools and save some irecovery time.
+      use this backup to restore the temporary tools and save some recovery time.
       Since the sources are located under 
       <filename class="directory">$LFS</filename>, they are included in the
Index: chapter07/tcl.xml
===================================================================
--- chapter07/tcl.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/tcl.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -35,6 +35,6 @@
 
       <seglistitem>
-        <seg>&tcl-ch5-sbu;</seg>
-        <seg>&tcl-ch5-du;</seg>
+        <seg>&tcl-tmp-sbu;</seg>
+        <seg>&tcl-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/texinfo.xml
===================================================================
--- chapter07/texinfo.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/texinfo.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&texinfo-ch5-sbu;</seg>
-        <seg>&texinfo-ch5-du;</seg>
+        <seg>&texinfo-tmp-sbu;</seg>
+        <seg>&texinfo-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter07/util-linux.xml
===================================================================
--- chapter07/util-linux.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter07/util-linux.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&util-linux-ch5-sbu;</seg>
-        <seg>&util-linux-ch5-du;</seg>
+        <seg>&util-linux-tmp-sbu;</seg>
+        <seg>&util-linux-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/acl.xml
===================================================================
--- chapter08/acl.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/acl.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&acl-ch6-sbu;</seg>
-        <seg>&acl-ch6-du;</seg>
+        <seg>&acl-fin-sbu;</seg>
+        <seg>&acl-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/attr.xml
===================================================================
--- chapter08/attr.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/attr.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&attr-ch6-sbu;</seg>
-        <seg>&attr-ch6-du;</seg>
+        <seg>&attr-fin-sbu;</seg>
+        <seg>&attr-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/autoconf.xml
===================================================================
--- chapter08/autoconf.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/autoconf.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&autoconf-ch6-sbu;</seg>
-        <seg>&autoconf-ch6-du;</seg>
+        <seg>&autoconf-fin-sbu;</seg>
+        <seg>&autoconf-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -60,5 +60,5 @@
 <screen><userinput remap="test">make check</userinput></screen>
 <!--
-    <para>This takes a long time, about &autoconf-ch6-sbu-tests; SBUs. In addition,
+    <para>This takes a long time, about &autoconf-fin-sbu-tests; SBUs. In addition,
     several tests are skipped that use Automake. For full test coverage,
     Autoconf can be re-tested after Automake has been installed.  In addition,
Index: chapter08/automake.xml
===================================================================
--- chapter08/automake.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/automake.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&automake-ch6-sbu;</seg>
-        <seg>&automake-ch6-du;</seg>
+        <seg>&automake-fin-sbu;</seg>
+        <seg>&automake-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/bash.xml
===================================================================
--- chapter08/bash.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/bash.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&bash-ch6-sbu;</seg>
-        <seg>&bash-ch6-du;</seg>
+        <seg>&bash-fin-sbu;</seg>
+        <seg>&bash-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/bc.xml
===================================================================
--- chapter08/bc.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/bc.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&bc-ch6-sbu;</seg>
-        <seg>&bc-ch6-du;</seg>
+        <seg>&bc-fin-sbu;</seg>
+        <seg>&bc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/binutils.xml
===================================================================
--- chapter08/binutils.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/binutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&binutils-ch6-sbu;</seg>
-        <seg>&binutils-ch6-du;</seg>
+        <seg>&binutils-fin-sbu;</seg>
+        <seg>&binutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/bison.xml
===================================================================
--- chapter08/bison.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/bison.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&bison-ch6-sbu;</seg>
-        <seg>&bison-ch6-du;</seg>
+        <seg>&bison-fin-sbu;</seg>
+        <seg>&bison-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/bzip2.xml
===================================================================
--- chapter08/bzip2.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/bzip2.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&bzip2-ch6-sbu;</seg>
-        <seg>&bzip2-ch6-du;</seg>
+        <seg>&bzip2-fin-sbu;</seg>
+        <seg>&bzip2-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/check.xml
===================================================================
--- chapter08/check.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/check.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&check-ch5-sbu;</seg>
-        <seg>&check-ch5-du;</seg>
+        <seg>&check-fin-sbu;</seg>
+        <seg>&check-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/coreutils.xml
===================================================================
--- chapter08/coreutils.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/coreutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&coreutils-ch6-sbu;</seg>
-        <seg>&coreutils-ch6-du;</seg>
+        <seg>&coreutils-fin-sbu;</seg>
+        <seg>&coreutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/dbus.xml
===================================================================
--- chapter08/dbus.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/dbus.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -37,6 +37,6 @@
 
       <seglistitem>
-        <seg>&dbus-ch6-sbu;</seg>
-        <seg>&dbus-ch6-du;</seg>
+        <seg>&dbus-fin-sbu;</seg>
+        <seg>&dbus-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/diffutils.xml
===================================================================
--- chapter08/diffutils.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/diffutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&diffutils-ch6-sbu;</seg>
-        <seg>&diffutils-ch6-du;</seg>
+        <seg>&diffutils-fin-sbu;</seg>
+        <seg>&diffutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/e2fsprogs.xml
===================================================================
--- chapter08/e2fsprogs.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/e2fsprogs.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -35,6 +35,6 @@
 
       <seglistitem>
-        <seg>&e2fsprogs-ch6-sbu;</seg>
-        <seg>&e2fsprogs-ch6-du;</seg>
+        <seg>&e2fsprogs-fin-sbu;</seg>
+        <seg>&e2fsprogs-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/eudev.xml
===================================================================
--- chapter08/eudev.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/eudev.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&eudev-ch6-sbu;</seg>
-        <seg>&eudev-ch6-du;</seg>
+        <seg>&eudev-fin-sbu;</seg>
+        <seg>&eudev-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/expat.xml
===================================================================
--- chapter08/expat.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/expat.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&expat-ch6-sbu;</seg>
-        <seg>&expat-ch6-du;</seg>
+        <seg>&expat-fin-sbu;</seg>
+        <seg>&expat-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/file.xml
===================================================================
--- chapter08/file.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/file.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&file-ch6-sbu;</seg>
-        <seg>&file-ch6-du;</seg>
+        <seg>&file-fin-sbu;</seg>
+        <seg>&file-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/findutils.xml
===================================================================
--- chapter08/findutils.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/findutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&findutils-ch6-sbu;</seg>
-        <seg>&findutils-ch6-du;</seg>
+        <seg>&findutils-fin-sbu;</seg>
+        <seg>&findutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/flex.xml
===================================================================
--- chapter08/flex.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/flex.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&flex-ch6-sbu;</seg>
-        <seg>&flex-ch6-du;</seg>
+        <seg>&flex-fin-sbu;</seg>
+        <seg>&flex-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gawk.xml
===================================================================
--- chapter08/gawk.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/gawk.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&gawk-ch6-sbu;</seg>
-        <seg>&gawk-ch6-du;</seg>
+        <seg>&gawk-fin-sbu;</seg>
+        <seg>&gawk-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gcc.xml
===================================================================
--- chapter08/gcc.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/gcc.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&gcc-ch6-sbu;</seg>
-        <seg>&gcc-ch6-du;</seg>
+        <seg>&gcc-fin-sbu;</seg>
+        <seg>&gcc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gdbm.xml
===================================================================
--- chapter08/gdbm.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/gdbm.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -35,6 +35,6 @@
 
       <seglistitem>
-        <seg>&gdbm-ch6-sbu;</seg>
-        <seg>&gdbm-ch6-du;</seg>
+        <seg>&gdbm-fin-sbu;</seg>
+        <seg>&gdbm-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gettext.xml
===================================================================
--- chapter08/gettext.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/gettext.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&gettext-ch6-sbu;</seg>
-        <seg>&gettext-ch6-du;</seg>
+        <seg>&gettext-fin-sbu;</seg>
+        <seg>&gettext-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/glibc.xml
===================================================================
--- chapter08/glibc.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/glibc.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&glibc-ch6-sbu;</seg>
-        <seg>&glibc-ch6-du;</seg>
+        <seg>&glibc-fin-sbu;</seg>
+        <seg>&glibc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gmp.xml
===================================================================
--- chapter08/gmp.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/gmp.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&gmp-ch6-sbu;</seg>
-        <seg>&gmp-ch6-du;</seg>
+        <seg>&gmp-fin-sbu;</seg>
+        <seg>&gmp-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gperf.xml
===================================================================
--- chapter08/gperf.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/gperf.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&gperf-ch6-sbu;</seg>
-        <seg>&gperf-ch6-du;</seg>
+        <seg>&gperf-fin-sbu;</seg>
+        <seg>&gperf-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/grep.xml
===================================================================
--- chapter08/grep.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/grep.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&grep-ch6-sbu;</seg>
-        <seg>&grep-ch6-du;</seg>
+        <seg>&grep-fin-sbu;</seg>
+        <seg>&grep-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/groff.xml
===================================================================
--- chapter08/groff.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/groff.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&groff-ch6-sbu;</seg>
-        <seg>&groff-ch6-du;</seg>
+        <seg>&groff-fin-sbu;</seg>
+        <seg>&groff-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/grub.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&grub-ch6-sbu;</seg>
-        <seg>&grub-ch6-du;</seg>
+        <seg>&grub-fin-sbu;</seg>
+        <seg>&grub-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gzip.xml
===================================================================
--- chapter08/gzip.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/gzip.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&gzip-ch6-sbu;</seg>
-        <seg>&gzip-ch6-du;</seg>
+        <seg>&gzip-fin-sbu;</seg>
+        <seg>&gzip-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/iana-etc.xml
===================================================================
--- chapter08/iana-etc.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/iana-etc.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&iana-etc-ch6-sbu;</seg>
-        <seg>&iana-etc-ch6-du;</seg>
+        <seg>&iana-etc-fin-sbu;</seg>
+        <seg>&iana-etc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/inetutils.xml
===================================================================
--- chapter08/inetutils.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/inetutils.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&inetutils-ch6-sbu;</seg>
-        <seg>&inetutils-ch6-du;</seg>
+        <seg>&inetutils-fin-sbu;</seg>
+        <seg>&inetutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/intltool.xml
===================================================================
--- chapter08/intltool.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/intltool.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&intltool-ch6-sbu;</seg>
-        <seg>&intltool-ch6-du;</seg>
+        <seg>&intltool-fin-sbu;</seg>
+        <seg>&intltool-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/iproute2.xml
===================================================================
--- chapter08/iproute2.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/iproute2.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&iproute2-ch6-sbu;</seg>
-        <seg>&iproute2-ch6-du;</seg>
+        <seg>&iproute2-fin-sbu;</seg>
+        <seg>&iproute2-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/kbd.xml
===================================================================
--- chapter08/kbd.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/kbd.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&kbd-ch6-sbu;</seg>
-        <seg>&kbd-ch6-du;</seg>
+        <seg>&kbd-fin-sbu;</seg>
+        <seg>&kbd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/kmod.xml
===================================================================
--- chapter08/kmod.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/kmod.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&kmod-ch6-sbu;</seg>
-        <seg>&kmod-ch6-du;</seg>
+        <seg>&kmod-fin-sbu;</seg>
+        <seg>&kmod-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/less.xml
===================================================================
--- chapter08/less.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/less.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&less-ch6-sbu;</seg>
-        <seg>&less-ch6-du;</seg>
+        <seg>&less-fin-sbu;</seg>
+        <seg>&less-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/libcap.xml
===================================================================
--- chapter08/libcap.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/libcap.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&libcap-ch6-sbu;</seg>
-        <seg>&libcap-ch6-du;</seg>
+        <seg>&libcap-fin-sbu;</seg>
+        <seg>&libcap-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/libelf.xml
===================================================================
--- chapter08/libelf.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/libelf.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&elfutils-ch6-sbu;</seg>
-        <seg>&elfutils-ch6-du;</seg>
+        <seg>&elfutils-fin-sbu;</seg>
+        <seg>&elfutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/libffi.xml
===================================================================
--- chapter08/libffi.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/libffi.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&libffi-ch6-sbu;</seg>
-        <seg>&libffi-ch6-du;</seg>
+        <seg>&libffi-fin-sbu;</seg>
+        <seg>&libffi-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/libpipeline.xml
===================================================================
--- chapter08/libpipeline.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/libpipeline.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&libpipeline-ch6-sbu;</seg>
-        <seg>&libpipeline-ch6-du;</seg>
+        <seg>&libpipeline-fin-sbu;</seg>
+        <seg>&libpipeline-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/libtool.xml
===================================================================
--- chapter08/libtool.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/libtool.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&libtool-ch6-sbu;</seg>
-        <seg>&libtool-ch6-du;</seg>
+        <seg>&libtool-fin-sbu;</seg>
+        <seg>&libtool-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/m4.xml
===================================================================
--- chapter08/m4.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/m4.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&m4-ch6-sbu;</seg>
-        <seg>&m4-ch6-du;</seg>
+        <seg>&m4-fin-sbu;</seg>
+        <seg>&m4-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/make.xml
===================================================================
--- chapter08/make.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/make.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&make-ch6-sbu;</seg>
-        <seg>&make-ch6-du;</seg>
+        <seg>&make-fin-sbu;</seg>
+        <seg>&make-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/man-db.xml
===================================================================
--- chapter08/man-db.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/man-db.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&man-db-ch6-sbu;</seg>
-        <seg>&man-db-ch6-du;</seg>
+        <seg>&man-db-fin-sbu;</seg>
+        <seg>&man-db-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/man-pages.xml
===================================================================
--- chapter08/man-pages.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/man-pages.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&man-pages-ch6-sbu;</seg>
-        <seg>&man-pages-ch6-du;</seg>
+        <seg>&man-pages-fin-sbu;</seg>
+        <seg>&man-pages-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/meson.xml
===================================================================
--- chapter08/meson.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/meson.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
       <segtitle>&diskspace;</segtitle>
       <seglistitem>
-        <seg>&meson-ch6-sbu;</seg>
-        <seg>&meson-ch6-du;</seg>
+        <seg>&meson-fin-sbu;</seg>
+        <seg>&meson-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/mpc.xml
===================================================================
--- chapter08/mpc.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/mpc.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&mpc-ch6-sbu;</seg>
-        <seg>&mpc-ch6-du;</seg>
+        <seg>&mpc-fin-sbu;</seg>
+        <seg>&mpc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/mpfr.xml
===================================================================
--- chapter08/mpfr.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/mpfr.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&mpfr-ch6-sbu;</seg>
-        <seg>&mpfr-ch6-du;</seg>
+        <seg>&mpfr-fin-sbu;</seg>
+        <seg>&mpfr-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/ncurses.xml
===================================================================
--- chapter08/ncurses.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/ncurses.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&ncurses-ch6-sbu;</seg>
-        <seg>&ncurses-ch6-du;</seg>
+        <seg>&ncurses-fin-sbu;</seg>
+        <seg>&ncurses-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/ninja.xml
===================================================================
--- chapter08/ninja.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/ninja.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&ninja-ch6-sbu;</seg>
-        <seg>&ninja-ch6-du;</seg>
+        <seg>&ninja-fin-sbu;</seg>
+        <seg>&ninja-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/openssl.xml
===================================================================
--- chapter08/openssl.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/openssl.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&openssl-ch6-sbu;</seg>
-        <seg>&openssl-ch6-du;</seg>
+        <seg>&openssl-fin-sbu;</seg>
+        <seg>&openssl-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/patch.xml
===================================================================
--- chapter08/patch.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/patch.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&patch-ch6-sbu;</seg>
-        <seg>&patch-ch6-du;</seg>
+        <seg>&patch-fin-sbu;</seg>
+        <seg>&patch-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/perl.xml
===================================================================
--- chapter08/perl.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/perl.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&perl-ch6-sbu;</seg>
-        <seg>&perl-ch6-du;</seg>
+        <seg>&perl-fin-sbu;</seg>
+        <seg>&perl-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/pkgconfig.xml
===================================================================
--- chapter08/pkgconfig.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/pkgconfig.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&pkgconfig-ch6-sbu;</seg>
-        <seg>&pkgconfig-ch6-du;</seg>
+        <seg>&pkgconfig-fin-sbu;</seg>
+        <seg>&pkgconfig-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/procps.xml
===================================================================
--- chapter08/procps.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/procps.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&procps-ng-ch6-sbu;</seg>
-        <seg>&procps-ng-ch6-du;</seg>
+        <seg>&procps-ng-fin-sbu;</seg>
+        <seg>&procps-ng-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/psmisc.xml
===================================================================
--- chapter08/psmisc.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/psmisc.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&psmisc-ch6-sbu;</seg>
-        <seg>&psmisc-ch6-du;</seg>
+        <seg>&psmisc-fin-sbu;</seg>
+        <seg>&psmisc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/python.xml
===================================================================
--- chapter08/python.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/python.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&python-ch6-sbu;</seg>
-        <seg>&python-ch6-du;</seg>
+        <seg>&python-fin-sbu;</seg>
+        <seg>&python-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/readline.xml
===================================================================
--- chapter08/readline.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/readline.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&readline-ch6-sbu;</seg>
-        <seg>&readline-ch6-du;</seg>
+        <seg>&readline-fin-sbu;</seg>
+        <seg>&readline-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/sed.xml
===================================================================
--- chapter08/sed.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/sed.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&sed-ch6-sbu;</seg>
-        <seg>&sed-ch6-du;</seg>
+        <seg>&sed-fin-sbu;</seg>
+        <seg>&sed-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/shadow.xml
===================================================================
--- chapter08/shadow.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/shadow.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&shadow-ch6-sbu;</seg>
-        <seg>&shadow-ch6-du;</seg>
+        <seg>&shadow-fin-sbu;</seg>
+        <seg>&shadow-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/sysklogd.xml
===================================================================
--- chapter08/sysklogd.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/sysklogd.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&sysklogd-ch6-sbu;</seg>
-        <seg>&sysklogd-ch6-du;</seg>
+        <seg>&sysklogd-fin-sbu;</seg>
+        <seg>&sysklogd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/systemd.xml
===================================================================
--- chapter08/systemd.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/systemd.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&systemd-ch6-sbu;</seg>
-        <seg>&systemd-ch6-du;</seg>
+        <seg>&systemd-fin-sbu;</seg>
+        <seg>&systemd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/sysvinit.xml
===================================================================
--- chapter08/sysvinit.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/sysvinit.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&sysvinit-ch6-sbu;</seg>
-        <seg>&sysvinit-ch6-du;</seg>
+        <seg>&sysvinit-fin-sbu;</seg>
+        <seg>&sysvinit-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/tar.xml
===================================================================
--- chapter08/tar.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/tar.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&tar-ch6-sbu;</seg>
-        <seg>&tar-ch6-du;</seg>
+        <seg>&tar-fin-sbu;</seg>
+        <seg>&tar-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/texinfo.xml
===================================================================
--- chapter08/texinfo.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/texinfo.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&texinfo-ch6-sbu;</seg>
-        <seg>&texinfo-ch6-du;</seg>
+        <seg>&texinfo-fin-sbu;</seg>
+        <seg>&texinfo-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/util-linux.xml
===================================================================
--- chapter08/util-linux.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/util-linux.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&util-linux-ch6-sbu;</seg>
-        <seg>&util-linux-ch6-du;</seg>
+        <seg>&util-linux-fin-sbu;</seg>
+        <seg>&util-linux-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/vim.xml
===================================================================
--- chapter08/vim.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/vim.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&vim-ch6-sbu;</seg>
-        <seg>&vim-ch6-du;</seg>
+        <seg>&vim-fin-sbu;</seg>
+        <seg>&vim-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/xml-parser.xml
===================================================================
--- chapter08/xml-parser.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/xml-parser.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&xml-parser-ch6-sbu;</seg>
-        <seg>&xml-parser-ch6-du;</seg>
+        <seg>&xml-parser-fin-sbu;</seg>
+        <seg>&xml-parser-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/xz.xml
===================================================================
--- chapter08/xz.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/xz.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -35,6 +35,6 @@
 
       <seglistitem>
-        <seg>&xz-ch6-sbu;</seg>
-        <seg>&xz-ch6-du;</seg>
+        <seg>&xz-fin-sbu;</seg>
+        <seg>&xz-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/zlib.xml
===================================================================
--- chapter08/zlib.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/zlib.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -32,6 +32,6 @@
 
       <seglistitem>
-        <seg>&zlib-ch6-sbu;</seg>
-        <seg>&zlib-ch6-du;</seg>
+        <seg>&zlib-fin-sbu;</seg>
+        <seg>&zlib-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/zstd.xml
===================================================================
--- chapter08/zstd.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter08/zstd.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -33,6 +33,6 @@
 
       <seglistitem>
-        <seg>&zstd-ch6-sbu;</seg>
-        <seg>&zstd-ch6-du;</seg>
+        <seg>&zstd-fin-sbu;</seg>
+        <seg>&zstd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter09/bootscripts.xml
===================================================================
--- chapter09/bootscripts.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter09/bootscripts.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -34,6 +34,6 @@
 
       <seglistitem>
-        <seg>&lfs-bootscripts-ch7-sbu;</seg>
-        <seg>&lfs-bootscripts-ch7-du;</seg>
+        <seg>&lfs-bootscripts-cfg-sbu;</seg>
+        <seg>&lfs-bootscripts-cfg-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter10/kernel.xml
===================================================================
--- chapter10/kernel.xml	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ chapter10/kernel.xml	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -31,6 +31,6 @@
 
       <seglistitem>
-        <seg>&linux-ch8-sbu;</seg>
-        <seg>&linux-ch8-du;</seg>
+        <seg>&linux-knl-sbu;</seg>
+        <seg>&linux-knl-du;</seg>
       </seglistitem>
     </segmentedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 302d97aaabd2c4dac31e6dc8e9bd419ccd164f13)
+++ packages.ent	(revision fb386e05f17d44dc6322a1b3db172cc297ed5ce5)
@@ -5,5 +5,12 @@
      Packages sizes allways in KB
      Allowed deviation in SBUs : 10%
-     Allowed deviation in disk usage : 2% -->
+     Allowed deviation in disk usage : 2%
+     
+     Suffixes:
+     *-tmp-*     Package info for Temporary Tools
+     *-fin-*     Package info for Final System
+     *-cfg-*     Package info for System Configuration
+     *-knl-*     Package info for Kernel stuff
+-->
 
 <!ENTITY acl-version "2.2.53">
@@ -12,6 +19,6 @@
 <!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
 <!ENTITY acl-home "&savannah-nongnu;/projects/acl">
-<!ENTITY acl-ch6-du "6.4 MB">
-<!ENTITY acl-ch6-sbu "0.1 SBU">
+<!ENTITY acl-fin-du "6.4 MB">
+<!ENTITY acl-fin-sbu "0.1 SBU">
 
 <!ENTITY attr-version "2.4.48">
@@ -20,6 +27,6 @@
 <!ENTITY attr-md5 "bc1e5cb5c96d99b24886f1f527d3bb3d">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
-<!ENTITY attr-ch6-du "4.2 MB">
-<!ENTITY attr-ch6-sbu "less than 0.1 SBU">
+<!ENTITY attr-fin-du "4.2 MB">
+<!ENTITY attr-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY autoconf-version "2.69">
@@ -28,7 +35,7 @@
 <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
-<!ENTITY autoconf-ch6-du "79 MB">
-<!ENTITY autoconf-ch6-sbu-tests "3.2">
-<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about &autoconf-ch6-sbu-tests; SBU with tests)">
+<!ENTITY autoconf-fin-du "79 MB">
+<!ENTITY autoconf-fin-sbu-tests "3.2">
+<!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
 
 <!ENTITY automake-version "1.16.2">
@@ -38,6 +45,6 @@
 <!ENTITY automake-md5 "6cb234c86f3f984df29ce758e6d0d1d7">
 <!ENTITY automake-home "&gnu-software;automake/">
-<!ENTITY automake-ch6-du "107 MB">
-<!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 8.1 SBU with tests)">
+<!ENTITY automake-fin-du "107 MB">
+<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 8.1 SBU with tests)">
 
 <!ENTITY bash-version "5.0">
@@ -46,8 +53,8 @@
 <!ENTITY bash-md5 "2b44b47b905be16f45709648f671820b">
 <!ENTITY bash-home "&gnu-software;bash/">
-<!ENTITY bash-ch5-du "67 MB">
-<!ENTITY bash-ch5-sbu "0.4 SBU">
-<!ENTITY bash-ch6-du "62 MB">
-<!ENTITY bash-ch6-sbu "1.9 SBU">
+<!ENTITY bash-tmp-du "67 MB">
+<!ENTITY bash-tmp-sbu "0.4 SBU">
+<!ENTITY bash-fin-du "62 MB">
+<!ENTITY bash-fin-sbu "1.9 SBU">
 
 <!ENTITY bc-version "2.7.2">
@@ -56,6 +63,6 @@
 <!ENTITY bc-md5 "28235ceaf2280b909591ace7a3a4f051">
 <!ENTITY bc-home "https://github.com/gavinhoward/bc">
-<!ENTITY bc-ch6-du "2.9 MB">
-<!ENTITY bc-ch6-sbu "0.1 SBU">
+<!ENTITY bc-fin-du "2.9 MB">
+<!ENTITY bc-fin-sbu "0.1 SBU">
 
 <!ENTITY binutils-version "2.34">
@@ -64,10 +71,10 @@
 <!ENTITY binutils-md5 "664ec3a2df7805ed3464639aaae332d6">
 <!ENTITY binutils-home "&gnu-software;binutils/">
-<!ENTITY binutils-ch5p1-du "625 MB">
-<!ENTITY binutils-ch5p1-sbu "1 SBU">
-<!ENTITY binutils-ch5p2-du "651 MB">
-<!ENTITY binutils-ch5p2-sbu "1.1 SBU">
-<!ENTITY binutils-ch6-du "5.1 GB">
-<!ENTITY binutils-ch6-sbu "6.7 SBU">
+<!ENTITY binutils-tmpp1-du "625 MB">
+<!ENTITY binutils-tmpp1-sbu "1 SBU">
+<!ENTITY binutils-tmpp2-du "651 MB">
+<!ENTITY binutils-tmpp2-sbu "1.1 SBU">
+<!ENTITY binutils-fin-du "5.1 GB">
+<!ENTITY binutils-fin-sbu "6.7 SBU">
 
 <!ENTITY bison-version "3.6.3">
@@ -76,8 +83,8 @@
 <!ENTITY bison-md5 "ca0513e77de1de46b9f2419d175cb3b4">
 <!ENTITY bison-home "&gnu-software;bison/">
-<!ENTITY bison-ch5-du "43 MB">
-<!ENTITY bison-ch5-sbu "0.3 SBU">
-<!ENTITY bison-ch6-du "52 MB">
-<!ENTITY bison-ch6-sbu "5.8 SBU">
+<!ENTITY bison-tmp-du "43 MB">
+<!ENTITY bison-tmp-sbu "0.3 SBU">
+<!ENTITY bison-fin-du "52 MB">
+<!ENTITY bison-fin-sbu "5.8 SBU">
 
 <!ENTITY bzip2-version "1.0.8">
@@ -86,8 +93,8 @@
 <!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5">
 <!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
-<!ENTITY bzip2-ch5-du "6.4 MB">
-<!ENTITY bzip2-ch5-sbu "less than 0.1 SBU">
-<!ENTITY bzip2-ch6-du "7.7 MB">
-<!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
+<!ENTITY bzip2-tmp-du "6.4 MB">
+<!ENTITY bzip2-tmp-sbu "less than 0.1 SBU">
+<!ENTITY bzip2-fin-du "7.7 MB">
+<!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY ref5-version "&version;">
@@ -106,6 +113,6 @@
 <!ENTITY check-md5 "270e82a445be6026040267a5e11cc94b">
 <!ENTITY check-home "https://libcheck.github.io/check">
-<!ENTITY check-ch5-du "13 MB">
-<!ENTITY check-ch5-sbu "0.1 SBU (about 3.5 SBU with tests)">
+<!ENTITY check-fin-du "13 MB">
+<!ENTITY check-fin-sbu "0.1 SBU (about 3.5 SBU with tests)">
 
 <!ENTITY coreutils-version "8.32">
@@ -114,8 +121,8 @@
 <!ENTITY coreutils-md5 "022042695b7d5bcf1a93559a9735e668">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
-<!ENTITY coreutils-ch5-du "157 MB">
-<!ENTITY coreutils-ch5-sbu "0.7 SBU">
-<!ENTITY coreutils-ch6-du "202 MB">
-<!ENTITY coreutils-ch6-sbu "2.3 SBU">
+<!ENTITY coreutils-tmp-du "157 MB">
+<!ENTITY coreutils-tmp-sbu "0.7 SBU">
+<!ENTITY coreutils-fin-du "202 MB">
+<!ENTITY coreutils-fin-sbu "2.3 SBU">
 
 <!ENTITY dbus-version "1.12.18">
@@ -124,6 +131,6 @@
 <!ENTITY dbus-md5 "4ca570c281be35d0b30ab83436712242">
 <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
-<!ENTITY dbus-ch6-du "18 MB">
-<!ENTITY dbus-ch6-sbu "0.2 SBU">
+<!ENTITY dbus-fin-du "18 MB">
+<!ENTITY dbus-fin-sbu "0.2 SBU">
 
 <!ENTITY dejagnu-version "1.6.2">
@@ -132,6 +139,6 @@
 <!ENTITY dejagnu-md5 "e1b07516533f351b3aba3423fafeffd6">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu/">
-<!ENTITY dejagnu-ch5-du "3.2 MB">
-<!ENTITY dejagnu-ch5-sbu "less than 0.1 SBU">
+<!ENTITY dejagnu-tmp-du "3.2 MB">
+<!ENTITY dejagnu-tmp-sbu "less than 0.1 SBU">
 
 <!ENTITY diffutils-version "3.7">
@@ -140,8 +147,8 @@
 <!ENTITY diffutils-md5 "4824adc0e95dbbf11dfbdfaad6a1e461">
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
-<!ENTITY diffutils-ch5-du "26 MB">
-<!ENTITY diffutils-ch5-sbu "0.2 SBU">
-<!ENTITY diffutils-ch6-du "36 MB">
-<!ENTITY diffutils-ch6-sbu "0.4 SBU">
+<!ENTITY diffutils-tmp-du "26 MB">
+<!ENTITY diffutils-tmp-sbu "0.2 SBU">
+<!ENTITY diffutils-fin-du "36 MB">
+<!ENTITY diffutils-fin-sbu "0.4 SBU">
 
 <!ENTITY e2fsprogs-version "1.45.6">
@@ -150,6 +157,6 @@
 <!ENTITY e2fsprogs-md5 "cccfb706d162514e4f9dbfbc9e5d65ee">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
-<!ENTITY e2fsprogs-ch6-du "108 MB">
-<!ENTITY e2fsprogs-ch6-sbu "1.6 SBU">
+<!ENTITY e2fsprogs-fin-du "108 MB">
+<!ENTITY e2fsprogs-fin-sbu "1.6 SBU">
 
 <!ENTITY elfutils-version "0.179">
@@ -158,6 +165,6 @@
 <!ENTITY elfutils-md5 "8ee56b371b5a7ea081284c44e5164600">
 <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">
-<!ENTITY elfutils-ch6-du "124 MB">
-<!ENTITY elfutils-ch6-sbu "0.9 SBU">
+<!ENTITY elfutils-fin-du "124 MB">
+<!ENTITY elfutils-fin-sbu "0.9 SBU">
 
 <!ENTITY eudev-version "3.2.9">
@@ -165,6 +172,6 @@
 <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
 <!ENTITY eudev-md5 "dedfb1964f6098fe9320de827957331f">
-<!ENTITY eudev-ch6-du "83 MB">
-<!ENTITY eudev-ch6-sbu "0.2 SBU">
+<!ENTITY eudev-fin-du "83 MB">
+<!ENTITY eudev-fin-sbu "0.2 SBU">
 
 <!ENTITY expat-version "2.2.9">
@@ -173,6 +180,6 @@
 <!ENTITY expat-md5 "d2384fa607223447e713e1b9bd272376">
 <!ENTITY expat-home "https://libexpat.github.io/">
-<!ENTITY expat-ch6-du "11 MB">
-<!ENTITY expat-ch6-sbu "0.1 SBU">
+<!ENTITY expat-fin-du "11 MB">
+<!ENTITY expat-fin-sbu "0.1 SBU">
 
 <!ENTITY expect-version "5.45.4">
@@ -182,6 +189,6 @@
 <!ENTITY expect-md5 "00fce8de158422f5ccd2666512329bd2">
 <!ENTITY expect-home "https://core.tcl.tk/expect/">
-<!ENTITY expect-ch5-du "4.0 MB">
-<!ENTITY expect-ch5-sbu "0.1 SBU">
+<!ENTITY expect-tmp-du "4.0 MB">
+<!ENTITY expect-tmp-sbu "0.1 SBU">
 
 <!ENTITY file-version "5.38">
@@ -190,8 +197,8 @@
 <!ENTITY file-md5 "3217633ed09c7cd35ed8d04191675574">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
-<!ENTITY file-ch5-du "20 MB">
-<!ENTITY file-ch5-sbu "0.1 SBU">
-<!ENTITY file-ch6-du "20 MB">
-<!ENTITY file-ch6-sbu "0.1 SBU">
+<!ENTITY file-tmp-du "20 MB">
+<!ENTITY file-tmp-sbu "0.1 SBU">
+<!ENTITY file-fin-du "20 MB">
+<!ENTITY file-fin-sbu "0.1 SBU">
 
 <!ENTITY findutils-version "4.7.0">
@@ -200,8 +207,8 @@
 <!ENTITY findutils-md5 "731356dec4b1109b812fecfddfead6b2">
 <!ENTITY findutils-home "&gnu-software;findutils/">
-<!ENTITY findutils-ch5-du "39 MB">
-<!ENTITY findutils-ch5-sbu "0.3 SBU">
-<!ENTITY findutils-ch6-du "57 MB">
-<!ENTITY findutils-ch6-sbu "0.7 SBU">
+<!ENTITY findutils-tmp-du "39 MB">
+<!ENTITY findutils-tmp-sbu "0.3 SBU">
+<!ENTITY findutils-fin-du "57 MB">
+<!ENTITY findutils-fin-sbu "0.7 SBU">
 
 <!ENTITY flex-version "2.6.4">
@@ -210,8 +217,8 @@
 <!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
 <!ENTITY flex-home "&github;/westes/flex">
-<!ENTITY flex-ch5-du "15 MB">
-<!ENTITY flex-ch5-sbu "0.1 SBU">
-<!ENTITY flex-ch6-du "36 MB">
-<!ENTITY flex-ch6-sbu "0.4 SBU">
+<!ENTITY flex-tmp-du "15 MB">
+<!ENTITY flex-tmp-sbu "0.1 SBU">
+<!ENTITY flex-fin-du "36 MB">
+<!ENTITY flex-fin-sbu "0.4 SBU">
 
 <!ENTITY gawk-version "5.1.0">
@@ -220,8 +227,8 @@
 <!ENTITY gawk-md5 "8470c34eeecc41c1aa0c5d89e630df50">
 <!ENTITY gawk-home "&gnu-software;gawk/">
-<!ENTITY gawk-ch5-du "46 MB">
-<!ENTITY gawk-ch5-sbu "0.2 SBU">
-<!ENTITY gawk-ch6-du "47 MB">
-<!ENTITY gawk-ch6-sbu "0.4 SBU">
+<!ENTITY gawk-tmp-du "46 MB">
+<!ENTITY gawk-tmp-sbu "0.2 SBU">
+<!ENTITY gawk-fin-du "47 MB">
+<!ENTITY gawk-fin-sbu "0.4 SBU">
 
 <!ENTITY gcc-version "10.1.0">
@@ -230,10 +237,10 @@
 <!ENTITY gcc-md5 "7d48e00245330c48b670ec9a2c518291">
 <!ENTITY gcc-home "https://gcc.gnu.org/">
-<!ENTITY gcc-ch5p1-du "3.9 GB">
-<!ENTITY gcc-ch5p1-sbu "12 SBU">
-<!ENTITY gcc-ch5p2-du "4.3 GB">
-<!ENTITY gcc-ch5p2-sbu "14 SBU">
-<!ENTITY gcc-ch6-du "4.9 GB ">
-<!ENTITY gcc-ch6-sbu "103 SBU (with tests)">
+<!ENTITY gcc-tmpp1-du "3.9 GB">
+<!ENTITY gcc-tmpp1-sbu "12 SBU">
+<!ENTITY gcc-tmpp2-du "4.3 GB">
+<!ENTITY gcc-tmpp2-sbu "14 SBU">
+<!ENTITY gcc-fin-du "4.9 GB ">
+<!ENTITY gcc-fin-sbu "103 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
 <!ENTITY libstdcpp-version   "6.0.28">
@@ -244,6 +251,6 @@
 <!--<!ENTITY libcilkrts-version  "5.0.0">-->
 
-<!ENTITY libstdcpp-ch5-du "878 MB">
-<!ENTITY libstdcpp-ch5-sbu "0.5 SBU">
+<!ENTITY libstdcpp-tmp-du "878 MB">
+<!ENTITY libstdcpp-tmp-sbu "0.5 SBU">
 
 <!ENTITY gdbm-version "1.18.1">
@@ -252,6 +259,6 @@
 <!ENTITY gdbm-md5 "988dc82182121c7570e0cb8b4fcd5415">
 <!ENTITY gdbm-home "&gnu-software;gdbm/">
-<!ENTITY gdbm-ch6-du "11 MB">
-<!ENTITY gdbm-ch6-sbu "0.1 SBU">
+<!ENTITY gdbm-fin-du "11 MB">
+<!ENTITY gdbm-fin-sbu "0.1 SBU">
 
 <!ENTITY gettext-version "0.20.2">
@@ -260,8 +267,8 @@
 <!ENTITY gettext-md5 "0cf5f68338d5d941bbf9ac93b847310f">
 <!ENTITY gettext-home "&gnu-software;gettext/">
-<!ENTITY gettext-ch5-du "300 MB">
-<!ENTITY gettext-ch5-sbu "1.6 SBU">
-<!ENTITY gettext-ch6-du "249 MB">
-<!ENTITY gettext-ch6-sbu "2.7 SBU">
+<!ENTITY gettext-tmp-du "300 MB">
+<!ENTITY gettext-tmp-sbu "1.6 SBU">
+<!ENTITY gettext-fin-du "249 MB">
+<!ENTITY gettext-fin-sbu "2.7 SBU">
 
 <!ENTITY glibc-version "2.31">
@@ -270,8 +277,8 @@
 <!ENTITY glibc-md5 "78a720f17412f3c3282be5a6f3363ec6">
 <!ENTITY glibc-home "&gnu-software;libc/">
-<!ENTITY glibc-ch5-du "896 MB">
-<!ENTITY glibc-ch5-sbu "4.5 SBU">
-<!ENTITY glibc-ch6-du "5.5 GB">
-<!ENTITY glibc-ch6-sbu "19 SBU">
+<!ENTITY glibc-tmp-du "896 MB">
+<!ENTITY glibc-tmp-sbu "4.5 SBU">
+<!ENTITY glibc-fin-du "5.5 GB">
+<!ENTITY glibc-fin-sbu "19 SBU">
 <!ENTITY libthread_db-version "1.0">
 
@@ -281,6 +288,6 @@
 <!ENTITY gmp-md5 "a325e3f09e6d91e62101e59f9bda3ec1">
 <!ENTITY gmp-home "&gnu-software;gmp/">
-<!ENTITY gmp-ch6-du "51 MB">
-<!ENTITY gmp-ch6-sbu "1.1 SBU">
+<!ENTITY gmp-fin-du "51 MB">
+<!ENTITY gmp-fin-sbu "1.1 SBU">
 
 <!ENTITY gperf-version "3.1">
@@ -289,6 +296,6 @@
 <!ENTITY gperf-md5 "9e251c0a618ad0824b51117d5d9db87e">
 <!ENTITY gperf-home "&gnu-software;gperf/">
-<!ENTITY gperf-ch6-du "6.3 MB">
-<!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
+<!ENTITY gperf-fin-du "6.3 MB">
+<!ENTITY gperf-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY grep-version "3.4">
@@ -297,8 +304,8 @@
 <!ENTITY grep-md5 "111b117d22d6a7d049d6ae7505e9c4d2">
 <!ENTITY grep-home "&gnu-software;grep/">
-<!ENTITY grep-ch5-du "25 MB">
-<!ENTITY grep-ch5-sbu "0.2 SBU">
-<!ENTITY grep-ch6-du "39 MB">
-<!ENTITY grep-ch6-sbu "0.7 SBU">
+<!ENTITY grep-tmp-du "25 MB">
+<!ENTITY grep-tmp-sbu "0.2 SBU">
+<!ENTITY grep-fin-du "39 MB">
+<!ENTITY grep-fin-sbu "0.7 SBU">
 
 <!ENTITY groff-version "1.22.4">
@@ -307,6 +314,6 @@
 <!ENTITY groff-md5 "08fb04335e2f5e73f23ea4c3adbf0c5f">
 <!ENTITY groff-home "&gnu-software;groff/">
-<!ENTITY groff-ch6-du "95 MB">
-<!ENTITY groff-ch6-sbu "0.5 SBU">
+<!ENTITY groff-fin-du "95 MB">
+<!ENTITY groff-fin-sbu "0.5 SBU">
 
 <!ENTITY grub-version "2.04">
@@ -315,6 +322,6 @@
 <!ENTITY grub-md5 "5aaca6713b47ca2456d8324a58755ac7">
 <!ENTITY grub-home "&gnu-software;grub/">
-<!ENTITY grub-ch6-du "161 MB">
-<!ENTITY grub-ch6-sbu "0.8 SBU">
+<!ENTITY grub-fin-du "161 MB">
+<!ENTITY grub-fin-sbu "0.8 SBU">
 
 <!ENTITY gzip-version "1.10">
@@ -323,8 +330,8 @@
 <!ENTITY gzip-md5 "691b1221694c3394f1c537df4eee39d3">
 <!ENTITY gzip-home "&gnu-software;gzip/">
-<!ENTITY gzip-ch5-du "10 MB">
-<!ENTITY gzip-ch5-sbu "0.1 SBU">
-<!ENTITY gzip-ch6-du "20 MB">
-<!ENTITY gzip-ch6-sbu "0.1 SBU">
+<!ENTITY gzip-tmp-du "10 MB">
+<!ENTITY gzip-tmp-sbu "0.1 SBU">
+<!ENTITY gzip-fin-du "20 MB">
+<!ENTITY gzip-fin-sbu "0.1 SBU">
 
 <!ENTITY iana-etc-version "20200429">
@@ -333,6 +340,6 @@
 <!ENTITY iana-etc-md5 "f9f7cda56c0ebe6ac2fa69a0be5d5400">
 <!ENTITY iana-etc-home "http://freecode.com/projects/iana-etc">
-<!ENTITY iana-etc-ch6-du "4.7 MB">
-<!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
+<!ENTITY iana-etc-fin-du "4.7 MB">
+<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY inetutils-version "1.9.4">
@@ -341,6 +348,6 @@
 <!ENTITY inetutils-md5 "87fef1fa3f603aef11c41dcc097af75e">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
-<!ENTITY inetutils-ch6-du "29 MB">
-<!ENTITY inetutils-ch6-sbu "0.3 SBU">
+<!ENTITY inetutils-fin-du "29 MB">
+<!ENTITY inetutils-fin-sbu "0.3 SBU">
 
 <!ENTITY intltool-version "0.51.0">
@@ -349,6 +356,6 @@
 <!ENTITY intltool-md5 "12e517cac2b57a0121cda351570f1e63">
 <!ENTITY intltool-home "https://freedesktop.org/wiki/Software/intltool">
-<!ENTITY intltool-ch6-du "1.5 MB">
-<!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
+<!ENTITY intltool-fin-du "1.5 MB">
+<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY iproute2-version "5.6.0">
@@ -357,6 +364,6 @@
 <!ENTITY iproute2-md5 "9da0c352707c34b8b1fec3bf42fcfd09">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
-<!ENTITY iproute2-ch6-du "14 MB">
-<!ENTITY iproute2-ch6-sbu "0.2 SBU">
+<!ENTITY iproute2-fin-du "14 MB">
+<!ENTITY iproute2-fin-sbu "0.2 SBU">
 
 <!ENTITY kbd-version "2.2.0">
@@ -365,6 +372,6 @@
 <!ENTITY kbd-md5 "d1d7ae0b5fb875dc082731e09cd0c8bc">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
-<!ENTITY kbd-ch6-du "36 MB">
-<!ENTITY kbd-ch6-sbu "0.1 SBU">
+<!ENTITY kbd-fin-du "36 MB">
+<!ENTITY kbd-fin-sbu "0.1 SBU">
 
 <!ENTITY kmod-version "27">
@@ -373,6 +380,6 @@
 <!ENTITY kmod-md5 "3973a74786670d3062d89a827e266581">
 <!ENTITY kmod-home " ">
-<!ENTITY kmod-ch6-du "13 MB">
-<!ENTITY kmod-ch6-sbu "0.1 SBU">
+<!ENTITY kmod-fin-du "13 MB">
+<!ENTITY kmod-fin-sbu "0.1 SBU">
 
 <!ENTITY less-version "551">
@@ -381,6 +388,6 @@
 <!ENTITY less-md5 "4ad4408b06d7a6626a055cb453f36819">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
-<!ENTITY less-ch6-du "4.1 MB">
-<!ENTITY less-ch6-sbu "less than 0.1 SBU">
+<!ENTITY less-fin-du "4.1 MB">
+<!ENTITY less-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY lfs-bootscripts-version "20191031">      <!-- Scripts depend on this format -->
@@ -389,6 +396,6 @@
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">  
 <!ENTITY lfs-bootscripts-home " ">
-<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> 
-<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
+<!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB"> 
+<!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
 <!ENTITY libcap-version "2.36">
@@ -397,6 +404,6 @@
 <!ENTITY libcap-md5 "3d8cd4a87650cdee130691cb110c2ce2">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
-<!ENTITY libcap-ch6-du "8.5 MB">
-<!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
+<!ENTITY libcap-fin-du "8.5 MB">
+<!ENTITY libcap-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY libffi-version "3.3">
@@ -405,6 +412,6 @@
 <!ENTITY libffi-md5 "6313289e32f1d38a9df4770b014a2ca7">
 <!ENTITY libffi-home "https://sourceware.org/libffi/">
-<!ENTITY libffi-ch6-du "10 MB">
-<!ENTITY libffi-ch6-sbu "1.9 SBU">
+<!ENTITY libffi-fin-du "10 MB">
+<!ENTITY libffi-fin-sbu "1.9 SBU">
 
 <!ENTITY libpipeline-version "1.5.2">
@@ -413,6 +420,6 @@
 <!ENTITY libpipeline-md5 "169de4cc1f6f7f7d430a5bed858b2fd3">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
-<!ENTITY libpipeline-ch6-du "9.2 MB">
-<!ENTITY libpipeline-ch6-sbu "0.2 SBU">
+<!ENTITY libpipeline-fin-du "9.2 MB">
+<!ENTITY libpipeline-fin-sbu "0.2 SBU">
 
 <!ENTITY libtool-version "2.4.6">
@@ -421,6 +428,6 @@
 <!ENTITY libtool-md5 "1bfb9b923f2c1339b4d2ce1807064aa5">
 <!ENTITY libtool-home "&gnu-software;libtool/">
-<!ENTITY libtool-ch6-du "43 MB">
-<!ENTITY libtool-ch6-sbu "1.8 SBU">
+<!ENTITY libtool-fin-du "43 MB">
+<!ENTITY libtool-fin-sbu "1.8 SBU">
 
 <!ENTITY linux-major-version "5">
@@ -436,11 +443,11 @@
  allnoconfig extended for a hopefully-bootable build on desktop machine,
  max is allyesconfig which requires openssl -->
-<!ENTITY linux-ch8-du "960 - 4250 MB (typically about 1100 MB)">
-<!ENTITY linux-ch8-sbu "4.4 - 66.0 SBU (typically about 6 SBU)">
-
-<!ENTITY linux-headers-ch5-du "1 GB">
-<!ENTITY linux-headers-ch5-sbu "0.1 SBU">
-<!ENTITY linux-headers-ch6-du "1 GB">
-<!ENTITY linux-headers-ch6-sbu "0.1 SBU">
+<!ENTITY linux-knl-du "960 - 4250 MB (typically about 1100 MB)">
+<!ENTITY linux-knl-sbu "4.4 - 66.0 SBU (typically about 6 SBU)">
+
+<!ENTITY linux-headers-tmp-du "1 GB">
+<!ENTITY linux-headers-tmp-sbu "0.1 SBU">
+<!ENTITY linux-headers-fin-du "1 GB">
+<!ENTITY linux-headers-fin-sbu "0.1 SBU">
 
 <!ENTITY m4-version "1.4.18">
@@ -449,8 +456,8 @@
 <!ENTITY m4-md5 "730bb15d96fffe47e148d1e09235af82">
 <!ENTITY m4-home "&gnu-software;m4/">
-<!ENTITY m4-ch5-du "20 MB">
-<!ENTITY m4-ch5-sbu "0.2 SBU">
-<!ENTITY m4-ch6-du "33 MB">
-<!ENTITY m4-ch6-sbu "0.4 SBU">
+<!ENTITY m4-tmp-du "20 MB">
+<!ENTITY m4-tmp-sbu "0.2 SBU">
+<!ENTITY m4-fin-du "33 MB">
+<!ENTITY m4-fin-sbu "0.4 SBU">
 
 <!ENTITY make-version "4.3">
@@ -459,8 +466,8 @@
 <!ENTITY make-md5 "fc7a67ea86ace13195b0bce683fd4469">
 <!ENTITY make-home "&gnu-software;make/">
-<!ENTITY make-ch5-du "16 MB">
-<!ENTITY make-ch5-sbu "0.1 SBU">
-<!ENTITY make-ch6-du "16 MB">
-<!ENTITY make-ch6-sbu "0.5 SBU">
+<!ENTITY make-tmp-du "16 MB">
+<!ENTITY make-tmp-sbu "0.1 SBU">
+<!ENTITY make-fin-du "16 MB">
+<!ENTITY make-fin-sbu "0.5 SBU">
 
 <!ENTITY man-db-version "2.9.2">
@@ -469,6 +476,6 @@
 <!ENTITY man-db-md5 "86c7b99ce5969d9b20bf9aeae8d86e0b">
 <!ENTITY man-db-home "https://www.nongnu.org/man-db/">
-<!ENTITY man-db-ch6-du "40 MB">
-<!ENTITY man-db-ch6-sbu "0.5 SBU">
+<!ENTITY man-db-fin-du "40 MB">
+<!ENTITY man-db-fin-sbu "0.5 SBU">
 
 <!ENTITY man-pages-version "5.06">
@@ -477,6 +484,6 @@
 <!ENTITY man-pages-md5 "df2054d875c83bbc0bc0cfb8f53f3d43">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
-<!ENTITY man-pages-ch6-du "31 MB">
-<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
+<!ENTITY man-pages-fin-du "31 MB">
+<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY meson-version "0.54.2">
@@ -485,6 +492,6 @@
 <!ENTITY meson-md5 "6da6600c230d4124a73ca77ffef69cad">
 <!ENTITY meson-home "https://mesonbuild.com">
-<!ENTITY meson-ch6-du "31 MB">
-<!ENTITY meson-ch6-sbu "less than 0.1 SBU">
+<!ENTITY meson-fin-du "31 MB">
+<!ENTITY meson-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY mpc-version "1.1.0">
@@ -493,6 +500,6 @@
 <!ENTITY mpc-md5 "4125404e41e482ec68282a2e687f6c73">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
-<!ENTITY mpc-ch6-du "22 MB">
-<!ENTITY mpc-ch6-sbu "0.3 SBU">
+<!ENTITY mpc-fin-du "22 MB">
+<!ENTITY mpc-fin-sbu "0.3 SBU">
 
 <!ENTITY mpfr-version "4.0.2">
@@ -501,6 +508,6 @@
 <!ENTITY mpfr-md5 "320fbc4463d4c8cb1e566929d8adc4f8">
 <!ENTITY mpfr-home "https://www.mpfr.org/">
-<!ENTITY mpfr-ch6-du "37 MB">
-<!ENTITY mpfr-ch6-sbu "0.8 SBU">
+<!ENTITY mpfr-fin-du "37 MB">
+<!ENTITY mpfr-fin-sbu "0.8 SBU">
 
 <!ENTITY ncurses-version "6.2">
@@ -509,8 +516,8 @@
 <!ENTITY ncurses-md5 "e812da327b1c2214ac1aed440ea3ae8d">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
-<!ENTITY ncurses-ch5-du "41 MB">
-<!ENTITY ncurses-ch5-sbu "0.6 SBU">
-<!ENTITY ncurses-ch6-du "43 MB">
-<!ENTITY ncurses-ch6-sbu "0.4 SBU">
+<!ENTITY ncurses-tmp-du "41 MB">
+<!ENTITY ncurses-tmp-sbu "0.6 SBU">
+<!ENTITY ncurses-fin-du "43 MB">
+<!ENTITY ncurses-fin-sbu "0.4 SBU">
 
 <!ENTITY ninja-version "1.10.0">
@@ -519,6 +526,6 @@
 <!ENTITY ninja-md5 "cf1d964113a171da42a8940e7607e71a">
 <!ENTITY ninja-home "https://ninja-build.org/">
-<!ENTITY ninja-ch6-du "89 MB">
-<!ENTITY ninja-ch6-sbu "0.3 SBU">
+<!ENTITY ninja-fin-du "89 MB">
+<!ENTITY ninja-fin-sbu "0.3 SBU">
 
 <!ENTITY openssl-version "1.1.1g">
@@ -527,6 +534,6 @@
 <!ENTITY openssl-md5 "76766e98997660138cdaf13a187bd234">
 <!ENTITY openssl-home "https://www.openssl.org/">
-<!ENTITY openssl-ch6-du "147 MB">
-<!ENTITY openssl-ch6-sbu "2.2 SBU">
+<!ENTITY openssl-fin-du "147 MB">
+<!ENTITY openssl-fin-sbu "2.2 SBU">
 
 <!ENTITY patch-version "2.7.6">
@@ -535,8 +542,8 @@
 <!ENTITY patch-md5 "78ad9937e4caadcba1526ef1853730d5">
 <!ENTITY patch-home "https://savannah.gnu.org/projects/patch/">
-<!ENTITY patch-ch5-du "13 MB">
-<!ENTITY patch-ch5-sbu "0.2 SBU">
-<!ENTITY patch-ch6-du "13 MB">
-<!ENTITY patch-ch6-sbu "0.2 SBU">
+<!ENTITY patch-tmp-du "13 MB">
+<!ENTITY patch-tmp-sbu "0.2 SBU">
+<!ENTITY patch-fin-du "13 MB">
+<!ENTITY patch-fin-sbu "0.2 SBU">
 
 <!ENTITY perl-version "5.30.3">
@@ -545,8 +552,8 @@
 <!ENTITY perl-md5 "0af2ab0f01ec13e37cc13a27de930936">
 <!ENTITY perl-home "https://www.perl.org/">
-<!ENTITY perl-ch5-du "275 MB">
-<!ENTITY perl-ch5-sbu "1.5 SBU">
-<!ENTITY perl-ch6-du "272 MB">
-<!ENTITY perl-ch6-sbu "9.2 SBU">
+<!ENTITY perl-tmp-du "275 MB">
+<!ENTITY perl-tmp-sbu "1.5 SBU">
+<!ENTITY perl-fin-du "272 MB">
+<!ENTITY perl-fin-sbu "9.2 SBU">
 
 <!ENTITY pkgconfig-version "0.29.2">
@@ -555,6 +562,6 @@
 <!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a">
 <!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config">
-<!ENTITY pkgconfig-ch6-du "30 MB">
-<!ENTITY pkgconfig-ch6-sbu "0.3 SBU">
+<!ENTITY pkgconfig-fin-du "30 MB">
+<!ENTITY pkgconfig-fin-sbu "0.3 SBU">
 
 <!ENTITY procps-ng-version "3.3.16">
@@ -563,6 +570,6 @@
 <!ENTITY procps-ng-md5 "e8dc8455e573bdc40b8381d572bbb89b">
 <!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
-<!ENTITY procps-ng-ch6-du "17 MB">
-<!ENTITY procps-ng-ch6-sbu "0.1 SBU">
+<!ENTITY procps-ng-fin-du "17 MB">
+<!ENTITY procps-ng-fin-sbu "0.1 SBU">
 
 <!ENTITY psmisc-version "23.3">
@@ -571,6 +578,6 @@
 <!ENTITY psmisc-md5 "573bf80e6b0de86e7f307e310098cf86">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
-<!ENTITY psmisc-ch6-du "4.6 MB">
-<!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
+<!ENTITY psmisc-fin-du "4.6 MB">
+<!ENTITY psmisc-fin-sbu "less than 0.1 SBU">
 
 <!-- If python minor version changes, updates in python and 
@@ -583,8 +590,8 @@
 <!ENTITY python-md5 "3000cf50aaa413052aef82fd2122ca78">
 <!ENTITY python-home "https://www.python.org/">
-<!ENTITY python-ch5-du "409 MB">
-<!ENTITY python-ch5-sbu "1.3 SBU">
-<!ENTITY python-ch6-du "426 MB">
-<!ENTITY python-ch6-sbu "1.2 SBU">
+<!ENTITY python-tmp-du "409 MB">
+<!ENTITY python-tmp-sbu "1.3 SBU">
+<!ENTITY python-fin-du "426 MB">
+<!ENTITY python-fin-sbu "1.2 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
 <!ENTITY python-docs-md5 "2568df23eb5ad90aabab4b1e84b99fd9">
@@ -596,6 +603,6 @@
 <!ENTITY readline-md5 "7e6c1f16aee3244a69aba6e438295ca3">
 <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html">
-<!ENTITY readline-ch6-du "15 MB">
-<!ENTITY readline-ch6-sbu "0.1 SBU">
+<!ENTITY readline-fin-du "15 MB">
+<!ENTITY readline-fin-sbu "0.1 SBU">
 
 <!ENTITY sed-version "4.8">
@@ -604,8 +611,8 @@
 <!ENTITY sed-md5 "6d906edfdb3202304059233f51f9a71d">
 <!ENTITY sed-home "&gnu-software;sed/">
-<!ENTITY sed-ch5-du "21 MB">
-<!ENTITY sed-ch5-sbu "0.2 SBU">
-<!ENTITY sed-ch6-du "34 MB">
-<!ENTITY sed-ch6-sbu "0.4 SBU">
+<!ENTITY sed-tmp-du "21 MB">
+<!ENTITY sed-tmp-sbu "0.2 SBU">
+<!ENTITY sed-fin-du "34 MB">
+<!ENTITY sed-fin-sbu "0.4 SBU">
 
 <!ENTITY shadow-version "4.8.1">
@@ -614,6 +621,6 @@
 <!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45">
 <!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/"> 
-<!ENTITY shadow-ch6-du "46 MB">
-<!ENTITY shadow-ch6-sbu "0.2 SBU">
+<!ENTITY shadow-fin-du "46 MB">
+<!ENTITY shadow-fin-sbu "0.2 SBU">
 
 <!ENTITY sysklogd-version "1.5.1">
@@ -622,6 +629,6 @@
 <!ENTITY sysklogd-md5 "c70599ab0d037fde724f7210c2c8d7f8">
 <!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
-<!ENTITY sysklogd-ch6-du "0.6 MB">
-<!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
+<!ENTITY sysklogd-fin-du "0.6 MB">
+<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY systemd-version  "245">
@@ -638,6 +645,6 @@
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
 <!ENTITY systemd-man-md5  "ecf8cc4baa33b91ad4212d28e88f8edd">
-<!ENTITY systemd-ch6-du   "176 MB">
-<!ENTITY systemd-ch6-sbu  "1.9 SBU">
+<!ENTITY systemd-fin-du   "176 MB">
+<!ENTITY systemd-fin-sbu  "1.9 SBU">
 
 <!ENTITY sysvinit-version "2.96">
@@ -646,6 +653,6 @@
 <!ENTITY sysvinit-md5 "48cebffebf2a96ab09bec14bf9976016">
 <!ENTITY sysvinit-home "https://savannah.nongnu.org/projects/sysvinit">
-<!ENTITY sysvinit-ch6-du "1.4 MB">
-<!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
+<!ENTITY sysvinit-fin-du "1.4 MB">
+<!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY tar-version "1.32">
@@ -654,8 +661,8 @@
 <!ENTITY tar-md5 "83e38700a80a26e30b2df054e69956e5">
 <!ENTITY tar-home "&gnu-software;tar/">
-<!ENTITY tar-ch5-du "38 MB">
-<!ENTITY tar-ch5-sbu "0.3 SBU">
-<!ENTITY tar-ch6-du "45 MB">
-<!ENTITY tar-ch6-sbu "2.0 SBU">
+<!ENTITY tar-tmp-du "38 MB">
+<!ENTITY tar-tmp-sbu "0.3 SBU">
+<!ENTITY tar-fin-du "45 MB">
+<!ENTITY tar-fin-sbu "2.0 SBU">
 
 <!ENTITY tcl-version "8.6.10">
@@ -665,6 +672,6 @@
 <!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
-<!ENTITY tcl-ch5-du "72 MB">
-<!ENTITY tcl-ch5-sbu "0.9 SBU">
+<!ENTITY tcl-tmp-du "72 MB">
+<!ENTITY tcl-tmp-sbu "0.9 SBU">
 
 <!ENTITY texinfo-version "6.7">
@@ -673,8 +680,8 @@
 <!ENTITY texinfo-md5 "d4c5d8cc84438c5993ec5163a59522a6">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
-<!ENTITY texinfo-ch5-du "104 MB">
-<!ENTITY texinfo-ch5-sbu "0.2 SBU">
-<!ENTITY texinfo-ch6-du "116 MB">
-<!ENTITY texinfo-ch6-sbu "0.7 SBU">
+<!ENTITY texinfo-tmp-du "104 MB">
+<!ENTITY texinfo-tmp-sbu "0.2 SBU">
+<!ENTITY texinfo-fin-du "116 MB">
+<!ENTITY texinfo-fin-sbu "0.7 SBU">
 
 <!ENTITY tzdata-version "2020a">
@@ -696,8 +703,8 @@
 <!ENTITY util-linux-md5 "248a4d0810c9193e0e9a4bb3f26b93d8">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
-<!ENTITY util-linux-ch5-du "154 MB">
-<!ENTITY util-linux-ch5-sbu "0.9 SBU">
-<!ENTITY util-linux-ch6-du "289 MB">
-<!ENTITY util-linux-ch6-sbu "1.1 SBU">
+<!ENTITY util-linux-tmp-du "154 MB">
+<!ENTITY util-linux-tmp-sbu "0.9 SBU">
+<!ENTITY util-linux-fin-du "289 MB">
+<!ENTITY util-linux-fin-sbu "1.1 SBU">
 
 <!ENTITY vim-version "8.2.0814">
@@ -709,6 +716,6 @@
 <!ENTITY vim-md5 "02b8b91bd2a9a97879fc60616f4eb767">
 <!ENTITY vim-home "https://www.vim.org">
-<!ENTITY vim-ch6-du "202 MB">
-<!ENTITY vim-ch6-sbu "1.7 SBU">
+<!ENTITY vim-fin-du "202 MB">
+<!ENTITY vim-fin-sbu "1.7 SBU">
 
 <!ENTITY xml-parser-version "2.46">
@@ -717,6 +724,6 @@
 <!ENTITY xml-parser-md5 "80bb18a8e6240fcf7ec2f7b57601c170">
 <!ENTITY xml-parser-home "&github;/chorny/XML-Parser">
-<!ENTITY xml-parser-ch6-du "2.4 MB">
-<!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
+<!ENTITY xml-parser-fin-du "2.4 MB">
+<!ENTITY xml-parser-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY xz-version "5.2.5">
@@ -725,8 +732,8 @@
 <!ENTITY xz-md5 "aa1621ec7013a19abab52a8aff04fe5b">
 <!ENTITY xz-home "https://tukaani.org/xz">
-<!ENTITY xz-ch5-du "18 MB">
-<!ENTITY xz-ch5-sbu "0.2 SBU">
-<!ENTITY xz-ch6-du "16 MB">
-<!ENTITY xz-ch6-sbu "0.2 SBU">
+<!ENTITY xz-tmp-du "18 MB">
+<!ENTITY xz-tmp-sbu "0.2 SBU">
+<!ENTITY xz-fin-du "16 MB">
+<!ENTITY xz-fin-sbu "0.2 SBU">
 
 <!ENTITY zlib-version "1.2.11">
@@ -735,6 +742,6 @@
 <!ENTITY zlib-md5 "85adef240c5f370b308da8c938951a68">
 <!ENTITY zlib-home "https://www.zlib.net/">
-<!ENTITY zlib-ch6-du "5.1 MB">
-<!ENTITY zlib-ch6-sbu "less than 0.1 SBU">
+<!ENTITY zlib-fin-du "5.1 MB">
+<!ENTITY zlib-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY zstd-version "1.4.5">
@@ -743,5 +750,5 @@
 <!ENTITY zstd-md5 "dd0b53631303b8f972dafa6fd34beb0c">
 <!ENTITY zstd-home "https://facebook.github.io/zstd/">
-<!ENTITY zstd-ch6-du "16 MB">
-<!ENTITY zstd-ch6-sbu "0.7 SBU">
-
+<!ENTITY zstd-fin-du "16 MB">
+<!ENTITY zstd-fin-sbu "0.7 SBU">
+
