Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ general/prog/gcc.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -95,5 +95,5 @@
 dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="tcsh-package"/></para></sect4>
+<para><xref linkend="tcsh"/></para></sect4>
 </sect3>
 
Index: general/prog/j2sdk.xml
===================================================================
--- general/prog/j2sdk.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ general/prog/j2sdk.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -86,5 +86,5 @@
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-static_cxx-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-ash-1.patch"/> 
-(Only required if /bin/sh is symlinked to <xref linkend="ash-package"/>)</para></listitem>
+(Only required if /bin/sh is symlinked to <xref linkend="ash"/>)</para></listitem>
 </itemizedlist>
 </sect3>
@@ -94,5 +94,5 @@
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="cpio"/>, 
-<xref linkend="alsa"/>, <xref linkend="tcsh-package"/> and 
+<xref linkend="alsa"/>, <xref linkend="tcsh"/> and 
 <xref linkend="gcc3"/></para>
 </sect4>
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ general/prog/pdl.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="pdl-package" xreflabel="PDL">
+<sect1 id="pdl" xreflabel="PDL">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,5 +20,5 @@
 <?dbhtml filename="pdl.html" ?>
 <title><application><acronym>PDL</acronym></application>-&pdl-version;</title>
-<indexterm zone="pdl-package">
+<indexterm zone="pdl">
 <primary sortas="a-PDL">PDL</primary></indexterm>
 
@@ -421,7 +421,7 @@
 <para><filename>~/.perldlrc</filename> and 
 <filename>local.perldlrc</filename> in the current directory</para>
-<indexterm zone="pdl-package pdl-config">
+<indexterm zone="pdl pdl-config">
 <primary sortas="e-AA.perldlrc">~/.perldlrc</primary></indexterm>
-<indexterm zone="pdl-package pdl-config">
+<indexterm zone="pdl pdl-config">
 <primary sortas="e-local.perldlrc">local.perldlrc</primary></indexterm>
 </sect3>
@@ -454,10 +454,10 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="pdl">
+<varlistentry id="pdl-prog">
 <term><command>pdl</command></term>
 <listitem><para>is a binary program called from 
 <application><acronym>PDL</acronym></application> scripts which is used to
 interface <command>perldl</command>.</para>
-<indexterm zone="pdl-package pdl">
+<indexterm zone="pdl pdl-prog">
 <primary sortas="b-pdl">pdl</primary></indexterm>
 </listitem>
@@ -468,5 +468,5 @@
 <listitem><para>is a shell interface to
 <application><acronym>PDL</acronym></application> documentation.</para>
-<indexterm zone="pdl-package pdldoc">
+<indexterm zone="pdl pdldoc">
 <primary sortas="b-pdldoc">pdldoc</primary></indexterm>
 </listitem>
@@ -478,5 +478,5 @@
 <application><acronym>Perl</acronym></application>) for interactive use of
 <application><acronym>PDL</acronym></application>.</para>
-<indexterm zone="pdl-package perldl">
+<indexterm zone="pdl perldl">
 <primary sortas="b-perldl">perldl</primary></indexterm>
 </listitem>
@@ -487,5 +487,5 @@
 <listitem><para>is a script to generate <filename>Makefile.PL</filename> 
 and <acronym>PP</acronym> file skeletons.</para>
-<indexterm zone="pdl-package pptemplate">
+<indexterm zone="pdl pptemplate">
 <primary sortas="b-pptemplate">pptemplate</primary></indexterm>
 </listitem>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ gnome/core/gnome-vfs.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -56,5 +56,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="samba3"/>, 
-<xref linkend="cdparanoia-package"/>,
+<xref linkend="cdparanoia"/>,
 <xref linkend="fam"/>,
 <xref linkend="gtk-doc"/>,
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ gnome/core/nautilus.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -61,5 +61,5 @@
 <xref linkend="libgsf"/>, 
 <xref linkend="libcroco"/>, 
-<xref linkend="cdparanoia-package"/>, 
+<xref linkend="cdparanoia"/>, 
 <xref linkend="libjpeg"/>, 
 <xref linkend="docbook-utils"/>, 
Index: gnome/otherlibs/gnome-vfs1.xml
===================================================================
--- gnome/otherlibs/gnome-vfs1.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ gnome/otherlibs/gnome-vfs1.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -64,5 +64,5 @@
 <xref linkend="bonobo14"/>, 
 <xref linkend="openssl"/>, 
-<xref linkend="cdparanoia-package"/>, 
+<xref linkend="cdparanoia"/>, 
 <xref linkend="gtk-doc"/> and 
 <xref linkend="docbook-utils"/></para>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ kde/add/kdemultimedia.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -51,5 +51,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="cdparanoia-package"/>, 
+<para><xref linkend="cdparanoia"/>, 
 <xref linkend="lame"/>,
 <xref linkend="audiofile"/>,
Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/audioutils/cdparanoia.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -11,5 +11,5 @@
 ]>
 
-<sect1 id="cdparanoia-package" xreflabel="CDParanoia-&CDParanoia-version;">
+<sect1 id="cdparanoia" xreflabel="CDParanoia-&CDParanoia-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,5 @@
 <?dbhtml filename="cdparanoia.html"?>
 <title>CDParanoia-&CDParanoia-version;</title>
