8 files changed, 27 insertions, 27 deletions

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}%