7 files changed, 18 insertions, 18 deletions

diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index ab7593c893..a4aade54d0 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{recorder,recorderv2fm,ondio}{
+\opt{archosrecorder,archosrecorderv2fm,ondio}{
 \note{This plugin will stop playback.}
 }
 
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 292327046f..1974c65eef 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{recorder,recorderv2fm,h100,m5,lcd_color}
+    \opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}
     {and Rockboy in \reference{ref:Rockboy}}.}
 
 \opt{lcd_bitmap}{\input{plugins/blackjack.tex}}
@@ -41,7 +41,7 @@ text files%
 
 \opt{lcd_bitmap}{\input{plugins/goban.tex}}
 
-\opt{lcd_non-mono}{\nopt{h10_5gb,ipodmini,c200}{
+\opt{lcd_non-mono}{\nopt{iriverh10_5gb,ipodmini1g,sansac200}{
   \input{plugins/invadrox.tex}}}
 
 {\input{plugins/jackpot.tex}}
@@ -52,9 +52,9 @@ text files%
 
 \opt{lcd_bitmap}{\input{plugins/minesweeper.tex}}
 
-\opt{player}{\input{plugins/nim.tex}}
+\opt{archosplayer}{\input{plugins/nim.tex}}
 
-\opt{h100,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}}
+\opt{iriverh100,iaudiom5,lcd_color}{\nopt{sansac200}{\input{plugins/pacbox.tex}}}
 
 \opt{lcd_bitmap}{\input{plugins/pegbox.tex}}
 
@@ -166,7 +166,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \opt{swcodec}{\input{plugins/midiplay.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
 
 \opt{lcd_bitmap}{\opt{swcodec}{\input{plugins/mpegplayer.tex}}}
 
@@ -174,9 +174,9 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \opt{lcd_color}{\input{plugins/ppmviewer.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
 
-\opt{recorder,recorderv2fm,h100,m5,lcd_color}{\input{plugins/rockboy.tex}}
+\opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}{\input{plugins/rockboy.tex}}
 
 {\input{plugins/search.tex}}
 
@@ -188,13 +188,13 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/vbrfix.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/wavplay.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/wavplay.tex}}
 
 \opt{lcd_bitmap}{\input{plugins/zxbox.tex}}
 
 \section{Applications}
 
-\opt{player,recorder,recorderv2fm}{\input{plugins/alpinecdc.tex}}
+\opt{archosplayer,archosrecorder,archosrecorderv2fm}{\input{plugins/alpinecdc.tex}}
 
 {\input{plugins/batterybenchmark.tex}}
 
@@ -208,9 +208,9 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/disktidy.tex}}
 
-\opt{player}{\input{plugins/euro_converter.tex}}
+\opt{archosplayer}{\input{plugins/euro_converter.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/firmware_flash.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/firmware_flash.tex}}
 
 {\input{plugins/keybox.tex}}
 
@@ -226,7 +226,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \opt{lcd_color}{\input{plugins/rockpaint.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/split_editor.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/split_editor.tex}}
 
 {\input{plugins/stats.tex}}
 
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 90a5bc0015..73a042d725 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,h100}{using the greyscale engine}.
+\opt{archos,iriverh100}{using the greyscale engine}.
 \begin{table}
   \begin{btnmap}{}{}
     Direction keys
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index 015622be1d..a838debcad 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,h10,h10_5gb,mrobe100}{
+\opt{ipod,sansa,iriverh10,iriverh10_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/rockboy.tex b/manual/plugins/rockboy.tex
index bfa61110a0..33f19821c6 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -66,7 +66,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         & Select\\
         %
     }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,m5}{
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,iaudiom5}{
         \opt{RECORDER_PAD}{\ButtonOn}
         \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch}
               \opt{HAVEREMOTEKEYMAP}{& }
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index 3e2cfca56c..e4e9ce872a 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{player}{Press \ButtonStop\ to quit.}%
+\opt{archosplayer}{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 442a86c9ff..8e9fe9c16b 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{player}{, music files }%
+\nopt{archosplayer}{, music files }%
 and directories on your \dap.
 Press %
 \opt{PLAYER_PAD}{\ButtonStop}%