38 files changed, 37 insertions, 37 deletions

diff --git a/manual/platform/ondiofm.tex b/manual/platform/archosondiofm.tex
index c49a1363d7..cad2757923 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/archosondiofm.tex
@@ -21,4 +21,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-ondio.tex}
+\input{platform/keymap-archosondio.tex}
diff --git a/manual/platform/ondiosp.tex b/manual/platform/archosondiosp.tex
index 43d74e76fd..db05569744 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/archosondiosp.tex
@@ -21,4 +21,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-ondio.tex}
+\input{platform/keymap-archosondio.tex}
diff --git a/manual/platform/player.tex b/manual/platform/archosplayer.tex
index eddd5eddfc..f384639681 100644
--- a/manual/platform/player.tex
+++ b/manual/platform/archosplayer.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-player.tex}
+\input{platform/keymap-archosplayer.tex}
diff --git a/manual/platform/recorder.tex b/manual/platform/archosrecorder.tex
index 9eaf9091d8..d1293c7403 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/archosrecorder.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-recorder.tex}
+\input{platform/keymap-archosrecorder.tex}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/archosrecorderv2fm.tex
index 99b829d8a5..c7ecc84374 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/archosrecorderv2fm.tex
@@ -21,4 +21,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-recorder.tex}
+\input{platform/keymap-archosrecorder.tex}
diff --git a/manual/platform/gigabeatf.tex b/manual/platform/gigabeatfx.tex
index e49f1593c8..e9dc01bd18 100644
--- a/manual/platform/gigabeatf.tex
+++ b/manual/platform/gigabeatfx.tex
@@ -25,5 +25,5 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-gigabeatf.tex}
+\input{platform/keymap-gigabeatfx.tex}
 \input{platform/remote-keymap-gigabeat.tex}
diff --git a/manual/platform/m3.tex b/manual/platform/iaudiom3.tex
index bbdd255299..37b7825bbc 100644
--- a/manual/platform/m3.tex
+++ b/manual/platform/iaudiom3.tex
@@ -22,5 +22,5 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap files
-\input{platform/keymap-m3.tex}
+\input{platform/keymap-iaudiom3.tex}
 \input{platform/remote-keymap-iaudio.tex}
diff --git a/manual/platform/m5.tex b/manual/platform/iaudiom5.tex
index c7233b11f2..60cd1f590f 100644
--- a/manual/platform/m5.tex
+++ b/manual/platform/iaudiom5.tex
@@ -23,4 +23,4 @@
 \newcommand{\disk}{hard disk}
 
 % link to external keymap file
-\input{platform/keymap-mx5.tex}
+\input{platform/keymap-iaudiomx5.tex}
diff --git a/manual/platform/x5.tex b/manual/platform/iaudiox5.tex
index df8473c602..5b5a2122f5 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/iaudiox5.tex
@@ -23,4 +23,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-mx5.tex}
+\input{platform/keymap-iaudiomx5.tex}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini1g.tex
index 7671a4fb1a..7671a4fb1a 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini1g.tex
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano1g.tex
index 974fe687ec..974fe687ec 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano1g.tex
diff --git a/manual/platform/h10.tex b/manual/platform/iriverh10.tex
index 4b99b1ba51..eae5e5c4b9 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/iriverh10.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h10.tex}
+\input{platform/keymap-iriverh10.tex}
diff --git a/manual/platform/h100.tex b/manual/platform/iriverh100.tex
index 19e4ef0677..336f68489d 100644
--- a/manual/platform/h100.tex
+++ b/manual/platform/iriverh100.tex
@@ -25,6 +25,6 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h100_h300.tex}
-\input{platform/remote-keymap-h100.tex}
+\input{platform/keymap-iriverh100_h300.tex}
+\input{platform/remote-keymap-iriverh100.tex}
 
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/iriverh10_5gb.tex
index d89e1eabcd..0cb0376dfe 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/iriverh10_5gb.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h10.tex}
+\input{platform/keymap-iriverh10.tex}
diff --git a/manual/platform/h300.tex b/manual/platform/iriverh300.tex
index 211bc1a9b0..ba66fac13c 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/iriverh300.tex
@@ -23,5 +23,5 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h100_h300.tex}
+\input{platform/keymap-iriverh100_h300.tex}
 
