73 files changed, 458 insertions, 458 deletions

diff --git a/manual/advanced_topics/archos-flashing.tex b/manual/advanced_topics/archos-flashing.tex
index a964444f5b..4f6c622cd4 100644
--- a/manual/advanced_topics/archos-flashing.tex
+++ b/manual/advanced_topics/archos-flashing.tex
@@ -2,18 +2,18 @@
 
 \subsection{Introduction}
 
-When you bought your \archosplayertype, it came with the \archosplayerman\ firmware in
-flash ROM. When you power on your \dap, this \archosplayerman\ firmware starts,
+When you bought your \playertype, it came with the \playerman\ firmware in
+flash ROM. When you power on your \dap, this \playerman\ firmware starts,
 and then loads an updated firmware from disk if present (\firmwarefilename).
 An ordinary Rockbox installation only replaces the on-disk firmware, leaving
-the flash ROM contents intact. That means the \archosplayerman\ firmware still
+the flash ROM contents intact. That means the \playerman\ firmware still
 controls the boot process.
 
 The main reason to change this is to improve the startup time of your player.
-The \archosplayerman\ bootloader is rather slow. With Rockbox in flash, your \dap\
+The \playerman\ bootloader is rather slow. With Rockbox in flash, your \dap\
 will boot much faster, typically in three to five seconds. Furthermore you
 might prefer a clean Rockbox environment, with as little remnants of the
-\archosplayerman\ software as possible.
+\playerman\ software as possible.
 \opt{rombox}{On your \dap\ it is also possible to execute Rockbox directly
   from flash ROM, increasing the amount of free RAM for buffering music. This
   is called \emph{Rombox}.
@@ -28,11 +28,11 @@ might prefer a clean Rockbox environment, with as little remnants of the
   of them fails, it will not program.
 }
 
-\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \archosplayerman\
+\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \playerman\
     firmware
