diff --git a/manual/configure_rockbox/images/ss-equalizer-128x64x1-clip.png b/manual/configure_rockbox/images/ss-equalizer-128x64x1-sansaclip.png
similarity index 100%
rename from manual/configure_rockbox/images/ss-equalizer-128x64x1-clip.png
rename to manual/configure_rockbox/images/ss-equalizer-128x64x1-sansaclip.png
diff --git a/manual/configure_rockbox/images/ss-general-settings-112x64x1-ondiofm.png b/manual/configure_rockbox/images/ss-general-settings-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/configure_rockbox/images/ss-general-settings-112x64x1-ondiofm.png
rename to manual/configure_rockbox/images/ss-general-settings-112x64x1-archosondiofm.png
diff --git a/manual/configure_rockbox/images/ss-general-settings-112x64x1-ondiosp.png b/manual/configure_rockbox/images/ss-general-settings-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/configure_rockbox/images/ss-general-settings-112x64x1-ondiosp.png
rename to manual/configure_rockbox/images/ss-general-settings-112x64x1-archosondiosp.png
diff --git a/manual/configure_rockbox/images/ss-general-settings-128x64x1-clip.png b/manual/configure_rockbox/images/ss-general-settings-128x64x1-sansaclip.png
similarity index 100%
rename from manual/configure_rockbox/images/ss-general-settings-128x64x1-clip.png
rename to manual/configure_rockbox/images/ss-general-settings-128x64x1-sansaclip.png
diff --git a/manual/configure_rockbox/images/ss-sound-settings-112x64x1-ondiofm.png b/manual/configure_rockbox/images/ss-sound-settings-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/configure_rockbox/images/ss-sound-settings-112x64x1-ondiofm.png
rename to manual/configure_rockbox/images/ss-sound-settings-112x64x1-archosondiofm.png
diff --git a/manual/configure_rockbox/images/ss-sound-settings-112x64x1-ondiosp.png b/manual/configure_rockbox/images/ss-sound-settings-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/configure_rockbox/images/ss-sound-settings-112x64x1-ondiosp.png
rename to manual/configure_rockbox/images/ss-sound-settings-112x64x1-archosondiosp.png
diff --git a/manual/configure_rockbox/images/ss-sound-settings-128x64x1-clip.png b/manual/configure_rockbox/images/ss-sound-settings-128x64x1-sansaclip.png
similarity index 100%
rename from manual/configure_rockbox/images/ss-sound-settings-128x64x1-clip.png
rename to manual/configure_rockbox/images/ss-sound-settings-128x64x1-sansaclip.png
diff --git a/manual/main_menu/images/ss-fm-radio-screen-112x64x1-ondiofm.png b/manual/main_menu/images/ss-fm-radio-screen-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/main_menu/images/ss-fm-radio-screen-112x64x1-ondiofm.png
rename to manual/main_menu/images/ss-fm-radio-screen-112x64x1-archosondiofm.png
diff --git a/manual/main_menu/images/ss-fm-radio-screen-128x64x1-clip.png b/manual/main_menu/images/ss-fm-radio-screen-128x64x1-sansaclip.png
similarity index 100%
rename from manual/main_menu/images/ss-fm-radio-screen-128x64x1-clip.png
rename to manual/main_menu/images/ss-fm-radio-screen-128x64x1-sansaclip.png
diff --git a/manual/main_menu/images/ss-list-bookmarks-128x64x1-clip.png b/manual/main_menu/images/ss-list-bookmarks-128x64x1-sansaclip.png
similarity index 100%
rename from manual/main_menu/images/ss-list-bookmarks-128x64x1-clip.png
rename to manual/main_menu/images/ss-list-bookmarks-128x64x1-sansaclip.png
diff --git a/manual/main_menu/images/ss-main-menu-112x64x1-ondiofm.png b/manual/main_menu/images/ss-main-menu-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/main_menu/images/ss-main-menu-112x64x1-ondiofm.png
rename to manual/main_menu/images/ss-main-menu-112x64x1-archosondiofm.png
diff --git a/manual/main_menu/images/ss-main-menu-112x64x1-ondiosp.png b/manual/main_menu/images/ss-main-menu-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/main_menu/images/ss-main-menu-112x64x1-ondiosp.png
rename to manual/main_menu/images/ss-main-menu-112x64x1-archosondiosp.png
diff --git a/manual/main_menu/images/ss-main-menu-128x64x1-clip.png b/manual/main_menu/images/ss-main-menu-128x64x1-sansaclip.png
similarity index 100%
rename from manual/main_menu/images/ss-main-menu-128x64x1-clip.png
rename to manual/main_menu/images/ss-main-menu-128x64x1-sansaclip.png
diff --git a/manual/main_menu/images/ss-recording-settings-112x64x1-ondiofm.png b/manual/main_menu/images/ss-recording-settings-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/main_menu/images/ss-recording-settings-112x64x1-ondiofm.png
rename to manual/main_menu/images/ss-recording-settings-112x64x1-archosondiofm.png
diff --git a/manual/main_menu/images/ss-while-recording-screen-112x64x1-ondiofm.png b/manual/main_menu/images/ss-while-recording-screen-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/main_menu/images/ss-while-recording-screen-112x64x1-ondiofm.png
rename to manual/main_menu/images/ss-while-recording-screen-112x64x1-archosondiofm.png
diff --git a/manual/platform/archosondiofm.tex b/manual/platform/archosondiofm.tex
index cad2757923..40d0220bac 100644
--- a/manual/platform/archosondiofm.tex
+++ b/manual/platform/archosondiofm.tex
@@ -10,7 +10,7 @@
 \newcommand{\playertype}{Ondio}
 \newcommand{\playerlongtype}{Ondio 128 FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{ondiofm}
+\newcommand{\specimg}{archosondiofm}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/archosondiosp.tex b/manual/platform/archosondiosp.tex
index db05569744..f1eab45152 100644
--- a/manual/platform/archosondiosp.tex
+++ b/manual/platform/archosondiosp.tex
@@ -10,7 +10,7 @@
 \newcommand{\playertype}{Ondio}
 \newcommand{\playerlongtype}{Ondio 128 SP}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{ondiosp}
+\newcommand{\specimg}{archosondiosp}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/archosplayer.tex b/manual/platform/archosplayer.tex
index f384639681..1cdc67937a 100644
--- a/manual/platform/archosplayer.tex
+++ b/manual/platform/archosplayer.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{Studio/Player}
 \newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
 \newcommand{\genericimg}{charx11x1}
-\newcommand{\specimg}{player}
+\newcommand{\specimg}{archosplayer}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/archosrecorder.tex b/manual/platform/archosrecorder.tex
index d1293c7403..e9ede9a2a7 100644
--- a/manual/platform/archosrecorder.tex
+++ b/manual/platform/archosrecorder.tex
@@ -11,7 +11,7 @@
 \newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20}
 \newcommand{\genericimg}{112x64x1}
 
