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>