-<indexterm zone="cdparanoia-package">
+<indexterm zone="cdparanoia">
 <primary sortas="a-CDParanoia">CDParanoia</primary></indexterm>
 
@@ -104,9 +104,9 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="cdparanoia">
+<varlistentry id="cdparanoia-prog">
 <term><command>cdparanoia</command></term>
 <listitem><para>is used for 'ripping' an audio-cd. Ripping is the process of 
 digitally extracting music from an audio-cd.</para>
-<indexterm zone="cdparanoia-package cdparanoia">
+<indexterm zone="cdparanoia cdparanoia-prog">
 <primary sortas="b-cdparanoia">cdparanoia</primary></indexterm>
 </listitem>
@@ -118,5 +118,5 @@
 well as other packages, which can automatically identify if a 
 <acronym>CD</acronym> device is <acronym>CDDA</acronym> compatible.</para>
-<indexterm zone="cdparanoia-package libcdda_interface">
+<indexterm zone="cdparanoia libcdda_interface">
 <primary sortas="c-libcdda_interface">libcdda_interface.[so,a]</primary>
 </indexterm></listitem>
@@ -128,5 +128,5 @@
 well as other packages, which provide data verification, synchronization, 
 error handling and scratch reconstruction capability.</para>
-<indexterm zone="cdparanoia-package libcdda_paranoia">
+<indexterm zone="cdparanoia libcdda_paranoia">
 <primary sortas="c-libcdda_paranoia">libcdda_paranoia.[so,a]</primary>
 </indexterm></listitem>
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/audioutils/mpg123.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -11,5 +11,5 @@
 ]>
 
-<sect1 id="mpg123-package" xreflabel="mpg123-&mpg123-version;">
+<sect1 id="mpg123" xreflabel="mpg123-&mpg123-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,5 @@
 <?dbhtml filename="mpg123.html"?>
 <title>mpg123-&mpg123-version;</title>
-<indexterm zone="mpg123-package">
+<indexterm zone="mpg123">
 <primary sortas="a-Mpg123">Mpg123</primary></indexterm>
 
@@ -76,9 +76,9 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="mpg123">
+<varlistentry id="mpg123-prog">
 <term><command>mpg123</command></term>
 <listitem><para>is used for playing <filename>MP3</filename> files via the 
 console.</para>
-<indexterm zone="mpg123-package mpg123">
+<indexterm zone="mpg123 mpg123-prog">
 <primary sortas="b-mpg123">mpg123</primary></indexterm>
 </listitem>
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -11,5 +11,5 @@
 ]>
 
-<sect1 id="cdrdao-package" xreflabel="Cdrdao-&cdrdao-version;">
+<sect1 id="cdrdao" xreflabel="Cdrdao-&cdrdao-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,5 @@
 <?dbhtml filename="cdrdao.html"?>
 <title>Cdrdao-&cdrdao-version;</title>
-<indexterm zone="cdrdao-package">
+<indexterm zone="cdrdao">
 <primary sortas="a-Cdrdao">Cdrdao</primary></indexterm>
 
@@ -114,10 +114,10 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="cdrdao">
+<varlistentry id="cdrdao-prog">
 <term><command>cdrdao</command></term>
 <listitem><para>records audio or data <acronym>CD</acronym>-Rs in disk-at-once 
 (<acronym>DAO</acronym>) mode based on a textual description of the 
 <acronym>CD</acronym> contents.</para>
-<indexterm zone="cdrdao-package cdrdao">
+<indexterm zone="cdrdao cdrdao-prog">
 <primary sortas="b-cdrdao">cdrdao</primary></indexterm>
 </listitem>
@@ -128,5 +128,5 @@
 <listitem><para>converts <acronym>CUE</acronym> to <acronym>TOC</acronym> 
 format for audio <acronym>CD</acronym>s.</para>
-<indexterm zone="cdrdao-package cue2toc">
+<indexterm zone="cdrdao cue2toc">
 <primary sortas="b-cue2toc">cue2toc</primary></indexterm>
 </listitem>
@@ -137,5 +137,5 @@
 <listitem><para>is a graphical front end to <command>cdrdao</command> for 
 composing audio <acronym>CD</acronym>s.</para>
-<indexterm zone="cdrdao-package gcdmaster">
+<indexterm zone="cdrdao gcdmaster">
 <primary sortas="b-gcdmaster">gcdmaster</primary></indexterm>
 </listitem>
@@ -146,5 +146,5 @@
 <listitem><para>converts a <application>Cdrdao</application> 
 <acronym>TOC</acronym> file into a cddb file and prints it to stdout.</para>
-<indexterm zone="cdrdao-package toc2cddb">
+<indexterm zone="cdrdao toc2cddb">
 <primary sortas="b-toc2cddb">toc2cddb</primary></indexterm>
 </listitem>
@@ -155,5 +155,5 @@
 <listitem><para>converts <acronym>TOC</acronym> to <acronym>CUE</acronym> 
 format for audio <acronym>CD</acronym>s.</para>
