diff --git a/manual/platform/iaudiom3.tex b/manual/platform/iaudiom3.tex
index 37b7825bbc..cffcc8e128 100644
--- a/manual/platform/iaudiom3.tex
+++ b/manual/platform/iaudiom3.tex
@@ -12,7 +12,7 @@
 \newcommand{\playertype}{M3}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x96x2}
-\newcommand{\specimg}{m3}
+\newcommand{\specimg}{iaudiom3}
 %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/iaudiom5.tex b/manual/platform/iaudiom5.tex
index 60cd1f590f..da45a1810b 100644
--- a/manual/platform/iaudiom5.tex
+++ b/manual/platform/iaudiom5.tex
@@ -12,7 +12,7 @@
 \newcommand{\playertype}{M5}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{m5}
+\newcommand{\specimg}{iaudiom5}
 %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/iaudiox5.tex b/manual/platform/iaudiox5.tex
index 5b5a2122f5..15785ea74e 100644
--- a/manual/platform/iaudiox5.tex
+++ b/manual/platform/iaudiox5.tex
@@ -12,7 +12,7 @@
 \newcommand{\playertype}{X5}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{x5}
+\newcommand{\specimg}{iaudiox5}
 %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/iriverh10.tex b/manual/platform/iriverh10.tex
index eae5e5c4b9..8ff17fee28 100644
--- a/manual/platform/iriverh10.tex
+++ b/manual/platform/iriverh10.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{H10}
 \newcommand{\playerlongtype}{\playertype{} 20GB}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{h10}
+\newcommand{\specimg}{iriverh10}
 %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/iriverh100.tex b/manual/platform/iriverh100.tex
index 336f68489d..062a928575 100644
--- a/manual/platform/iriverh100.tex
+++ b/manual/platform/iriverh100.tex
@@ -14,7 +14,7 @@
 \newcommand{\playertype}{H100}
 \newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{h100}
+\newcommand{\specimg}{iriverh100}
 %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/iriverh10_5gb.tex b/manual/platform/iriverh10_5gb.tex
index 0cb0376dfe..77a5a79acf 100644
--- a/manual/platform/iriverh10_5gb.tex
+++ b/manual/platform/iriverh10_5gb.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{H10}
 \newcommand{\playerlongtype}{\playertype{} 5GB and 6GB}
 \newcommand{\genericimg}{128x128x16}
-\newcommand{\specimg}{h10_5gb}
+\newcommand{\specimg}{iriverh10_5gb}
 %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/iriverh300.tex b/manual/platform/iriverh300.tex
index ba66fac13c..a69af98455 100644
--- a/manual/platform/iriverh300.tex
+++ b/manual/platform/iriverh300.tex
@@ -12,7 +12,7 @@
 \newcommand{\playertype}{H3xx}
 \newcommand{\playerlongtype}{H320 and H340}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{h300}
+\newcommand{\specimg}{iriverh300}
 %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/sansac200.tex b/manual/platform/sansac200.tex
index 0db90eac40..3d4cc1bc46 100644
--- a/manual/platform/sansac200.tex
+++ b/manual/platform/sansac200.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{c200 Series}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{132x80x16}
-\newcommand{\specimg}{c200}
+\newcommand{\specimg}{sansac200}
 %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/sansaclip.tex b/manual/platform/sansaclip.tex
index 24a004597c..0509c52eb3 100644
--- a/manual/platform/sansaclip.tex
+++ b/manual/platform/sansaclip.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{Clip}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x64x1-clip}
-\newcommand{\specimg}{clip}
+\newcommand{\specimg}{sansaclip}
 %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/sansae200.tex b/manual/platform/sansae200.tex
index 69e0f437b8..1703a0c309 100644
--- a/manual/platform/sansae200.tex
+++ b/manual/platform/sansae200.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{e200 and e200R Series}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{176x220x16}
-\newcommand{\specimg}{e200}
+\newcommand{\specimg}{sansae200}
 %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/sansae200v2.tex b/manual/platform/sansae200v2.tex