-    \opt{archosondiofm}{versions 1.31f or 1.32b! These versions are flash updates
+    \opt{ondiofm}{versions 1.31f or 1.32b! These versions are flash updates
       themselves. If they are}
-    \opt{archosondiosp}{version 1.32b! This version is a flash update itself.
+    \opt{ondiosp}{version 1.32b! This version is a flash update itself.
       If it is}
     applied when Rockbox is flashed, you'll end up with a garbled flash ROM
     and hence a dead box.
@@ -76,14 +76,14 @@ screen. To get out of it, perform a hardware shutdown of your \dap.
 \subsection{Initial Flashing Procedure}
 
 You only need to perform this procedure the first time you flash your
-\archosplayertype. You may also want to perform it in case the update procedure for
+\playertype. You may also want to perform it in case the update procedure for
 the second image recommends it. In the latter case do not perform the steps
 listed under "Preparation".
 
 \subsubsection{Preparation}
 
 \nopt{ondio}{
-  First, check whether your \archosplayertype\ is flashable at all. Select
+  First, check whether your \playertype\ is flashable at all. Select
   \setting{System $\rightarrow$ Debug (Keep Out!) $\rightarrow$ View HW
   Info}. 
   \opt{lcd_charcell}{Cycle through the displayed values with \ButtonRight /
@@ -115,7 +115,7 @@ a safe place.
   \nopt{ondio}{This will extract two files to the root,
     \fname{firmware\_{\textless}model{\textgreater}.bin} and
     \fname{firmware\_{\textless}model{\textgreater}\_norom.bin}.
-    \opt{archosrecorder,archosrecorderv2fm}{(The {\textless}model{\textgreater} part is
+    \opt{recorder,recorderv2fm}{(The {\textless}model{\textgreater} part is
       slighty different from that in the .zip file name.)
     }
     The flash plugin will select the correct one for your \dap.
@@ -152,14 +152,14 @@ a safe place.
 
 \note{There are no separate flash packages for {\dap}s modified to have 8MB
   of RAM. You need to use the corresponding package for non-modified
-  \archosplayertype. You should then install a Rockbox image that makes use of all
+  \playertype. You should then install a Rockbox image that makes use of all
   available RAM as described in the following section.
 }
 
 \subsection{Updating the Rockbox Image in Flash}
 
 When Rockbox is booted from flash, it does not check for an updated firmware
-on disk. This is one of the reasons why it boots faster than the \archosplayerman\
+on disk. This is one of the reasons why it boots faster than the \playerman\
 firmware. It means that whenever you update Rockbox, you also need to update
 the image in the flash. This is a simple and safe procedure:
 
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 23748da18a..53bb984f2e 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -213,7 +213,7 @@ all the tags that are available.
   the last number giving the colour depth in bits) when
   designing your own WPS, or if you use a WPS designed for another target.
   \opt{HAVE_REMOTE_LCD}{The resolution of the remote is
-  \opt{iriverh100,iriverh300}{128x64x1}\opt{iaudiox5,iaudiom5}{128x96x2} pixels.}}
+  \opt{h100,h300}{128x64x1}\opt{x5,m5}{128x96x2} pixels.}}
 
 \nopt{lcd_charcell}{
 \subsubsection{\label{ref:Viewports}Viewports}
@@ -554,7 +554,7 @@ Example of a configuration file:
 \end{description}
 
 \section{\label{ref:FirmwareLoading}Firmware Loading}
-\opt{archosplayer,archosrecorder,archosrecorderv2fm,ondio}{
+\opt{player,recorder,recorderv2fm,ondio}{
   When your \dap{} powers on, it loads the Archos firmware in ROM, which
   automatically checks your \daps{} root directory for a file named 
   \firmwarefilename. Note that Archos firmware can only read the first 
@@ -567,14 +567,14 @@ Example of a configuration file:
 \subsection{\label{ref:using_rolo}Using ROLO (Rockbox Loader)}
 Rockbox is able to load and start another firmware file without rebooting. 
 You just ``play'' a file with the extension %
-\opt{archosrecorder,archosrecorderv2fm,ondio}{\fname{.ajz}.} %
-\opt{archosplayer}{\fname{.mod}.} %
-\opt{iriverh100,iriverh300}{\fname{.iriver}.} %
+\opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} %
+\opt{player}{\fname{.mod}.} %
+\opt{h100,h300}{\fname{.iriver}.} %
 \opt{ipod}{\fname{.ipod}.} %
 \opt{iaudio}{\fname{.iaudio}.} %
-\opt{sansa,iriverh10,iriverh10_5gb}{\fname{.mi4}.} %
+\opt{sansa,h10,h10_5gb}{\fname{.mi4}.} %
 \opt{sansaAMS}{\fname{.sansa}.} %
-\opt{gigabeatfx,gigabeats}{\fname{.gigabeat}.} %
+\opt{gigabeatf,gigabeats}{\fname{.gigabeat}.} %
 This can be used to test new firmware versions without deleting your
 current version.
 
diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index f06d8380e6..9aeadba56d 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -95,7 +95,7 @@ The recording hardware (the MAS) does not allow us to do this
   do that. The MAS chip is programmable, but we have no access to the chip 
   documentation.
 }
-\nopt{iriverh300,iaudiox5}{
+\nopt{h300,x5}{
 \item Interfacing with other USB devices (like cameras) or 2 player games over USB\\
   The USB system demands that there is a master that talks to a slave. The
   \dap{} can only serve as a slave, as most other USB devices such as
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 41b90e6a32..d0fa073635 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -13,25 +13,25 @@
     \midrule\localendhead % endhead breaks with htlatex
     volume      & \opt{masd}{-78 to +18}%
                   \opt{masf}{-100 -to +12}%
-                  \opt{iriverh100,iriverh300}{-84 to 0}%
-                  \opt{ipodnano1g}{-72 to +6}%
+                  \opt{h100,h300}{-84 to 0}%
+                  \opt{ipodnano}{-72 to +6}%
                   \opt{ipodvideo}{-57 to +6}%
-                  \opt{iaudiox5}{-73 to +6}
-                  \opt{sansae200}{-74 to +6}
+                  \opt{x5}{-73 to +6}
+                  \opt{e200}{-74 to +6}
                   \opt{ipodcolor}{-74 to +6}%
                                         & dB\\
-    \nopt{iaudiox5}{%
+    \nopt{x5}{%
       bass      & \opt{masd}{-15 to +15}%
                   \opt{masf}{-12 to +12}%
-                  \opt{iriverh100,iriverh300}{0 to +24}%
+                  \opt{h100,h300}{0 to +24}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{sansae200}{-24 to +24}%
+                  \opt{e200}{-24 to +24}%
                                         & dB\\
       treble    & \opt{masd}{-15 to +15}%
                   \opt{masf}{-12 to +12}%
-                  \opt{iriverh100,iriverh300}{0 to +6}%
+                  \opt{h100,h300}{0 to +6}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{sansae200}{-24 to +24}%
+                  \opt{e200}{-24 to +24}%
                                         & dB\\
     }%
     balance         & -100 to +100      & \%\\
@@ -299,7 +299,7 @@
                 & on, off               & N/A\\
       remote iconset & /path/filename.bmp & N/A\\
       remote viewers iconset & /path/filename.bmp & N/A\\
-      \opt{iriverh100,iriverh300}{
+      \opt{h100,h300}{
         remote reduce ticking
                 & on, off               & N/A\\
       }%
@@ -333,7 +333,7 @@
       force fm mono
                 & off, on               & N/A\\
     }%
-    \opt{archosplayer}{
+    \opt{player}{
       jump scroll
                 & 0 to 5                & N/A\\
       jump scroll delay
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 2ca8582388..cbf1ab2c07 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -25,9 +25,9 @@
     the first file \\
 \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & 
-    \opt{archosplayer}{\fname{.mod}}\opt{archosrecorder,archosrecorderv2fm,archosondiofm,archosondiosp}{\fname{.ajz}}%
-    \opt{iriverh100,iriverh300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
-    \opt{iriverh10,iriverh10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
+    \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}%
+    \opt{h100,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
+    \opt{h10,h10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
     \opt{sansaAMS}{\fname{.sansa}}
   & Load the new firmware with ROLO \\
 \includegraphics[width=0.37cm]{appendix/images/icon-wps.png} 
@@ -100,16 +100,16 @@
     Apple Lossless & \fname{.m4a, .mp4} & \\
     Wavpack & \fname{.wv} & \\
     Shorten & \fname{.shn} & Seeking not supported.\\
-    \opt{iriverh100,iriverh300,iaudiox5,iaudiom5,iaudiom3}{
+    \opt{h100,h300,x5,m5,m3}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode
       fast enough to be useful.}
-    \opt{gigabeatfx}{
+    \opt{gigabeatf}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000
       files decode fast enough to be useful.}
     \opt{gigabeats}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c4000 files decode
       fast enough to be useful.}
-    \opt{ipod,iriverh10,iriverh10_5gb,mrobe100,sansa}{
+    \opt{ipod,h10,h10_5gb,mrobe100,sansa}{
       Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast
       enough to be useful.}
     \\
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 828a379d23..7c4fd5418a 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -112,7 +112,7 @@ produce the information for the next file to be played.
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%pb} & Progress Bar\\
-    \opt{archosplayer}{
+    \opt{player}{
           & This will display a one character ``cup''
             that empties as the time progresses.}
     \opt{lcd_bitmap}{
@@ -120,13 +120,13 @@ produce the information for the next file to be played.
          & You can set the position, width and height of the progressbar %
            (in pixels) and load a custom image for it: %
            \config{\%pb{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\
-    \opt{archosplayer}{%
+    \opt{player}{%
     \config{\%pf} & Full-line progress bar \& time display\\
     }%
     \config{\%px} & Percentage Played In Song\\
     \config{\%pc} & Current Time In Song\\
     \config{\%pe} & Total Number of Playlist Entries\\
-    \nopt{archosplayer}{%
+    \nopt{player}{%
     \config{\%pm} & Peak Meter. The entire line is used as %
                     volume peak meter.\\%
     }%
@@ -202,7 +202,7 @@ produce the information for the next file to be played.
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%mm} & Repeat mode, 0-4, in the order: Off, All, One, Shuffle
-           \opt{archosplayer,archosrecorder,archosrecorderv2fm}{, A-B}\\
+           \opt{player,recorder,recorderv2fm}{, A-B}\\
   \end{tagmap}
 \end{table}
 Example: \config{\%?mm{\textless}Off{\textbar}All{\textbar}One{\textbar}Shuffle%
@@ -422,9 +422,9 @@ used as a conditional. This can be very useful for designing a WPS that works on
 multiple targets, some with and some without a clock. By using this tag as a
 conditional it is possible to display current date and time on those targets that
 support this
-\opt{rtc}{ (like the \archosplayertype)},
+\opt{rtc}{ (like the \playertype)},
 or alternate information on those that do not
-\nopt{rtc}{ (like the \archosplayertype)}%
+\nopt{rtc}{ (like the \playertype)}%
 .
 
 Example:
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 823a313adc..9ea7e4713c 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -70,12 +70,12 @@
       }
     } % \opt{HAVE_BACKLIGHT}
     
-    \opt{archos,iriverh100,ipodmini1g,ipod3g,ipod4g,iaudiox5}{
+    \opt{archos,h100,ipodmini,ipod3g,ipod4g,x5}{
       \item[Contrast:]
       Changes the contrast of your LCD display.
       \warn{Setting the contrast too dark or too light can make it hard to
         find this menu option again!}
-    } % \opt{archos,iriverh100,ipodmini1g,ipod4g,iaudiox5}
+    } % \opt{archos,h100,ipodmini,ipod4g,x5}
 
     \opt{lcd_invert}{
       \item[LCD Mode:]
@@ -124,7 +124,7 @@
          Displays the screen so that the top of the display is nearest 
          the buttons. This is sometimes useful when carrying the \dap\ in a
          pocket for easy access to the headphone socket.
-       \opt{iriverh100,iriverh300}{
+       \opt{h100,h300}{
          \item[Reduce Ticking:]
            Enable this option if you can hear a ticking sound in your headphones
            when using your remote.
@@ -163,11 +163,11 @@
     \opt{lcd_bitmap}{
       \item[Screen Scrolls Out of View:]
         Screens can be manually scrolled horizontally by pressing
-        \opt{archosrecorder,archosrecorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
+        \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
         \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
-        \opt{sansac200,sansae200,iriverh100,iriverh300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini1g,ipodnano1g,
-        ipodvideo,iaudiox5,mrobe100,gigabeatfx,gigabeats}
-        {Long \ButtonRight/\ButtonLeft}\opt{iriverh10,iriverh10_5gb}{Long \ButtonRew/\ButtonFF}.
+        \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
+        ipodvideo,x5,mrobe100,gigabeatf,gigabeats}
+        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
         Setting this option to \setting{Yes}
         will keep the list entries at their fixed positions and allow them to be
         scrolled out of view, whereas \setting{No} will only scroll those entries
@@ -176,7 +176,7 @@
         Defines the number of pixels the horizontal manual screen scroll should move
         for each step.
     }
-    \opt{archosplayer}{
+    \opt{player}{
       \item[Jump Scroll:]
         This setting makes text scroll a page at a time instead of a character
         at a time. If set to \setting{One time}, \setting{2}, \setting{3} or
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index e8f1fdac12..27db3e86ce 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -45,8 +45,8 @@
    \nopt{sansa}{
     Choose the recording frequency (sample rate).
     \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz}
-    \opt{iriverh100,iriverh300}{44.1kHz, 22.05kHz and 11.025kHz}
-    \opt{iaudiox5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
+    \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz}
+    \opt{x5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
     are available. Higher sample rates use up more disk space, but give better
     sound quality.
     \opt{swcodec}{\note{The 11.025kHz setting is not available when using%
@@ -58,19 +58,19 @@
       MPEG v1 for 48, 44.1 and 32\\
       MPEG v2 for 24, 22.05 and 16\\
     }
-    \opt{archosrecorder,archosrecorderv2fm,iriverh100}
+    \opt{recorder,recorderv2fm,h100}
       {\note{You cannot change the sample rate for digital recordings.}
     }
    } % nopt e200  
-   \opt{sansae200}{ 
+   \opt{e200}{ 
        Recordings can only be made at a 22.05kHz frequency (sample rate)
          on this \dap. 
     } % opt e200
 
 \section{Source}
   Choose the source of the recording. The options are: 
-  \opt{archosrecorder,archosrecorderv2fm,iriverh100}{\setting{SPDIF (digital)}, }%
-  \nopt{ipodnano1g,ipodvideo}{\setting{Mic}}%
+  \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
+  \nopt{ipodnano,ipodvideo}{\setting{Mic}}%
   \nopt{sansa}{, and {\setting{Line In}}}. %
   \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
 
@@ -228,7 +228,7 @@
   
 More information can be found at \wikilink{VolumeTriggeredRecording}.
   
-\opt{iriverh100,iriverh300}{%
+\opt{h100,h300}{%
   \section{Automatic Gain Control}
     The \setting{Automatic Gain Control} has five different presets for
     automatically controlling the gain while recording.
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index a395b7f0d6..c24b38a891 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -10,35 +10,35 @@ change to customise your listening experience.
   where 0 dB is a reference that indicates the maximum volume that the \dap{}
   can produce without possible distortion (clipping). All values lower than
   this reference will be negative and yield a progressively softer volume.
-  \opt{archosplayer,archosrecorder,archosrecorderv2fm,ondio,iaudiox5,iaudiom5,ipodnano1g,ipodvideo,
-       ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS,gigabeats,gigabeatfx}{
+  \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodvideo,
+       ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf}{
   Values higher than 0 dB are available and can be used to raise the
   volume more than would otherwise be possible. These volume levels will
   ordinarily lead to distorted sound, but might work nicely for music that has
   an otherwise low volume level.}
   The volume can be adjusted from a
-  \opt{archosplayer}{minimum of -78 dB to a maximum of +18 dB.}%
-  \opt{archosrecorder,archosrecorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
-  \opt{iriverh100,iriverh300}{minimum of -84 dB to a maximum of 0 dB.}%
-  \opt{iaudiox5,iaudiom5,ipod3g,ipod4g,gigabeatfx,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
-  \opt{ipodnano1g}{minimum of -72 dB to a maximum of +6 dB.}%
+  \opt{player}{minimum of -78 dB to a maximum of +18 dB.}%
+  \opt{recorder,recorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
+  \opt{h100,h300}{minimum of -84 dB to a maximum of 0 dB.}%
+  \opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
+  \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}%
   \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}%
-  \opt{ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum
+  \opt{ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum
   of +6 db.}%
   \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}%
-  \opt{gigabeatfx}{minimum of -74 dB to a maximum of +6 dB.}%
+  \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}%
 
 \section{Bass}
   This setting emphasises
-  \nopt{iriverh100,iriverh300}{or suppresses}
+  \nopt{h100,h300}{or suppresses}
   the lower (bass) frequencies in the sound. A value of 0 dB means that bass
   sounds are unaltered (flat response).
   \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
   \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
-  \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
+  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
+  \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
   \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
 
 \opt{ipodvideo}{
 \section{Bass Cutoff}
@@ -50,15 +50,15 @@ change to customise your listening experience.
 
 \section{Treble}
   This setting emphasises
-  \nopt{iriverh100,iriverh300}{or suppresses}
+  \nopt{h100,h300}{or suppresses}
   the higher (treble) frequencies in the sound. A value of 0 dB means that
   treble sounds are unaltered (flat response).
   \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
   \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
-  \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
+  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
+  \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
   \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
 
 \opt{ipodvideo}{
 \section{Treble Cutoff}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index d1cf61061a..52c42e0ccf 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -15,19 +15,19 @@
   \begin{description}
     \item [Battery Capacity: ]This setting can be used to tell Rockbox what
       capacity (in mAh) the battery being used has. The default is
-      \opt{archosplayer,archosrecorder}{1500mAh}%
-      \opt{archosrecorderv2fm}{2200mAh}%
-      \opt{archosondiosp,archosondiofm}{1000mAh}%
-      \opt{iriverh100,iriverh300}{1300mAh}%
-      \opt{ipodmini1g}{400mAh (1G) or 630mAh (2G)}%
+      \opt{player,recorder}{1500mAh}%
+      \opt{recorderv2fm}{2200mAh}%
+      \opt{ondiosp,ondiofm}{1000mAh}%
+      \opt{h100,h300}{1300mAh}%
+      \opt{ipodmini}{400mAh (1G) or 630mAh (2G)}%
       \opt{ipodcolor}{700mAh}%
-      \opt{ipodnano1g}{300mAh}%
+      \opt{ipodnano}{300mAh}%
       \opt{ipodvideo}{400mAh (30GB) or 600mAh (60/80GB)}%
       \opt{ipod4g}{630mAh}%
       \opt{ipod3g}{630mAh}%
       \opt{ipod1g2g}{1200mAh}%
-      \opt{iaudiom5,iaudiox5}{950mAh}%
-      \opt{gigabeatfx}{2000mAh}%
+      \opt{m5,x5}{950mAh}%
+      \opt{gigabeatf}{2000mAh}%
       \opt{gigabeats}{700mAh}%
       , which is the capacity value for the standard
       \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
@@ -37,9 +37,9 @@
         runtime estimation as shown on screen.
       \opt{iaudio}{Rockbox does not automatically distinguish between the
         ``L'' models and the ``simple'' models which determine the default
-        value. If your dap{} is an \opt{iaudiom5}{M5L}\opt{iaudiox5}{X5L} set the value
+        value. If your dap{} is an \opt{m5}{M5L}\opt{x5}{X5L} set the value
         to 2250mAh for more accuracy in the runtime estimation.}
-      \opt{ipod,sansa}{This value is fairly meaningless in the \archosplayerman{}
+      \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
         family at present, and work is on-going into finding a better way to
         determine battery life.}
 
@@ -117,7 +117,7 @@ This sub menu relates to limits in the Rockbox operating system.
   \end{description}
 
 % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
-\opt{archosplayer}{
+\opt{player}{
   \subsection{Line In} This option activates the line in port on \dap, which is
     off by default. This is useful for such applications as:
     \begin{itemize}
@@ -161,7 +161,7 @@ this option \setting{On}. If it is not required, then turning this setting
 } 
 
 \opt{HAVE_BUTTON_LIGHTS}{
-  \opt{sansae200}{
+  \opt{e200}{
   \subsection{Wheel Light Timeout}
     This setting controls the amount of time the wheel lights shine after a
     button press or wheel turn. If set to \setting{Off}, the LEDs will not
@@ -169,7 +169,7 @@ this option \setting{On}. If it is not required, then turning this setting
     never shut off. If set to a time (1 to 120 seconds), the wheel will stay
     lit for that amount of time after a button press or wheel turn.
   }
-  \nopt{sansae200}{
+  \nopt{e200}{
   \subsection{Button Light Timeout}
     This setting controls the amount of time the button lights shine after a
     button press. If set to \setting{Off}, the LEDs will not light when a
@@ -177,7 +177,7 @@ this option \setting{On}. If it is not required, then turning this setting
     If set to a time (1 to 120 seconds), the buttons will stay lit for
     that amount of time after a button press.
   }
-  \opt{gigabeatfx}{
+  \opt{gigabeatf}{
     \subsection{Button Light Brightness}
       Changes the brightness of the button lights.
   }
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 2acb88c454..b87c0f8583 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -14,28 +14,28 @@ customize the visual apperance of Rockbox.
 
   There are a number of themes that ship with Rockbox. If none of
   these suit your needs, many more can be downloaded from 
-  \opt{archosplayer}{\url{http://themes.rockbox.org/index.php?target=player}}%
-  \opt{archosrecorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{archosrecorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{archosondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
-  \opt{archosondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
-  \opt{iaudiom5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
-  \opt{iaudiox5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
-  \opt{iaudiom3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
-  \opt{iriverh100}{\url{http://themes.rockbox.org/index.php?target=h100}}%
-  \opt{iriverh300}{\url{http://themes.rockbox.org/index.php?target=h300}}%
-  \opt{iriverh10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}%
-  \opt{iriverh10}{\url{http://themes.rockbox.org/index.php?target=h10}}%
+  \opt{player}{\url{http://themes.rockbox.org/index.php?target=player}}%
+  \opt{recorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
+  \opt{recorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
+  \opt{ondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
+  \opt{ondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
+  \opt{m5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
+  \opt{x5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
+  \opt{m3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
+  \opt{h100}{\url{http://themes.rockbox.org/index.php?target=h100}}%
+  \opt{h300}{\url{http://themes.rockbox.org/index.php?target=h300}}%
+  \opt{h10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}%
+  \opt{h10}{\url{http://themes.rockbox.org/index.php?target=h10}}%
   \opt{ipod1g2g}{\url{http://themes.rockbox.org/index.php?target=ipod1g2g}}%
   \opt{ipod3g}{\url{http://themes.rockbox.org/index.php?target=ipod3g}}%
   \opt{ipod4g}{\url{http://themes.rockbox.org/index.php?target=ipod4g}}%
   \opt{ipodcolor}{\url{http://themes.rockbox.org/index.php?target=ipodcolor}}%
   \opt{ipodvideo}{\url{http://themes.rockbox.org/index.php?target=ipodvideo}}%
-  \opt{ipodmini1g}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
-  \opt{ipodnano1g}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
-  \opt{sansae200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
-  \opt{sansac200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
-  \opt{gigabeatfx}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
+  \opt{ipodmini}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
+  \opt{ipodnano}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
+  \opt{e200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
+  \opt{c200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
+  \opt{gigabeatf}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
   \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}%
   \opt{mrobe100}{\url{http://themes.rockbox.org/index.php?target=mrobe100}}%
   .
@@ -49,7 +49,7 @@ customize the visual apperance of Rockbox.
   \item[Font.]
     Browse the installed fonts on your \dap{}. Selecting one will activate it.
     See \reference{ref:Loadingfonts} for further details about fonts.
-} % \nopt{archosplayer}
+} % \nopt{player}
 
 \item[While Playing Screen.]
   Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and
diff --git a/manual/frontpage/frontpage.tex b/manual/frontpage/frontpage.tex
index 4f5eeef2e7..bfeb192fd6 100644
--- a/manual/frontpage/frontpage.tex
+++ b/manual/frontpage/frontpage.tex
@@ -4,7 +4,7 @@
 \ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}}
 {\includegraphics{frontpage/rockbox-web.png}}\\
 \vspace{2cm}
-\huge{The Rockbox Manual\\for\\\archosplayername}\vspace{1cm}\\
+\huge{The Rockbox Manual\\for\\\playername}\vspace{1cm}\\
 
 \vspace{\fill}
 
diff --git a/manual/getting_started/gigabeat_install.tex b/manual/getting_started/gigabeat_install.tex
index 9929449340..c248527c20 100644
--- a/manual/getting_started/gigabeat_install.tex
+++ b/manual/getting_started/gigabeat_install.tex
@@ -9,7 +9,7 @@
   to show hidden files or you may be unable to see \fname{FWIMG}.
 \item In that directory you'll find a file called \fname{FWIMG01.DAT}. This too
   may be hidden. Rename the file to \fname{FWIMG01.DAT.ORIG}. Make sure you
-  spelled that name  correctly as it is needed for booting the \archosplayerman{} firmware.
+  spelled that name  correctly as it is needed for booting the \playerman{} firmware.
   \warn{If you do not complete this step then you will be unable to uninstall Rockbox
   without a copy of the original firmware from the original install CD.}
 \item Now copy the file \fname{FWIMG01.DAT} you downloaded to that directory.
diff --git a/manual/getting_started/gigabeats_install.tex b/manual/getting_started/gigabeats_install.tex
index 9b6402548f..317e190fe0 100644
--- a/manual/getting_started/gigabeats_install.tex
+++ b/manual/getting_started/gigabeats_install.tex
@@ -1,14 +1,14 @@
 % $Id$
 
 \warn{Before starting this procedure, ensure that you have a copy
-of the original \archosplayerman{} firmware. Without this, it is
-\emph{not} possible to uninstall Rockbox. The \archosplayerman{}
+of the original \playerman{} firmware. Without this, it is
+\emph{not} possible to uninstall Rockbox. The \playerman{}
 firmware can be downloaded from
 \url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}.\\}
 
 Installing the bootloader is only needed once. It involves replacing the
 existing firmware file on your \dap{} with another version.
-When running the original \archosplayerman{} firmware (a version of Windows CE), it is
+When running the original \playerman{} firmware (a version of Windows CE), it is
 only possible to connect the \dap{} to a PC in ``MTP mode'', which hides
 the actual content of your \daps{} disk and provides restricted access
 to its contents.
diff --git a/manual/getting_started/h10_install.tex b/manual/getting_started/h10_install.tex
index a8909e68dc..ff72f6661e 100644
--- a/manual/getting_started/h10_install.tex
+++ b/manual/getting_started/h10_install.tex
@@ -1,17 +1,17 @@
 \subsubsection{Installation}
 \begin{enumerate}
   \item Download 
-  \opt{iriverh10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
-  \opt{iriverh10_5gb}{
+  \opt{h10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
+  \opt{h10_5gb}{
     \begin{itemize}
       \item \url{http://download.rockbox.org/bootloader/iriver/H10.mi4} if your \dap{} is UMS or
       \item \url{http://download.rockbox.org/bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP.
     \end{itemize}}
-  \item Connect your \archosplayertype{} to the computer using UMS mode and the UMS trick\opt{iriverh10_5gb}{ if necessary}.
-  \item Rename the \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} file to \fname{OF.mi4} in the \fname{System} directory on your \archosplayertype{}.
-    \opt{iriverh10_5gb}{\note{If you have a Pure model \archosplayertype{} (which does not have a FM radio) it is possible that this file will be called \fname{H10EMP.mi4} instead. If so, rename the \fname{H10.mi4} you downloaded in step 1 to \fname{H10EMP.mi4}.}}
-    \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \archosplayerman{} firmware.}
+  \item Connect your \playertype{} to the computer using UMS mode and the UMS trick\opt{h10_5gb}{ if necessary}.
+  \item Rename the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.
+    \opt{h10_5gb}{\note{If you have a Pure model \playertype{} (which does not have a FM radio) it is possible that this file will be called \fname{H10EMP.mi4} instead. If so, rename the \fname{H10.mi4} you downloaded in step 1 to \fname{H10EMP.mi4}.}}
+    \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
     \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.}
 
-  \item Copy the \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4} (or \fname{H10EMP.mi4} if you have a \archosplayertype{} Pure)} file you downloaded to the System directory on your \dap{}.
+  \item Copy the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4} (or \fname{H10EMP.mi4} if you have a \playertype{} Pure)} file you downloaded to the System directory on your \dap{}.
 \end{enumerate}
diff --git a/manual/getting_started/iaudio_install.tex b/manual/getting_started/iaudio_install.tex
index cb56027fc9..1ef566173e 100644
--- a/manual/getting_started/iaudio_install.tex
+++ b/manual/getting_started/iaudio_install.tex
@@ -1,8 +1,8 @@
-The \archosplayername{} has a built-in bootloader which performs the
+The \playername{} has a built-in bootloader which performs the
 firmware update and can also access the hard drive via USB.  The
 Rockbox bootloader can therefore be very minimalistic, as it does not require
  it's own USB mode.  This makes it less dangerous to install the Rockbox bootloader
- as you can always restore it using the \archosplayerman{} bootloader.
+ as you can always restore it using the \playerman{} bootloader.
 
 \note{The Rockbox bootloader overwrites the original firmware, making it
    impossible to dual-boot.}
@@ -11,9 +11,9 @@ Rockbox bootloader can therefore be very minimalistic, as it does not require
 \begin{itemize}
 \item Download the Rockbox bootloader binary from 
 \url{http://download.rockbox.org/bootloader/iaudio/}.
-  \opt{iaudiox5}{Use the \fname{iaudiox5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5
-    or X5L, use the \fname{iaudiox5\_fw.bin} file.}
-  \opt{iaudiom5}{Use the \fname{iaudiom5\_fw.bin} file.}
-  \opt{iaudiom3}{Use the \fname{cowon\_m3.bin} file.}
+  \opt{x5}{Use the \fname{x5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5
+    or X5L, use the \fname{x5\_fw.bin} file.}
+  \opt{m5}{Use the \fname{m5\_fw.bin} file.}
+  \opt{m3}{Use the \fname{cowon\_m3.bin} file.}
 \item Copy it to the \fname{FIRMWARE} directory on your \dap{}.
 \end{itemize}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index c42afa6815..582937f9ed 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -6,16 +6,16 @@ before beginning there are a few things it is important to know.
 
 \section{Before Starting}
 
-\opt{sansae200}{\fixme{NOTE: These instructions will not work on the 
+\opt{e200}{\fixme{NOTE: These instructions will not work on the 
 ``Rhapsody'' version of the E200 series (also known as E200R). Please 
 follow the instructions at 
 \url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}}
 
-\opt{ipodnano1g,ipodvideo,sansae200,sansac200}{
+\opt{ipodnano,ipodvideo,e200,c200}{
 \begin{description}  
 \item[Supported hardware versions.] 
-    \opt{ipodnano1g}{
-    The \archosplayertype{} is available in multiple versions, not
+    \opt{ipodnano}{
+    The \playertype{} is available in multiple versions, not
     all of which run Rockbox.  Rockbox presently runs only on 
     the original Ipod Nano. Rockbox does
     \emph{not} run on the second, third, or fourth generation Ipod Nano.
@@ -23,13 +23,13 @@ follow the instructions at
     Apple's website: \url{http://www.info.apple.com/kbnum/n61688}.
   }
   \opt{ipodvideo}{
-    The \archosplayertype{} is the 5th/5.5th generation \archosplayerman{} only.
+    The \playertype{} is the 5th/5.5th generation \playerman{} only.
     Rockbox does \emph{not} run on the newer, 6th/Classic generation Ipod. 
     For information on identifying which Ipod you own, see this page on Apple's 
     website: \url{http://www.info.apple.com/kbnum/n61688}.
   }
-  \opt{sansae200,sansac200}{
-    The \archosplayertype{} is available in multiple versions, not
+  \opt{e200,c200}{
+    The \playertype{} is available in multiple versions, not
     all of which run Rockbox.  Rockbox doesn't run on the
     newer v2 models. They can be identified
     by checking the Sandisk firmware version number under 
@@ -39,7 +39,7 @@ follow the instructions at
 \end{description}
 }
 
-\opt{iriverh300}{
+\opt{h300}{
 \begin{description}  
   \item[DRM capability.] If your \dap{} has a US firmware, then by installing Rockbox you will
   \emph{permanently} lose the ability to playback files with DRM.
@@ -77,7 +77,7 @@ follow the instructions at
     and hold the \ButtonSelect{} and \ButtonPlay{} buttons simultaneously. Your
     \dap{} should enter disk mode and you can try reconnecting to the computer.
   }
-  \opt{iaudiox5}{
+  \opt{x5}{
     When instructed to connect/disconnect the USB cable, always use
     the USB port through the subpack, not the side 'USB Host' port. The side port
     is intended to be used for USB OTG connections only (digital cameras, memory
@@ -89,15 +89,15 @@ follow the instructions at
 
     \warn{Never extract files to your \dap{} while it is in recovery mode.}
   }
-  \opt{iriverh10,iriverh10_5gb}{
+  \opt{h10,h10_5gb}{
     The installation requires you to use UMS mode and so
     may require use of the UMS trick, whereby it is possible to force a MTP
-    \archosplayertype{} to start up in UMS mode as follows:
+    \playertype{} to start up in UMS mode as follows:
       \begin{enumerate}
-        \item Ensure the \dap{} is fully powered off by \opt{iriverh10}{using a pin to
+        \item Ensure the \dap{} is fully powered off by \opt{h10}{using a pin to
         push the small reset button inside the hole between the Hold switch and
-        remote control connector.}\opt{iriverh10_5gb}{removing the battery and putting it back in again.}
-        \item Connect your \archosplayertype{} to the computer using the data cable.
+        remote control connector.}\opt{h10_5gb}{removing the battery and putting it back in again.}
+        \item Connect your \playertype{} to the computer using the data cable.
         \item Hold \ButtonRight{} and push \ButtonPower{} to turn the \dap{} on.
         \item Continue holding \ButtonRight{} until the USB Connected screen appears.
         \item The \dap{} will now appear as a regular disk on your computer.
@@ -105,7 +105,7 @@ follow the instructions at
       \note{Once Rockbox has been installed, when you shut down your \dap{} from Rockbox it will totally
        power the player off so step 1 is no longer necessary.}
   }
-  \opt{gigabeatfx}{During installation, do not connect your \dap{}
+  \opt{gigabeatf}{During installation, do not connect your \dap{}
   using the cradle but plug the USB cable directly to the \dap{}.
   } 
 \end{description}
@@ -141,7 +141,7 @@ for you. However, should you encounter a problem, then the manual way is
 still available to you.\\
 
 \opt{gigabeats}{\note{The automated install is not yet available for the
-  \archosplayertype{}. For now you can use the manual method to install Rockbox.
+  \playertype{}. For now you can use the manual method to install Rockbox.
   Please still read the section on the automatic install as it explains
   various important aspects of Rockbox, such as the different versions
   available.\\}}
@@ -156,31 +156,31 @@ still available to you.\\
 
 \begin{description}
 \opt{HAVE_RB_BL_ON_DISK}{
-\item[The \archosplayerman{} bootloader.]
-  The \archosplayerman{} bootloader is the program that tells your \dap{} how to load
+\item[The \playerman{} bootloader.]
+  The \playerman{} bootloader is the program that tells your \dap{} how to load
   and start the original firmware. It is also responsible for any emergency,
   recovery, or disk modes on your \dap{}. This bootloader is stored in special flash
-  memory in your \archosplayerman{} and comes factory-installed. It is not necessary
+  memory in your \playerman{} and comes factory-installed. It is not necessary
   to modify this in order to install Rockbox.}
 
 \item[The Rockbox bootloader.] \index{Bootloader}
   \opt{HAVE_RB_BL_ON_DISK}{The Rockbox bootloader is loaded from disk by
-  the \archosplayerman{} bootloader. It is responsible for loading the Rockbox
+  the \playerman{} bootloader. It is responsible for loading the Rockbox
   firmware and for providing the dual boot function. It directly replaces the
-  \archosplayerman{} firmware in the \daps{} boot sequence.
-  \opt{gigabeatfx}{\note{Dual boot does not currently work on the Gigabeat.}}}
+  \playerman{} firmware in the \daps{} boot sequence.
+  \opt{gigabeatf}{\note{Dual boot does not currently work on the Gigabeat.}}}
 
   \opt{HAVE_RB_BL_IN_FLASH}{
   The bootloader is the program that tells your
   \dap{} how to load and start other components of Rockbox and for providing
   the dual boot function. This is the component of Rockbox that is installed
-  to the flash memory of your \archosplayerman.
-  \opt{iaudio}{\note{Dual boot does not currently work on the \archosplayertype{}.}}}
+  to the flash memory of your \playerman.
+  \opt{iaudio}{\note{Dual boot does not currently work on the \playertype{}.}}}
 
 \item[The Rockbox firmware.]
-  \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \archosplayerman{} firmware, which runs
+  \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs
   entirely from flash memory,}
-  \opt{HAVE_RB_BL_ON_DISK}{Similar to the \archosplayerman{} firmware,}
+  \opt{HAVE_RB_BL_ON_DISK}{Similar to the \playerman{} firmware,}
   most of the Rockbox code is contained in a
   ``build'' that resides on your \daps{} drive. This makes it easy to
   update Rockbox. The build consists of a directory called
@@ -190,7 +190,7 @@ still available to you.\\
 \end{description}
 }
 
-\nopt{archosplayer} {
+\nopt{player} {
     Apart from the required parts there are some addons you might be interested
     in installing.
     \begin{description}
@@ -214,7 +214,7 @@ housekeeping tool \caps{Rockbox Utility}. It allows you to:
         (``Minimal Installation'').
 \item Automatically install all suggested components (``Complete Installation'').
 \item Selectively install optional components.
-\nopt{archosplayer}{\item Install additional fonts and themes.}
+\nopt{player}{\item Install additional fonts and themes.}
 \item Install voice files and generate talk clips.
 \item Uninstall all components you installed using Rockbox Utility.
 \end{itemize}
@@ -232,35 +232,35 @@ filesystem.\\*
 
 \opt{ipodvideo}
     {\note{Autodetection is unable to distinguish between the
-    \archosplayerman{} 30~GB and 60~GB / 80~GB models and defaults to the
+    \playerman{} 30~GB and 60~GB / 80~GB models and defaults to the
     30~GB model. This will usually work but you might want to check the
     detected value, especially if you experience problems with Rockbox.}
 }
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
   Rockbox Utility will ask you for a compatible copy of the original
   firmware. This is because for legal reasons we cannot distribute
   the bootloader directly. Instead, we have to patch the Iriver firmware
   with the Rockbox bootloader.
 
   Download a supported version of the Iriver firmware for your 
-  \archosplayername{} from the Iriver website, links can be found on 
+  \playername{} from the Iriver website, links can be found on 
   \wikilink{IriverBoot}.
  
   Supported Iriver firmware versions currently include 
-  \opt{iriverh100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 
+  \opt{h100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 
     1.66EU and 1.66K. Note that the H140 uses the same firmware as the H120;
     H120 and H140 owners should use the firmware called \fname{ihp\_120.hex}.
     Likewise, the iHP110 and iHP115 use the same firmware, called 
     \fname{ihp\_100.hex}. Be sure to use the correct firmware file for 
     your player.}
-    \opt{iriverh300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
-    \note{The US \archosplayername{} firmware is not supported and cannot be
+    \opt{h300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
+    \note{The US \playername{} firmware is not supported and cannot be
     patched to be used with the bootloader. If you wish to install Rockbox
-    on a US \archosplayername{}, you must first install a non-US version of the
+    on a US \playername{}, you must first install a non-US version of the
     original firmware and then install one of the supported versions patched
     with the Rockbox bootloader.}
-    \warn{Installing a non-US firmware on a US \archosplayername{} will
+    \warn{Installing a non-US firmware on a US \playername{} will
     \emph{permanently} remove DRM support from the player.}}
 
   If the file that you downloaded is a \fname{.zip} file, use an unzip 
@@ -339,7 +339,7 @@ data partiton.}}
 \dap{}.}}
 
 \item Connect your \dap{} to the computer via USB
-  \opt{ipod3g,ipod4g,ipodmini1g,ipodcolor}{ or Firewire} as described in
+  \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire} as described in
   the manual that came with your \dap{}.
 
 \item Take the \fname{.zip} file that you downloaded and use
@@ -370,18 +370,18 @@ structure that Rockbox needs.\\}
 
 \opt{swcodec}{\nopt{gigabeats}{
   \subsubsection{Installing the bootloader}
-  \opt{iriverh100,iriverh300}{\input{getting_started/iriver_install.tex}}
+  \opt{h100,h300}{\input{getting_started/iriver_install.tex}}
   \opt{ipod}{\input{getting_started/ipod_install.tex}}
-  \opt{iaudiom3,iaudiom5,iaudiox5}{\input{getting_started/iaudio_install.tex}}
-  \opt{iriverh10,iriverh10_5gb}{\input{getting_started/h10_install.tex}}
-  \opt{gigabeatfx}{\input{getting_started/gigabeat_install.tex}}
+  \opt{m3,m5,x5}{\input{getting_started/iaudio_install.tex}}
+  \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}}
+  \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}}
   \opt{sansa}{\input{getting_started/sansa_install.tex}}
   \opt{mrobe100}{\input{getting_started/mrobe100_install.tex}}
 }}
 
 \subsection{Finishing the install}\label{ref:finish_install}
 
-\opt{gigabeatfx}{
+\opt{gigabeatf}{
   After installing you \emph{need} to power-cycle the 
   \dap{} by doing the following steps. Failure to do so may result in problems.
   \begin{itemize}
@@ -394,7 +394,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{iaudiom3,iaudiom5,iaudiox5}{
+\opt{m3,m5,x5}{
   After installing you \emph{need} to power-cycle the 
   \dap{} by doing the following steps.
   \begin{itemize}
@@ -407,7 +407,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,archos}{
+\opt{h10,h10_5gb,ipod,mrobe100,sansa,archos}{
   Safely eject / unmount the USB drive, unplug the cable and restart.
 }
 
@@ -415,7 +415,7 @@ structure that Rockbox needs.\\}
   Safely eject / unmount your \dap{}.
 }
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
   \begin{itemize}
   \item Safely eject / unmount your \dap{}.
   
@@ -426,14 +426,14 @@ structure that Rockbox needs.\\}
   the jukebox on. Press and hold the \ButtonSelect{} button to enter the main menu,
   and navigate to \setting{General $\rightarrow$ Firmware Upgrade}. Select
   \setting{Yes} when asked to confirm if you want to upgrade the 
-  firmware. The \archosplayerman{} will display a message indicating that the
+  firmware. The \playerman{} will display a message indicating that the
   firmware update is in progress. Do \emph{not} interrupt this process. When the
   firmware update is complete the player will turn itself off. (The update
   firmware process usually takes a minute or so.). You are now ready to go.
 \end{itemize}
 }
 
-\opt{sansae200}{Your e200 will automatically reboot and Rockbox should load.}
+\opt{e200}{Your e200 will automatically reboot and Rockbox should load.}
 
 
 
@@ -463,10 +463,10 @@ you turn the unit on, Rockbox should load.}
 \opt{gigabeats}{Rockbox should automatically load when you turn on your player.\\
 
   \note{
-    If you have loaded music onto your \dap{} using the \archosplayerman{}
+    If you have loaded music onto your \dap{} using the \playerman{}
     firmware, you will not be able to see your music properly in the
     \setting{File Browser} as MTP mode changes the location and file names. 
-    Files placed on your \dap{} using the \archosplayerman{} firmware can be
+    Files placed on your \dap{} using the \playerman{} firmware can be
     viewed by initialising and using Rockbox's database.
     See \reference{ref:database} for more information.}
 }
@@ -482,7 +482,7 @@ you turn the unit on, Rockbox should load.}
   }
 }
 
-\opt{iaudiom3}{
+\opt{m3}{
   \fixme{Add a note about the charging trick and place it here?}
 }
 
@@ -512,7 +512,7 @@ The new build will be installed over your current build.\\
 
 \section{Uninstalling Rockbox}\index{Installation!uninstall}
 
-\nopt{gigabeatfx,iaudiom5,iaudiox5,archos,mrobe100,gigabeats}{
+\nopt{gigabeatf,m5,x5,archos,mrobe100,gigabeats}{
   \note{The Rockbox bootloader allows you to choose between Rockbox and 
   the original firmware. (See \reference{ref:Dualboot} for more information.)}
 }
@@ -524,37 +524,37 @@ You can uninstall Rockbox automatically by using Rockbox Utility. If you
 installed Rockbox manually you can still use Rockbox Utility for uninstallation
 but will not be able to do this selectively.
 
-\opt{iriverh100,iriverh300}{\note{Rockbox Utility cannot uninstall the bootloader due to
+\opt{h100,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to
 the fact that it requires a flashing procedure. To uninstall the bootloader
 completely follow the manual uninstallation instructions below.}}
 
 \subsection{Manual Uninstallation}
 
 \opt{archos}{
-  If you would like to go back to using the original \archosplayerman{} software,
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
   \fname{\firmwarefilename} file.
 }
 
-\opt{iriverh10,iriverh10_5gb}{
-  If you would like to go back to using the original \archosplayerman{} software,
+\opt{h10,h10_5gb}{
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
-  \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} file and rename
-  \fname{OF.mi4} to \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}}
-  in the \fname{System} directory on your \archosplayertype{}. As in the installation,
+  \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename
+  \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}}
+  in the \fname{System} directory on your \playertype{}. As in the installation,
   it may be necessary to first put your device into UMS mode.
 }
 
 \opt{mrobe100}{
-  If you would like to go back to using the original \archosplayerman{} software,
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
   \fname{pp5020.mi4} file and rename
   \fname{OF.mi4} to \fname{pp5020.mi4}
-  in the \fname{System} directory on your \archosplayertype{}.
+  in the \fname{System} directory on your \playertype{}.
 }
 
-\opt{sansae200}{
-  If you would like to go back to using the original \archosplayerman{} software,
+\opt{e200}{
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and follow the instructions to install
   the bootloader, but when prompted by sansapatcher, enter \texttt{u} for uninstall,
   instead of \texttt{i} for install. As in the installation, it may be necessary to
@@ -568,26 +568,26 @@ completely follow the manual uninstallation instructions below.}}
   instead of \texttt{i} for install.
 }
 
-\opt{iaudiom5,iaudiox5}{
-  If you would like to go back to using the original \archosplayerman{} software,
-  connect the \dap{} to your computer, download the original \archosplayername{}
-  firmware from the \archosplayerman{} website, and copy it to the \fname{FIRMWARE}
-  directory on your \archosplayername{}. Turn off the \dap{}, remove the USB cable
+\opt{m5,x5}{
+  If you would like to go back to using the original \playerman{} software,
+  connect the \dap{} to your computer, download the original \playername{}
+  firmware from the \playerman{} website, and copy it to the \fname{FIRMWARE}
+  directory on your \playername{}. Turn off the \dap{}, remove the USB cable
   and insert the charger. The original firmware will automatically be flashed.
 }
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
     If you want to remove the Rockbox bootloader, simply flash an unpatched
-    \archosplayerman{} firmware. Be aware that doing so will also remove the bootloader
+    \playerman{} firmware. Be aware that doing so will also remove the bootloader
     USB mode. As that mode can come in quite handy (especially if you experience
    disk errors) it is recommended to keep the bootloader. It also
     gives you the possibility of trying Rockbox anytime later by simply
     installing the distribution files.
-    \opt{iriverh100}{
+    \opt{h100}{
       The Rockbox bootloader will automatically start the original firmware if
       the \fname{.rockbox} directory has been deleted.
     }
-    \opt{iriverh300}{
+    \opt{h300}{
       Although if you retain the Rockbox bootloader, you will need to hold the
       \ButtonRec{} button each time you want to start the original firmware.
     }
@@ -596,8 +596,8 @@ completely follow the manual uninstallation instructions below.}}
 \nopt{gigabeats}{
   If you wish to clean up your disk, you may also wish to delete the
   \fname{.rockbox} directory and its contents.
-  \nopt{iaudiom5,iaudiox5}{Turn the \archosplayerman{} off.
-    Turn the \dap{} back on and the original \archosplayerman{} software will load.}
+  \nopt{m5,x5}{Turn the \playerman{} off.
+    Turn the \dap{} back on and the original \playerman{} software will load.}
 }
 
 \opt{gigabeats}{
@@ -605,7 +605,7 @@ completely follow the manual uninstallation instructions below.}}
   \fname{.rockbox} directory and its contents, this must be done
   before uninstalling the bootloader in the next step.
 
-  Before installation you should have downloaded a copy of the \archosplayerman{}
+  Before installation you should have downloaded a copy of the \playerman{}
   firmware from
   \url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}.
   \begin{itemize}
@@ -633,7 +633,7 @@ completely follow the manual uninstallation instructions below.}}
   please ensure that you are either logged in as an administrator (Windows), or
   you have root rights (Linux)}
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
   \item[Immediately loading original firmware.]
   If the original firmware is immediately
   loaded without the Rockbox bootloader appearing first, then the Rockbox bootloader
@@ -641,10 +641,10 @@ completely follow the manual uninstallation instructions below.}}
   the update if the filename is correct, including case. Make sure that the patched
   Iriver firmware is called \fname{.hex}.}
 
-\nopt{iriverh100,iriverh300}{\item[``File Not Found'']}
-\opt{iriverh100,iriverh300}{\item[``-1 error'']}
+\nopt{h100,h300}{\item[``File Not Found'']}
+\opt{h100,h300}{\item[``-1 error'']}
   If you receive a
-  \nopt{iriverh100,iriverh300}{``File Not Found''}\opt{iriverh100,iriverh300}{``-1 error''} from the
+  \nopt{h100,h300}{``File Not Found''}\opt{h100,h300}{``-1 error''} from the
   bootloader, then the bootloader cannot find the Rockbox firmware. This is
   usually a result of not extracting the contents of the \fname{.zip} file
   to the proper location, and should not happen when Rockbox has been
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index 5d9e812784..f5eba1fae8 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -60,7 +60,7 @@ We have some conventions (especially for naming) that are intended to be
 consistent throughout this manual.
 
 Manufacturer and product names are formatted in accordance with the standard
-rules of English grammar, e.g. ``\archosplayerman{} playback is currently
+rules of English grammar, e.g. ``\playerman{} playback is currently
 unsupported''. Manufacturer and model names are proper nouns, and
 thus are written beginning with a capital letter.
 
diff --git a/manual/getting_started/mrobe100_install.tex b/manual/getting_started/mrobe100_install.tex
index 0ddc966c4a..41fafac073 100644
--- a/manual/getting_started/mrobe100_install.tex
+++ b/manual/getting_started/mrobe100_install.tex
@@ -2,9 +2,9 @@
 \begin{enumerate}

   \item Download 

   {\url{http://download.rockbox.org/bootloader/olympus/mrobe100/pp5020.mi4}}

-  \item Connect your \archosplayertype{} to the computer.

-  \item Rename the original \fname{pp5020.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \archosplayertype{}.

-    \warn{You should keep a safe backup of this file for use if you ever wish to switch back to the \archosplayerman{} firmware.}

+  \item Connect your \playertype{} to the computer.

+  \item Rename the original \fname{pp5020.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.

+    \warn{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}

     \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.}

 

   \item Copy the \fname{pp5020.mi4} file you downloaded to the System directory on your \dap{}.

diff --git a/manual/getting_started/sansaAMS_install.tex b/manual/getting_started/sansaAMS_install.tex
index 9e07c1b28a..9f2e25c64b 100644
--- a/manual/getting_started/sansaAMS_install.tex
+++ b/manual/getting_started/sansaAMS_install.tex
@@ -1,6 +1,6 @@
 % $Id: %
 
-In order to make your \archosplayertype{} load and execute the Rockbox
+In order to make your \playertype{} load and execute the Rockbox
 firmware you have just installed, you will need to install the
 Rockbox bootloader. Unless bugs are found in the bootloader code, or
 significant new features are added, you will only have to perform this
diff --git a/manual/getting_started/sansa_install.tex b/manual/getting_started/sansa_install.tex
index edfb3b646d..7956e94f76 100644
--- a/manual/getting_started/sansa_install.tex
+++ b/manual/getting_started/sansa_install.tex
@@ -8,7 +8,7 @@
 and run it whilst logged in with an administrator account.
 
 \item If all has gone well, you should see some information displayed about
-your \archosplayertype{} and a message asking you if you wish to install the Rockbox
+your \playertype{} and a message asking you if you wish to install the Rockbox
 bootloader. Press i followed by ENTER, and sansapatcher will now
 install the bootloader. After a short time you should see the message
 ``[INFO] Bootloader installed successfully.'' Press ENTER again to exit
@@ -58,7 +58,7 @@ steps will assume you have saved it in your home directory.
 sufficient permission to perform raw disk access to your \dap{}.}
 
 \item If all has gone well, you should see some information displayed about
-your \archosplayertype{} and a message asking you if you wish to install the Rockbox
+your \playertype{} and a message asking you if you wish to install the Rockbox
 bootloader. Press i followed by ENTER, and sansapatcher will now install the
 bootloader. After a short time you should see the message ``[INFO] Bootloader
 installed successfully.'' Press ENTER again to exit sansapatcher.
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 50bdd4c657..6eb539c718 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -181,7 +181,7 @@ utilities. A detailed description of the different plugins is to be found in
 \reference{ref:plugins}.
 
 \section{\label{ref:Info}System}
-\opt{archosplayer}{Use the MINUS and PLUS keys to step through several 
+\opt{player}{Use the MINUS and PLUS keys to step through several 
 pages of information.}
 
 \begin{description}
@@ -224,7 +224,7 @@ pages of information.}
   given seperately for internal memory (\emph{Int}) and for a plugged in
   memory card
   \opt{ondio}{(\emph{MMC})}
-  \opt{sansa,sansae200v2,sansafuze}{(\emph{MSD})}.
+  \opt{sansa,e200v2,fuze}{(\emph{MSD})}.
 }%
 \nopt{multivolume}{Hard disk size and the amount of free space on the disk.}
 
@@ -248,7 +248,7 @@ pages of information.}
   settings before asking for help.}
 \end{description}
 
-\opt{archosplayer}{
+\opt{player}{
   \section{Shutdown}
   This menu option saves the Rockbox configuration and turns off the hard
   drive before shutting down the machine. For maximum safety this procedure
diff --git a/manual/platform/sansac200.tex b/manual/platform/c200.tex
index 732faded82..0c7473ee18 100644
--- a/manual/platform/sansac200.tex
+++ b/manual/platform/c200.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{sansac200}
+\def\UseOption{c200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_C200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{sansac200 Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{c200 Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{132x80x16}
-\newcommand{\specimg}{sansac200}
+\newcommand{\specimg}{c200}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/sansaclip.tex b/manual/platform/clip.tex
index 0ac35127e4..c6811b6316 100644
--- a/manual/platform/sansaclip.tex
+++ b/manual/platform/clip.tex
@@ -1,20 +1,20 @@
 % Id: %
-\def\UseOption{sansaclip}
+\def\UseOption{clip}
 \edef\UseOption{\UseOption,SANSA_CLIP_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{Clip}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{Clip}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x64x1-clip}
-\newcommand{\specimg}{sansaclip}
+\newcommand{\specimg}{clip}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
 \newcommand{\firmwareextension}{\fname{sansa}}
 \newcommand{\screenshotsize}{3cm}
diff --git a/manual/platform/sansae200.tex b/manual/platform/e200.tex
index 821346e39d..d20d34f2d7 100644
--- a/manual/platform/sansae200.tex
+++ b/manual/platform/e200.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{sansae200}
+\def\UseOption{e200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_E200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{sansae200 and e200R Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{e200 and e200R Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{176x220x16}
-\newcommand{\specimg}{sansae200}
+\newcommand{\specimg}{e200}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/sansafuze.tex b/manual/platform/fuze.tex
index e00939f94e..887d62ea89 100644
--- a/manual/platform/sansafuze.tex
+++ b/manual/platform/fuze.tex
@@ -1,20 +1,20 @@
 % $Id$ %
-\def\UseOption{sansafuze}
+\def\UseOption{fuze}
 \edef\UseOption{\UseOption,SANSA_FUZE_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{Fuze}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{Fuze}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{sansafuze}
+\newcommand{\specimg}{fuze}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
 \newcommand{\firmwareextension}{\fname{sansa}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/gigabeatfx.tex b/manual/platform/gigabeatf.tex
index b1803f02b8..e49f1593c8 100644
--- a/manual/platform/gigabeatfx.tex
+++ b/manual/platform/gigabeatf.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{gigabeatfx}
+\def\UseOption{gigabeatf}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,GIGABEAT_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -10,20 +10,20 @@
 \edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Toshiba}
-\newcommand{\archosplayertype}{Gigabeat F and X Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Toshiba}
+\newcommand{\playertype}{Gigabeat F and X Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{240x320x16}
-\newcommand{\specimg}{gigabeatfx}
+\newcommand{\specimg}{gigabeatf}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
 \newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-gigabeatfx.tex}
+\input{platform/keymap-gigabeatf.tex}
 \input{platform/remote-keymap-gigabeat.tex}
diff --git a/manual/platform/gigabeats.tex b/manual/platform/gigabeats.tex
index 664bf85fb1..920eb1789f 100644
--- a/manual/platform/gigabeats.tex
+++ b/manual/platform/gigabeats.tex
@@ -9,15 +9,15 @@
 \edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Toshiba}
-\newcommand{\archosplayertype}{Gigabeat S Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Toshiba}
+\newcommand{\playertype}{Gigabeat S Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{240x320x16}
 \newcommand{\specimg}{gigabeats}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
 \newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
diff --git a/manual/platform/iriverh10.tex b/manual/platform/h10.tex
index d810ac42d5..4b99b1ba51 100644
--- a/manual/platform/iriverh10.tex
+++ b/manual/platform/h10.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh10}
+\def\UseOption{h10}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H10}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 20GB}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H10}
+\newcommand{\playerlongtype}{\playertype{} 20GB}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{iriverh10}
+\newcommand{\specimg}{h10}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh10.tex}
+\input{platform/keymap-h10.tex}
diff --git a/manual/platform/iriverh100.tex b/manual/platform/h100.tex
index 96f9e00d8b..19e4ef0677 100644
--- a/manual/platform/iriverh100.tex
+++ b/manual/platform/h100.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh100}
+\def\UseOption{h100}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H100_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -10,21 +10,21 @@
 \edef\UseOption{\UseOption,IRIVER_RC_H100_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H100}
-\newcommand{\archosplayerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H100}
+\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{iriverh100}
+\newcommand{\specimg}{h100}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
 \newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh100_h300.tex}
-\input{platform/remote-keymap-iriverh100.tex}
+\input{platform/keymap-h100_h300.tex}
+\input{platform/remote-keymap-h100.tex}
 
diff --git a/manual/platform/iriverh10_5gb.tex b/manual/platform/h10_5gb.tex
index 37bfb8d22c..d89e1eabcd 100644
--- a/manual/platform/iriverh10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh10_5gb}
+\def\UseOption{h10_5gb}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H10}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 5GB and 6GB}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H10}
+\newcommand{\playerlongtype}{\playertype{} 5GB and 6GB}
 \newcommand{\genericimg}{128x128x16}
-\newcommand{\specimg}{iriverh10_5gb}
+\newcommand{\specimg}{h10_5gb}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh10.tex}
+\input{platform/keymap-h10.tex}
diff --git a/manual/platform/iriverh300.tex b/manual/platform/h300.tex
index 00370b2887..211bc1a9b0 100644
--- a/manual/platform/iriverh300.tex
+++ b/manual/platform/h300.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh300}
+\def\UseOption{h300}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H300_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,20 +8,20 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H3xx}
-\newcommand{\archosplayerlongtype}{H320 and H340}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H3xx}
+\newcommand{\playerlongtype}{H320 and H340}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{iriverh300}
+\newcommand{\specimg}{h300}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
 \newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh100_h300.tex}
+\input{platform/keymap-h100_h300.tex}
 
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index 884834344d..28679a5025 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{1G / 2G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{1G / 2G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod1g2g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 2ca6e60053..21ca69adbb 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{3G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{3G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod3g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 72ab509239..06483fa6e2 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{4G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{4G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod4g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index dd9755114d..04dc457a81 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Color}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Color}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
 \newcommand{\specimg}{ipodcolor}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{6cm}
diff --git a/manual/platform/ipodmini1g.tex b/manual/platform/ipodmini.tex
index f9f8673048..7671a4fb1a 100644
--- a/manual/platform/ipodmini1g.tex
+++ b/manual/platform/ipodmini.tex
@@ -1,20 +1,20 @@
 % $Id$ %
-\def\UseOption{ipodmini1g}
+\def\UseOption{ipodmini}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Mini}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Mini}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{138x110x2}
-\newcommand{\specimg}{ipodmini1g}
+\newcommand{\specimg}{ipodmini}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodnano1g.tex b/manual/platform/ipodnano.tex
index d5078ea9d6..974fe687ec 100644
--- a/manual/platform/ipodnano1g.tex
+++ b/manual/platform/ipodnano.tex
@@ -1,19 +1,19 @@
 % $Id$ %
-\def\UseOption{ipodnano1g}
+\def\UseOption{ipodnano}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Nano}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 1st generation}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Nano}
+\newcommand{\playerlongtype}{\playertype{} 1st generation}
 \newcommand{\genericimg}{176x132x16}
-\newcommand{\specimg}{ipodnano1g}
+\newcommand{\specimg}{ipodnano}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 52d892c2d4..ff18551266 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Video}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Video}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{320x240x16}
 \newcommand{\specimg}{ipodvideo}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{8cm}
diff --git a/manual/platform/keymap-sansac200.tex b/manual/platform/keymap-c200.tex
index 8fbed84de3..8fbed84de3 100644
--- a/manual/platform/keymap-sansac200.tex
+++ b/manual/platform/keymap-c200.tex
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-clip.tex
index 1ddc718e44..1ddc718e44 100644
--- a/manual/platform/keymap-sansaclip.tex
+++ b/manual/platform/keymap-clip.tex
diff --git a/manual/platform/keymap-sansae200.tex b/manual/platform/keymap-e200.tex
index ce2bc5a47a..ce2bc5a47a 100644
--- a/manual/platform/keymap-sansae200.tex
+++ b/manual/platform/keymap-e200.tex
diff --git a/manual/platform/keymap-sansafuze.tex b/manual/platform/keymap-fuze.tex
index 351db621b0..351db621b0 100644
--- a/manual/platform/keymap-sansafuze.tex
+++ b/manual/platform/keymap-fuze.tex
diff --git a/manual/platform/keymap-gigabeatfx.tex b/manual/platform/keymap-gigabeatf.tex
index 39d51b0dd5..39d51b0dd5 100644
--- a/manual/platform/keymap-gigabeatfx.tex
+++ b/manual/platform/keymap-gigabeatf.tex
diff --git a/manual/platform/keymap-iriverh10.tex b/manual/platform/keymap-h10.tex
index 364504fcd7..364504fcd7 100644
--- a/manual/platform/keymap-iriverh10.tex
+++ b/manual/platform/keymap-h10.tex
diff --git a/manual/platform/keymap-iriverh100_h300.tex b/manual/platform/keymap-h100_h300.tex
index 419dc0bfcf..419dc0bfcf 100644
--- a/manual/platform/keymap-iriverh100_h300.tex
+++ b/manual/platform/keymap-h100_h300.tex
diff --git a/manual/platform/keymap-iaudiom3.tex b/manual/platform/keymap-m3.tex
index 098422b21d..098422b21d 100644
--- a/manual/platform/keymap-iaudiom3.tex
+++ b/manual/platform/keymap-m3.tex
diff --git a/manual/platform/keymap-iaudiomx5.tex b/manual/platform/keymap-mx5.tex
index aea09f4496..aea09f4496 100644
--- a/manual/platform/keymap-iaudiomx5.tex
+++ b/manual/platform/keymap-mx5.tex
diff --git a/manual/platform/keymap-archosondio.tex b/manual/platform/keymap-ondio.tex
index dd0cf25061..dd0cf25061 100644
--- a/manual/platform/keymap-archosondio.tex
+++ b/manual/platform/keymap-ondio.tex
diff --git a/manual/platform/keymap-archosplayer.tex b/manual/platform/keymap-player.tex
index 651239b4d9..651239b4d9 100644
--- a/manual/platform/keymap-archosplayer.tex
+++ b/manual/platform/keymap-player.tex
diff --git a/manual/platform/keymap-archosrecorder.tex b/manual/platform/keymap-recorder.tex
index ac194a4422..ac194a4422 100644
--- a/manual/platform/keymap-archosrecorder.tex
+++ b/manual/platform/keymap-recorder.tex
diff --git a/manual/platform/iaudiom3.tex b/manual/platform/m3.tex
index 032c9007a0..bbdd255299 100644
--- a/manual/platform/iaudiom3.tex
+++ b/manual/platform/m3.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiom3}
+\def\UseOption{m3}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_M3_PAD}
 \edef\UseOption{\UseOption,IAUDIO_RC_PAD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,iaudio}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{M3}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{M3}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x96x2}
-\newcommand{\specimg}{iaudiom3}
+\newcommand{\specimg}{m3}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap files
-\input{platform/keymap-iaudiom3.tex}
+\input{platform/keymap-m3.tex}
 \input{platform/remote-keymap-iaudio.tex}
diff --git a/manual/platform/iaudiom5.tex b/manual/platform/m5.tex
index 2dbcd06584..c7233b11f2 100644
--- a/manual/platform/iaudiom5.tex
+++ b/manual/platform/m5.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiom5}
+\def\UseOption{m5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{M5}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{M5}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{iaudiom5}
+\newcommand{\specimg}{m5}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link to external keymap file
-\input{platform/keymap-iaudiomx5.tex}
+\input{platform/keymap-mx5.tex}
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index 6a07a35f7a..ddac2fda67 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,olympus}
 
-\newcommand{\archosplayerman}{Olympus}
-\newcommand{\archosplayertype}{m:robe 100}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Olympus}
+\newcommand{\playertype}{m:robe 100}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x1}
 \newcommand{\specimg}{mrobe100}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/archosondiofm.tex b/manual/platform/ondiofm.tex
index d78f1c53fa..c49a1363d7 100644
--- a/manual/platform/archosondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -1,24 +1,24 @@
 % $Id$ %
 %platform file for the Ondio FM
-\def\UseOption{archosondiofm}
+\def\UseOption{ondiofm}
 % To not break the current manual
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Ondio}
-\newcommand{\archosplayerlongtype}{Ondio 128 FM}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Ondio}
+\newcommand{\playerlongtype}{Ondio 128 FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosondiofm}
+\newcommand{\specimg}{ondiofm}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-archosondio.tex}
+\input{platform/keymap-ondio.tex}
diff --git a/manual/platform/archosondiosp.tex b/manual/platform/ondiosp.tex
index 9414d2ba72..43d74e76fd 100644
--- a/manual/platform/archosondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -1,24 +1,24 @@
 % $Id$ %
 %platform file for the Ondio SP
-\def\UseOption{archosondiosp}
+\def\UseOption{ondiosp}
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Ondio}
-\newcommand{\archosplayerlongtype}{Ondio 128 SP}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Ondio}
+\newcommand{\playerlongtype}{Ondio 128 SP}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosondiosp}
+\newcommand{\specimg}{ondiosp}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-archosondio.tex}
+\input{platform/keymap-ondio.tex}
diff --git a/manual/platform/archosplayer.tex b/manual/platform/player.tex
index 8fcf375b42..eddd5eddfc 100644
--- a/manual/platform/archosplayer.tex
+++ b/manual/platform/player.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{archosplayer}
+\def\UseOption{player}
 \edef\UseOption{\UseOption,PLAYER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Studio/Player}
-\newcommand{\archosplayerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Studio/Player}
+\newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
 \newcommand{\genericimg}{charx11x1}
-\newcommand{\specimg}{archosplayer}
+\newcommand{\specimg}{player}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{archos.mod}}
 \newcommand{\firmwareextension}{\fname{mod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosplayer.tex}
+\input{platform/keymap-player.tex}
diff --git a/manual/platform/archosrecorder.tex b/manual/platform/recorder.tex
index 6897947de5..9eaf9091d8 100644
--- a/manual/platform/archosrecorder.tex
+++ b/manual/platform/recorder.tex
@@ -1,25 +1,25 @@
 % $Id$ %
-\def\UseOption{archosrecorder}
+\def\UseOption{recorder}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Recorder}
-\newcommand{\archosplayerlongtype}{Recorder 6, 10, 15 and 20}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Recorder}
+\newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20}
 \newcommand{\genericimg}{112x64x1}
 
-\newcommand{\specimg}{archosrecorder}
+\newcommand{\specimg}{recorder}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosrecorder.tex}
+\input{platform/keymap-recorder.tex}
diff --git a/manual/platform/archosrecorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 1fd9e78bed..99b829d8a5 100644
--- a/manual/platform/archosrecorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -1,24 +1,24 @@
 % $Id$ %
-\def\UseOption{archosrecorderv2fm}
+\def\UseOption{recorderv2fm}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Recorder V2/FM}
-\newcommand{\archosplayerlongtype}{Recorder V2 and FM}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Recorder V2/FM}
+\newcommand{\playerlongtype}{Recorder V2 and FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosrecorderv2fm}
+\newcommand{\specimg}{recorderv2fm}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosrecorder.tex}
+\input{platform/keymap-recorder.tex}
diff --git a/manual/platform/remote-keymap-iriverh100.tex b/manual/platform/remote-keymap-h100.tex
index cc0537047b..cc0537047b 100644
--- a/manual/platform/remote-keymap-iriverh100.tex
+++ b/manual/platform/remote-keymap-h100.tex
diff --git a/manual/platform/iaudiox5.tex b/manual/platform/x5.tex
index 9864a6ffec..df8473c602 100644
--- a/manual/platform/iaudiox5.tex
+++ b/manual/platform/x5.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiox5}
+\def\UseOption{x5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{X5}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{X5}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{iaudiox5}
+\newcommand{\specimg}{x5}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iaudiomx5.tex}
+\input{platform/keymap-mx5.tex}
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index a4aade54d0..ab7593c893 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -23,7 +23,7 @@ you resume the game. The menu also allows the user to reload the last game
 saved, save the current position and start a new game without having to quit
 the game.
 
-\opt{archosrecorder,archosrecorderv2fm,ondio}{
+\opt{recorder,recorderv2fm,ondio}{
 \note{This plugin will stop playback.}
 }
 
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 1653e3d812..51344123f7 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -16,7 +16,7 @@ text files%
 \section{Games}
 \opt{lcd_bitmap}
     {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator}
-    \opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}
+    \opt{recorder,recorderv2fm,h100,m5,lcd_color}
     {and Rockboy in \reference{ref:Rockboy}}.}
 
 \opt{lcd_bitmap}{\input{plugins/blackjack.tex}}
@@ -39,7 +39,7 @@ text files%
 
 \opt{lcd_bitmap}{\input{plugins/goban.tex}}
 
-\opt{lcd_non-mono}{\nopt{iriverh10_5gb,ipodmini1g,sansac200}{
+\opt{lcd_non-mono}{\nopt{h10_5gb,ipodmini,c200}{
   \input{plugins/invadrox.tex}}}
 
 {\input{plugins/jackpot.tex}}
@@ -50,9 +50,9 @@ text files%
 
 \opt{lcd_bitmap}{\input{plugins/minesweeper.tex}}
 
-\opt{archosplayer}{\input{plugins/nim.tex}}
+\opt{player}{\input{plugins/nim.tex}}
 
-\opt{iriverh100,iaudiom5,lcd_color}{\nopt{sansac200}{\input{plugins/pacbox.tex}}}
+\opt{h100,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}}
 
 \opt{lcd_bitmap}{\input{plugins/pegbox.tex}}
 
@@ -133,7 +133,7 @@ the associated file. Viewers are stored in the
 
 \opt{swcodec}{\input{plugins/midiplay.tex}}
 
-\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
+\opt{recorder,recorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
 
 \opt{lcd_bitmap}{\opt{swcodec}{\input{plugins/mpegplayer.tex}}}
 
@@ -141,9 +141,9 @@ the associated file. Viewers are stored in the
 
 \opt{lcd_color}{\input{plugins/ppmviewer.tex}}
 
-\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
+\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
 
-\opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}{\input{plugins/rockboy.tex}}
+\opt{recorder,recorderv2fm,h100,m5,lcd_color}{\input{plugins/rockboy.tex}}
 
 {\input{plugins/search.tex}}
 
@@ -153,13 +153,13 @@ the associated file. Viewers are stored in the
 
 {\input{plugins/vbrfix.tex}}
 
-\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/wavplay.tex}}
+\opt{recorder,recorderv2fm,ondio}{\input{plugins/wavplay.tex}}
 
 \opt{lcd_bitmap}{\input{plugins/zxbox.tex}}
 
 \section{Applications}
 
-\opt{archosplayer,archosrecorder,archosrecorderv2fm}{\input{plugins/alpinecdc.tex}}
+\opt{player,recorder,recorderv2fm}{\input{plugins/alpinecdc.tex}}
 
 {\input{plugins/batterybenchmark.tex}}
 
@@ -173,9 +173,9 @@ the associated file. Viewers are stored in the
 
 {\input{plugins/disktidy.tex}}
 
-\opt{archosplayer}{\input{plugins/euro_converter.tex}}
+\opt{player}{\input{plugins/euro_converter.tex}}
 
-\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/firmware_flash.tex}}
+\opt{recorder,recorderv2fm,ondio}{\input{plugins/firmware_flash.tex}}
 
 {\input{plugins/keybox.tex}}
 
@@ -191,7 +191,7 @@ the associated file. Viewers are stored in the
 
 \opt{lcd_color}{\input{plugins/rockpaint.tex}}
 
-\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/split_editor.tex}}
+\opt{recorder,recorderv2fm,ondio}{\input{plugins/split_editor.tex}}
 
 {\input{plugins/stats.tex}}
 
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index a2244fbc72..2eb860309a 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -1,7 +1,7 @@
 \subsection{Mandelbrot}
 \screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot}
 This demonstration draws fractal images from the Mandelbrot set
-\opt{archos,iriverh100}{using the greyscale engine}.
+\opt{archos,h100}{using the greyscale engine}.
 \begin{table}
   \begin{btnmap}{}{}
     Direction keys
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index 6d0937cbfe..95f4a197cb 100644
--- a/manual/plugins/midiplay.tex
+++ b/manual/plugins/midiplay.tex
@@ -9,7 +9,7 @@ containing several \fname{.pat} files and two \fname {.cfg} files. Just
 select a MIDI file with either the \fname{.mid} or \fname{.midi} extension
 in the file browser to start playback.
 % portalplayer targets
-\opt{ipod,sansa,iriverh10,iriverh10_5gb,mrobe100}{
+\opt{ipod,sansa,h10,h10_5gb,mrobe100}{
 \note{Currently playing MIDI files is still in its early stages and you
 might experience ``Buffer miss!'' with many files, except simple ones.}
 }
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index 10fdfae2a3..8c40ef9d14 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -29,27 +29,27 @@ found at \url{http://www.mame.net}.
 \begin{table}
   \begin{btnmap}{}{}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
-        IPOD_3G_PAD,iriverh10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight}
+        IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
-    \opt{iriverh10_5gb}{\ButtonScrollUp}
+    \opt{h10_5gb}{\ButtonScrollUp}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Up\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
-    IPOD_3G_PAD,iriverh10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft}
-    \opt{iriverh10_5gb}{\ButtonScrollDown}
+    IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft}
+    \opt{h10_5gb}{\ButtonScrollDown}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{iriverh10}{\ButtonScrollUp}
-    \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
+    \opt{h10}{\ButtonScrollUp}
+    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Left\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
-    \opt{iriverh10}{\ButtonScrollDown}
-    \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
+    \opt{h10}{\ButtonScrollDown}
+    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Right\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index f04b5d174d..c273f719fd 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -64,7 +64,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         & Select\\
         %
     }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,iaudiom5}{
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,m5}{
         \opt{RECORDER_PAD}{\ButtonOn}
         \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch}
               \opt{HAVEREMOTEKEYMAP}{& }
@@ -100,7 +100,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         Chose whether the original aspect ratio should be kept when scaling
         the picture to the screen%
         % targets with bigger displays than the original gameboy
-        \opt{gigabeat,iriverh300,ipodcolor,ipodvideo,sansae200}{
+        \opt{gigabeat,h300,ipodcolor,ipodvideo,e200}{
             or whether it should be displayed unscaled%
         }.
         \item[Screen Rotate.]
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index 8e3e6e8f5d..ea914295ae 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -3,7 +3,7 @@
 This demo replicates snow falling on your screen. If you love winter,
 you will love this demo.  Or maybe not.
 %
-\opt{archosplayer}{Press \ButtonStop\ to quit.}%
+\opt{player}{Press \ButtonStop\ to quit.}%
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRVER_H300_PAD}{Press \ButtonOff\ to quit.}%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Press \ButtonMenu\ to quit.}%
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}%
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index c468cd9749..300eb4da7c 100644
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -2,7 +2,7 @@
 \screenshot{plugins/images/ss-stats}{The stats-plugin}{}
 
 The stats-plugin simply counts the number of files%
-\nopt{archosplayer}{, music files }%
+\nopt{player}{, music files }%
 and directories on your \dap.
 Press %
 \opt{PLAYER_PAD}{\ButtonStop}%
diff --git a/manual/preamble.tex b/manual/preamble.tex
index e1e192dfe1..1e3ccce95a 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -41,7 +41,7 @@
 \input{platform/\platform.tex}
 \input{features.tex}
 
-\newcommand{\archosplayername}{\archosplayerman\ \archosplayerlongtype}
+\newcommand{\playername}{\playerman\ \playerlongtype}
 
 \hypersetup{% add some values to the pdf properties
   colorlinks = true,
@@ -51,7 +51,7 @@
   urlcolor = blue,
   pdftitle = {Rockbox user manual},
   pdfauthor = {The Rockbox Team},
-  pdfsubject = {Rockbox user manual for \archosplayername}
+  pdfsubject = {Rockbox user manual for \playername}
 }
 
 \newcommand{\fname}[1]{\texttt{#1}}
@@ -94,7 +94,7 @@
 \fancyhead[L]{{\nouppercase{\textsc{\leftmark}}}}
 \fancyhead[R]{\iffloatpage{}{\thepage}}
 \fancyfoot[L]{\textsc{The Rockbox manual}}
-\fancyfoot[R]{\textsc{\archosplayerman{} \archosplayertype}}
+\fancyfoot[R]{\textsc{\playerman{} \playertype}}
 \fancypagestyle{plain}{}
 
 \renewcommand{\headrulewidth}{\iffloatpage{0pt}{0.4pt}}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 9be15adeb1..bdbb97ef5c 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -35,7 +35,7 @@ generated as \fname{<MMC1>}, and will behave exactly as any other directory
 on the \dap{}.
 }
 
-\opt{iriverh10,iriverh10_5gb}{\note{
+\opt{h10,h10_5gb}{\note{
 If your \dap{} is a MTP model, the Music directory where all your music is stored
 may be hidden in the \setting{File Browser}. This may be fixed by either
 either changing its properties (on a computer) to not hidden, or by changing
@@ -78,7 +78,7 @@ the \setting{Show Files} setting to all.
          & If there is an audio file playing, returns to the
          \setting{While Playing Screen} (WPS) without stopping playback.\\
       %
-      \nopt{archosplayer,sansac200}%
+      \nopt{player,c200}%
         {%
           \ActionTreeStop 
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop}
@@ -317,7 +317,7 @@ can be easily changed by making a text file with the required layout.  More
   \end{table}
 }
 
-\opt{archosplayer}{
+\opt{player}{
   The current text line to be entered or edited is always listed on the first
   line of the display. The second line of the display can contain the character
   selection bar, as in the screenshot above.
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 72a1fa5fe4..f8768c3ceb 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -9,7 +9,7 @@
 % The extension is selected in the preamble, so no further \ifpdfoutput
 % is necessary.
 \includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front}
-\opt{iaudiom3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
+\opt{m3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
   \end{center}
   % spacing between the two pictures, could possibly be improved
   \begin{center}
@@ -27,7 +27,7 @@ described in detail in the following paragraph.
   \wikilink{BlindFAQ}.
   
   %
-  \opt{iriverh100}{
+  \opt{h100}{
   Hold or lay the \dap{} so that the side with the joystick and LCD is facing
   towards you, and the curved side is at the top. The joystick functions as
   the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when
@@ -48,7 +48,7 @@ described in detail in the following paragraph.
   \dap{} hard locks, you can reset it by inserting a paper clip into the hole
   where the reset switch is.}
   % 
-  \opt{iriverh300}{
+  \opt{h300}{
   Hold or lay the \dap{} so that the side with the button pad and
   LCD is facing towards you.  The buttons on the button pad are as follows:  top 
   left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: 
@@ -74,7 +74,7 @@ described in detail in the following paragraph.
   used in Rockbox. 
   }
   %
-  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini1g}{ 
+  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{ 
   The main controls on the \dap{} are a slightly indented scroll wheel 
   with a flat round button in the center. Hold the \dap{} with these controls 
   facing you. 
@@ -84,7 +84,7 @@ described in detail in the following paragraph.
   \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{} 
     switch.}
   \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.}
-  \opt{ipodmini1g}{\ButtonHold{} switch, remote connector, headphone jack.}     
+  \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone jack.}       
 
   The dock connector that is used to connect your \dap{} to your computer is on 
   the bottom panel of the \dap{}.
@@ -156,7 +156,7 @@ described in detail in the following paragraph.
   \ButtonHold{} is off before trying to use your player. 
   }
   %
-  \opt{ipodnano1g}{
+  \opt{ipodnano}{
   The main controls on the \dap{} are a slightly indented wheel with a
   flat round button in the center. Hold the \dap{} with these controls on the
   top surface. There is a \ButtonHold{} switch at one end, and
@@ -194,7 +194,7 @@ described in detail in the following paragraph.
   round crosspad is labelled \ButtonMenu{}.
   }
   %
-  \opt{iriverh10,iriverh10_5gb}{
+  \opt{h10,h10_5gb}{
   Hold or lay the \dap{} so that the side with the scroll pad and
   LCD is facing towards you. In the centre below the lcd is the scroll pad. It
   is oriented vertically. Touching the top and bottom half of it acts as the 
@@ -207,12 +207,12 @@ described in detail in the following paragraph.
   hand side is the \ButtonPower{} button.
 
   On the top panel of the \dap{}, from left to right, you can find the 
-  following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port and
+  following: \ButtonHold{} switch, \opt{h10}{reset pin hole, }remote port and
   headphone mini jack plug. 
   
   On the bottom panel of the \dap{} is the data cable port.}
   %
-  \opt{gigabeatfx}{
+  \opt{gigabeatf}{
   \note{The following description is for the Gigabeat F, but can also apply for the
   Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the
   Gigabeat X is smaller and has a slightly tapered back.}
@@ -285,7 +285,7 @@ described in detail in the following paragraph.
   bottom of the unit, there is a connector for the docking station or the 
   proprietary USB connector for connecting directly to USB.}
   %
-  \opt{iaudiox5,iaudiom5}{
+  \opt{x5,m5}{
   The \dap{} is curved so that the end with the screen on it is thicker than the 
   other end.  Hold the \dap{} wih the thick end towards the top and the screen
   facing towards you.  Half way up the front of the unit on the right hand side
@@ -306,14 +306,14 @@ described in detail in the following paragraph.
   reset by inserting a paper clip.
   
   On the bottom of the unit is the connector for the 
-  \archosplayerman{} subpack or dock.  On the top of the unit is a charge 
+  \playerman{} subpack or dock.  On the top of the unit is a charge 
   indicator light, which may feel a bit like a button, but is not.
   
   From the top of the \dap{} on the left hand side is the headphone socket, then the 
-  remote connector.  Below this is a cover which protects the \opt{iaudiox5}{USB host
-  connector.}\opt{iaudiom5}{USB and charging connector}.}
+  remote connector.  Below this is a cover which protects the \opt{x5}{USB host
+  connector.}\opt{m5}{USB and charging connector}.}
   %
-  \opt{sansae200}{
+  \opt{e200}{
   Hold the \dap{} with the turning wheel at the front and bottom.  On the bottom left
   of the front of the \dap{} is a raised round button, the \ButtonPower{} button.
   Above and to the left of this, on the outside of the turning wheel are four 
@@ -329,7 +329,7 @@ described in detail in the following paragraph.
   other buttons have any effect.  Just to the left of the \ButtonHold{} switch is a
   small hole which contains the internal microphone.}
   %
-  \opt{sansac200}{
+  \opt{c200}{
   Hold the \dap{} with the buttons on the right and the screen on the left. On
   the right side of the unit, there is a series of four connected buttons that
   form a square. The four sides of the square are the \ButtonUp{},
@@ -351,7 +351,7 @@ described in detail in the following paragraph.
   Immediately above the headphone socket is a lanyard loop and the microphone.
   }
   %
-  \opt{sansaclip}{
+  \opt{clip}{
   Hold the \dap{} with the controls on the bottom and the screen on the top. The main
   controls are a four-way pad with a button in the centre; pressing this centre button
   functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains
@@ -369,7 +369,7 @@ described in detail in the following paragraph.
   above this button is the headphone jack.
   }
   %
-  \opt{archosplayer}{
+  \opt{player}{
   The main controls of this player are a four-way button on the right below
   the screen, and two round buttons to the left of it. Hold the \dap{} with
   these controls on the bottom and facing you.
@@ -384,7 +384,7 @@ described in detail in the following paragraph.
   the DC-In jack on the right, and the USB connector in the centre.
   }
   %
-  \opt{archosrecorder}{
+  \opt{recorder}{
   Holding the Jukebox in front of you, there should be three rectangular buttons
   in a horizontal line towards the middle of the unit, and below this to the left
   there is a circular four button array with the circular \ButtonPlay{} button
@@ -405,7 +405,7 @@ described in detail in the following paragraph.
   the right. On the bottom of the \dap{} is the Line-In jack on the left, the
   DC-In jack on the right, and the USB connector in the centre.
   }
-  \opt{archosrecorderv2fm}{
+  \opt{recorderv2fm}{
   Holding the Jukebox in front of you, there should be three rectangular buttons
   in a horizontal line towards the middle of the unit, and below this centred on the
   middle button there are four radial arc shaped buttons placed in a cross formation
@@ -441,8 +441,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
       & Start Rockbox\\
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
-      \opt{ONDIO_PAD,archosrecorderv2fm}{Long \ButtonOff}%
-      \opt{archosrecorder}{Double tap \ButtonOff\ when playback is stopped}%
+      \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
+      \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
       \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}%
           {Long \ButtonPower}%
@@ -476,11 +476,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   performed by inserting a paperclip gently into the Reset hole.
 }%
 
-\nopt{gigabeatfx,iaudiom3,iaudiom5,iaudiox5,archos}
+\nopt{gigabeatf,m3,m5,x5,archos}
   {
   \subsection{Starting the original firmware}
   \label{ref:Dualboot}
-  \opt{ipod4g,ipodcolor,ipodvideo,ipodnano1g,ipodmini1g}
+  \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodmini}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware, shut
     down the device as described above. Turn on the \ButtonHold{} switch
@@ -512,22 +512,22 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     simultaneously until the player hard resets.
     }
 
-  \opt{iriverh100,iriverh300}
+  \opt{h100,h300}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware,
     when the \dap{} is turned off, press and hold the \ButtonRec{} button,
     and then press the \ButtonOn{} button.
     }
 
-  \opt{iriverh10,iriverh10_5gb}
+  \opt{h10,h10_5gb}
     {
     Rockbox has a dual-boot feature. It loads the original firmware from
     the file \fname{/System/OF.mi4}. To boot into the original firmware,
     press and hold the \ButtonLeft{} button while turning on the player.
     \note{The iriver firmware does not shut down properly when you turn it off,
     it only goes to sleep. To get back into Rockbox when exiting from the
-    iriver firmware, you will need to reset the player by \opt{iriverh10}{inserting a
-    pin in the reset hole}\opt{iriverh10_5gb}{removing and reinserting the battery}.}
+    iriver firmware, you will need to reset the player by \opt{h10}{inserting a
+    pin in the reset hole}\opt{h10_5gb}{removing and reinserting the battery}.}
     }
     
   \opt{sansa,sansaAMS}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 362311ddaf..2c8ecfa17d 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -30,7 +30,7 @@ currently playing audio file.
   \item Peak meter.
   \end{itemize}
 }
-\opt{archosrecorder,archosrecorderv2fm,ondio}{
+\opt{recorder,recorderv2fm,ondio}{
   \note{
   \begin{itemize}
   \item The number of lines shown depends on the size of the font used.
@@ -40,7 +40,7 @@ currently playing audio file.
   }
 }
 %
-\opt{archosplayer}{
+\opt{player}{
   \note{
   \begin{itemize}
   \item Playlist index/Playlist size: Artist {}- Title.