-<indexterm zone="cdrdao-package toc2cue">
+<indexterm zone="cdrdao toc2cue">
 <primary sortas="b-toc2cue">toc2cue</primary></indexterm>
 </listitem>
@@ -165,5 +165,5 @@
 disk image (<filename>.toc</filename> file) to MP3 files (requires 
 <xref linkend="lame"/> to build).</para>
-<indexterm zone="cdrdao-package toc2mp3">
+<indexterm zone="cdrdao toc2mp3">
 <primary sortas="b-toc2mp3">toc2mp3</primary></indexterm>
 </listitem>
Index: multimedia/libdriv/gst-plugins.xml
===================================================================
--- multimedia/libdriv/gst-plugins.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/libdriv/gst-plugins.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -51,5 +51,5 @@
 <sect4><title>Optional utilities (graphics, compression, misc.)</title>
 <para><xref linkend="aalib"/>, 
-<xref linkend="cdparanoia-package"/>, 
+<xref linkend="cdparanoia"/>, 
 <xref linkend="freetype2"/>, 
 <xref linkend="GConf"/>, 
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/libdriv/xine-lib.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -57,5 +57,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
-<xref linkend="ffmpeg-package"/>, 
+<xref linkend="ffmpeg"/>, 
 <xref linkend="aalib"/>, 
 <xref linkend="libmng"/>, 
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/videoutils/ffmpeg.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -11,5 +11,5 @@
 ]>
 
-<sect1 id="ffmpeg-package" xreflabel="FFmpeg-&ffmpeg-version;">
+<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,5 @@
 <?dbhtml filename="ffmpeg.html"?>
 <title>FFmpeg-&ffmpeg-version;</title>
-<indexterm zone="ffmpeg-package">
+<indexterm zone="ffmpeg">
 <primary sortas="a-FFmpeg">FFmpeg</primary></indexterm>
 
@@ -133,9 +133,9 @@
 <filename>~/.ffmpeg/ffserver-config</filename></para>
 
-<indexterm zone="ffmpeg-package ffmpeg-config">
+<indexterm zone="ffmpeg ffmpeg-config">
 <primary 
 sortas="e-AA.ffmpeg-ffserver-config">~/.ffmpeg/ffserver-config</primary>
 </indexterm>
-<indexterm zone="ffmpeg-package ffmpeg-config">
+<indexterm zone="ffmpeg ffmpeg-config">
 <primary sortas="e-etc-ffserver.conf">/etc/ffserver.conf</primary>
 </indexterm>
@@ -167,9 +167,9 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="ffmpeg">
+<varlistentry id="ffmpeg-prog">
 <term><command>ffmpeg</command></term>
 <listitem><para>is a command-line tool to convert video files, network streams 
 and input from a <acronym>TV</acronym> card to several video formats.</para>
-<indexterm zone="ffmpeg-package ffmpeg">
+<indexterm zone="ffmpeg ffmpeg-prog">
 <primary sortas="b-ffmpeg">ffmpeg</primary></indexterm>
 </listitem>
@@ -181,5 +181,5 @@
 <filename>ffmpeg</filename> libraries and the <acronym>SDL</acronym> 
 library.</para>
-<indexterm zone="ffmpeg-package ffplay">
+<indexterm zone="ffmpeg ffplay">
 <primary sortas="b-ffplay">ffplay</primary></indexterm>
 </listitem>
@@ -191,5 +191,5 @@
 <command>ffmpeg</command> could use as input (files, streams, TV card input, 
 webcam, etc.).</para>
-<indexterm zone="ffmpeg-package ffserver">
+<indexterm zone="ffmpeg ffserver">
 <primary sortas="b-ffserver">ffserver</primary></indexterm>
 </listitem>
@@ -200,5 +200,5 @@
 <listitem><para>is a library containing the <application>FFmpeg</application> 
 codecs (both encoding and decoding).</para>
-<indexterm zone="ffmpeg-package libavcodec">
+<indexterm zone="ffmpeg libavcodec">
 <primary sortas="c-libavcodec">libavcodec.so</primary></indexterm>
 </listitem>
@@ -210,5 +210,5 @@
 demux code for several formats) used by <command>ffplay</command> as well as 
 allowing the generation of  audio or video streams.</para>
-<indexterm zone="ffmpeg-package libavformat">
+<indexterm zone="ffmpeg libavformat">
 <primary sortas="c-libavformat">libavformat.so</primary></indexterm>
 </listitem>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/videoutils/mplayer.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="mplayer-package" xreflabel="MPlayer-&mplayer-version;">
+<sect1 id="mplayer" xreflabel="MPlayer-&mplayer-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -22,5 +22,5 @@
 <?dbhtml filename="mplayer.html"?>
 <title><application>MPlayer</application>-&mplayer-version;</title>
-<indexterm zone="mplayer-package">
+<indexterm zone="mplayer">
 <primary sortas="a-MPlayer">MPlayer</primary></indexterm>
 
@@ -96,5 +96,5 @@
 <sect3><title><application>MPlayer</application> dependencies</title>
 <sect4><title>Optional input drivers and libraries</title>
-<para><xref linkend="cdparanoia-package"/>, 
+<para><xref linkend="cdparanoia"/>, 
 <xref linkend="libdv"/>, 
 <xref linkend="libdvdread"/>, 