diff --git a/manual/platform/keymap-player.tex b/manual/platform/keymap-archosplayer.tex
index 651239b4d9..651239b4d9 100644
--- a/manual/platform/keymap-player.tex
+++ b/manual/platform/keymap-archosplayer.tex
diff --git a/manual/platform/keymap-recorder.tex b/manual/platform/keymap-archosrecorder.tex
index ac194a4422..ac194a4422 100644
--- a/manual/platform/keymap-recorder.tex
+++ b/manual/platform/keymap-archosrecorder.tex
diff --git a/manual/platform/keymap-gigabeatf.tex b/manual/platform/keymap-gigabeatfx.tex
index 39d51b0dd5..39d51b0dd5 100644
--- a/manual/platform/keymap-gigabeatf.tex
+++ b/manual/platform/keymap-gigabeatfx.tex
diff --git a/manual/platform/keymap-m3.tex b/manual/platform/keymap-iaudiom3.tex
index 098422b21d..098422b21d 100644
--- a/manual/platform/keymap-m3.tex
+++ b/manual/platform/keymap-iaudiom3.tex
diff --git a/manual/platform/keymap-h10.tex b/manual/platform/keymap-iriverh10.tex
index 364504fcd7..364504fcd7 100644
--- a/manual/platform/keymap-h10.tex
+++ b/manual/platform/keymap-iriverh10.tex
diff --git a/manual/platform/keymap-h100_h300.tex b/manual/platform/keymap-iriverh100_h300.tex
index 419dc0bfcf..419dc0bfcf 100644
--- a/manual/platform/keymap-h100_h300.tex
+++ b/manual/platform/keymap-iriverh100_h300.tex
diff --git a/manual/platform/keymap-c200.tex b/manual/platform/keymap-sansac200.tex
index 8fbed84de3..8fbed84de3 100644
--- a/manual/platform/keymap-c200.tex
+++ b/manual/platform/keymap-sansac200.tex
diff --git a/manual/platform/keymap-clip.tex b/manual/platform/keymap-sansaclip.tex
index 1ddc718e44..1ddc718e44 100644
--- a/manual/platform/keymap-clip.tex
+++ b/manual/platform/keymap-sansaclip.tex
diff --git a/manual/platform/keymap-e200.tex b/manual/platform/keymap-sansae200.tex
index 253e8898eb..253e8898eb 100644
--- a/manual/platform/keymap-e200.tex
+++ b/manual/platform/keymap-sansae200.tex
diff --git a/manual/platform/keymap-fuze.tex b/manual/platform/keymap-sansafuze.tex
index 8c4935c013..8c4935c013 100644
--- a/manual/platform/keymap-fuze.tex
+++ b/manual/platform/keymap-sansafuze.tex
diff --git a/manual/platform/remote-keymap-h100.tex b/manual/platform/remote-keymap-iriverh100.tex
index cc0537047b..cc0537047b 100644
--- a/manual/platform/remote-keymap-h100.tex
+++ b/manual/platform/remote-keymap-iriverh100.tex
diff --git a/manual/platform/c200.tex b/manual/platform/sansac200.tex
index 0c7473ee18..0db90eac40 100644
--- a/manual/platform/c200.tex
+++ b/manual/platform/sansac200.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-c200.tex}
+\input{platform/keymap-sansac200.tex}
diff --git a/manual/platform/clip.tex b/manual/platform/sansaclip.tex
index 018ef40b25..24a004597c 100644
--- a/manual/platform/clip.tex
+++ b/manual/platform/sansaclip.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-clip.tex}
+\input{platform/keymap-sansaclip.tex}
diff --git a/manual/platform/e200.tex b/manual/platform/sansae200.tex
index d20d34f2d7..2bdc3f562d 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/sansae200.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-e200.tex}
+\input{platform/keymap-sanse200.tex}
diff --git a/manual/platform/e200v2.tex b/manual/platform/sansae200v2.tex
index 25ce3a7311..a5001cc89d 100644
--- a/manual/platform/e200v2.tex
+++ b/manual/platform/sansae200v2.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-e200.tex}
+\input{platform/keymap-sansae200.tex}
diff --git a/manual/platform/fuze.tex b/manual/platform/sansafuze.tex
index 1c76948ee6..0020e2e01b 100644
--- a/manual/platform/fuze.tex
+++ b/manual/platform/sansafuze.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-fuze.tex}
+\input{platform/keymap-sansafuze.tex}
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}%