-\newcommand{\specimg}{recorder}
+\newcommand{\specimg}{archosrecorder}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/archosrecorderv2fm.tex b/manual/platform/archosrecorderv2fm.tex
index c7ecc84374..0e53d0940a 100644
--- a/manual/platform/archosrecorderv2fm.tex
+++ b/manual/platform/archosrecorderv2fm.tex
@@ -10,7 +10,7 @@
 \newcommand{\playertype}{Recorder V2/FM}
 \newcommand{\playerlongtype}{Recorder V2 and FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{recorderv2fm}
+\newcommand{\specimg}{archosrecorderv2fm}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/gigabeatfx.tex b/manual/platform/gigabeatfx.tex
index e9dc01bd18..56e8a7868b 100644
--- a/manual/platform/gigabeatfx.tex
+++ b/manual/platform/gigabeatfx.tex
@@ -14,7 +14,7 @@
 \newcommand{\playertype}{Gigabeat F and X Series}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{240x320x16}
-\newcommand{\specimg}{gigabeatf}
+\newcommand{\specimg}{gigabeatfx}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/ipodmini1g.tex b/manual/platform/ipodmini1g.tex
index 7671a4fb1a..4613ecd20c 100644
--- a/manual/platform/ipodmini1g.tex
+++ b/manual/platform/ipodmini1g.tex
@@ -10,7 +10,7 @@
 \newcommand{\playertype}{Mini}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{138x110x2}
-\newcommand{\specimg}{ipodmini}
+\newcommand{\specimg}{ipodmini1g}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/ipodnano1g.tex b/manual/platform/ipodnano1g.tex
index 974fe687ec..62811c3a2b 100644
--- a/manual/platform/ipodnano1g.tex
+++ b/manual/platform/ipodnano1g.tex
@@ -9,7 +9,7 @@
 \newcommand{\playertype}{Nano}
 \newcommand{\playerlongtype}{\playertype{} 1st generation}
 \newcommand{\genericimg}{176x132x16}
-\newcommand{\specimg}{ipodnano}
+\newcommand{\specimg}{ipodnano1g}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/plugins/images/ss-blackjack-128x64x1-clip.png b/manual/plugins/images/ss-blackjack-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-blackjack-128x64x1-clip.png
rename to manual/plugins/images/ss-blackjack-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-bounce-112x64x1-ondiofm.png b/manual/plugins/images/ss-bounce-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/plugins/images/ss-bounce-112x64x1-ondiofm.png
rename to manual/plugins/images/ss-bounce-112x64x1-archosondiofm.png
diff --git a/manual/plugins/images/ss-bounce-112x64x1-ondiosp.png b/manual/plugins/images/ss-bounce-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/plugins/images/ss-bounce-112x64x1-ondiosp.png
rename to manual/plugins/images/ss-bounce-112x64x1-archosondiosp.png
diff --git a/manual/plugins/images/ss-bounce-128x64x1-clip.png b/manual/plugins/images/ss-bounce-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-bounce-128x64x1-clip.png
rename to manual/plugins/images/ss-bounce-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-brickmania-128x64x1-clip.png b/manual/plugins/images/ss-brickmania-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-brickmania-128x64x1-clip.png
rename to manual/plugins/images/ss-brickmania-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-bubbles-128x64x1-clip.png b/manual/plugins/images/ss-bubbles-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-bubbles-128x64x1-clip.png
rename to manual/plugins/images/ss-bubbles-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-calculator-128x64x1-clip.png b/manual/plugins/images/ss-calculator-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-calculator-128x64x1-clip.png
rename to manual/plugins/images/ss-calculator-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-calendar-128x64x1-clip.png b/manual/plugins/images/ss-calendar-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-calendar-128x64x1-clip.png
rename to manual/plugins/images/ss-calendar-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-chess_clock-128x64x1-clip.png b/manual/plugins/images/ss-chess_clock-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-chess_clock-128x64x1-clip.png
rename to manual/plugins/images/ss-chess_clock-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-chessbox-128x64x1-clip.png b/manual/plugins/images/ss-chessbox-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-chessbox-128x64x1-clip.png
rename to manual/plugins/images/ss-chessbox-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-chopper-128x64x1-clip.png b/manual/plugins/images/ss-chopper-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-chopper-128x64x1-clip.png
rename to manual/plugins/images/ss-chopper-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-clock-128x64x1-clip.png b/manual/plugins/images/ss-clock-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-clock-128x64x1-clip.png
rename to manual/plugins/images/ss-clock-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-cube-128x64x1-clip.png b/manual/plugins/images/ss-cube-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-cube-128x64x1-clip.png
rename to manual/plugins/images/ss-cube-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-demystify-128x64x1-clip.png b/manual/plugins/images/ss-demystify-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-demystify-128x64x1-clip.png
rename to manual/plugins/images/ss-demystify-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-fire-128x64x1-clip.png b/manual/plugins/images/ss-fire-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-fire-128x64x1-clip.png
rename to manual/plugins/images/ss-fire-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-flipit-128x64x1-clip.png b/manual/plugins/images/ss-flipit-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-flipit-128x64x1-clip.png
rename to manual/plugins/images/ss-flipit-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-goban-128x64x1-clip.png b/manual/plugins/images/ss-goban-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-goban-128x64x1-clip.png
rename to manual/plugins/images/ss-goban-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-jackpot-128x64x1-clip.png b/manual/plugins/images/ss-jackpot-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-jackpot-128x64x1-clip.png
rename to manual/plugins/images/ss-jackpot-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-jewels-128x64x1-clip.png b/manual/plugins/images/ss-jewels-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-jewels-128x64x1-clip.png
rename to manual/plugins/images/ss-jewels-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-jpegviewer-128x64x1-clip.png b/manual/plugins/images/ss-jpegviewer-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-jpegviewer-128x64x1-clip.png
rename to manual/plugins/images/ss-jpegviewer-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-mandelbrot-128x64x1-clip.png b/manual/plugins/images/ss-mandelbrot-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-mandelbrot-128x64x1-clip.png
rename to manual/plugins/images/ss-mandelbrot-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-maze-128x64x1-clip.png b/manual/plugins/images/ss-maze-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-maze-128x64x1-clip.png
rename to manual/plugins/images/ss-maze-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-mazezam-128x64x1-clip.png b/manual/plugins/images/ss-mazezam-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-mazezam-128x64x1-clip.png
rename to manual/plugins/images/ss-mazezam-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-minesweeper-128x64x1-clip.png b/manual/plugins/images/ss-minesweeper-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-minesweeper-128x64x1-clip.png
rename to manual/plugins/images/ss-minesweeper-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-mosaic-128x64x1-clip.png b/manual/plugins/images/ss-mosaic-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-mosaic-128x64x1-clip.png
rename to manual/plugins/images/ss-mosaic-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-oscilloscope-128x64x1-clip.png b/manual/plugins/images/ss-oscilloscope-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-oscilloscope-128x64x1-clip.png
rename to manual/plugins/images/ss-oscilloscope-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-pegbox-128x64x1-clip.png b/manual/plugins/images/ss-pegbox-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-pegbox-128x64x1-clip.png
rename to manual/plugins/images/ss-pegbox-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-pictureflow-128x64x1-clip.png b/manual/plugins/images/ss-pictureflow-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-pictureflow-128x64x1-clip.png
rename to manual/plugins/images/ss-pictureflow-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-plasma-128x64x1-clip.png b/manual/plugins/images/ss-plasma-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-plasma-128x64x1-clip.png
rename to manual/plugins/images/ss-plasma-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-pong-128x64x1-clip.png b/manual/plugins/images/ss-pong-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-pong-128x64x1-clip.png
rename to manual/plugins/images/ss-pong-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-reversi-128x64x1-clip.png b/manual/plugins/images/ss-reversi-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-reversi-128x64x1-clip.png
rename to manual/plugins/images/ss-reversi-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-robotfindskitten-128x64x1-clip.png b/manual/plugins/images/ss-robotfindskitten-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-robotfindskitten-128x64x1-clip.png
rename to manual/plugins/images/ss-robotfindskitten-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-rockblox-128x64x1-clip.png b/manual/plugins/images/ss-rockblox-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-rockblox-128x64x1-clip.png
rename to manual/plugins/images/ss-rockblox-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-rocklife-128x64x1-clip.png b/manual/plugins/images/ss-rocklife-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-rocklife-128x64x1-clip.png
rename to manual/plugins/images/ss-rocklife-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-sliding-128x64x1-clip.png b/manual/plugins/images/ss-sliding-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-sliding-128x64x1-clip.png
rename to manual/plugins/images/ss-sliding-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-snake-128x64x1-clip.png b/manual/plugins/images/ss-snake-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-snake-128x64x1-clip.png
rename to manual/plugins/images/ss-snake-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-snake2-128x64x1-clip.png b/manual/plugins/images/ss-snake2-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-snake2-128x64x1-clip.png
rename to manual/plugins/images/ss-snake2-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-snow-128x64x1-clip.png b/manual/plugins/images/ss-snow-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-snow-128x64x1-clip.png
rename to manual/plugins/images/ss-snow-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-sokoban-128x64x1-clip.png b/manual/plugins/images/ss-sokoban-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-sokoban-128x64x1-clip.png
rename to manual/plugins/images/ss-sokoban-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-solitaire-128x64x1-clip.png b/manual/plugins/images/ss-solitaire-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-solitaire-128x64x1-clip.png
rename to manual/plugins/images/ss-solitaire-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-spacerocks-128x64x1-clip.png b/manual/plugins/images/ss-spacerocks-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-spacerocks-128x64x1-clip.png
rename to manual/plugins/images/ss-spacerocks-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-star-128x64x1-clip.png b/manual/plugins/images/ss-star-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-star-128x64x1-clip.png
rename to manual/plugins/images/ss-star-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-starfield-128x64x1-clip.png b/manual/plugins/images/ss-starfield-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-starfield-128x64x1-clip.png
rename to manual/plugins/images/ss-starfield-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-stats-128x64x1-clip.png b/manual/plugins/images/ss-stats-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-stats-128x64x1-clip.png
rename to manual/plugins/images/ss-stats-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-stopwatch-128x64x1-clip.png b/manual/plugins/images/ss-stopwatch-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-stopwatch-128x64x1-clip.png
rename to manual/plugins/images/ss-stopwatch-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-sudoku-128x64x1-clip.png b/manual/plugins/images/ss-sudoku-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-sudoku-128x64x1-clip.png
rename to manual/plugins/images/ss-sudoku-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-vumeter-128x64x1-clip.png b/manual/plugins/images/ss-vumeter-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-vumeter-128x64x1-clip.png
rename to manual/plugins/images/ss-vumeter-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-wormlet-128x64x1-clip.png b/manual/plugins/images/ss-wormlet-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-wormlet-128x64x1-clip.png
rename to manual/plugins/images/ss-wormlet-128x64x1-sansaclip.png
diff --git a/manual/plugins/images/ss-xobox-128x64x1-clip.png b/manual/plugins/images/ss-xobox-128x64x1-sansaclip.png
similarity index 100%
rename from manual/plugins/images/ss-xobox-128x64x1-clip.png
rename to manual/plugins/images/ss-xobox-128x64x1-sansaclip.png
diff --git a/manual/rockbox_interface/images/ondiofm-front.pdf b/manual/rockbox_interface/images/archosondiofm-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/ondiofm-front.pdf
rename to manual/rockbox_interface/images/archosondiofm-front.pdf
diff --git a/manual/rockbox_interface/images/ondiofm-front.png b/manual/rockbox_interface/images/archosondiofm-front.png
similarity index 100%
rename from manual/rockbox_interface/images/ondiofm-front.png
rename to manual/rockbox_interface/images/archosondiofm-front.png
diff --git a/manual/rockbox_interface/images/ondiofm-front.svg b/manual/rockbox_interface/images/archosondiofm-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/ondiofm-front.svg
rename to manual/rockbox_interface/images/archosondiofm-front.svg
diff --git a/manual/rockbox_interface/images/ondiosp-front.pdf b/manual/rockbox_interface/images/archosondiosp-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/ondiosp-front.pdf
rename to manual/rockbox_interface/images/archosondiosp-front.pdf
diff --git a/manual/rockbox_interface/images/ondiosp-front.png b/manual/rockbox_interface/images/archosondiosp-front.png
similarity index 100%
rename from manual/rockbox_interface/images/ondiosp-front.png
rename to manual/rockbox_interface/images/archosondiosp-front.png
diff --git a/manual/rockbox_interface/images/ondiosp-front.svg b/manual/rockbox_interface/images/archosondiosp-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/ondiosp-front.svg
rename to manual/rockbox_interface/images/archosondiosp-front.svg
diff --git a/manual/rockbox_interface/images/player-front.pdf b/manual/rockbox_interface/images/archosplayer-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/player-front.pdf
rename to manual/rockbox_interface/images/archosplayer-front.pdf
diff --git a/manual/rockbox_interface/images/player-front.png b/manual/rockbox_interface/images/archosplayer-front.png
similarity index 100%
rename from manual/rockbox_interface/images/player-front.png
rename to manual/rockbox_interface/images/archosplayer-front.png
diff --git a/manual/rockbox_interface/images/player-front.svg b/manual/rockbox_interface/images/archosplayer-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/player-front.svg
rename to manual/rockbox_interface/images/archosplayer-front.svg
diff --git a/manual/rockbox_interface/images/recorder-front.pdf b/manual/rockbox_interface/images/archosrecorder-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/recorder-front.pdf
rename to manual/rockbox_interface/images/archosrecorder-front.pdf
diff --git a/manual/rockbox_interface/images/recorder-front.png b/manual/rockbox_interface/images/archosrecorder-front.png
similarity index 100%
rename from manual/rockbox_interface/images/recorder-front.png
rename to manual/rockbox_interface/images/archosrecorder-front.png
diff --git a/manual/rockbox_interface/images/recorder-front.svg b/manual/rockbox_interface/images/archosrecorder-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/recorder-front.svg
rename to manual/rockbox_interface/images/archosrecorder-front.svg
diff --git a/manual/rockbox_interface/images/recorderv2fm-front.pdf b/manual/rockbox_interface/images/archosrecorderv2fm-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/recorderv2fm-front.pdf
rename to manual/rockbox_interface/images/archosrecorderv2fm-front.pdf
diff --git a/manual/rockbox_interface/images/recorderv2fm-front.png b/manual/rockbox_interface/images/archosrecorderv2fm-front.png
similarity index 100%
rename from manual/rockbox_interface/images/recorderv2fm-front.png
rename to manual/rockbox_interface/images/archosrecorderv2fm-front.png
diff --git a/manual/rockbox_interface/images/recorderv2fm-front.svg b/manual/rockbox_interface/images/archosrecorderv2fm-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/recorderv2fm-front.svg
rename to manual/rockbox_interface/images/archosrecorderv2fm-front.svg
diff --git a/manual/rockbox_interface/images/gigabeatf-front.pdf b/manual/rockbox_interface/images/gigabeatfx-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/gigabeatf-front.pdf
rename to manual/rockbox_interface/images/gigabeatfx-front.pdf
diff --git a/manual/rockbox_interface/images/gigabeatf-front.png b/manual/rockbox_interface/images/gigabeatfx-front.png
similarity index 100%
rename from manual/rockbox_interface/images/gigabeatf-front.png
rename to manual/rockbox_interface/images/gigabeatfx-front.png
diff --git a/manual/rockbox_interface/images/gigabeatf-front.svg b/manual/rockbox_interface/images/gigabeatfx-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/gigabeatf-front.svg
rename to manual/rockbox_interface/images/gigabeatfx-front.svg
diff --git a/manual/rockbox_interface/images/m3-remote.pdf b/manual/rockbox_interface/images/iaudiom3-remote.pdf
similarity index 100%
rename from manual/rockbox_interface/images/m3-remote.pdf
rename to manual/rockbox_interface/images/iaudiom3-remote.pdf
diff --git a/manual/rockbox_interface/images/m3-remote.png b/manual/rockbox_interface/images/iaudiom3-remote.png
similarity index 100%
rename from manual/rockbox_interface/images/m3-remote.png
rename to manual/rockbox_interface/images/iaudiom3-remote.png
diff --git a/manual/rockbox_interface/images/m3-remote.svg b/manual/rockbox_interface/images/iaudiom3-remote.svg
similarity index 100%
rename from manual/rockbox_interface/images/m3-remote.svg
rename to manual/rockbox_interface/images/iaudiom3-remote.svg
diff --git a/manual/rockbox_interface/images/ipodmini-front.pdf b/manual/rockbox_interface/images/ipodmini1g-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/ipodmini-front.pdf
rename to manual/rockbox_interface/images/ipodmini1g-front.pdf
diff --git a/manual/rockbox_interface/images/ipodmini-front.png b/manual/rockbox_interface/images/ipodmini1g-front.png
similarity index 100%
rename from manual/rockbox_interface/images/ipodmini-front.png
rename to manual/rockbox_interface/images/ipodmini1g-front.png
diff --git a/manual/rockbox_interface/images/ipodmini-front.svg b/manual/rockbox_interface/images/ipodmini1g-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/ipodmini-front.svg
rename to manual/rockbox_interface/images/ipodmini1g-front.svg
diff --git a/manual/rockbox_interface/images/ipodnano-front.pdf b/manual/rockbox_interface/images/ipodnano1g-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/ipodnano-front.pdf
rename to manual/rockbox_interface/images/ipodnano1g-front.pdf
diff --git a/manual/rockbox_interface/images/ipodnano-front.png b/manual/rockbox_interface/images/ipodnano1g-front.png
similarity index 100%
rename from manual/rockbox_interface/images/ipodnano-front.png
rename to manual/rockbox_interface/images/ipodnano1g-front.png
diff --git a/manual/rockbox_interface/images/ipodnano-front.svg b/manual/rockbox_interface/images/ipodnano1g-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/ipodnano-front.svg
rename to manual/rockbox_interface/images/ipodnano1g-front.svg
diff --git a/manual/rockbox_interface/images/ss-context-menu-112x64x1-ondiofm.png b/manual/rockbox_interface/images/ss-context-menu-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-context-menu-112x64x1-ondiofm.png
rename to manual/rockbox_interface/images/ss-context-menu-112x64x1-archosondiofm.png
diff --git a/manual/rockbox_interface/images/ss-context-menu-112x64x1-ondiosp.png b/manual/rockbox_interface/images/ss-context-menu-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-context-menu-112x64x1-ondiosp.png
rename to manual/rockbox_interface/images/ss-context-menu-112x64x1-archosondiosp.png
diff --git a/manual/rockbox_interface/images/ss-context-menu-128x64x1-clip.png b/manual/rockbox_interface/images/ss-context-menu-128x64x1-sansaclip.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-context-menu-128x64x1-clip.png
rename to manual/rockbox_interface/images/ss-context-menu-128x64x1-sansaclip.png
diff --git a/manual/rockbox_interface/images/ss-file-browser-112x64x1-ondiofm.png b/manual/rockbox_interface/images/ss-file-browser-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-file-browser-112x64x1-ondiofm.png
rename to manual/rockbox_interface/images/ss-file-browser-112x64x1-archosondiofm.png
diff --git a/manual/rockbox_interface/images/ss-file-browser-112x64x1-ondiosp.png b/manual/rockbox_interface/images/ss-file-browser-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-file-browser-112x64x1-ondiosp.png
rename to manual/rockbox_interface/images/ss-file-browser-112x64x1-archosondiosp.png
diff --git a/manual/rockbox_interface/images/ss-file-browser-128x64x1-clip.png b/manual/rockbox_interface/images/ss-file-browser-128x64x1-sansaclip.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-file-browser-128x64x1-clip.png
rename to manual/rockbox_interface/images/ss-file-browser-128x64x1-sansaclip.png
diff --git a/manual/rockbox_interface/images/ss-id3-viewer-112x64x1-ondiofm.png b/manual/rockbox_interface/images/ss-id3-viewer-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-id3-viewer-112x64x1-ondiofm.png
rename to manual/rockbox_interface/images/ss-id3-viewer-112x64x1-archosondiofm.png
diff --git a/manual/rockbox_interface/images/ss-id3-viewer-112x64x1-ondiosp.png b/manual/rockbox_interface/images/ss-id3-viewer-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-id3-viewer-112x64x1-ondiosp.png
rename to manual/rockbox_interface/images/ss-id3-viewer-112x64x1-archosondiosp.png
diff --git a/manual/rockbox_interface/images/ss-id3-viewer-128x64x1-clip.png b/manual/rockbox_interface/images/ss-id3-viewer-128x64x1-sansaclip.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-id3-viewer-128x64x1-clip.png
rename to manual/rockbox_interface/images/ss-id3-viewer-128x64x1-sansaclip.png
diff --git a/manual/rockbox_interface/images/ss-playlist-menu-112x64x1-ondiofm.png b/manual/rockbox_interface/images/ss-playlist-menu-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-playlist-menu-112x64x1-ondiofm.png
rename to manual/rockbox_interface/images/ss-playlist-menu-112x64x1-archosondiofm.png
diff --git a/manual/rockbox_interface/images/ss-playlist-menu-112x64x1-ondiosp.png b/manual/rockbox_interface/images/ss-playlist-menu-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-playlist-menu-112x64x1-ondiosp.png
rename to manual/rockbox_interface/images/ss-playlist-menu-112x64x1-archosondiosp.png
diff --git a/manual/rockbox_interface/images/ss-playlist-menu-128x64x1-clip.png b/manual/rockbox_interface/images/ss-playlist-menu-128x64x1-sansaclip.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-playlist-menu-128x64x1-clip.png
rename to manual/rockbox_interface/images/ss-playlist-menu-128x64x1-sansaclip.png
diff --git a/manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-ondiofm.png b/manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-archosondiofm.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-ondiofm.png
rename to manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-archosondiofm.png
diff --git a/manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-ondiosp.png b/manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-archosondiosp.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-ondiosp.png
rename to manual/rockbox_interface/images/ss-virtual-keyboard-112x64x1-archosondiosp.png
diff --git a/manual/rockbox_interface/images/ss-virtual-keyboard-128x64x1-clip.png b/manual/rockbox_interface/images/ss-virtual-keyboard-128x64x1-sansaclip.png
similarity index 100%
rename from manual/rockbox_interface/images/ss-virtual-keyboard-128x64x1-clip.png
rename to manual/rockbox_interface/images/ss-virtual-keyboard-128x64x1-sansaclip.png