@@ -322,7 +322,7 @@
 <para><filename>/etc/mplayer/*</filename>, 
 <filename>~/.mplayer/*</filename></para>
-<indexterm zone="mplayer-package mplayer-config">
+<indexterm zone="mplayer mplayer-config">
 <primary sortas="e-AA.mplayer">~/.mplayer/*</primary></indexterm>
-<indexterm zone="mplayer-package mplayer-config">
+<indexterm zone="mplayer mplayer-config">
 <primary sortas="e-etc-mplayer">/etc/mplayer/*</primary></indexterm>
 </sect3>
@@ -364,10 +364,10 @@
 the graphical user interface component of 
 <application>MPlayer</application>.</para>
-<indexterm zone="mplayer-package gmplayer">
+<indexterm zone="mplayer gmplayer">
 <primary sortas="b-gmplayer">gmplayer</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="mplayer">
+<varlistentry id="mplayer-prog">
 <term><command>mplayer</command></term>
 <listitem><para> manages the input formats, the <acronym>CODEC</acronym>s and 
@@ -375,5 +375,5 @@
 (S)<acronym>VCD</acronym>s or network streams containing audio and/or video 
 information on your system.</para>
-<indexterm zone="mplayer-package mplayer">
+<indexterm zone="mplayer mplayer-prog">
 <primary sortas="b-mplayer">mplayer</primary></indexterm>
 
@@ -399,5 +399,5 @@
 <filename class='libraryfile'>libavcodec</filename> with
 <acronym>PCM</acronym>/MP3/VBRMP3 audio.</para>
-<indexterm zone="mplayer-package mencoder">
+<indexterm zone="mplayer mencoder">
 <primary sortas="b-mencoder">mencoder</primary></indexterm>
 
@@ -425,5 +425,5 @@
 <listitem><para>contains functions used by the 
 <application>MPlayer</application> programs.</para>
-<indexterm zone="mplayer-package libdha">
+<indexterm zone="mplayer libdha">
 <primary sortas="c-libdha">libdha.so</primary></indexterm>
 </listitem>
@@ -434,5 +434,5 @@
 <listitem><para>is a post-processing filter library used by the 
 <application>MPlayer</application> programs and other packages.</para>
-<indexterm zone="mplayer-package libpostproc">
+<indexterm zone="mplayer libpostproc">
 <primary sortas="c-libpostproc">libpostproc.so</primary></indexterm>
 </listitem>
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ multimedia/videoutils/transcode.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="transcode-package" xreflabel="Transcode-&transcode-version;">
+<sect1 id="transcode" xreflabel="Transcode-&transcode-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,5 +19,5 @@
 <?dbhtml filename="transcode.html"?>
 <title><application>Transcode</application>-&transcode-version;</title>
-<indexterm zone="transcode-package">
+<indexterm zone="transcode">
 <primary sortas="a-Transcode">Transcode</primary></indexterm>
 
@@ -64,5 +64,5 @@
 <sect3><title><application>Transcode</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="ffmpeg-package"/></para>
+<para><xref linkend="ffmpeg"/></para>
 </sect4>
 
@@ -98,5 +98,5 @@
 
 <para>Though <application>Transcode</application> has no compile-time 
-requirement for <xref linkend="mplayer-package"/>'s shared post-processing 
+requirement for <xref linkend="mplayer"/>'s shared post-processing 
 library, <application>Transcode</application> can use it at run-time.</para>
 </sect4>
@@ -163,5 +163,5 @@
 <listitem><para>indicates or changes the <acronym>FOURCC</acronym> 
 <acronym>CODEC</acronym> flag in an <acronym>AVI</acronym> file.</para>
-<indexterm zone="transcode-package avicodec">
+<indexterm zone="transcode avicodec">
 <primary sortas="b-avicodec">avicodec</primary></indexterm>
 </listitem>
@@ -173,5 +173,5 @@
 file to stdout (for <acronym>AVI</acronym> conversion or extraction of audio 
 streams).</para>
-<indexterm zone="transcode-package avidump">
+<indexterm zone="transcode avidump">
 <primary sortas="b-avidump">avidump</primary></indexterm>
 </listitem>
@@ -181,5 +181,5 @@
 <term><command>avifix</command></term>
 <listitem><para>fixes the header of an <acronym>AVI</acronym> file.</para>
-<indexterm zone="transcode-package avifix">
+<indexterm zone="transcode avifix">
 <primary sortas="b-avifix">avifix</primary></indexterm>
 </listitem>
@@ -190,5 +190,5 @@
 <listitem><para>writes a text file describing the index of an 
 <acronym>AVI</acronym> file.</para>
-<indexterm zone="transcode-package aviindex">
+<indexterm zone="transcode aviindex">
 <primary sortas="b-aviindex">aviindex</primary></indexterm>
 </listitem>
@@ -200,5 +200,5 @@
 not try to merge <acronym>AVI</acronym> files of different formats, it will 
 most likely result in errors (and format means same bitrates, too!).</para>
-<indexterm zone="transcode-package avimerge">
+<indexterm zone="transcode avimerge">
 <primary sortas="b-avimerge">avimerge</primary></indexterm>
 </listitem>
@@ -208,5 +208,5 @@
 <term><command>avisplit</command></term>
 <listitem><para>splits <acronym>AVI</acronym> files into multiple files.</para>
-<indexterm zone="transcode-package avisplit">
+<indexterm zone="transcode avisplit">
 <primary sortas="b-avisplit">avisplit</primary></indexterm>
 </listitem>
@@ -217,5 +217,5 @@
 <listitem><para>can shift audio in <acronym>AVI</acronym> files for better 
 synchronizing of the audio and video data signal.</para>
-<indexterm zone="transcode-package avisync">
+<indexterm zone="transcode avisync">
 <primary sortas="b-avisync">avisync</primary></indexterm>
 </listitem>
@@ -226,5 +226,5 @@
 <listitem><para>concatenates input files using the input plugins of 
 <application>Transcode</application>.</para>
-<indexterm zone="transcode-package tccat">
+<indexterm zone="transcode tccat">
 <primary sortas="b-tccat">tccat</primary></indexterm>
 </listitem>
@@ -235,5 +235,5 @@
 <listitem><para>is used to decode input files to raw video and 
 <acronym>PCM</acronym> audio streams.</para>
-<indexterm zone="transcode-package tcdecode">
+<indexterm zone="transcode tcdecode">
 <primary sortas="b-tcdecode">tcdecode</primary></indexterm>
 </listitem>
@@ -244,5 +244,5 @@
 <listitem><para>demultiplexes (separates) audio/video input that contains 
 multiple streams, e.g., <acronym>VOB</acronym> files.</para>
-<indexterm zone="transcode-package tcdemux">
+<indexterm zone="transcode tcdemux">
 <primary sortas="b-tcdemux">tcdemux</primary></indexterm>
 </listitem>
@@ -253,5 +253,5 @@
 <listitem><para>grabs single streams from a file containing multiple 
 streams.</para>
-<indexterm zone="transcode-package tcextract">
+<indexterm zone="transcode tcextract">
 <primary sortas="b-tcextract">tcextract</primary></indexterm>
 </listitem>
@@ -262,5 +262,5 @@
 <listitem><para>processes single video frames for different color encodings 
 (<acronym>RGB</acronym> &gt;-&lt; <acronym>YUV</acronym> or similar).</para>
-<indexterm zone="transcode-package tcframe">
+<indexterm zone="transcode tcframe">
 <primary sortas="b-tcframe">tcframe</primary></indexterm>
 </listitem>
@@ -271,5 +271,5 @@
 <listitem><para>loads a supplied <application>Transcode</application> filter 
 module and prints its parameters.</para>
-<indexterm zone="transcode-package tcmodinfo">
+<indexterm zone="transcode tcmodinfo">
 <primary sortas="b-tcmodinfo">tcmodinfo</primary></indexterm>
 </listitem>
@@ -280,5 +280,5 @@
 <listitem><para>is a tool which can cut <acronym>MP3</acronym> streams at 
 milliseconds positions.</para>
-<indexterm zone="transcode-package tcmp3cut">
+<indexterm zone="transcode tcmp3cut">
 <primary sortas="b-tcmp3cut">tcmp3cut</primary></indexterm>
 </listitem>
@@ -288,5 +288,5 @@
 <term><command>tcprobe</command></term>
 <listitem><para>prints information about the input file format.</para>
-<indexterm zone="transcode-package tcprobe">
+<indexterm zone="transcode tcprobe">
 <primary sortas="b-tcprobe">tcprobe</primary></indexterm>
 </listitem>
@@ -297,5 +297,5 @@
 <listitem><para>is a tool which can requantize an <acronym>MPEG</acronym>-2 
 elementary stream.</para>
-<indexterm zone="transcode-package tcrequant">
+<indexterm zone="transcode tcrequant">
 <primary sortas="b-tcrequant">tcrequant</primary></indexterm>
 </listitem>
@@ -305,5 +305,5 @@
 <term><command>tcscan</command></term>
 <listitem><para> performs several measurements on the given input data.</para>
-<indexterm zone="transcode-package tcscan">
+<indexterm zone="transcode tcscan">
 <primary sortas="b-tcscan">tcscan</primary></indexterm>
 </listitem>
@@ -314,10 +314,10 @@
 <listitem><para> checks information in a <acronym>SMIL</acronym> input 
 file.</para>
-<indexterm zone="transcode-package tcxmlcheck">
+<indexterm zone="transcode tcxmlcheck">
 <primary sortas="b-tcxmlcheck">tcxmlcheck</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="transcode">
+<varlistentry id="transcode-prog">
 <term><command>transcode</command></term>
 <listitem><para>is the encoder's user interface that handles the plugins and 
@@ -325,5 +325,5 @@
 documented usage examples on both the homepage and the documentation included 
 in the package.</para>
-<indexterm zone="transcode-package transcode">
+<indexterm zone="transcode transcode-prog">
 <primary sortas="b-transcode">transcode</primary></indexterm>
 </listitem>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ postlfs/security/stunnel.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="stunnel-package" xreflabel="Stunnel-&stunnel-version;">
+<sect1 id="stunnel" xreflabel="Stunnel-&stunnel-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,5 +19,5 @@
 <?dbhtml filename="stunnel.html"?>
 <title>Stunnel-&stunnel-version;</title>
-<indexterm zone="stunnel-package">
+<indexterm zone="stunnel">
 <primary sortas="a-Stunnel">Stunnel</primary></indexterm>
 
@@ -128,5 +128,5 @@
 <sect3 id="stunnel-config"><title>Config files</title>
 <para><filename>/etc/stunnel/stunnel.conf</filename></para>
-<indexterm zone="stunnel-package stunnel-config">
+<indexterm zone="stunnel stunnel-config">
 <primary sortas="e-etc-stunnel-stunnel.conf">/etc/stunnel/stunnel.conf</primary>
 </indexterm>
@@ -173,5 +173,5 @@
 <filename>/etc/rc.d/init.d/stunnel</filename> bootscript from the 
 <xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="stunnel-package stunnel.init">
+<indexterm zone="stunnel stunnel.init">
 <primary sortas="f-stunnel.init">stunnel</primary></indexterm>
 
@@ -190,6 +190,6 @@
 <seg>stunnel and stunnel3</seg>
 <seg>libstunnel.so</seg>
-<seg>/etc/stunnel, /var/lib/stunnel and 
-/usr/share/doc/stunnel</seg></seglistitem>
+<seg>/etc/stunnel, /var/lib/stunnel and /usr/share/doc/stunnel</seg>
+</seglistitem>
 </segmentedlist>
 
@@ -198,10 +198,10 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="stunnel">
+<varlistentry id="stunnel-prog">
 <term><command>stunnel</command></term>
 <listitem><para> is a program designed to work as an <acronym>SSL</acronym> 
 encryption wrapper between remote clients and local
 (<command>[x]inetd</command>-startable) or remote servers.</para>
-<indexterm zone="stunnel-package stunnel">
+<indexterm zone="stunnel stunnel-prog">
 <primary sortas="b-stunnel">stunnel</primary></indexterm>
 </listitem>
@@ -213,5 +213,5 @@
 <command>stunnel</command> 3.x syntax with <command>stunnel</command> 
 >=4.05.</para>
-<indexterm zone="stunnel-package stunnel3">
+<indexterm zone="stunnel stunnel3">
 <primary sortas="b-stunnel3">stunnel3</primary></indexterm>
 </listitem>
@@ -222,5 +222,5 @@
 <listitem><para> contains the <acronym>API</acronym> functions required by 
 <application>Stunnel</application>.</para>
-<indexterm zone="stunnel-package libstunnel">
+<indexterm zone="stunnel libstunnel">
 <primary sortas="c-libstunnel">libstunnel.so</primary></indexterm>
 </listitem>
Index: postlfs/shells/ash.xml
===================================================================
--- postlfs/shells/ash.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ postlfs/shells/ash.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="ash-package" xreflabel="ASH-&ash-version;">
+<sect1 id="ash" xreflabel="ASH-&ash-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,6 +20,6 @@
 <?dbhtml filename="ash.html"?>
 <title>ASH-&ash-version;</title>
-<indexterm zone="ash-package">
-<primary sortas="a-ASH-package">ASH</primary></indexterm>
+<indexterm zone="ash">
+<primary sortas="a-ASH">ASH</primary></indexterm>
 
 <sect2>
@@ -84,7 +84,7 @@
 <filename>$HOME/.profile</filename></para>
 
-<indexterm zone="ash-package ash-config">
+<indexterm zone="ash ash-config">
 <primary sortas="e-etc-profile">/etc/profile</primary></indexterm>
-<indexterm zone="ash-package ash-config">
+<indexterm zone="ash ash-config">
 <primary sortas="e-AHOME-.profile">$HOME/.profile</primary></indexterm>
 </sect3>
@@ -105,8 +105,8 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="ash">
+<varlistentry id="ash-prog">
 <term><command>ash</command></term>
 <listitem><para>is a <command>sh</command>-compliant shell.</para>
-<indexterm zone="ash-package ash">
+<indexterm zone="ash ash-prog">
 <primary sortas="b-ash">ash</primary></indexterm>
 </listitem>
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ postlfs/shells/tcsh.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="tcsh-package" xreflabel="Tcsh-&tcsh-version;">
+<sect1 id="tcsh" xreflabel="Tcsh-&tcsh-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,5 +20,5 @@
 <?dbhtml filename="tcsh.html"?>
 <title>Tcsh-&tcsh-version;</title>
-<indexterm zone="tcsh-package">
+<indexterm zone="tcsh">
 <primary sortas="a-Tcsh">Tcsh</primary></indexterm>
 
@@ -88,21 +88,21 @@
 found in the <filename>tcsh(1)</filename> man page.</para>
 
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-etc-csh.cshrc">/etc/csh.cshrc</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-etc-csh.login">/etc/csh.login</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-etc-csh.logout">/etc/csh.logout</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.tcshrc">~/.tcshrc</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.cshrc">~/.cshrc</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.history">~/.history</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.cshdirs">~/.cshdirs</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.login">~/.login</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.logout">~/.logout</primary></indexterm>
 </sect3>
@@ -124,10 +124,10 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="tcsh">
+<varlistentry id="tcsh-prog">
 <term><command>tcsh</command></term>
 <listitem><para>is an enhanced but completely compatible version of the 
 Berkeley Unix C shell, <command>csh</command>. It is usable as both an 
 interactive shell and a script processor.</para>
-<indexterm zone="tcsh-package tcsh">
+<indexterm zone="tcsh tcsh-prog">
 <primary sortas="b-tcsh">tcsh</primary></indexterm>
 </listitem>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ postlfs/shells/zsh.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="zsh-package" xreflabel="ZSH-&zsh-version;">
+<sect1 id="zsh" xreflabel="ZSH-&zsh-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,5 +20,5 @@
 <?dbhtml filename="zsh.html"?>
 <title>ZSH-&zsh-version;</title>
-<indexterm zone="zsh-package">
+<indexterm zone="zsh">
 <primary sortas="a-ZSH">ZSH</primary></indexterm>
 
@@ -79,13 +79,13 @@
 the <filename>zsh(1)</filename> and related man pages.</para>
 
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zshenv">/etc/zshenv</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zprofile">/etc/zprofile</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zshrc">/etc/zshrc</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zlogin">/etc/zlogin</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zlogout">/etc/zlogout</primary></indexterm>
 </sect3>
@@ -107,10 +107,10 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="zsh">
+<varlistentry id="zsh-prog">
 <term><command>zsh</command></term>
 <listitem><para>is a shell which has command-line editing, built-in spelling 
 correction, programmable command completion, shell functions (with 
 autoloading), a history mechanism, and a host of other features.</para>
-<indexterm zone="zsh-package zsh">
+<indexterm zone="zsh zsh-prog">
 <primary sortas="b-zsh">zsh</primary></indexterm>
 </listitem>
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ pst/sgml/docbook-utils.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -49,5 +49,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="jadetex-package"/> (for conversion to 
+<para><xref linkend="jadetex"/> (for conversion to 
 <acronym>DVI</acronym>, <acronym>PS</acronym> and <acronym>PDF</acronym>), 
 <xref linkend="perl-modules"/>: SGMLSpm-&SGMLSpm-version; (for conversion to 
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ pst/typesetting/jadetex.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="jadetex-package" xreflabel="JadeTeX-&jadetex-version;">
+<sect1 id="jadetex" xreflabel="JadeTeX-&jadetex-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,5 +19,5 @@
 <?dbhtml filename="jadetex.html"?>
 <title>JadeTeX-&jadetex-version;</title>
-<indexterm zone="jadetex-package">
+<indexterm zone="jadetex">
 <primary sortas="a-JadeTeX">JadeTeX</primary></indexterm>
 
@@ -186,10 +186,10 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="jadetex">
+<varlistentry id="jadetex-prog">
 <term><command>jadetex</command></term>
 <listitem><para>transforms LaTeX macros created by 
 <application>OpenJade</application> into <acronym>DVI</acronym>/PostScript 
 forms.</para>
-<indexterm zone="jadetex-package jadetex">
+<indexterm zone="jadetex jadetex-prog">
 <primary sortas="b-jadetex">jadetex</primary></indexterm>
 </listitem>
@@ -201,5 +201,5 @@
 <application>OpenJade</application> into Portable Document Format
 (<acronym>PDF</acronym>) forms.</para>
-<indexterm zone="jadetex-package pdfjadetex">
+<indexterm zone="jadetex pdfjadetex">
 <primary sortas="b-pdfjadetex">pdfjadetex</primary></indexterm>
 </listitem>
Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ server/other/bind.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -56,5 +56,5 @@
 <sect4><title>Optional (to [re]build documentation)</title>
 <para><xref linkend="openjade"/>, 
-<xref linkend="jadetex-package"/>, 
+<xref linkend="jadetex"/>, 
 <xref linkend="docbook-dsssl"/></para>
 </sect4>
Index: server/other/samba3.xml
===================================================================
--- server/other/samba3.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ server/other/samba3.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -61,5 +61,5 @@
 <xref linkend="xinetd"/>, 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink> and 
-<xref linkend="stunnel-package"/> (used to encrypt access to SWAT)</para>
+<xref linkend="stunnel"/> (used to encrypt access to SWAT)</para>
 </sect4>
 </sect3>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ x/wm/fluxbox.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="fluxbox-package" xreflabel="Fluxbox-&fluxbox-version;">
+<sect1 id="fluxbox" xreflabel="Fluxbox-&fluxbox-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,5 +19,5 @@
 <?dbhtml filename="fluxbox.html" ?>
 <title>Fluxbox-&fluxbox-version;</title>
-<indexterm zone="fluxbox-package"><primary
+<indexterm zone="fluxbox"><primary
 sortas="a-Fluxbox">Fluxbox</primary></indexterm>
 
@@ -67,9 +67,9 @@
 <filename>~/.fluxbox/keys</filename>,
 <filename>~/.fluxbox/menu</filename></para>
-<indexterm zone="fluxbox-package fluxbox-config">
+<indexterm zone="fluxbox fluxbox-config">
 <primary sortas="e-AA.fluxbox-init">~/.fluxbox/init</primary></indexterm>
-<indexterm zone="fluxbox-package fluxbox-config">
+<indexterm zone="fluxbox fluxbox-config">
 <primary sortas="e-AA.fluxbox-keys">~/.fluxbox/keys</primary></indexterm>
-<indexterm zone="fluxbox-package fluxbox-config">
+<indexterm zone="fluxbox fluxbox-config">
 <primary sortas="e-AA.fluxbox-menu">~/.fluxbox/menu</primary></indexterm>
 </sect3>
@@ -111,9 +111,9 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="fluxbox">
+<varlistentry id="fluxbox-prog">
 <term><command>fluxbox</command></term>
 <listitem><para>is a window manager for <application>X11</application> based 
 on <application>Blackbox</application> 0.61.0.</para>
-<indexterm zone="fluxbox-package fluxbox">
+<indexterm zone="fluxbox fluxbox-prog">
 <primary sortas="b-fluxbox">fluxbox</primary></indexterm>
 </listitem>
@@ -126,5 +126,5 @@
 <command>wmsetbg</command>, <command>xv</command>,
 <command>qiv</command> or <command>xsri</command> to be used.</para>
-<indexterm zone="fluxbox-package fbsetbg">
+<indexterm zone="fluxbox fbsetbg">
 <primary sortas="b-fbsetbg">fbsetbg</primary></indexterm>
 </listitem>
@@ -135,5 +135,5 @@
 <listitem><para>is a <application>Blackbox</application> 
 utility to change root window appearance.</para>
-<indexterm zone="fluxbox-package bsetroot">
+<indexterm zone="fluxbox bsetroot">
 <primary sortas="b-bsetroot">bsetroot</primary></indexterm>
 </listitem>
@@ -143,5 +143,5 @@
 <term><command>fluxbox-generate_menu</command></term>
 <listitem><para> is a menu maker utility.</para>
-<indexterm zone="fluxbox-package fluxbox-generate">
+<indexterm zone="fluxbox fluxbox-generate">
 <primary sortas="b-fluxbox-generate">fluxbox-generate_menu</primary></indexterm>
 </listitem>
@@ -153,5 +153,5 @@
 allows for command executions prior to <command>fluxbox</command> 
 starting.</para>
-<indexterm zone="fluxbox-package startfluxbox">
+<indexterm zone="fluxbox startfluxbox">
 <primary sortas="b-startfluxbox">startfluxbox</primary></indexterm>
 </listitem>
@@ -161,5 +161,5 @@
 <term><command>fbrun</command></term>
 <listitem><para> displays a run dialog window.</para>
-<indexterm zone="fluxbox-package fbrun">
+<indexterm zone="fluxbox fbrun">
 <primary sortas="b-fbrun">fbrun</primary></indexterm>
 </listitem>
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ xsoft/office/abiword.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="abiword-package" xreflabel="AbiWord-&AbiWord-version;">
+<sect1 id="abiword" xreflabel="AbiWord-&AbiWord-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,5 +20,5 @@
 <?dbhtml filename="AbiWord.html" ?>
 <title>AbiWord-&AbiWord-version;</title>
-<indexterm zone="abiword-package">
+<indexterm zone="abiword">
 <primary sortas="a-AbiWord">AbiWord</primary></indexterm>
 
@@ -129,9 +129,9 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="abiword">
+<varlistentry id="abiword-prog">
 <term><command>abiword</command></term>
 <listitem><para>is a symbolic link to the main <command>AbiWord-2.2</command> 
 executable.</para>
-<indexterm zone="abiword-package abiword">
+<indexterm zone="abiword abiword-prog">
 <primary sortas="g-abiword">abiword</primary></indexterm>
 </listitem>
@@ -141,5 +141,5 @@
 <term><command>AbiWord-2.2</command></term>
 <listitem><para>is the word-processing program executable.</para>
-<indexterm zone="abiword-package AbiWord-2.2">
+<indexterm zone="abiword AbiWord-2.2">
 <primary sortas="b-AbiWord-2.2">AbiWord-2.2</primary></indexterm>
 </listitem>
@@ -151,5 +151,5 @@
 <application>AbiWord</application> for each TrueType font in a
 given directory.</para>
-<indexterm zone="abiword-package ttfadmin.sh">
+<indexterm zone="abiword ttfadmin.sh">
 <primary sortas="b-ttfadmin.sh">ttfadmin.sh</primary></indexterm>
 </listitem>
@@ -159,5 +159,5 @@
 <term><command>ttftool</command></term>
 <listitem><para>is a utility for processing TrueType fonts.</para>
-<indexterm zone="abiword-package ttftool">
+<indexterm zone="abiword ttftool">
 <primary sortas="b-ttftool">ttftool</primary></indexterm>
 </listitem>
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
+++ xsoft/suites/openoffice.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
@@ -97,5 +97,5 @@
 <xref linkend="zip"/>, 
 <xref linkend="unzip"/>, 
-<xref linkend="tcsh-package"/>, 
+<xref linkend="tcsh"/>, 
 <xref linkend="which"/> and 
 <xref linkend="gcc3"/>.</para>