index a5001cc89d..d1f4fdffc2 100644
--- a/manual/platform/sansae200v2.tex
+++ b/manual/platform/sansae200v2.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{e200v2 Series}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{176x220x16}
-\newcommand{\specimg}{e200}
+\newcommand{\specimg}{sansae200}
 %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/sansafuze.tex b/manual/platform/sansafuze.tex
index 0020e2e01b..9ba14c4d9b 100644
--- a/manual/platform/sansafuze.tex
+++ b/manual/platform/sansafuze.tex
@@ -11,7 +11,7 @@
 \newcommand{\playertype}{Fuze}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{fuze}
+\newcommand{\specimg}{sansafuze}
 %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/rockbox_interface/images/m3-front.pdf b/manual/rockbox_interface/images/iaudiom3-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/m3-front.pdf
rename to manual/rockbox_interface/images/iaudiom3-front.pdf
diff --git a/manual/rockbox_interface/images/m3-front.png b/manual/rockbox_interface/images/iaudiom3-front.png
similarity index 100%
rename from manual/rockbox_interface/images/m3-front.png
rename to manual/rockbox_interface/images/iaudiom3-front.png
diff --git a/manual/rockbox_interface/images/m3-front.svg b/manual/rockbox_interface/images/iaudiom3-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/m3-front.svg
rename to manual/rockbox_interface/images/iaudiom3-front.svg
diff --git a/manual/rockbox_interface/images/m5-front.pdf b/manual/rockbox_interface/images/iaudiom5-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/m5-front.pdf
rename to manual/rockbox_interface/images/iaudiom5-front.pdf
diff --git a/manual/rockbox_interface/images/m5-front.png b/manual/rockbox_interface/images/iaudiom5-front.png
similarity index 100%
rename from manual/rockbox_interface/images/m5-front.png
rename to manual/rockbox_interface/images/iaudiom5-front.png
diff --git a/manual/rockbox_interface/images/m5-front.svg b/manual/rockbox_interface/images/iaudiom5-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/m5-front.svg
rename to manual/rockbox_interface/images/iaudiom5-front.svg
diff --git a/manual/rockbox_interface/images/x5-front.pdf b/manual/rockbox_interface/images/iaudiox5-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/x5-front.pdf
rename to manual/rockbox_interface/images/iaudiox5-front.pdf
diff --git a/manual/rockbox_interface/images/x5-front.png b/manual/rockbox_interface/images/iaudiox5-front.png
similarity index 100%
rename from manual/rockbox_interface/images/x5-front.png
rename to manual/rockbox_interface/images/iaudiox5-front.png
diff --git a/manual/rockbox_interface/images/x5-front.svg b/manual/rockbox_interface/images/iaudiox5-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/x5-front.svg
rename to manual/rockbox_interface/images/iaudiox5-front.svg
diff --git a/manual/rockbox_interface/images/h10-front.pdf b/manual/rockbox_interface/images/iriverh10-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/h10-front.pdf
rename to manual/rockbox_interface/images/iriverh10-front.pdf
diff --git a/manual/rockbox_interface/images/h10-front.png b/manual/rockbox_interface/images/iriverh10-front.png
similarity index 100%
rename from manual/rockbox_interface/images/h10-front.png
rename to manual/rockbox_interface/images/iriverh10-front.png
diff --git a/manual/rockbox_interface/images/h10-front.svg b/manual/rockbox_interface/images/iriverh10-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/h10-front.svg
rename to manual/rockbox_interface/images/iriverh10-front.svg
diff --git a/manual/rockbox_interface/images/h100-front.pdf b/manual/rockbox_interface/images/iriverh100-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/h100-front.pdf
rename to manual/rockbox_interface/images/iriverh100-front.pdf
diff --git a/manual/rockbox_interface/images/h100-front.png b/manual/rockbox_interface/images/iriverh100-front.png
similarity index 100%
rename from manual/rockbox_interface/images/h100-front.png
rename to manual/rockbox_interface/images/iriverh100-front.png
diff --git a/manual/rockbox_interface/images/h100-front.svg b/manual/rockbox_interface/images/iriverh100-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/h100-front.svg
rename to manual/rockbox_interface/images/iriverh100-front.svg
diff --git a/manual/rockbox_interface/images/h10_5gb-front.pdf b/manual/rockbox_interface/images/iriverh10_5gb-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/h10_5gb-front.pdf
rename to manual/rockbox_interface/images/iriverh10_5gb-front.pdf
diff --git a/manual/rockbox_interface/images/h10_5gb-front.png b/manual/rockbox_interface/images/iriverh10_5gb-front.png
similarity index 100%
rename from manual/rockbox_interface/images/h10_5gb-front.png
rename to manual/rockbox_interface/images/iriverh10_5gb-front.png
diff --git a/manual/rockbox_interface/images/h10_5gb-front.svg b/manual/rockbox_interface/images/iriverh10_5gb-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/h10_5gb-front.svg
rename to manual/rockbox_interface/images/iriverh10_5gb-front.svg
diff --git a/manual/rockbox_interface/images/h300-front.pdf b/manual/rockbox_interface/images/iriverh300-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/h300-front.pdf
rename to manual/rockbox_interface/images/iriverh300-front.pdf
diff --git a/manual/rockbox_interface/images/h300-front.png b/manual/rockbox_interface/images/iriverh300-front.png
similarity index 100%
rename from manual/rockbox_interface/images/h300-front.png
rename to manual/rockbox_interface/images/iriverh300-front.png
diff --git a/manual/rockbox_interface/images/h300-front.svg b/manual/rockbox_interface/images/iriverh300-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/h300-front.svg
rename to manual/rockbox_interface/images/iriverh300-front.svg
diff --git a/manual/rockbox_interface/images/c200-front.pdf b/manual/rockbox_interface/images/sansac200-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/c200-front.pdf
rename to manual/rockbox_interface/images/sansac200-front.pdf
diff --git a/manual/rockbox_interface/images/c200-front.png b/manual/rockbox_interface/images/sansac200-front.png
similarity index 100%
rename from manual/rockbox_interface/images/c200-front.png
rename to manual/rockbox_interface/images/sansac200-front.png
diff --git a/manual/rockbox_interface/images/c200-front.svg b/manual/rockbox_interface/images/sansac200-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/c200-front.svg
rename to manual/rockbox_interface/images/sansac200-front.svg
diff --git a/manual/rockbox_interface/images/clip-front.pdf b/manual/rockbox_interface/images/sansaclip-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/clip-front.pdf
rename to manual/rockbox_interface/images/sansaclip-front.pdf
diff --git a/manual/rockbox_interface/images/clip-front.png b/manual/rockbox_interface/images/sansaclip-front.png
similarity index 100%
rename from manual/rockbox_interface/images/clip-front.png
rename to manual/rockbox_interface/images/sansaclip-front.png
diff --git a/manual/rockbox_interface/images/clip-front.svg b/manual/rockbox_interface/images/sansaclip-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/clip-front.svg
rename to manual/rockbox_interface/images/sansaclip-front.svg
diff --git a/manual/rockbox_interface/images/e200-front.pdf b/manual/rockbox_interface/images/sansae200-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/e200-front.pdf
rename to manual/rockbox_interface/images/sansae200-front.pdf
diff --git a/manual/rockbox_interface/images/e200-front.png b/manual/rockbox_interface/images/sansae200-front.png
similarity index 100%
rename from manual/rockbox_interface/images/e200-front.png
rename to manual/rockbox_interface/images/sansae200-front.png
diff --git a/manual/rockbox_interface/images/e200-front.svg b/manual/rockbox_interface/images/sansae200-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/e200-front.svg
rename to manual/rockbox_interface/images/sansae200-front.svg
diff --git a/manual/rockbox_interface/images/fuze-front.pdf b/manual/rockbox_interface/images/sansafuze-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/fuze-front.pdf
rename to manual/rockbox_interface/images/sansafuze-front.pdf
diff --git a/manual/rockbox_interface/images/fuze-front.png b/manual/rockbox_interface/images/sansafuze-front.png
similarity index 100%
rename from manual/rockbox_interface/images/fuze-front.png
rename to manual/rockbox_interface/images/sansafuze-front.png
diff --git a/manual/rockbox_interface/images/fuze-front.svg b/manual/rockbox_interface/images/sansafuze-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/fuze-front.svg
rename to manual/rockbox_interface/images/sansafuze-front.svg