Reverted r23881 mistakenly committed to branch.v3.4

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657

220 files changed, 4030 insertions, 4160 deletions

diff --git a/apps/lang/afrikaans.lang b/apps/lang/afrikaans.lang
index 4e7a61f3ed..3718468a1f 100644
--- a/apps/lang/afrikaans.lang
+++ b/apps/lang/afrikaans.lang
@@ -970,7 +970,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
+  desc: the buffer size player-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%02dMB"
@@ -984,7 +984,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%02dMB"
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index 44d7d670de..c06af35560 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -3851,15 +3851,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "عالى"
+    gigabeatf: "عالى"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </voice>
 </phrase>
 <phrase>
@@ -4286,19 +4286,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
-    iriverh100,iriverh120,iriverh300: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
+    h100,h120,h300: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
     ipod*: "جاري بناء قاعدة البيانات...  عثر على d% (السابق للعودة)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
-    gogearsa9200: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
+    x5,m5,gigabeat*,mrobe100: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
+    h10,h10_5gb,e200*,c200*,fuze*: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
+    sa9200: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
   </dest>
   <voice>
     *: "المدخلات التي عثر عليها لفاعدة البيانات"
@@ -4673,7 +4673,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4834,15 +4834,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "حساسية اللمس"
+    gigabeatf: "حساسية اللمس"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -5444,16 +5444,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "القرص مملوء. اضغط إيقاف للاستمرار."
-    iriverh100,iriverh120,iriverh300: "القرص مملوء. اضغط إيقاف للاستمرار."
-    iaudiom5,iaudiox5: "القرص مملوء. اضغط زر التشغيل للاستمرار."
-    sansae200*,sansac200*: "القرص مملوء. اضغط السابق للاستمرار."
+    h100,h120,h300: "القرص مملوء. اضغط إيقاف للاستمرار."
+    m5,x5: "القرص مملوء. اضغط زر التشغيل للاستمرار."
+    e200*,c200*: "القرص مملوء. اضغط السابق للاستمرار."
   </dest>
   <voice>
     *: none
@@ -6064,7 +6064,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -6249,17 +6249,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "ميكروفون"
-    iriverh100,iriverh120,iriverh300: "ميكروفون داخلي"
+    h100,h120,h300: "ميكروفون داخلي"
   </dest>
   <voice>
     *: none
     recording: "ميكروفون"
-    iriverh100,iriverh120,iriverh300: "ميكروفون داخلي"
+    h100,h120,h300: "ميكروفون داخلي"
   </voice>
 </phrase>
 <phrase>
@@ -6899,15 +6899,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "أي آخر = لا"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -7003,11 +7003,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "نهاية القائمة"
-    archosplayer: "نهاية القائمة الاغنية"
+    player: "نهاية القائمة الاغنية"
   </dest>
   <voice>
     *: "نهاية القائمة الاغنية"
@@ -7549,26 +7549,26 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "عرض = إاغاء الأمر"
-    ipod*,sansac200*: "قائمة = إاغاء الأمر"
-    iaudiox5,iaudiom5: "سجل = إاغاء الأمر"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "السابق = إاغاء الأمر"
-    gigabeatfx: "طاقة = إاغاء الأمر"
+    h100,h120,h300: "عرض = إاغاء الأمر"
+    ipod*,c200*: "قائمة = إاغاء الأمر"
+    x5,m5: "سجل = إاغاء الأمر"
+    h10,h10_5gb,e200*,fuze*: "السابق = إاغاء الأمر"
+    gigabeatf: "طاقة = إاغاء الأمر"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "خلف = إاغاء الأمر"
-    gogearsa9200: "يسار = إاغاء الأمر"
+    sa9200: "يسار = إاغاء الأمر"
   </dest>
   <voice>
     *: none
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index c289f2b90a..4a5e5ab09f 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -665,12 +665,12 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Микрoфон"
-    iriverh100,iriverh120,iriverh300: "Вграден микрофон"
+    h100,h120,h300: "Вграден микрофон"
   </dest>
   <voice>
     *: ""
@@ -1242,19 +1242,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Батерия: нерегулирано зареждане"
+    recorder: "Батерия: нерегулирано зареждане"
   </dest>
   <voice>
     *: none
-    archosrecorder: none
+    recorder: none
   </voice>
 </phrase>
 <phrase>
@@ -1280,18 +1280,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерия: %d%% %dч %dмин"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dмин"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dч %dмин"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dмин"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dч %dмин"
   </dest>
   <voice>
     *: ""
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
-    iriverh10,ipodmini1g,ipodmini2g: ""
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
+    h10,ipodmini,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -1349,22 +1349,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF за отказ"
-    iriverh100,iriverh120,iriverh300: "STOP за отказ"
-    ipod*,sansac200*,gogearsa9200: "MENU за отказ"
-    iaudiox5,iaudiom5: "RECORD за отказ"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV за отказ"
-    gigabeatfx: "POWER за отказ"
+    h100,h120,h300: "STOP за отказ"
+    ipod*,c200*,sa9200: "MENU за отказ"
+    x5,m5: "RECORD за отказ"
+    h10,h10_5gb,e200*,fuze*: "PREV за отказ"
+    gigabeatf: "POWER за отказ"
     mrobe100: "DISPLAY за отказ"
     gigabeats: "BACK за отказ"
   </dest>
@@ -2914,17 +2914,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Изграждане на базата данни...  намерени %d (OFF за връщане)"
-    iriverh100,iriverh120,iriverh300: "Изграждане на базата данни...  намерени %d (STOP за връщане)"
+    h100,h120,h300: "Изграждане на базата данни...  намерени %d (STOP за връщане)"
     ipod*: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Изграждане на базата данни...  намерени %d (LEFT за връщане)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
+    x5,m5,gigabeat*,mrobe100: "Изграждане на базата данни...  намерени %d (LEFT за връщане)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3476,7 +3476,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4649,23 +4649,23 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Дискът е пълен. Натиснете OFF за да продължите."
-    iriverh100,iriverh120,iriverh300: "Дискът е пълен. Натиснете STOP за да продължите."
-    iaudiom5,iaudiox5: "Дискът е пълен. Натиснете POWER за да продължите."
-    sansae200*,sansac200*: "Дискът е пълен. Натиснете PREV за да продължите."
+    h100,h120,h300: "Дискът е пълен. Натиснете STOP за да продължите."
+    m5,x5: "Дискът е пълен. Натиснете POWER за да продължите."
+    e200*,c200*: "Дискът е пълен. Натиснете PREV за да продължите."
   </dest>
   <voice>
     *: ""
     recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    h100,h120,h300: ""
+    m5,x5: ""
+    e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4773,15 +4773,15 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Буфер:"
-    archosplayer: "Буф:"
+    player: "Буф:"
   </dest>
   <voice>
     *: ""
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -4987,15 +4987,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Да"
-    iriverh100,iriverh120,iriverh300: "NAVI = Да"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Да"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Да"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Да"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -5022,14 +5022,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Запази"
-    iriverh100,iriverh120,iriverh300: "NAVI = Запази"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Запази"
+    h100,h120,h300: "NAVI = Запази"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Запази"
   </dest>
   <voice>
     *: none
@@ -5041,15 +5041,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Всеки друг = Не"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -5440,28 +5440,28 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
   </source>
   <dest>
     *: "OFF за отказ"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP за отказ"
+    player,h100,h120,h300: "STOP за отказ"
     ipod*: "PLAY/PAUSE за отказ"
-    iaudiox5,iaudiom5: "Продължително PLAY за отказ"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV за отказ"
+    x5,m5: "Продължително PLAY за отказ"
+    h10,h10_5gb,e200*,c200*: "PREV за отказ"
   </dest>
   <voice>
     *: ""
-    archosplayer,iriverh100,iriverh120,iriverh300: ""
+    player,h100,h120,h300: ""
     ipod*: ""
-    iaudiox5,iaudiom5: ""
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: ""
+    x5,m5: ""
+    h10,h10_5gb,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5765,15 +5765,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Край на списъка с песни"
-    archosplayer: "Kрай на списъка"
+    player: "Kрай на списъка"
   </dest>
   <voice>
     *: ""
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -6628,7 +6628,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -6673,7 +6673,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -7731,15 +7731,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </dest>
   <voice>
     *: ""
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -8844,17 +8844,17 @@
   user: core
   <source>
     *: none
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: ""
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -10206,17 +10206,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Изключване на осветяването на бутоните"
-    sansafuze*,sansae200*: "Изключване на осветяването на колелото"
+    fuze*,e200*: "Изключване на осветяването на колелото"
   </dest>
   <voice>
     *: none
     button_light: ""
-    sansafuze*,sansae200*: ""
+    fuze*,e200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -10497,7 +10497,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -11358,14 +11358,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Установяване OFF=Отказ"
     ipod*: "SELECT=Установяване MENU=Отказ"
-    iriverh10,iriverh10_5gb: "SELECT=Установяване PREV=Отказ"
+    h10,h10_5gb: "SELECT=Установяване PREV=Отказ"
     gigabeats: "SELECT=Установяване POWER=Отказ"
   </dest>
   <voice>
@@ -11612,15 +11612,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Чувствителност на тъчпада"
+    gigabeatf: "Чувствителност на тъчпада"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11933,14 +11933,14 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Високо"
+    gigabeatf: "Високо"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </voice>
 </phrase>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 5a90be0d28..6c097a7c7b 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -261,15 +261,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Si"
-    iriverh100,iriverh120,iriverh300: "NAVI = Si"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Si"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Si"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Si"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -281,15 +281,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Qualsevol altre = No"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2362,17 +2362,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construint Base de dades... %d trobats (OFF per tornar)"
-    iriverh100,iriverh120,iriverh300: "Construint Base de dades... %d trobats (STOP per tornar)"
+    h100,h120,h300: "Construint Base de dades... %d trobats (STOP per tornar)"
     ipod*: "Construint Base de dades... %d trobats (PREV per tornar)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construint Base de dades... %d trobats (LEFT per tornar)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construint Base de dades... %d trobats (PREV per tornar)"
+    x5,m5,gigabeat*,mrobe100: "Construint Base de dades... %d trobats (LEFT per tornar)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Construint Base de dades... %d trobats (PREV per tornar)"
   </dest>
   <voice>
     *: "entrades trobades per base de dades"
@@ -3172,7 +3172,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3186,7 +3186,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3200,7 +3200,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3830,17 +3830,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Apagat de llum de botons"
-    sansafuze*,sansae200*: "Apagat de llum de roda"
+    fuze*,e200*: "Apagat de llum de roda"
   </dest>
   <voice>
     *: none
     button_light: "Apagat de llum de botons"
-    sansafuze*,sansae200*: "Apagat de llum de roda"
+    fuze*,e200*: "Apagat de llum de roda"
   </voice>
 </phrase>
 <phrase>
@@ -4121,18 +4121,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Desar"
-    iriverh100,iriverh120,iriverh300: "NAVI = Desar"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Desar"
+    h100,h120,h300: "NAVI = Desar"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Desar"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4142,28 +4142,28 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Cancel·lar"
-    iriverh100,iriverh120,iriverh300: "STOP = Cancel·lar"
-    ipod*,sansac200*,gogearsa9200: "MENU = Cancel·lar"
-    iaudiox5,iaudiom5: "RECORD = Cancel·lar"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancel·lar"
-    gigabeatfx: "POWER = Cancel·lar"
+    h100,h120,h300: "STOP = Cancel·lar"
+    ipod*,c200*,sa9200: "MENU = Cancel·lar"
+    x5,m5: "RECORD = Cancel·lar"
+    h10,h10_5gb,e200*,fuze*: "PREV = Cancel·lar"
+    gigabeatf: "POWER = Cancel·lar"
     mrobe100: "DISPLAY = Cancel·lar"
     gigabeats: "BACK = Cancel·lar"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4685,14 +4685,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Accepta OFF=Anul·lar"
     ipod*: "SELECT=Accepta MENU=Anul·lar"
-    iriverh10,iriverh10_5gb: "SELECT=Accepta PREV=Anul·lar"
+    h10,h10_5gb: "SELECT=Accepta PREV=Anul·lar"
     gigabeats: "SELECT=Accepta POWER=Anul·lar"
   </dest>
   <voice>
@@ -5865,17 +5865,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Micròfon"
-    iriverh100,iriverh120,iriverh300: "Micròfon intern"
+    h100,h120,h300: "Micròfon intern"
   </dest>
   <voice>
     *: none
     recording: "Micròfon"
-    iriverh100,iriverh120,iriverh300: "Micròfon intern"
+    h100,h120,h300: "Micròfon intern"
   </voice>
 </phrase>
 <phrase>
@@ -5901,15 +5901,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none  
-    recording,archosplayer: "Línia d'entrada"
+    recording,player: "Línia d'entrada"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Línia d'entrada"
+    recording,player: "Línia d'entrada"
   </voice>
 </phrase>
 <phrase>
@@ -6839,15 +6839,15 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Mida de Buffer"
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -6856,13 +6856,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nivell de batería"
@@ -6920,19 +6920,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8042,15 +8042,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fi de la Llista de Cançons"
-    archosplayer: "Fi Llista"
+    player: "Fi Llista"
   </dest>
   <voice>
     *: "Fi de la Llista de Cançons"
-    archosplayer: "Fi Llista"
+    player: "Fi Llista"
   </voice>
 </phrase>
 <phrase>
@@ -8290,20 +8290,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disc ple. Prem OFF per continuar"
-    iriverh100,iriverh120,iriverh300: "Disc ple. Prem STOP per continuar"
-    iaudiom5,iaudiox5: "Disc ple. Prem POWER per continuar"
-    sansae200*,sansac200*: "Disc ple. Prem PREV per continuar"
+    h100,h120,h300: "Disc ple. Prem STOP per continuar"
+    m5,x5: "Disc ple. Prem POWER per continuar"
+    e200*,c200*: "Disc ple. Prem PREV per continuar"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8387,25 +8387,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF per a cancelar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP per a cancelar"
+    player,h100,h120,h300: "STOP per a cancelar"
     ipod*: "PLAY/PAUSE per a cancelar"
-    iaudiox5,iaudiom5: "Long PLAY per a cancelar"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV per a cancelar"
+    x5,m5: "Long PLAY per a cancelar"
+    h10,h10_5gb,e200*,c200*: "PREV per a cancelar"
     gigabeats: "BACK per a cancelar"
-    gigabeatfx: "POWER per a cancelar"
+    gigabeatf: "POWER per a cancelar"
   </dest>
   <voice>
     *: ""
@@ -8629,19 +8629,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batería: Top-Off Chg"
+    recorder: "Batería: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Batería: Top-Off Chg"
+    recorder: "Batería: Top-Off Chg"
   </voice>
 </phrase>
 <phrase>
@@ -10458,7 +10458,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11669,15 +11669,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensibilitat de Touchpad"
+    gigabeatf: "Sensibilitat de Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensibilitat de Touchpad"
+    gigabeatf: "Sensibilitat de Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11686,15 +11686,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Alta"
+    gigabeatf: "Alta"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Alta"
+    gigabeatf: "Alta"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index d718dbbcca..39f0eb88d1 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -2192,15 +2192,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "线路输入"
+    recording,player: "线路输入"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "线路输入"
+    recording,player: "线路输入"
   </voice>
 </phrase>
 <phrase>
@@ -2446,17 +2446,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "麦克风"
-    iriverh100,iriverh120,iriverh300: "内置麦克风"
+    h100,h120,h300: "内置麦克风"
   </dest>
   <voice>
     *: none
     recording: "麦克风"
-    iriverh100,iriverh120,iriverh300: "内置麦克风"
+    h100,h120,h300: "内置麦克风"
   </voice>
 </phrase>
 <phrase>
@@ -3308,7 +3308,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3322,7 +3322,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3336,7 +3336,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4341,19 +4341,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "电池:恒流快速充电"
+    recorder: "电池:恒流快速充电"
   </dest>
   <voice>
     *: none
-    archosrecorder: "电池 恒流快速充电"
+    recorder: "电池 恒流快速充电"
   </voice>
 </phrase>
 <phrase>
@@ -4379,13 +4379,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "剩余电量:%d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "电量:%d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "电量:%d%% %dh %dm"
   </dest>
   <voice>
     *: "剩余电量"
@@ -4443,19 +4443,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "磁盘1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "磁盘1"
-    sansae200*,sansac200*,sansafuze*: "mSD卡"
+    e200*,c200*,fuze*: "mSD卡"
     ondio*: "MMC卡"
   </voice>
 </phrase>
@@ -4587,22 +4587,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF=放弃"
-    iriverh100,iriverh120,iriverh300: "STOP=放弃"
-    ipod*,sansac200*,gogearsa9200: "MENU=放弃"
-    iaudiox5,iaudiom5: "RECORD=放弃"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV=放弃"
-    gigabeatfx: "POWER=放弃"
+    h100,h120,h300: "STOP=放弃"
+    ipod*,c200*,sa9200: "MENU=放弃"
+    x5,m5: "RECORD=放弃"
+    h10,h10_5gb,e200*,fuze*: "PREV=放弃"
+    gigabeatf: "POWER=放弃"
     mrobe100: "DISPLAY=放弃"
     gigabeats: "BACK=放弃"
   </dest>
@@ -4685,16 +4685,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "磁盘已满，按下OFF继续."
-    iriverh100,iriverh120,iriverh300: "磁盘已满，按下STOP继续."
-    iaudiom5,iaudiox5: "磁盘已满，按下POWER继续."
-    sansae200*,sansac200*: "磁盘，按下PREV继续."
+    h100,h120,h300: "磁盘已满，按下STOP继续."
+    m5,x5: "磁盘已满，按下POWER继续."
+    e200*,c200*: "磁盘，按下PREV继续."
   </dest>
   <voice>
     *: none
@@ -4861,21 +4861,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=设置 OFF=取消"
     ipod*: "SELECT=设置 MENU=取消"
-    iriverh10,iriverh10_5gb: "SELECT=设置 PREV=取消"
+    h10,h10_5gb: "SELECT=设置 PREV=取消"
     gigabeats: "SELECT=设置 POWER=取消"
   </dest>
   <voice>
    *: none
     alarm: ""
     ipod*: ""
-    iriverh10,iriverh10_5gb: ""
+    h10,h10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -7390,25 +7390,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "按OFF键取消"
-    archosplayer,iriverh100,iriverh120,iriverh300: "按STOP键取消"
+    player,h100,h120,h300: "按STOP键取消"
     ipod*: "按PLAY/PAUSE键取消"
-    iaudiox5,iaudiom5: "长按PLAY键取消"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "按PREV键取消"
+    x5,m5: "长按PLAY键取消"
+    h10,h10_5gb,e200*,c200*: "按PREV键取消"
     gigabeats: "按BACK键取消"
-    gigabeatfx: "按POWER键取消"
+    gigabeatf: "按POWER键取消"
   </dest>
   <voice>
     *: ""
@@ -8501,7 +8501,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8776,24 +8776,24 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "数据库更新中...已找到%d个(按OFF返回)"
-    iriverh100,iriverh120,iriverh300: "数据库更新中...已找到%d个(按STOP返回)"
+    h100,h120,h300: "数据库更新中...已找到%d个(按STOP返回)"
     ipod*: "数据库更新中...已找到%d个(按PREV返回)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "数据库更新中...已找到%d个(按LEFT返回)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "数据库更新中...已找到%d个(按PREV返回)"
+    x5,m5,gigabeat*,mrobe100: "数据库更新中...已找到%d个(按LEFT返回)"
+    h10,h10_5gb,e200*,c200*,sa9200: "数据库更新中...已找到%d个(按PREV返回)"
   </dest>
   <voice>
     *: "数据库更新中"
-    iriverh100,iriverh120,iriverh300: ""
+    h100,h120,h300: ""
     ipod*: ""
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
+    x5,m5,gigabeat*,mrobe100: ""
+    h10,h10_5gb,e200*,c200*,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9287,11 +9287,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "缓冲区:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "缓冲区大小为"
@@ -9351,15 +9351,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY=是"
-    iriverh100,iriverh120,iriverh300: "NAVI=是"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT=是"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI=是"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT=是"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -9372,14 +9372,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON=设置"
-    iriverh100,iriverh120,iriverh300: "NAVI=设置"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT=设置"
+    h100,h120,h300: "NAVI=设置"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT=设置"
   </dest>
   <voice>
     *: none
@@ -9391,11 +9391,11 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Any Other=否"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
@@ -9584,15 +9584,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "曲目列表结束"
-    archosplayer: "列表结束"
+    player: "列表结束"
   </dest>
   <voice>
     *: "曲目列表结束"
-    archosplayer: "列表结束"
+    player: "列表结束"
   </voice>
 </phrase>
 <phrase>
@@ -10687,17 +10687,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "按键背光自动关闭时滞"
-    sansafuze*,sansae200*: "转盘背光自动关闭时滞"
+    fuze*,e200*: "转盘背光自动关闭时滞"
   </dest>
   <voice>
     *: none
     button_light: "按键背光自动关闭时滞"
-    sansafuze*,sansae200*: "转盘背光自动关闭时滞"
+    fuze*,e200*: "转盘背光自动关闭时滞"
   </voice>
 </phrase>
 <phrase>
@@ -11630,15 +11630,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "触摸板灵敏度"
+    gigabeatf: "触摸板灵敏度"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "触摸板灵敏度"
+    gigabeatf: "触摸板灵敏度"
   </voice>
 </phrase>
 <phrase>
@@ -11951,15 +11951,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "高"
+    gigabeatf: "高"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "高"
+    gigabeatf: "高"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 48eaec544a..e897ae5a63 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -2191,15 +2191,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "聲音輸入"
+    recording,player: "聲音輸入"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: ""
+    recording,player: ""
   </voice>
 </phrase>
 <phrase>
@@ -2445,17 +2445,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "麥克風"
-    iriverh100,iriverh120,iriverh300: "內置麥克風"
+    h100,h120,h300: "內置麥克風"
   </dest>
   <voice>
     *: none
     recording: ""
-    iriverh100,iriverh120,iriverh300: ""
+    h100,h120,h300: ""
   </voice>
 </phrase>
 <phrase>
@@ -3307,7 +3307,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3321,7 +3321,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3335,7 +3335,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4340,19 +4340,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "電池: 完成充電"
+    recorder: "電池: 完成充電"
   </dest>
   <voice>
     *: none
-    archosrecorder: ""
+    recorder: ""
   </voice>
 </phrase>
 <phrase>
@@ -4378,18 +4378,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "電池: %d%% %d小時%d分"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "電池: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "電池: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
-    iriverh10,ipodmini1g,ipodmini2g: ""
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
+    h10,ipodmini,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -4444,19 +4444,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "磁盤1"
-    sansae200*,sansac200*,sansafuze*: "Multimedia 卡:"
+    e200*,c200*,fuze*: "Multimedia 卡:"
     ondio*: "MMC卡:"
   </dest>
   <voice>
     *: none
     multivolume: "磁盤1"
-    sansae200*,sansac200*,sansafuze*: "Multimedia 卡"
+    e200*,c200*,fuze*: "Multimedia 卡"
     ondio*: "mmc卡"
   </voice>
 </phrase>
@@ -4588,33 +4588,33 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = 回去"
-    iriverh100,iriverh120,iriverh300: "STOP = 回去"
-    ipod*,sansac200*,gogearsa9200: "MENU = 回去"
-    iaudiox5,iaudiom5: "RECORD = 回去"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 回去"
-    gigabeatfx: "POWER = 回去"
+    h100,h120,h300: "STOP = 回去"
+    ipod*,c200*,sa9200: "MENU = 回去"
+    x5,m5: "RECORD = 回去"
+    h10,h10_5gb,e200*,fuze*: "PREV = 回去"
+    gigabeatf: "POWER = 回去"
     mrobe100: "DISPLAY = 回去"
     gigabeats: "BACK = 回去"
   </dest>
   <voice>
     *: none
     rtc: ""
-    iriverh100,iriverh120,iriverh300: ""
-    ipod*,sansae200*,sansac200*,gogearsa9200: ""
-    iaudiox5,iaudiom5: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeatfx: ""
+    h100,h120,h300: ""
+    ipod*,e200*,c200*,sa9200: ""
+    x5,m5: ""
+    h10,h10_5gb: ""
+    gigabeatf: ""
     mrobe100: ""
     gigabeats: ""
   </voice>
@@ -4694,23 +4694,23 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "硬碟已滿，按下OFF繼續。"
-    iriverh100,iriverh120,iriverh300: "硬碟已滿，按下STOP繼續。"
-    iaudiom5,iaudiox5: "硬碟已滿，按下POWER繼續。"
-    sansae200*,sansac200*: "硬碟已滿，按下PREV繼續。"
+    h100,h120,h300: "硬碟已滿，按下STOP繼續。"
+    m5,x5: "硬碟已滿，按下POWER繼續。"
+    e200*,c200*: "硬碟已滿，按下PREV繼續。"
   </dest>
   <voice>
     *: none
     recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    h100,h120,h300: ""
+    m5,x5: ""
+    e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4874,21 +4874,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=設定 OFF=取消"
     ipod*: "SELECT=設定 MENU=取消"
-    iriverh10,iriverh10_5gb: "SELECT=設定 PREV=取消"
+    h10,h10_5gb: "SELECT=設定 PREV=取消"
     gigabeats: "SELECT=設定 POWER=取消"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    iriverh10,iriverh10_5gb: ""
+    h10,h10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -7403,25 +7403,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF: 離開"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP: 離開"
+    player,h100,h120,h300: "STOP: 離開"
     ipod*: "PLAY/PAUSE: 離開"
-    iaudiox5,iaudiom5: "長按PLAY: 離開"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV: 離開"
+    x5,m5: "長按PLAY: 離開"
+    h10,h10_5gb,e200*,c200*: "PREV: 離開"
     gigabeats: "BACK: 離開"
-    gigabeatfx: "POWER: 離開"
+    gigabeatf: "POWER: 離開"
   </dest>
   <voice>
     *: ""
@@ -8480,7 +8480,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8755,24 +8755,24 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "建立資料庫... 找到%d項 (OFF: 回上一畫面)"
-    iriverh100,iriverh120,iriverh300: "建立資料庫... 找到%d項 (STOP: 回上一畫面)"
+    h100,h120,h300: "建立資料庫... 找到%d項 (STOP: 回上一畫面)"
     ipod*: "建立資料庫... 找到%d項 (PREV: 回上一畫面)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "建立資料庫... 找到%d項 (LEFT: 回上一畫面)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "建立資料庫... 找到%d項 (PREV: 回上一畫面)"
+    x5,m5,gigabeat*,mrobe100: "建立資料庫... 找到%d項 (LEFT: 回上一畫面)"
+    h10,h10_5gb,e200*,c200*,sa9200: "建立資料庫... 找到%d項 (PREV: 回上一畫面)"
   </dest>
   <voice>
     *: "entries found for database"
-    iriverh100,iriverh120,iriverh300: ""
+    h100,h120,h300: ""
     ipod*: ""
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
+    x5,m5,gigabeat*,mrobe100: ""
+    h10,h10_5gb,e200*,c200*,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9266,15 +9266,15 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "緩沖:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: ""
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -9331,21 +9331,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = 是"
-    iriverh100,iriverh120,iriverh300: "NAVI = 是"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = 是"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = 是"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = 是"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
-    iriverh100,iriverh120,iriverh300: ""
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
-    archosplayer: ""
+    h100,h120,h300: ""
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -9355,20 +9355,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = 設定"
-    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = 設定"
+    h100,h120,h300: "NAVI = 設定"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = 設定"
   </dest>
   <voice>
     *: none
     rtc: ""
-    iriverh100,iriverh120,iriverh300: ""
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    h100,h120,h300: ""
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9377,15 +9377,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Any Other = 否"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -9571,15 +9571,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "列表結束"
-    archosplayer: "列表結束"
+    player: "列表結束"
   </dest>
   <voice>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -10674,17 +10674,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "轉盤燈自動關時間"
+    fuze*,e200*: "轉盤燈自動關時間"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -11648,15 +11648,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "觸摸板靈敏度"
+    gigabeatf: "觸摸板靈敏度"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "觸摸板靈敏度"
+    gigabeatf: "觸摸板靈敏度"
   </voice>
 </phrase>
 <phrase>
@@ -12291,15 +12291,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "高"
+    gigabeatf: "高"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "高"
+    gigabeatf: "高"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index c2e640445b..fee2242557 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -262,15 +262,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ano"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ano"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Ano"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Ano"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Ano"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -282,15 +282,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Vše ostatní = Ne"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2366,17 +2366,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Vytvářím databázi... %d found (OFF pro návrat)"
-    iriverh100,iriverh120,iriverh300: "Vytvářím databázi... %d found (STOP pro návrat)"
+    h100,h120,h300: "Vytvářím databázi... %d found (STOP pro návrat)"
     ipod*: "Vytvářím databázi... %d found (PREV pro návrat)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Vytvářím databázi... %d found (LEFT pro návrat)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Vytvářím databázi... %d found (PREV pro návrat)"
+    x5,m5,gigabeat*,mrobe100: "Vytvářím databázi... %d found (LEFT pro návrat)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Vytvářím databázi... %d found (PREV pro návrat)"
   </dest>
   <voice>
     *: "záznamy nalezené v databázi"
@@ -3176,7 +3176,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3190,7 +3190,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3204,7 +3204,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3835,15 +3835,15 @@
   user: core
   <source>
     *: none
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
-    sansafuze*,sansae200*: "Časový limit osvětlení kolečka"
+    fuze*,e200*: "Časový limit osvětlení kolečka"
   </dest>
   <voice>
     *: none
-    sansafuze*,sansae200*: "Časový limit osvětlení kolečka"
+    fuze*,e200*: "Časový limit osvětlení kolečka"
   </voice>
 </phrase>
 <phrase>
@@ -4107,14 +4107,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Nastavit"
-    iriverh100,iriverh120,iriverh300: "NAVI = Nastavit"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Nastavit"
+    h100,h120,h300: "NAVI = Nastavit"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Nastavit"
   </dest>
   <voice>
     *: none
@@ -4127,22 +4127,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Vrátit zpět"
-    iriverh100,iriverh120,iriverh300: "STOP = Vrátit zpět"
-    ipod*,sansac200*,gogearsa9200: "MENU = Vrátit zpět"
-    iaudiox5,iaudiom5: "RECORD = Vrátit zpět"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Vrátit zpět"
-    gigabeatfx: "POWER = Vrátit zpět"
+    h100,h120,h300: "STOP = Vrátit zpět"
+    ipod*,c200*,sa9200: "MENU = Vrátit zpět"
+    x5,m5: "RECORD = Vrátit zpět"
+    h10,h10_5gb,e200*,fuze*: "PREV = Vrátit zpět"
+    gigabeatf: "POWER = Vrátit zpět"
     mrobe100: "DISPLAY = Vrátit zpět"
     gigabeats: "BACK = Vrátit zpět"
   </dest>
@@ -4670,14 +4670,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Nastavit OFF=Storno"
     ipod*: "SELECT=Nastavit MENU=Storno"
-    iriverh10,iriverh10_5gb: "SELECT=Nastavit PREV=Storno"
+    h10,h10_5gb: "SELECT=Nastavit PREV=Storno"
     gigabeats: "SELECT=Nastavit POWER=Storno"
   </dest>
   <voice>
@@ -5851,17 +5851,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofón"
-    iriverh100,iriverh120,iriverh300: "Interní mikrofón"
+    h100,h120,h300: "Interní mikrofón"
   </dest>
   <voice>
     *: none
     recording: "Mikrofón"
-    iriverh100,iriverh120,iriverh300: "Interní mikrofón"
+    h100,h120,h300: "Interní mikrofón"
   </voice>
 </phrase>
 <phrase>
@@ -5887,15 +5887,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linkový vstup"
+    recording,player: "Linkový vstup"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linkový vstup"
+    recording,player: "Linkový vstup"
   </voice>
 </phrase>
 <phrase>
@@ -6825,11 +6825,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Vyrovnávací paměť"
@@ -6841,13 +6841,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Baterie: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Baterie: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Stav baterie"
@@ -6904,17 +6904,17 @@
   user: core
   <source>
     *: none
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8026,15 +8026,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Konec seznamu skladeb"
-    archosplayer: "Konec seznamu"
+    player: "Konec seznamu"
   </dest>
   <voice>
     *: "Konec seznamu skladeb"
-    archosplayer: "Konec seznamu"
+    player: "Konec seznamu"
   </voice>
 </phrase>
 <phrase>
@@ -8274,20 +8274,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disk je plný. Pro pokračování stiskněte OFF."
-    iriverh100,iriverh120,iriverh300: "Disk je plný. Pro pokračování stiskněte STOP."
-    iaudiom5,iaudiox5: "Disk je plný. Pro pokračování stiskněte POWER."
-    sansae200*,sansac200*: "Disk je plný. Pro pokračování stiskněte PREV."
+    h100,h120,h300: "Disk je plný. Pro pokračování stiskněte STOP."
+    m5,x5: "Disk je plný. Pro pokračování stiskněte POWER."
+    e200*,c200*: "Disk je plný. Pro pokračování stiskněte PREV."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8371,21 +8371,21 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
   </source>
   <dest>
     *: "OFF=zrušit"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP=zrušit"
+    player,h100,h120,h300: "STOP=zrušit"
     ipod*: "PLAY/PAUSE=zrušit"
-    iaudiox5,iaudiom5: "Long PLAY=zrušit"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV=zrušit"
+    x5,m5: "Long PLAY=zrušit"
+    h10,h10_5gb,e200*,c200*: "PREV=zrušit"
   </dest>
   <voice>
     *: ""
@@ -8609,19 +8609,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Baterie: Donabíjení"
+    recorder: "Baterie: Donabíjení"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Donabíjení"
+    recorder: "Donabíjení"
   </voice>
 </phrase>
 <phrase>
@@ -10438,7 +10438,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index da2ebe08f2..1c005fb9ac 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -1832,15 +1832,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linje indgang"
+    recording,player: "Linje indgang"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linje indgang"
+    recording,player: "Linje indgang"
   </voice>
 </phrase>
 <phrase>
@@ -2086,17 +2086,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -2781,7 +2781,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -2795,7 +2795,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2809,7 +2809,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3640,19 +3640,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batteri: Fyld ladning"
+    recorder: "Batteri: Fyld ladning"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Batteri fyld-lader"
+    recorder: "Batteri fyld-lader"
   </voice>
 </phrase>
 <phrase>
@@ -3678,18 +3678,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dt %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dt %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dt %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Batteri niveau"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
-    iriverh10,ipodmini1g,ipodmini2g: ""
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
+    h10,ipodmini,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -3744,19 +3744,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Hard disk 1"
-    sansae200*,sansac200*,sansafuze*: "Mikro SD kort"
+    e200*,c200*,fuze*: "Mikro SD kort"
     ondio*: "Multimedie kort"
   </voice>
 </phrase>
@@ -3889,27 +3889,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "SLUK = Fortryd"
     mrobe500: "TÆND/SLUK = Fortryd"
-    iriverh100,iriverh120,iriverh300: "STOP = Fortryd"
-    ipod*,sansac200*: "MENU = Fortryd"
-    iaudiox5,iaudiom5: "OPTAG = Fortryd"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FORRIGE = Fortryd"
-    gigabeatfx: "TÆND/SLUK = Fortryd"
+    h100,h120,h300: "STOP = Fortryd"
+    ipod*,c200*: "MENU = Fortryd"
+    x5,m5: "OPTAG = Fortryd"
+    h10,h10_5gb,e200*,fuze*: "FORRIGE = Fortryd"
+    gigabeatf: "TÆND/SLUK = Fortryd"
     mrobe100: "VIS = Fortryd"
     gigabeats: "TILBAGE = Fortryd"
-    gogearsa9200: "VENSTRE = Fortryd"
+    sa9200: "VENSTRE = Fortryd"
   </dest>
   <voice>
     *: none
@@ -3990,23 +3990,23 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disken er fuld. Tryk SLUK for at fortsætte."
-    iriverh100,iriverh120,iriverh300: "Disken er fuld. Tryk STOP for at fortsætte."
-    iaudiom5,iaudiox5: "Disken er fuld. Tryk TÆND/SLUK for at fortsætte."
-    sansae200*,sansac200*: "Disken er fuld. Tryk FORRIGE for at fortsætte."
+    h100,h120,h300: "Disken er fuld. Tryk STOP for at fortsætte."
+    m5,x5: "Disken er fuld. Tryk TÆND/SLUK for at fortsætte."
+    e200*,c200*: "Disken er fuld. Tryk FORRIGE for at fortsætte."
   </dest>
   <voice>
     *: none
     recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    h100,h120,h300: ""
+    m5,x5: ""
+    e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4170,21 +4170,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPIL=Sæt SLUK=Annuller"
     ipod*: "VÆLG=Sæt MENU=Annuller"
-    iriverh10,iriverh10_5gb: "VÆLG=Sæt FORRIGE=Annuller"
+    h10,h10_5gb: "VÆLG=Sæt FORRIGE=Annuller"
     gigabeats: "VÆLG=Sæt TÆND/SLUK=Annuller"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    iriverh10,iriverh10_5gb: ""
+    h10,h10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -6606,25 +6606,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "SLUK for at afbryde"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP for at afbryde"
+    player,h100,h120,h300: "STOP for at afbryde"
     ipod*: "SPIL/PAUSE for at afbryde"
-    iaudiox5,iaudiom5: "Lang SPIL for at afbryde"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "FORRIGE for at afbryde"
+    x5,m5: "Lang SPIL for at afbryde"
+    h10,h10_5gb,e200*,c200*: "FORRIGE for at afbryde"
     gigabeats: "TILBAGE for at afbryde"
-    gigabeatfx: "TÆND/SLUK for at afbryde"
+    gigabeatf: "TÆND/SLUK for at afbryde"
   </dest>
   <voice>
     *: ""
@@ -8741,7 +8741,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9316,26 +9316,26 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Bygger database... %d fundet (SLUK for at stoppe)"
-    iriverh100,iriverh120,iriverh300: "Bygger database... %d fundet (STOP for at stoppe)"
+    h100,h120,h300: "Bygger database... %d fundet (STOP for at stoppe)"
     ipod*: "Bygger database... %d fundet (FORRIGE for at stoppe)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bygger database... %d fundet (VENSTRE for at stoppe)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Bygger database... %d fundet (FORRIGE for at stoppe)"
-    gogearsa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)"
+    x5,m5,gigabeat*,mrobe100: "Bygger database... %d fundet (VENSTRE for at stoppe)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Bygger database... %d fundet (FORRIGE for at stoppe)"
+    sa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)"
   </dest>
   <voice>
     *: "filer fundet til databasen"
-    iriverh100,iriverh120,iriverh300: ""
+    h100,h120,h300: ""
     ipod*: ""
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
+    x5,m5,gigabeat*,mrobe100: ""
+    h10,h10_5gb,e200*,c200*,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9931,17 +9931,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knap-lys sluk"
-    sansafuze*,sansae200*: "Hjul-lys sluk"
+    fuze*,e200*: "Hjul-lys sluk"
   </dest>
   <voice>
     *: none
     button_light: "Knap-lys sluk"
-    sansafuze*,sansae200*: "Hjul-lys sluk"
+    fuze*,e200*: "Hjul-lys sluk"
   </voice>
 </phrase>
 <phrase>
@@ -10507,11 +10507,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer størrelse"
@@ -10555,16 +10555,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "SPIL = Ja"
     cowond2*: "MENU = Ja"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÆLG = Ja"
-    archosplayer: "(SPIL/STOP)"
+    h100,h120,h300: "NAVI = Ja"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "VÆLG = Ja"
+    player: "(SPIL/STOP)"
   </dest>
   <voice>
     *: ""
@@ -10578,17 +10578,17 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "Tænd = Indstil"
     mrobe500: "HJERTE = Indstil"
-    iriverh100,iriverh120,iriverh300: "NAVI = Indstil"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "VÆLG = Indstil"
-    gogearsa9200: "SPIL = Indstil"
+    h100,h120,h300: "NAVI = Indstil"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "VÆLG = Indstil"
+    sa9200: "SPIL = Indstil"
   </dest>
   <voice>
     *: none
@@ -10600,15 +10600,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Alle andre = Nej"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -10690,11 +10690,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Slut på sætliste"
-    archosplayer: "Liste slut"
+    player: "Liste slut"
   </dest>
   <voice>
     *: "Slut på sætliste"
@@ -11596,15 +11596,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Touchpad følsomhed"
+    gigabeatf: "Touchpad følsomhed"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad følsomhed"
+    gigabeatf: "Touchpad følsomhed"
   </voice>
 </phrase>
 <phrase>
@@ -11731,15 +11731,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Høj"
+    gigabeatf: "Høj"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Høj"
+    gigabeatf: "Høj"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index d4be406d15..eb873ee6cf 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -280,16 +280,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ja"
     cowond2*: "MENU = Ja"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Ja"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Ja"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Ja"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -301,15 +301,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Andere = Nein"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2385,19 +2385,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Erstelle Datenbank... %d gefunden (OFF zum Abbrechen)"
-    iriverh100,iriverh120,iriverh300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)"
+    h100,h120,h300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)"
     ipod*: "Erstelle Datenbank... %d gefunden (PLAY/PAUSE zum Abbrechen)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)"
-    gogearsa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)"
+    x5,m5,gigabeat*,mrobe100: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)"
+    sa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)"
   </dest>
   <voice>
     *: "Erstelle Datenbank"
@@ -3197,7 +3197,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3211,7 +3211,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3225,7 +3225,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3857,17 +3857,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tastenbeleuchtungsdauer"
-    sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer"
+    fuze*,e200*: "Scrollradbeleuchtungsdauer"
   </dest>
   <voice>
     *: none
     button_light: "Tastenbeleuchtungsdauer"
-    sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer"
+    fuze*,e200*: "Scrollradbeleuchtungsdauer"
   </voice>
 </phrase>
 <phrase>
@@ -4151,21 +4151,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Speichern"
     mrobe500: "HEART = Speichern"
-    iriverh100,iriverh120,iriverh300: "NAVI = Speichern"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Speichern"
-    gogearsa9200: "PLAY = Speichern"
+    h100,h120,h300: "NAVI = Speichern"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Speichern"
+    sa9200: "PLAY = Speichern"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4176,30 +4176,30 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Abbrechen"
-    iriverh100,iriverh120,iriverh300: "STOP = Abbrechen"
-    ipod*,sansac200*: "MENU = Abbrechen"
-    iaudiox5,iaudiom5: "RECORD = Abbrechen"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Abbrechen"
-    gigabeatfx: "POWER = Abbrechen"
+    h100,h120,h300: "STOP = Abbrechen"
+    ipod*,c200*: "MENU = Abbrechen"
+    x5,m5: "RECORD = Abbrechen"
+    h10,h10_5gb,e200*,fuze*: "PREV = Abbrechen"
+    gigabeatf: "POWER = Abbrechen"
     mrobe100: "DISPLAY = Abbrechen"
     gigabeats: "BACK = Abbrechen"
-    gogearsa9200: "LEFT = Abbrechen"
+    sa9200: "LEFT = Abbrechen"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,h10_gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4722,14 +4722,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=OK OFF=Abbruch"
     ipod*: "SELECT=OK MENU=Abbruch"
-    iriverh10,iriverh10_5gb: "SELECT=OK PREV=Abbruch"
+    h10,h10_5gb: "SELECT=OK PREV=Abbruch"
     gigabeats: "SELECT=OK POWER=Abbruch"
   </dest>
   <voice>
@@ -5904,17 +5904,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Internes Mikrofon"
+    h100,h120,h300: "Internes Mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Internes Mikrofon"
+    h100,h120,h300: "Internes Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -5940,15 +5940,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Analogeingang"
+    recording,player: "Analogeingang"
   </voice>
 </phrase>
 <phrase>
@@ -6878,11 +6878,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Puffer:"
-    archosplayer: "Puf:"
+    player: "Puf:"
   </dest>
   <voice>
     *: "Puffergröße"
@@ -6894,13 +6894,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterie: %d%% %d Std %d Min"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterieladung"
@@ -6958,19 +6958,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Festplatte"
-    sansae200*,sansac200*,sansafuze*: "Micro-SD-Karte"
+    e200*,c200*,fuze*: "Micro-SD-Karte"
     ondio*: "Multimediakarte"
   </voice>
 </phrase>
@@ -8082,11 +8082,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Wiedergabeliste zu Ende"
-    archosplayer: "Liste zu Ende"
+    player: "Liste zu Ende"
   </dest>
   <voice>
     *: "Wiedergabeliste zu Ende"
@@ -8329,16 +8329,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Kein Speicherplatz mehr vorhanden. Drücke OFF zum fortfahren."
-    iriverh100,iriverh120,iriverh300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren."
-    iaudiom5,iaudiox5: "Kein Speicherplatz mehr vorhanden. Drücke POWER zum fortfahren."
-    sansae200*,sansac200*: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren."
+    h100,h120,h300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren."
+    m5,x5: "Kein Speicherplatz mehr vorhanden. Drücke POWER zum fortfahren."
+    e200*,c200*: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren."
   </dest>
   <voice>
     *: none
@@ -8426,25 +8426,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF zum Abbrechen"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP zum Abbrechen"
+    player,h100,h120,h300: "STOP zum Abbrechen"
     ipod*: "PLAY/PAUSE zum Abbrechen"
-    iaudiox5,iaudiom5: "Long PLAY zum Abbrechen"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV zum Abbrechen"
+    x5,m5: "Long PLAY zum Abbrechen"
+    h10,h10_5gb,e200*,c200*: "PREV zum Abbrechen"
     gigabeats: "BACK zum Abbrechen"
-    gigabeatfx: "POWER zum Abbrechen"
+    gigabeatf: "POWER zum Abbrechen"
   </dest>
   <voice>
     *: ""
@@ -8668,19 +8668,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Akku: Übergangsladen"
+    recorder: "Akku: Übergangsladen"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Übergangsladen"
+    recorder: "Übergangsladen"
   </voice>
 </phrase>
 <phrase>
@@ -11607,15 +11607,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Touchpad-Empfindlichkeit"
+    gigabeatf: "Touchpad-Empfindlichkeit"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad-Empfindlichkeit"
+    gigabeatf: "Touchpad-Empfindlichkeit"
   </voice>
 </phrase>
 <phrase>
@@ -11781,15 +11781,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Hoch"
+    gigabeatf: "Hoch"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Hoch"
+    gigabeatf: "Hoch"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index fe0d5d5dca..a8be9c33d2 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -844,25 +844,25 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic archosrecorder string to use to confirm
+  desc: Generic recorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    h100,h120,h300: "NAVI = Yes"
     ipod*: "SELECT = Yes"
-    iaudiox5: "SELECT = Yes"
-    iriverh10,iriverh10_5gb: "SELECT = Yes"
-    gigabeatfx: "SELECT = Yes"
-    sansae200*,sansac200*: "SELECT = Yes"
+    x5: "SELECT = Yes"
+    h10,h10_5gb: "SELECT = Yes"
+    gigabeatf: "SELECT = Yes"
+    e200*,c200*: "SELECT = Yes"
   </source>
   <dest>
     *: "PLAY = Jah"
-    iriverh100,iriverh120,iriverh300: "NAVI = Jah"
+    h100,h120,h300: "NAVI = Jah"
     ipod*: "SELECT = Jah"
-    iaudiox5: "SELECT = Jah"
-    iriverh10,iriverh10_5gb: "SELECT = Jah"
-    gigabeatfx: "SELECT = Jah"
-    sansae200*,sansac200*: "SELECT = Jah"
+    x5: "SELECT = Jah"
+    h10,h10_5gb: "SELECT = Jah"
+    gigabeatf: "SELECT = Jah"
+    e200*,c200*: "SELECT = Jah"
   </dest>
   <voice>
     *: ""
@@ -870,7 +870,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic archosrecorder string to use to cancel
+  desc: Generic recorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -3446,7 +3446,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu altarnative for jump scroll
+  desc: (player) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3460,7 +3460,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3474,7 +3474,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4440,7 +4440,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
+  desc: the buffer size player-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -4454,7 +4454,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -4514,13 +4514,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Aku"
@@ -4868,21 +4868,21 @@
   user: core
   <source>
     *: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    h100,h120,h300: "NAVI = Set"
     ipod*: "SELECT = Set"
-    iaudiox5: "SELECT = Set"
-    iriverh10,iriverh10_5gb: "SELECT = Set"
-    gigabeatfx: "SELECT = Set"
-    sansae200*,sansac200*: "SELECT = Set"
+    x5: "SELECT = Set"
+    h10,h10_5gb: "SELECT = Set"
+    gigabeatf: "SELECT = Set"
+    e200*,c200*: "SELECT = Set"
   </source>
   <dest>
     *: "ON muutmiseks"
-    iriverh100,iriverh120,iriverh300: "NAVI muutmiseks"
+    h100,h120,h300: "NAVI muutmiseks"
     ipod*: "SELECT muutmiseks"
-    iaudiox5: "SELECT muutmiseks"
-    iriverh10,iriverh10_5gb: "SELECT muutmiseks"
-    gigabeatfx: "SELECT muutmiseks"
-    sansae200*,sansac200*: "SELECT muutmiseks"
+    x5: "SELECT muutmiseks"
+    h10,h10_5gb: "SELECT muutmiseks"
+    gigabeatf: "SELECT muutmiseks"
+    e200*,c200*: "SELECT muutmiseks"
   </dest>
   <voice>
     *: ""
@@ -4894,19 +4894,19 @@
   user: core
   <source>
     *: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
   </source>
   <dest>
     *: "OFF tagasi pöördumiseks"
-    iriverh100,iriverh120,iriverh300: "STOP tagasi pöördumiseks"
-    ipod*,sansac200*: "MENU tagasi pöördumiseks"
-    iaudiox5: "RECORD tagasi pöördumiseks"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV tagasi pöördumiseks"
-    gigabeatfx: "POWER tagasi pöördumiseks"
+    h100,h120,h300: "STOP tagasi pöördumiseks"
+    ipod*,c200*: "MENU tagasi pöördumiseks"
+    x5: "RECORD tagasi pöördumiseks"
+    h10,h10_5gb,e200*,fuze*: "PREV tagasi pöördumiseks"
+    gigabeatf: "POWER tagasi pöördumiseks"
   </dest>
   <voice>
     *: ""
@@ -5100,11 +5100,11 @@
   user: core
   <source>
     *: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
   </source>
   <dest>
     *: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
   </dest>
   <voice>
     *: ""
@@ -7872,23 +7872,23 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    iriverh100,iriverh120,iriverh300: "STOP to abort"
+    h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb: "PREV to abort"
-    sansae200*,sansac200*: "PREV to abort"
+    x5: "Long PLAY to abort"
+    h10,h10_5gb: "PREV to abort"
+    e200*,c200*: "PREV to abort"
   </source>
   <dest>
     *: "OFF katkestamiseks"
-    iriverh100,iriverh120,iriverh300: "STOP katkestamiseks"
+    h100,h120,h300: "STOP katkestamiseks"
     ipod*: "PLAY/PAUSE katkestamiseks"
-    iaudiox5: "Long PLAY katkestamiseks"
-    iriverh10,iriverh10_5gb: "PREV katkestamiseks"
-    sansae200*,sansac200*: "PREV katkestamiseks"
+    x5: "Long PLAY katkestamiseks"
+    h10,h10_5gb: "PREV katkestamiseks"
+    e200*,c200*: "PREV katkestamiseks"
   </dest>
   <voice>
     *: ""
@@ -7896,7 +7896,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on archosplayer models
+  desc: Used on player models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 7c0579d68a..c7dad66b1a 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -39,56 +39,55 @@
 #
 # All phrases have a default string like: *: "default" that will be used if no
 # other string matches for the particular model you build the language for. If
-# you want a particular string for the iriverh300 series you'd write it like:
-# iriverh300: "iriverh300-specific string" (below the default line).
-#
-# If your string isn't used for all targets set the default to none like: *:
-# none (no quotes!) this will not include the string for target that will not
-# need it, see apps/features.txt for available categories that can be used
-# instead of the target name, for example: swcodec: "swcodec-specific string".
+# you want a particular string for the iriver h300 series you'd write it like:
+# h300: "h300-specific string" (below the default line). If your string isn't
+# used for all targets set the default to none like: *: none (no quotes!) this
+# will not include the string for target that will not need it, see
+# apps/features.txt for available categories that can be used instead of the
+# target name, for example: swcodec: "swcodec-specific string".
 #
 #
 # The target names used are picked from the configure script and are set in the
 # MODELNAME variable in the root makefile. Currently, they are:
 # Target        Target string
 # Archos
-# Player/Studio     archosplayer
-# Recorder          archosrecorder
-# FM Recorder       archosfmrecorder
-# Recorder V2       archosrecorderv2
-# Ondio SP          archosondiosp
-# Ondio FM          archosondiofm
+# Player/Studio     player
+# Recorder          recorder
+# FM Recorder       fmrecorder
+# Recorder V2       recorderv2
+# Ondio SP          ondiosp
+# Ondio FM          ondiofm
 # iriver
-# H100/H110/H115    iriverh100
-# H120/H140         iriverh120
-# H320/H340         iriverh300
-# H10               iriverh10
-# IFP 7XX           iriverifp7xx
+# H100/H110/H115    h100
+# H120/H140         h120
+# H320/H340         h300
+# H10               h10
+# IFP 7XX           ifp7xx
 # iaudio
-# X5                iaudiox5
-# M5                iaudiom5
+# X5                x5
+# M5                m5
 # ipod
 # All iPods         ipod*
 # 4G Color/Photo    ipodcolor
-# Nano              ipodnano1g
+# Nano              ipodnano
 # Video (5G)        ipodvideo
 # 3G                ipod3g
 # 4G gray           ipod4g
-# mini              ipodmini1g
+# mini              ipodmini
 # mini 2G           ipodmini2g
 # Toshiba
-# Gigabeat Fxx      gigabeatfx
+# Gigabeat Fxx      gigabeatf
 # Gigabeat Sxx      gigabeats
 #
 # Sandisk
-# Sansa E200        sansae200
-# Sansa C200        sansac200*
+# Sansa E200        e200
+# Sansa C200        c200*
 #
 # Olympus
 # m:robe 100        mrobe100
 #
 # Philips
-# GoGear SA9200     gogearsa9200
+# GoGear SA9200     sa9200
 
 <phrase>
   id: LANG_SET_BOOL_YES
@@ -335,17 +334,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
     mrobe500: "PLAY or POWER = Yes"
-    archosplayer: "(PLAY/STOP)"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -357,15 +356,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2458,19 +2457,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3270,7 +3269,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3284,7 +3283,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3298,7 +3297,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3930,17 +3929,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -4222,21 +4221,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4247,31 +4246,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4794,14 +4793,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </dest>
   <voice>
@@ -5976,17 +5975,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -6012,15 +6011,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6950,11 +6949,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
@@ -6966,13 +6965,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -7030,19 +7029,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8154,11 +8153,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </dest>
   <voice>
     *: "End of Song List"
@@ -8403,20 +8402,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8500,25 +8499,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </dest>
   <voice>
     *: ""
@@ -8742,19 +8741,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Top off charge"
+    recorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10571,7 +10570,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11782,15 +11781,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11799,15 +11798,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 6c0b86cfa2..7c509f1c02 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -1350,15 +1350,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrada de línea"
+    recording,player: "Entrada de línea"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrada de línea"
+    recording,player: "Entrada de línea"
   </voice>
 </phrase>
 <phrase>
@@ -1604,17 +1604,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Micrófono"
-    iriverh100,iriverh120,iriverh300: "Micrófono interno"
+    h100,h120,h300: "Micrófono interno"
   </dest>
   <voice>
     *: none
     recording: "Micrófono"
-    iriverh100,iriverh120,iriverh300: "Micrófono interno"
+    h100,h120,h300: "Micrófono interno"
   </voice>
 </phrase>
 <phrase>
@@ -1977,7 +1977,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -1991,7 +1991,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2005,7 +2005,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -2777,19 +2777,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batería: carga completa"
+    recorder: "Batería: carga completa"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Batería carga completa"
+    recorder: "Batería carga completa"
   </voice>
 </phrase>
 <phrase>
@@ -2815,13 +2815,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batería: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batería: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batería: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nivel y tiempo de batería"
@@ -2983,28 +2983,28 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Cancelar"
-    iriverh100,iriverh120,iriverh300: "STOP = Cancelar"
-    ipod*,sansac200*,gogearsa9200: "MENU = Cancelar"
-    iaudiox5,iaudiom5: "RECORD = Cancelar"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancelar"
-    gigabeatfx: "POWER = Cancelar"
+    h100,h120,h300: "STOP = Cancelar"
+    ipod*,c200*,sa9200: "MENU = Cancelar"
+    x5,m5: "RECORD = Cancelar"
+    h10,h10_5gb,e200*,fuze*: "PREV = Cancelar"
+    gigabeatf: "POWER = Cancelar"
     mrobe100: "DISPLAY = Cancelar"
     gigabeats: "BACK = Cancelar"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -3065,20 +3065,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disco duro lleno. Pulse OFF para continuar"
-    iriverh100,iriverh120,iriverh300: "Disco duro lleno. Pulse STOP para continuar"
-    iaudiom5,iaudiox5: "Disco duro lleno. Pulse POWER para continuar"
-    sansae200*,sansac200*: "Disco duro lleno. Pulse PREV para continuar"
+    h100,h120,h300: "Disco duro lleno. Pulse STOP para continuar"
+    m5,x5: "Disco duro lleno. Pulse POWER para continuar"
+    e200*,c200*: "Disco duro lleno. Pulse PREV para continuar"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3157,14 +3157,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Aceptar OFF=Cancelar"
     ipod*: "SELECT=Aceptar MENU=Cancelar"
-    iriverh10,iriverh10_5gb: "SELECT=Aceptar PREV=Cancelar"
+    h10,h10_5gb: "SELECT=Aceptar PREV=Cancelar"
     gigabeats: "SELECT=Aceptar POWER=Cancelar"
   </dest>
   <voice>
@@ -5398,25 +5398,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF para cancelar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para cancelar"
+    player,h100,h120,h300: "STOP para cancelar"
     ipod*: "PLAY/PAUSE para cancelar"
-    iaudiox5,iaudiom5: "Pulsación larga de PLAY para cancelar"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para cancelar"
+    x5,m5: "Pulsación larga de PLAY para cancelar"
+    h10,h10_5gb,e200*,c200*: "PREV para cancelar"
     gigabeats: "BACK para cancelar"
-    gigabeatfx: "POWER para cancelar"
+    gigabeatf: "POWER para cancelar"
   </dest>
   <voice>
     *: ""
@@ -6122,7 +6122,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8002,19 +8002,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "m S D"
+    e200*,c200*,fuze*: "m S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -9203,17 +9203,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construyendo base de datos... %d encontrados (OFF para volver)"
-    iriverh100,iriverh120,iriverh300: "Construyendo base de datos... %d encontrados (STOP para volver)"
+    h100,h120,h300: "Construyendo base de datos... %d encontrados (STOP para volver)"
     ipod*: "Construyendo base de datos... %d encontrados (PREV para volver)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construyendo base de datos... %d encontrados (LEFT para volver)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construyendo base de datos... %d encontrados (PREV para volver)"
+    x5,m5,gigabeat*,mrobe100: "Construyendo base de datos... %d encontrados (LEFT para volver)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Construyendo base de datos... %d encontrados (PREV para volver)"
   </dest>
   <voice>
     *: "elementos encontrados para la base de datos"
@@ -9854,11 +9854,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Búfer:"
-    archosplayer: "Búf:"
+    player: "Búf:"
   </dest>
   <voice>
     *: "Tamaño de búfer"
@@ -9932,15 +9932,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sí"
-    iriverh100,iriverh120,iriverh300: "NAVI = Sí"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sí"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Sí"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sí"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -9953,18 +9953,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Fijar"
-    iriverh100,iriverh120,iriverh300: "NAVI = Fijar"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Fijar"
+    h100,h120,h300: "NAVI = Fijar"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Fijar"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9973,11 +9973,11 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Otro = No"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
@@ -10214,11 +10214,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fin de la lista de canciones"
-    archosplayer: "Fin de la lista"
+    player: "Fin de la lista"
   </dest>
   <voice>
     *: "Fin de la lista de canciones"
@@ -11142,17 +11142,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tiempo de espera en la luz del botón"
-    sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda"
+    fuze*,e200*: "Tiempo de espera en la luz de la rueda"
   </dest>
   <voice>
     *: none
     button_light: "Tiempo de espera en la luz del botón"
-    sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda"
+    fuze*,e200*: "Tiempo de espera en la luz de la rueda"
   </voice>
 </phrase>
 <phrase>
@@ -11561,15 +11561,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensibilidad de la superficie táctil"
+    gigabeatf: "Sensibilidad de la superficie táctil"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensibilidad de la superficie táctil"
+    gigabeatf: "Sensibilidad de la superficie táctil"
   </voice>
 </phrase>
 <phrase>
@@ -11794,15 +11794,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index 49de5883cd..546626875c 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -850,14 +850,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic archosrecorder string to use to confirm
+  desc: Generic recorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "LEGI = Jes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Jes"
+    h100,h120,h300: "NAVI = Jes"
   </dest>
   <voice>
     *: ""
@@ -865,7 +865,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic archosrecorder string to use to cancel
+  desc: Generic recorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -3441,7 +3441,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu altarnative for jump scroll
+  desc: (player) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3455,7 +3455,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3469,7 +3469,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4435,7 +4435,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
+  desc: the buffer size player-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -4449,7 +4449,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -4764,7 +4764,7 @@
   </source>
   <dest>
     *: "LEGI = Elekti"
-    iriverh100,iriverh120,iriverh300: "NAVI = Elekti"
+    h100,h120,h300: "NAVI = Elekti"
   </dest>
   <voice>
     *: ""
@@ -4779,7 +4779,7 @@
   </source>
   <dest>
     *: "ON+LEGI = Elpreni"
-    iriverh100,iriverh120,iriverh300: "ON+NAVI = Elpreni"
+    h100,h120,h300: "ON+NAVI = Elpreni"
   </dest>
   <voice>
     *: ""
@@ -7839,7 +7839,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -7853,7 +7853,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on archosplayer models
+  desc: Used on player models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 12a11d4285..112b18c854 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -2192,15 +2192,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linjatulo"
+    recording,player: "Linjatulo"
 </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linjatulo"
+    recording,player: "Linjatulo"
   </voice>
 </phrase>
 <phrase>
@@ -2446,17 +2446,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofoni"
-    iriverh100,iriverh120,iriverh300: "Sis. mikrofoni"
+    h100,h120,h300: "Sis. mikrofoni"
   </dest>
   <voice>
     *: none
     recording: "Mikrofoni"
-    iriverh100,iriverh120,iriverh300: "Sisäinen mikrofoni"
+    h100,h120,h300: "Sisäinen mikrofoni"
   </voice>
 </phrase>
 <phrase>
@@ -3308,7 +3308,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3322,7 +3322,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3336,7 +3336,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4341,19 +4341,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Akku: huippulataus"
+    recorder: "Akku: huippulataus"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Akku täynnä"
+    recorder: "Akku täynnä"
   </voice>
 </phrase>
 <phrase>
@@ -4379,13 +4379,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %dt %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dt %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dt %dm"
+    h10,ipodmini,ipodmini2g: "Akku: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Akun varauksen taso"
@@ -4443,19 +4443,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Kiintolevy1"
-    sansae200*,sansac200*,sansafuze*: "micro s d muistikortti"
+    e200*,c200*,fuze*: "micro s d muistikortti"
     ondio*: "m m c muistikortti"
   </voice>
 </phrase>
@@ -4587,22 +4587,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Peruuta"
-    iriverh100,iriverh120,iriverh300: "STOP = Peruuta"
-    ipod*,sansac200*,gogearsa9200: "MENU = Peruuta"
-    iaudiox5,iaudiom5: "RECORD = Peruuta"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Peruuta"
-    gigabeatfx: "POWER = Peruuta"
+    h100,h120,h300: "STOP = Peruuta"
+    ipod*,c200*,sa9200: "MENU = Peruuta"
+    x5,m5: "RECORD = Peruuta"
+    h10,h10_5gb,e200*,fuze*: "PREV = Peruuta"
+    gigabeatf: "POWER = Peruuta"
     mrobe100: "DISPLAY = Peruuta"
     gigabeats: "BACK = Peruuta"
   </dest>
@@ -4685,23 +4685,23 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Levy täynnä. Jatka painamalla OFF."
-    iriverh100,iriverh120,iriverh300: "Levy täynnä. Jatka painamalla STOP."
-    iaudiom5,iaudiox5: "Levy täynnä. Jatka painamalla POWER."
-    sansae200*,sansac200*: "Levy täynnä. Jatka painamalla PREV."
+    h100,h120,h300: "Levy täynnä. Jatka painamalla STOP."
+    m5,x5: "Levy täynnä. Jatka painamalla POWER."
+    e200*,c200*: "Levy täynnä. Jatka painamalla PREV."
   </dest>
   <voice>
     *: none
     recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    h100,h120,h300: ""
+    m5,x5: ""
+    e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4865,14 +4865,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Aseta OFF=Peruuta"
     ipod*: "SELECT=Aseta MENU=Peruuta"
-    iriverh10,iriverh10_5gb: "SELECT=Aseta PREV=Peruuta"
+    h10,h10_5gb: "SELECT=Aseta PREV=Peruuta"
     gigabeats: "SELECT=Aseta POWER=Peruuta"
   </dest>
   <voice>
@@ -7391,34 +7391,34 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF keskeyttää"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP keskeyttää"
+    player,h100,h120,h300: "STOP keskeyttää"
     ipod*: "PLAY/PAUSE keskeyttää"
-    iaudiox5,iaudiom5: "Pitkä PLAY keskeyttää"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV keskeyttää"
+    x5,m5: "Pitkä PLAY keskeyttää"
+    h10,h10_5gb,e200*,c200*: "PREV keskeyttää"
     gigabeats: "BACK keskeyttää"
-    gigabeatfx: "POWER keskeyttää"
+    gigabeatf: "POWER keskeyttää"
   </dest>
   <voice>
     *: ""
-    archosplayer,iriverh100,iriverh120,iriverh300: ""
+    player,h100,h120,h300: ""
     ipod*: ""
-    iaudiox5,iaudiom5: ""
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: ""
+    x5,m5: ""
+    h10,h10_5gb,e200*,c200*: ""
     gigabeats: ""
-    gigabeatfx: ""
+    gigabeatf: ""
   </voice>
 </phrase>
 <phrase>
@@ -8810,7 +8810,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9778,11 +9778,11 @@
   </source>
   <dest>
     *: none
-    usb_charging: "Lataa USB-samsungyhteyden aikana"
+    usb_charging: "Lataa USB-yhteyden aikana"
   </dest>
   <voice>
     *: none
-    usb_charging: "Lataa u s b samsungyhteyden aikana"
+    usb_charging: "Lataa u s b yhteyden aikana"
   </voice>
 </phrase>
 <phrase>
@@ -9965,17 +9965,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Luodaan tietokantaa... %d löytyi (OFF = palaa)"
-    iriverh100,iriverh120,iriverh300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)"
+    h100,h120,h300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)"
     ipod*: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Luodaan tietokantaa... %d löytyi (LEFT = palaa)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
+    x5,m5,gigabeat*,mrobe100: "Luodaan tietokantaa... %d löytyi (LEFT = palaa)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
   </dest>
   <voice>
     *: "tietokantaa varten löytyi merkintöjä"
@@ -10002,17 +10002,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Painikevalon aikakatkaisu"
-    sansafuze*,sansae200*: "Rullavalon aikakatkaisu"
+    fuze*,e200*: "Rullavalon aikakatkaisu"
   </dest>
   <voice>
     *: none
     button_light: "Painikevalon aikakatkaisu"
-    sansafuze*,sansae200*: "Rullavalon aikakatkaisu"
+    fuze*,e200*: "Rullavalon aikakatkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -10471,11 +10471,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Puskuri:"
-    archosplayer: "Puskuri:"
+    player: "Puskuri:"
   </dest>
   <voice>
     *: "Puskurin koko"
@@ -10518,15 +10518,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Kyllä"
-    iriverh100,iriverh120,iriverh300: "NAVI = Kyllä"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Kyllä"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Kyllä"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Kyllä"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -10539,18 +10539,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Aseta"
-    iriverh100,iriverh120,iriverh300: "NAVI = Aseta"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Aseta"
+    h100,h120,h300: "NAVI = Aseta"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Aseta"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -10559,15 +10559,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Muu = Ei"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -10621,15 +10621,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Kappalelistan loppu"
-    archosplayer: "Listan loppu"
+    player: "Listan loppu"
   </dest>
   <voice>
     *: "Kappalelistan loppu"
-    archosplayer: "Listan loppu"
+    player: "Listan loppu"
   </voice>
 </phrase>
 <phrase>
@@ -11688,15 +11688,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Kosketuslevyn herkkyys"
+    gigabeatf: "Kosketuslevyn herkkyys"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Kosketuslevyn herkkyys"
+    gigabeatf: "Kosketuslevyn herkkyys"
   </voice>
 </phrase>
 <phrase>
@@ -11705,15 +11705,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Suuri"
+    gigabeatf: "Suuri"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Suuri"
+    gigabeatf: "Suuri"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 8806944905..43fe7561f2 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -292,17 +292,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Oui"
     cowond2*: "MENU = Oui"
-    iriverh100,iriverh120,iriverh300: "NAVI = Oui"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oui"
+    h100,h120,h300: "NAVI = Oui"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oui"
     mrobe500: "PLAY ou POWER = Oui"
-    archosplayer: "(PLAY/STOP)"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -314,15 +314,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Autres = Non"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2415,19 +2415,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Création base de données... %d trouvés (OFF = retour)"
-    iriverh100,iriverh120,iriverh300: "Création base de données... %d trouvés (STOP = retour)"
+    h100,h120,h300: "Création base de données... %d trouvés (STOP = retour)"
     ipod*: "Création base de données... %d trouvés (PREV = retour)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Création base de données... %d trouvés (PREV = retour)"
-    gogearsa9200: "Création base de données... %d trouvés (REW = retour)"
+    x5,m5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Création base de données... %d trouvés (PREV = retour)"
+    sa9200: "Création base de données... %d trouvés (REW = retour)"
   </dest>
   <voice>
     *: "entrées trouvées pour base de données"
@@ -3227,7 +3227,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3241,7 +3241,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3255,7 +3255,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3887,17 +3887,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Durée de l'éclairage des touches"
-    sansafuze*,sansae200*: "Durée de l'éclairage de la molette"
+    fuze*,e200*: "Durée de l'éclairage de la molette"
   </dest>
   <voice>
     *: none
     button_light: "Durée de l'éclairage des touches"
-    sansafuze*,sansae200*: "Durée de l'éclairage de la molette"
+    fuze*,e200*: "Durée de l'éclairage de la molette"
   </voice>
 </phrase>
 <phrase>
@@ -4179,21 +4179,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Valider"
     mrobe500: "HEART = Valider"
-    iriverh100,iriverh120,iriverh300: "NAVI = Valider"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Valider"
-    gogearsa9200: "PLAY = Valider"
+    h100,h120,h300: "NAVI = Valider"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Valider"
+    sa9200: "PLAY = Valider"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4204,31 +4204,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Annuler"
     mrobe500: "POWER = Annuler"
-    iriverh100,iriverh120,iriverh300: "STOP = Annuler"
-    ipod*,sansac200*: "MENU = Annuler"
-    iaudiox5,iaudiom5: "RECORD = Annuler"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annuler"
-    gigabeatfx: "POWER = Annuler"
+    h100,h120,h300: "STOP = Annuler"
+    ipod*,c200*: "MENU = Annuler"
+    x5,m5: "RECORD = Annuler"
+    h10,h10_5gb,e200*,fuze*: "PREV = Annuler"
+    gigabeatf: "POWER = Annuler"
     mrobe100: "DISPLAY = Annuler"
     gigabeats: "BACK = Annuler"
-    gogearsa9200: "LEFT = Annuler"
+    sa9200: "LEFT = Annuler"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4751,14 +4751,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Annuler"
     ipod*: "SELECT=Set MENU=Annuler"
-    iriverh10,iriverh10_5gb: "SELECT=Valider PREV=Annuler"
+    h10,h10_5gb: "SELECT=Valider PREV=Annuler"
     gigabeats: "SELECT=Valider POWER=Annuler"
   </dest>
   <voice>
@@ -5933,17 +5933,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Micro intégré"
-    iriverh100,iriverh120,iriverh300: "Micro intégré"
+    h100,h120,h300: "Micro intégré"
   </dest>
   <voice>
     *: none
     recording: "Micro intégré"
-    iriverh100,iriverh120,iriverh300: "Micro intégré"
+    h100,h120,h300: "Micro intégré"
   </voice>
 </phrase>
 <phrase>
@@ -5969,15 +5969,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrée ligne"
+    recording,player: "Entrée ligne"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrée ligne"
+    recording,player: "Entrée ligne"
   </voice>
 </phrase>
 <phrase>
@@ -6907,11 +6907,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Tampon:"
-    archosplayer: "Tamp.:"
+    player: "Tamp.:"
   </dest>
   <voice>
     *: "Tampon"
@@ -6923,13 +6923,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Niveau de la batterie"
@@ -6987,19 +6987,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "DD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "D D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8111,11 +8111,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fin de la liste de lecture"
-    archosplayer: "Fin de la liste"
+    player: "Fin de la liste"
   </dest>
   <voice>
     *: "Fin de la liste de lecture"
@@ -8358,20 +8358,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disque plein. Presser OFF pour continuer."
-    iriverh100,iriverh120,iriverh300: "Disque plein. Presser STOP pour continuer."
-    iaudiom5,iaudiox5: "Disque plein. Presser POWER pour continuer."
-    sansae200*,sansac200*: "Disque plein. Presser PREV pour continuer."
+    h100,h120,h300: "Disque plein. Presser STOP pour continuer."
+    m5,x5: "Disque plein. Presser POWER pour continuer."
+    e200*,c200*: "Disque plein. Presser PREV pour continuer."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8455,25 +8455,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF pour Annuler"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pour Annuler"
+    player,h100,h120,h300: "STOP pour Annuler"
     ipod*: "PLAY/PAUSE pour Annuler"
-    iaudiox5,iaudiom5: "Long PLAY pour Annuler"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pour Annuler"
+    x5,m5: "Long PLAY pour Annuler"
+    h10,h10_5gb,e200*,c200*: "PREV pour Annuler"
     gigabeats: "BACK pour Annuler"
-    gigabeatfx: "POWER pour Annuler"
+    gigabeatf: "POWER pour Annuler"
   </dest>
   <voice>
     *: ""
@@ -8697,19 +8697,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batterie: charge max."
+    recorder: "Batterie: charge max."
   </dest>
   <voice>
     *: none
-    archosrecorder: "Charge maximale de la batterie"
+    recorder: "Charge maximale de la batterie"
   </voice>
 </phrase>
 <phrase>
@@ -10526,7 +10526,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11737,15 +11737,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensibilité du pavé tactile"
+    gigabeatf: "Sensibilité du pavé tactile"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensibilité du pavé tactile"
+    gigabeatf: "Sensibilité du pavé tactile"
   </voice>
 </phrase>
 <phrase>
@@ -11754,15 +11754,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Haute"
+    gigabeatf: "Haute"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Haute"
+    gigabeatf: "Haute"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index 3034f11b33..c22ba822bd 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -89,7 +89,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (archosplayer) the jump scroll shall be done "always
+  desc: (player) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -775,14 +775,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic archosrecorder string to use to confirm
+  desc: Generic recorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = SI"
-    iriverh100,iriverh120,iriverh300: "NAVI = SI"
+    h100,h120,h300: "NAVI = SI"
   </dest>
   <voice>
     *: ""
@@ -790,7 +790,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic archosrecorder string to use to cancel
+  desc: Generic recorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -2372,7 +2372,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu altarnative for jump scroll
+  desc: (player) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -2386,7 +2386,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time
+  desc: (player) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -2400,7 +2400,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3156,7 +3156,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
+  desc: the buffer size player-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -3170,7 +3170,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3485,7 +3485,7 @@
   </source>
   <dest>
     *: "PLAY = Seleccionar"
-    iriverh100,iriverh120,iriverh300: "NAVI = Seleccionar"
+    h100,h120,h300: "NAVI = Seleccionar"
   </dest>
   <voice>
     *: ""
@@ -3500,7 +3500,7 @@
   </source>
   <dest>
     *: "ON+PLAY = Borrar"
-    iriverh100,iriverh120,iriverh300: "ON+NAVI = Borrar"
+    h100,h120,h300: "ON+NAVI = Borrar"
   </dest>
   <voice>
     *: ""
@@ -6252,7 +6252,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -6266,7 +6266,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on archosplayer models
+  desc: Used on player models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 58781fa511..389fdca24f 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -264,15 +264,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Επικύρωση"
-    iriverh100,iriverh120,iriverh300: "NAVI = Επικύρωση"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Επικύρωση"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Επικύρωση"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Επικύρωση"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -284,15 +284,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Any Other = Άκυρο"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2368,17 +2368,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (OFF για επιστροφή)"
-    iriverh100,iriverh120,iriverh300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)"
+    h100,h120,h300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)"
     ipod*: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
+    x5,m5,gigabeat*,mrobe100: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
   </dest>
   <voice>
     *: "Kαταχωρήσεις βρέθηκαν για τη βάση δεδομένων"
@@ -3178,7 +3178,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3192,7 +3192,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3206,7 +3206,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3838,17 +3838,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Χρόνος σβησίματος πλήκτρων"
-    sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού"
+    fuze*,e200*: "Χρόνος σβησίματος τροχού"
   </dest>
   <voice>
     *: none
     button_light: "Χρόνος σβησίματος πλήκτρων"
-    sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού"
+    fuze*,e200*: "Χρόνος σβησίματος τροχού"
   </voice>
 </phrase>
 <phrase>
@@ -4129,14 +4129,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Ρύθμιση"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ρύθμιση"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Ρύθμιση"
+    h100,h120,h300: "NAVI = Ρύθμιση"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Ρύθμιση"
   </dest>
   <voice>
     *: none
@@ -4149,22 +4149,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Ακύρωση"
-    iriverh100,iriverh120,iriverh300: "STOP = Ακύρωση"
-    ipod*,sansac200*,gogearsa9200: "MENU = Ακύρωση"
-    iaudiox5,iaudiom5: "RECORD = Ακύρωση"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Ακύρωση"
-    gigabeatfx: "POWER = Ακύρωση"
+    h100,h120,h300: "STOP = Ακύρωση"
+    ipod*,c200*,sa9200: "MENU = Ακύρωση"
+    x5,m5: "RECORD = Ακύρωση"
+    h10,h10_5gb,e200*,fuze*: "PREV = Ακύρωση"
+    gigabeatf: "POWER = Ακύρωση"
     mrobe100: "DISPLAY = Ακύρωση"
     gigabeats: "BACK = Ακύρωση"
   </dest>
@@ -4692,14 +4692,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Όρισε ΟFF=Ακύρωση"
     ipod*: "SELECT=Όρισε MENU=Ακύρωση"
-    iriverh10,iriverh10_5gb: "SELECT=Όρισε PREV=Ακύρωση"
+    h10,h10_5gb: "SELECT=Όρισε PREV=Ακύρωση"
     gigabeats: "SELECT=Όρισε POWER=Ακύρωση"
   </dest>
   <voice>
@@ -5873,17 +5873,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Μικρόφωνο"
-    iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο"
+    h100,h120,h300: "Εσωτερικό Μικρόφωνο"
   </dest>
   <voice>
     *: none
     recording: "Μικρόφωνο"
-    iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο"
+    h100,h120,h300: "Εσωτερικό Μικρόφωνο"
   </voice>
 </phrase>
 <phrase>
@@ -5909,15 +5909,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Eίσοδος"
+    recording,player: "Eίσοδος"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Eίσοδος"
+    recording,player: "Eίσοδος"
   </voice>
 </phrase>
 <phrase>
@@ -6847,11 +6847,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Μνήμη:"
-    archosplayer: "Μνη:"
+    player: "Μνη:"
   </dest>
   <voice>
     *: "Μέγεθος μνήμης"
@@ -6863,13 +6863,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Μπάτ: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Μπάτ: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Επίπεδο μπαταρίας"
@@ -6927,19 +6927,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Έιτς Ντι 1"
-    sansae200*,sansac200*,sansafuze*: "μάικρο Ες Ντι"
+    e200*,c200*,fuze*: "μάικρο Ες Ντι"
     ondio*: "Εμ Εμ Σι"
   </voice>
 </phrase>
@@ -8051,11 +8051,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Τέλος λίστας κομματιών"
-    archosplayer: "Τέλος λίστας"
+    player: "Τέλος λίστας"
   </dest>
   <voice>
     *: "Τέλος λίστας κομματιών"
@@ -8298,20 +8298,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Ο δίσκος είναι γεμάτος. Πατήστε OFF για συνέχεια."
-    iriverh100,iriverh120,iriverh300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια."
-    iaudiom5,iaudiox5: "Ο δίσκος είναι γεμάτος. Πατήστε POWER για συνέχεια.."
-    sansae200*,sansac200*: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια."
+    h100,h120,h300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια."
+    m5,x5: "Ο δίσκος είναι γεμάτος. Πατήστε POWER για συνέχεια.."
+    e200*,c200*: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8395,25 +8395,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF για ακύρωση"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP για ακύρωση"
+    player,h100,h120,h300: "STOP για ακύρωση"
     ipod*: "PLAY/PAUSE για ακύρωση"
-    iaudiox5,iaudiom5: "Long PLAY για ακύρωση"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV για ακύρωση"
+    x5,m5: "Long PLAY για ακύρωση"
+    h10,h10_5gb,e200*,c200*: "PREV για ακύρωση"
     gigabeats: "BACK για ακύρωση"
-    gigabeatfx: "POWER για ακύρωση"
+    gigabeatf: "POWER για ακύρωση"
   </dest>
   <voice>
     *: ""
@@ -8637,19 +8637,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Μπαταρία: Μέγιστη φόρτιση"
+    recorder: "Μπαταρία: Μέγιστη φόρτιση"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Μπαταρία: Μέγιστη φόρτιση"
+    recorder: "Μπαταρία: Μέγιστη φόρτιση"
   </voice>
 </phrase>
 <phrase>
@@ -10466,7 +10466,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11531,15 +11531,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Ευαισθησία πινακίδας αφής"
+    gigabeatf: "Ευαισθησία πινακίδας αφής"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Ευαισθησία πινακίδας αφής"
+    gigabeatf: "Ευαισθησία πινακίδας αφής"
   </voice>
 </phrase>
 <phrase>
@@ -11945,15 +11945,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Ψηλά"
+    gigabeatf: "Ψηλά"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Ψηλά"
+    gigabeatf: "Ψηλά"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 2fed974f7a..ac7f23ac39 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -264,15 +264,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = כן"
-    iriverh100,iriverh120,iriverh300: "NAVI = כן"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = כן"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = כן"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = כן"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -284,15 +284,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "אחר = לא"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2368,17 +2368,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: " בונה מסד נתונים... %d (OFF כדי לחזור) נמצאו"
-    iriverh100,iriverh120,iriverh300: "בונה מסד נתונים... %d (STOP כדי לחזור) נמצאו"
+    h100,h120,h300: "בונה מסד נתונים... %d (STOP כדי לחזור) נמצאו"
     ipod*: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: " בונה מסד נתונים... %d (LEFT כדי לחזור) נמצאו"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו"
+    x5,m5,gigabeat*,mrobe100: " בונה מסד נתונים... %d (LEFT כדי לחזור) נמצאו"
+    h10,h10_5gb,e200*,c200*,sa9200: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3178,7 +3178,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3192,7 +3192,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3206,7 +3206,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3838,17 +3838,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "זמן תאורת כפתור"
-    sansafuze*,sansae200*: "זמן תאורת הגלגל"
+    fuze*,e200*: "זמן תאורת הגלגל"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -4129,18 +4129,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = כוון"
-    iriverh100,iriverh120,iriverh300: "NAVI = כוון"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = כוון"
+    h100,h120,h300: "NAVI = כוון"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = כוון"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4150,28 +4150,28 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = ביטול"
-    iriverh100,iriverh120,iriverh300: "STOP = ביטול"
-    ipod*,sansac200*,gogearsa9200: "MENU = ביטול"
-    iaudiox5,iaudiom5: "RECORD = ביטול"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ביטול"
-    gigabeatfx: "POWER = ביטול"
+    h100,h120,h300: "STOP = ביטול"
+    ipod*,c200*,sa9200: "MENU = ביטול"
+    x5,m5: "RECORD = ביטול"
+    h10,h10_5gb,e200*,fuze*: "PREV = ביטול"
+    gigabeatf: "POWER = ביטול"
     mrobe100: "DISPLAY = ביטול"
     gigabeats: "BACK = ביטול"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4694,14 +4694,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=אישור OFF=ביטול"
     ipod*: "SELECT=אישור MENU=ביטול"
-    iriverh10,iriverh10_5gb: "SELECT=אישור PREV=ביטול"
+    h10,h10_5gb: "SELECT=אישור PREV=ביטול"
     gigabeats: "SELECT=אישור POWER=ביטול"
   </dest>
   <voice>
@@ -5876,17 +5876,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "מיקרופון"
-    iriverh100,iriverh120,iriverh300: "מיקרופון פנימי"
+    h100,h120,h300: "מיקרופון פנימי"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -5912,15 +5912,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "כניסת שמע"
+    recording,player: "כניסת שמע"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6850,11 +6850,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "חוצץ:"
-    archosplayer: "חצץ:"
+    player: "חצץ:"
   </dest>
   <voice>
     *: "Buffer size"
@@ -6866,13 +6866,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "סוללה: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "סולל: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "סולל: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6930,19 +6930,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8054,15 +8054,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "סוף רשימת השירים"
-    archosplayer: "סוף הרשימה"
+    player: "סוף הרשימה"
   </dest>
   <voice>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -8302,16 +8302,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "הכונן מלא. לחץ על OFF כדי להמשיך"
-    iriverh100,iriverh120,iriverh300: "הכונן מלא. לחץ על STOP כדי להמשיך"
-    iaudiom5,iaudiox5: "הכונן מלא. לחץ על POWER כדי להמשיך"
-    sansae200*,sansac200*: "הכונן מלא. לחץ על PREV כדי להמשיך"
+    h100,h120,h300: "הכונן מלא. לחץ על STOP כדי להמשיך"
+    m5,x5: "הכונן מלא. לחץ על POWER כדי להמשיך"
+    e200*,c200*: "הכונן מלא. לחץ על PREV כדי להמשיך"
   </dest>
   <voice>
     *: none
@@ -8398,25 +8398,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF כדי לבטל"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP כדי לבטל"
+    player,h100,h120,h300: "STOP כדי לבטל"
     ipod*: "PLAY/PAUSE כדי לבטל"
-    iaudiox5,iaudiom5: "PLAY ארוך כדי לבטל"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV כדי לבטל"
+    x5,m5: "PLAY ארוך כדי לבטל"
+    h10,h10_5gb,e200*,c200*: "PREV כדי לבטל"
     gigabeats: "BACK כדי לבטל"
-    gigabeatfx: "POWER כדי לבטל"
+    gigabeatf: "POWER כדי לבטל"
   </dest>
   <voice>
     *: ""
@@ -8640,19 +8640,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "סוללה: כיבוי במקסימום"
+    recorder: "סוללה: כיבוי במקסימום"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Top off charge"
+    recorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10469,7 +10469,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11680,15 +11680,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "רגישות משטח מגע"
+    gigabeatf: "רגישות משטח מגע"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11697,15 +11697,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "גבוה"
+    gigabeatf: "גבוה"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hindi.lang b/apps/lang/hindi.lang
index bd0bdf545c..14c9898113 100644
--- a/apps/lang/hindi.lang
+++ b/apps/lang/hindi.lang
@@ -232,15 +232,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    ipod*,x5,m5,gigabeatf,e200*,c200*,h10,h10_5gb: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "बजाना = हां"
-    iriverh100,iriverh120,iriverh300: "NAVI = हां"
-    ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "चुन = हां"
-    archosplayer: "(बजाना/रोक)"
+    h100,h120,h300: "NAVI = हां"
+    ipod*,x5,m5,gigabeatf,e200*,c200*,h10,h10_5gb: "चुन = हां"
+    player: "(बजाना/रोक)"
   </dest>
   <voice>
     *: ""
@@ -252,15 +252,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "दूसरों = नहीं"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -1267,17 +1267,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    x5,m5: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "डाटाबेस बन रहा है... %d मिले (OFF to बढ़)"
-    iriverh100,iriverh120,iriverh300: "डाटाबेस बन रहा है... %d मिले (STOP to बढ़)"
+    h100,h120,h300: "डाटाबेस बन रहा है... %d मिले (STOP to बढ़)"
     ipod*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
-    iaudiox5,iaudiom5: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
+    x5,m5: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)"
+    h10,h10_5gb,e200*,c200*,fuze*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -1620,7 +1620,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2132,13 +2132,13 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=लगा OFF=बंद"
     ipod*: "SELECT=लगा MENU=बंद"
-    iriverh10,iriverh10_5gb: "SELECT=लगा PREV=बंद"
+    h10,h10_5gb: "SELECT=लगा PREV=बंद"
   </dest>
   <voice>
     *: none
@@ -3867,15 +3867,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "गाने खतम हो गये"
-    archosplayer: "खतम हो गये"
+    player: "खतम हो गये"
   </dest>
   <voice>
     *: "गाने खतम हो गये"
-    archosplayer: "खतम हो गये"
+    player: "खतम हो गये"
   </voice>
 </phrase>
 <phrase>
@@ -3982,11 +3982,11 @@
   user: core
   <source>
     *: "No partition?"
-    archosplayer: "Partition?"
+    player: "Partition?"
   </source>
   <dest>
     *: "पारटिशन नहीं है?"
-    archosplayer: "पारटिशन?"
+    player: "पारटिशन?"
   </dest>
   <voice>
     *: ""
@@ -4044,20 +4044,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "दिसक भरी ह. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue."
-    iaudiom5,iaudiox5: "दिसक भरी ह. Press POWER to continue."
-    sansae200*,sansac200*: "दिसक भरी ह. Press PREV to continue."
+    h100,h120,h300: "दिसक भरी ह. Press STOP to continue."
+    m5,x5: "दिसक भरी ह. Press POWER to continue."
+    e200*,c200*: "दिसक भरी ह. Press PREV to continue."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5058,18 +5058,18 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "The disk is full. Press LEFT to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "The disk is full. Press LEFT to continue."
   </source>
   <dest>
     *: none
     recording: "दिसक भरी ह. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue."
-    iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "दिसक भरी ह. Press LEFT to continue."
+    h100,h120,h300: "दिसक भरी ह. Press STOP to continue."
+    m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "दिसक भरी ह. Press LEFT to continue."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index bdf743cdf8..512e530421 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -88,7 +88,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (archosplayer) the jump scroll shall be done "always
+  desc: (player) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -788,14 +788,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic archosrecorder string to use to confirm
+  desc: Generic recorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = Já"
-    iriverh100,iriverh120,iriverh300: "NAVI = Já"
+    h100,h120,h300: "NAVI = Já"
   </dest>
   <voice>
     *: ""
@@ -803,7 +803,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic archosrecorder string to use to cancel
+  desc: Generic recorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -2567,7 +2567,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu altarnative for jump scroll
+  desc: (player) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -2581,7 +2581,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time
+  desc: (player) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -2595,7 +2595,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3351,7 +3351,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
+  desc: the buffer size player-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -3365,7 +3365,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3680,7 +3680,7 @@
   </source>
   <dest>
     *: "Spila = Velja"
-    iriverh100,iriverh120,iriverh300: "NAVI = Velja"
+    h100,h120,h300: "NAVI = Velja"
   </dest>
   <voice>
     *: ""
@@ -3695,7 +3695,7 @@
   </source>
   <dest>
     *: "Á+Spila = Eyða"
-    iriverh100,iriverh120,iriverh300: "Á+NAVI = Eyða"
+    h100,h120,h300: "Á+NAVI = Eyða"
   </dest>
   <voice>
     *: ""
@@ -6503,7 +6503,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -6517,7 +6517,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on archosplayer models
+  desc: Used on player models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 67071e2a4e..075520d2af 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -263,17 +263,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sì"
     cowond2*: "MENU = Sì"
-    iriverh100,iriverh120,iriverh300: "NAVI = Sì"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Sì"
+    h100,h120,h300: "NAVI = Sì"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Sì"
     mrobe500: "PLAY o POWER = Sì"
-    archosplayer: "(PLAY/STOP)"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -285,15 +285,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Altro Tasto = No"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2386,19 +2386,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Costruzione database... %d trovato (OFF per uscire)"
-    iriverh100,iriverh120,iriverh300: "Costruzione database... %d trovato (STOP per uscire)"
+    h100,h120,h300: "Costruzione database... %d trovato (STOP per uscire)"
     ipod*: "Costruzione database... %d trovato (PREV per uscire)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Costruzione database... %d trovato (LEFT per uscire)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Costruzione database... %d trovato (PREV per uscire)"
-    gogearsa9200: "Costruzione database... %d trovato (REW per uscire)"
+    x5,m5,gigabeat*,mrobe100: "Costruzione database... %d trovato (LEFT per uscire)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Costruzione database... %d trovato (PREV per uscire)"
+    sa9200: "Costruzione database... %d trovato (REW per uscire)"
   </dest>
   <voice>
     *: "Elementi trovati per il database"
@@ -3198,7 +3198,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3212,7 +3212,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3226,7 +3226,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3858,17 +3858,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tempo di spegnimento illuminazione tasti"
-    sansafuze*,sansae200*: "Tempo di spegnimento illuminazione rotella"
+    fuze*,e200*: "Tempo di spegnimento illuminazione rotella"
   </dest>
   <voice>
     *: none
     button_light: "Tempo di spegnimento illuminazione tasti"
-    sansafuze*,sansae200*: "Tempo di spegnimento illuminazione rotella"
+    fuze*,e200*: "Tempo di spegnimento illuminazione rotella"
   </voice>
 </phrase>
 <phrase>
@@ -4150,21 +4150,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Imposta"
     mrobe500: "HEART = Imposta"
-    iriverh100,iriverh120,iriverh300: "NAVI = Imposta"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Imposta"
-    gogearsa9200: "PLAY = Imposta"
+    h100,h120,h300: "NAVI = Imposta"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Imposta"
+    sa9200: "PLAY = Imposta"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4175,31 +4175,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Annulla"
     mrobe500: "POWER = Annulla"
-    iriverh100,iriverh120,iriverh300: "STOP = Annulla"
-    ipod*,sansac200*: "MENU = Annulla"
-    iaudiox5,iaudiom5: "RECORD = Annulla"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annulla"
-    gigabeatfx: "POWER = Annulla"
+    h100,h120,h300: "STOP = Annulla"
+    ipod*,c200*: "MENU = Annulla"
+    x5,m5: "RECORD = Annulla"
+    h10,h10_5gb,e200*,fuze*: "PREV = Annulla"
+    gigabeatf: "POWER = Annulla"
     mrobe100: "DISPLAY = Annulla"
     gigabeats: "BACK = Annulla"
-    gogearsa9200: "LEFT = Annulla"
+    sa9200: "LEFT = Annulla"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4722,14 +4722,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Imposta OFF=Annulla"
     ipod*: "SELECT=Imposta MENU=Annulla"
-    iriverh10,iriverh10_5gb: "SELECT=Imposta PREV=Annulla"
+    h10,h10_5gb: "SELECT=Imposta PREV=Annulla"
     gigabeats: "SELECT=Imposta POWER=Annulla"
   </dest>
   <voice>
@@ -5904,17 +5904,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfono"
-    iriverh100,iriverh120,iriverh300: "Microfono interno"
+    h100,h120,h300: "Microfono interno"
   </dest>
   <voice>
     *: none
     recording: "Microfono"
-    iriverh100,iriverh120,iriverh300: "Microfono interno"
+    h100,h120,h300: "Microfono interno"
   </voice>
 </phrase>
 <phrase>
@@ -5940,15 +5940,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linea in ingresso"
+    recording,player: "Linea in ingresso"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linea in ingresso"
+    recording,player: "Linea in ingresso"
   </voice>
 </phrase>
 <phrase>
@@ -6878,11 +6878,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Dimensione buffer"
@@ -6894,13 +6894,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"   
+    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"   
   </dest>
   <voice>
     *: "Livello Batteria"
@@ -6958,19 +6958,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD 1"
-    sansae200*,sansac200*,sansafuze*: "Micro SD"
+    e200*,c200*,fuze*: "Micro SD"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8082,11 +8082,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fine della Lista dei Brani"
-    archosplayer: "Fine della lista"
+    player: "Fine della lista"
   </dest>
   <voice>
     *: "Fine della Lista dei Brani"
@@ -8331,20 +8331,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disco pieno. Premi STOP per continuare."
-    iriverh100,iriverh120,iriverh300: "Disco pieno. Premi stop per continuare."
-    iaudiom5,iaudiox5: "Disco pieno. Premi POWER per continuare."
-    sansae200*,sansac200*: "Disco pieno. Premi PREV per continuare."
+    h100,h120,h300: "Disco pieno. Premi stop per continuare."
+    m5,x5: "Disco pieno. Premi POWER per continuare."
+    e200*,c200*: "Disco pieno. Premi PREV per continuare."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8428,25 +8428,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF = Annulla"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP = Annulla"
+    player,h100,h120,h300: "STOP = Annulla"
     ipod*: "PLAY/PAUSA = Annulla"
-    iaudiox5,iaudiom5: "PLAY LUNGO = Annulla"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV = Annulla"
+    x5,m5: "PLAY LUNGO = Annulla"
+    h10,h10_5gb,e200*,c200*: "PREV = Annulla"
     gigabeats: "BACK = Annulla"
-    gigabeatfx: "POWER = Annulla"
+    gigabeatf: "POWER = Annulla"
   </dest>
   <voice>
     *: ""
@@ -8670,19 +8670,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batteria: Carica completa"
+    recorder: "Batteria: Carica completa"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Carica completa"
+    recorder: "Carica completa"
   </voice>
 </phrase>
 <phrase>
@@ -10499,7 +10499,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11710,15 +11710,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensibilità Touchpad"
+    gigabeatf: "Sensibilità Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensibilità Touchpad"
+    gigabeatf: "Sensibilità Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11727,15 +11727,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Alta"
+    gigabeatf: "Alta"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Alta"
+    gigabeatf: "Alta"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 1f3fade1ac..a0ec2e4705 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -266,16 +266,16 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = はい"
-    iriverh100,iriverh120,iriverh300: "NAVI = はい"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = はい"
+    h100,h120,h300: "NAVI = はい"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = はい"
     mrobe500: "PLAY or POWER = はい"
-    archosplayer: "(PLAY/STOP)"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -287,15 +287,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "[それ以外] = いいえ"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2388,19 +2388,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "データベース構築中... %d 件 (OFFで戻る)"
-    iriverh100,iriverh120,iriverh300: "データベース構築中... %d 件 (STOPで戻る)"
+    h100,h120,h300: "データベース構築中... %d 件 (STOPで戻る)"
     ipod*: "データベース構築中... %d 件 (PLAY/PAUSEで戻る)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "データベース構築中... %d 件 (左で戻る)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "データベース構築中... %d 件 (PREVで戻る)"
-    gogearsa9200: "データベース構築中... %d 件 (REWで戻る)"
+    x5,m5,gigabeat*,mrobe100: "データベース構築中... %d 件 (左で戻る)"
+    h10,h10_5gb,e200*,c200*,fuze*: "データベース構築中... %d 件 (PREVで戻る)"
+    sa9200: "データベース構築中... %d 件 (REWで戻る)"
   </dest>
   <voice>
     *: "データベースに登録"
@@ -3200,7 +3200,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3214,7 +3214,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3228,7 +3228,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3860,17 +3860,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "ボタンライトのタイムアウト"
-    sansafuze*,sansae200*: "ホイールライトのタイムアウト"
+    fuze*,e200*: "ホイールライトのタイムアウト"
   </dest>
   <voice>
     *: none
     button_light: "ボタンライトのタイムアウト"
-    sansafuze*,sansae200*: "ホイールライトのタイムアウト"
+    fuze*,e200*: "ホイールライトのタイムアウト"
   </voice>
 </phrase>
 <phrase>
@@ -4152,21 +4152,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = 設定"
     mrobe500: "HEART = 設定"
-    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = 設定"
-    gogearsa9200: "PLAY = 設定"
+    h100,h120,h300: "NAVI = 設定"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = 設定"
+    sa9200: "PLAY = 設定"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4177,31 +4177,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = 元に戻す"
     mrobe500: "POWER = 元に戻す"
-    iriverh100,iriverh120,iriverh300: "STOP = 元に戻す"
-    ipod*,sansac200*: "MENU = 元に戻す"
-    iaudiox5,iaudiom5: "RECORD = 元に戻す"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 元に戻す"
-    gigabeatfx: "POWER = 元に戻す"
+    h100,h120,h300: "STOP = 元に戻す"
+    ipod*,c200*: "MENU = 元に戻す"
+    x5,m5: "RECORD = 元に戻す"
+    h10,h10_5gb,e200*,fuze*: "PREV = 元に戻す"
+    gigabeatf: "POWER = 元に戻す"
     mrobe100: "DISPLAY = 元に戻す"
     gigabeats: "BACK = 元に戻す"
-    gogearsa9200: "LEFT = 元に戻す"
+    sa9200: "LEFT = 元に戻す"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4724,14 +4724,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=設定 OFF=キャンセル"
     ipod*: "SELECT=設定 MENU=キャンセル"
-    iriverh10,iriverh10_5gb: "SELECT=設定 PREV=キャンセル"
+    h10,h10_5gb: "SELECT=設定 PREV=キャンセル"
     gigabeats: "SELECT=設定 POWER=キャンセル"
   </dest>
   <voice>
@@ -5906,17 +5906,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "マイク"
-    iriverh100,iriverh120,iriverh300: "内蔵のマイク"
+    h100,h120,h300: "内蔵のマイク"
   </dest>
   <voice>
     *: none
     recording: "マイク"
-    iriverh100,iriverh120,iriverh300: "内蔵のマイク"
+    h100,h120,h300: "内蔵のマイク"
   </voice>
 </phrase>
 <phrase>
@@ -5942,15 +5942,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "ライン入力"
+    recording,player: "ライン入力"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "ライン入力"
+    recording,player: "ライン入力"
   </voice>
 </phrase>
 <phrase>
@@ -6880,11 +6880,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "バッファ:"
-    archosplayer: "バッファ:"
+    player: "バッファ:"
   </dest>
   <voice>
     *: "バッファサイズ"
@@ -6896,13 +6896,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "バッテリー: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "バッテリー容量"
@@ -6960,19 +6960,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "マイクロSD"
+    e200*,c200*,fuze*: "マイクロSD"
     ondio*: "マルチメディアカード"
   </voice>
 </phrase>
@@ -8084,11 +8084,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "プレイリストの終端です"
-    archosplayer: "プレイリストの終端です"
+    player: "プレイリストの終端です"
   </dest>
   <voice>
     *: "プレイリストの終端です"
@@ -8331,20 +8331,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "ディスクが一杯です．停止ボタンを押してください"
-    iriverh100,iriverh120,iriverh300: "ディスクが一杯です．停止ボタンを押してください"
-    iaudiom5,iaudiox5: "ディスクが一杯です．電源ボタンを押してください"
-    sansae200*,sansac200*: "ディスクが一杯です．PREVボタンを押してください"
+    h100,h120,h300: "ディスクが一杯です．停止ボタンを押してください"
+    m5,x5: "ディスクが一杯です．電源ボタンを押してください"
+    e200*,c200*: "ディスクが一杯です．PREVボタンを押してください"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8428,25 +8428,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF: キャンセル"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP: キャンセル"
+    player,h100,h120,h300: "STOP: キャンセル"
     ipod*: "PLAY/PAUSE: キャンセル"
-    iaudiox5,iaudiom5: "Long PLAY: キャンセル"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV: キャンセル"
+    x5,m5: "Long PLAY: キャンセル"
+    h10,h10_5gb,e200*,c200*: "PREV: キャンセル"
     gigabeats: "BACK: キャンセル"
-    gigabeatfx: "POWER: キャンセル"
+    gigabeatf: "POWER: キャンセル"
   </dest>
   <voice>
     *: ""
@@ -8670,19 +8670,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "バッテリー: 最終充電"
+    recorder: "バッテリー: 最終充電"
   </dest>
   <voice>
     *: none
-    archosrecorder: "バッテリー 最終充電"
+    recorder: "バッテリー 最終充電"
   </voice>
 </phrase>
 <phrase>
@@ -10499,7 +10499,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11710,15 +11710,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "タッチパッド感度"
+    gigabeatf: "タッチパッド感度"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "タッチパッド感度"
+    gigabeatf: "タッチパッド感度"
   </voice>
 </phrase>
 <phrase>
@@ -11727,15 +11727,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "高"
+    gigabeatf: "高"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "こう"
+    gigabeatf: "こう"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 4d06c4ba1e..0b139093e5 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -2203,15 +2203,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "라인 인"
+    recording,player: "라인 인"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "라인 인"
+    recording,player: "라인 인"
   </voice>
 </phrase>
 <phrase>
@@ -2457,17 +2457,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "외부 마이크"
-    iriverh100,iriverh120,iriverh300: "내장 마이크"
+    h100,h120,h300: "내장 마이크"
   </dest>
   <voice>
     *: none
     recording: "외부 마이크"
-    iriverh100,iriverh120,iriverh300: "내장 마이크"
+    h100,h120,h300: "내장 마이크"
   </voice>
 </phrase>
 <phrase>
@@ -3319,7 +3319,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3333,7 +3333,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3347,7 +3347,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4352,19 +4352,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "배터리: Top-Off Chg"
+    recorder: "배터리: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    archosrecorder: "배터리: Top-Off Chg"
+    recorder: "배터리: Top-Off Chg"
   </voice>
 </phrase>
 <phrase>
@@ -4390,13 +4390,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "배터리: %d%% (%d시간 %d분)"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %d시간 %d분"
-    iriverh10,ipodmini1g,ipodmini2g: "배터리: %d%% %d시간 %d분"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %d시간 %d분"
+    h10,ipodmini,ipodmini2g: "배터리: %d%% %d시간 %d분"
   </dest>
   <voice>
     *: "배터리 레벨"
@@ -4454,19 +4454,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1 "
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -4598,22 +4598,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "A = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "A = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "[끔]: 원상태 복구"
-    iriverh100,iriverh120,iriverh300: "[정지]: 원상태 복구"
-    ipod*,sansac200*,gogearsa9200: "[메뉴]: 원상태 복구"
-    iaudiox5,iaudiom5: "[녹음]: 원상태 복구"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "[이전]: 원상태 복구"
-    gigabeatfx: "[전원]: 원상태 복구"
+    h100,h120,h300: "[정지]: 원상태 복구"
+    ipod*,c200*,sa9200: "[메뉴]: 원상태 복구"
+    x5,m5: "[녹음]: 원상태 복구"
+    h10,h10_5gb,e200*,fuze*: "[이전]: 원상태 복구"
+    gigabeatf: "[전원]: 원상태 복구"
     mrobe100: "[화면]: 원상태 복구"
     gigabeats: "[뒤]: 원상태 복구"
   </dest>
@@ -4713,16 +4713,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press UP to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press UP to continue."
   </source>
   <dest>
     *: none
     recording: "디스크 공간이 부족합니다. [끔] 버튼을 누르세요."
-    iriverh100,iriverh120,iriverh300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요."
-    iaudiom5,iaudiox5: "디스크 공간이 부족합니다. [전원] 버튼을 누르세요."
-    sansae200*,sansac200*: "디스크 공간이 부족합니다. [위] 버튼을 누르세요."
+    h100,h120,h300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요."
+    m5,x5: "디스크 공간이 부족합니다. [전원] 버튼을 누르세요."
+    e200*,c200*: "디스크 공간이 부족합니다. [위] 버튼을 누르세요."
   </dest>
   <voice>
     *: none
@@ -4889,14 +4889,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "[재생]: 설정   [꺼짐]: 취소"
     ipod*: "[선택]: 설정   [메뉴]: 취소"
-    iriverh10,iriverh10_5gb: "[선택]: 설정   [이전]: 취소"
+    h10,h10_5gb: "[선택]: 설정   [이전]: 취소"
     gigabeats: "[선택]: 설정   [꺼짐]: 취소"
   </dest>
   <voice>
@@ -7400,25 +7400,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "[꺼짐]: 중지"
-    archosplayer,iriverh100,iriverh120,iriverh300: "[정지]: 중지"
+    player,h100,h120,h300: "[정지]: 중지"
     ipod*: "[재생/일시정지]: 중지"
-    iaudiox5,iaudiom5: "[재생 길게누름]: 중지"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "[이전]: 중지"
+    x5,m5: "[재생 길게누름]: 중지"
+    h10,h10_5gb,e200*,c200*: "[이전]: 중지"
     gigabeats: "[뒤]: 중지"
-    gigabeatfx: "[전원]: 중지"
+    gigabeatf: "[전원]: 중지"
   </dest>
   <voice>
     *: ""
@@ -8813,7 +8813,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9985,17 +9985,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "음악 DB 생성 중... %d개 완료 ([꺼짐]: 돌아가기)"
-    iriverh100,iriverh120,iriverh300: "음악 DB 생성 중... %d개 완료 ([정지]: 돌아가기)"
+    h100,h120,h300: "음악 DB 생성 중... %d개 완료 ([정지]: 돌아가기)"
     ipod*: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
+    x5,m5,gigabeat*,mrobe100: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)"
+    h10,h10_5gb,e200*,c200*,sa9200: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
   </dest>
   <voice>
     *: "음악 DB의 요소를 찾음"
@@ -10022,17 +10022,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "버튼 조명 시간"
-    sansafuze*,sansae200*: "휠 조명 시간"
+    fuze*,e200*: "휠 조명 시간"
   </dest>
   <voice>
     *: none
     button_light: "버튼 조명 시간"
-    sansafuze*,sansae200*: "휠 조명 시간"
+    fuze*,e200*: "휠 조명 시간"
   </voice>
 </phrase>
 <phrase>
@@ -10373,15 +10373,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "터치패드 감도"
+    gigabeatf: "터치패드 감도"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "터치패드 감도"
+    gigabeatf: "터치패드 감도"
   </voice>
 </phrase>
 <phrase>
@@ -10587,11 +10587,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "버퍼:"
-    archosplayer: "버퍼:"
+    player: "버퍼:"
   </dest>
   <voice>
     *: "버퍼 크기"
@@ -10727,15 +10727,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "[재생] = 예"
-    iriverh100,iriverh120,iriverh300: "[네비] = 예"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "[선택] = 예"
-    archosplayer: "(재생/정지)"
+    h100,h120,h300: "[네비] = 예"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "[선택] = 예"
+    player: "(재생/정지)"
   </dest>
   <voice>
     *: ""
@@ -10748,14 +10748,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "[켬] = 설정"
-    iriverh100,iriverh120,iriverh300: "[네비] = 설정"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "[선택] = 설정"
+    h100,h120,h300: "[네비] = 설정"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "[선택] = 설정"
   </dest>
   <voice>
     *: none
@@ -10767,15 +10767,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "다른 버튼 = 아니오"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -10981,15 +10981,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "노래 목록의 마지막"
-    archosplayer: "목록의 마지막"
+    player: "목록의 마지막"
   </dest>
   <voice>
     *: "노래 목록의 마지막"
-    archosplayer: "목록의 마지막"
+    player: "목록의 마지막"
   </voice>
 </phrase>
 <phrase>
@@ -12071,15 +12071,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "높음"
+    gigabeatf: "높음"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "높음"
+    gigabeatf: "높음"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 478722c801..f2d5992b32 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -14,6 +14,80 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
+# This is the master of the language files. This is the original, the one with
+# all the existing strings Rockbox features.
+#
+# The target names used for target-specific strings are set in the ARCHOS
+# variable in the root Makefile
+#
+# *WARNING*
+#
+# If you want to add a new string, add it to the end of this file!
+# If you want to remove a string, just blank it, don't actually remove it!
+#
+# If you re-order things or remove entries, you must bump the binary language
+# file version number in both the 'genlang' tool and the language loader code.
+#
+# The "voice' entry contains how we want the speech UI to pronounce the phrase.
+#
+# Since this file is both the master for the language system, as well as the
+# source for generating english strings, make sure that all <source> strings
+# are *identical* to the <dest> strings within the english.lang file. The
+# <source> strings are the ones that'll be exposed and used by other languages
+# when doing updates etc, while the <dest> ones are used when this file is
+# used to simply get the full set of english strings for a particular target.
+#
+# All phrases have a default string like: *: "default" that will be used if no
+# other string matches for the particular model you build the language for. If
+# you want a particular string for the iriver h300 series you'd write it like:
+# h300: "h300-specific string" (below the default line). If your string isn't
+# used for all targets set the default to none like: *: none (no quotes!) this
+# will not include the string for target that will not need it, see
+# apps/features.txt for available categories that can be used instead of the
+# target name, for example: swcodec: "swcodec-specific string".
+#
+#
+# The target names used are picked from the configure script and are set in the
+# MODELNAME variable in the root makefile. Currently, they are:
+# Target        Target string
+# Archos
+# Player/Studio     player
+# Recorder          recorder
+# FM Recorder       fmrecorder
+# Recorder V2       recorderv2
+# Ondio SP          ondiosp
+# Ondio FM          ondiofm
+# iriver
+# H100/H110/H115    h100
+# H120/H140         h120
+# H320/H340         h300
+# H10               h10
+# IFP 7XX           ifp7xx
+# iaudio
+# X5                x5
+# M5                m5
+# ipod
+# All iPods         ipod*
+# 4G Color/Photo    ipodcolor
+# Nano              ipodnano
+# Video (5G)        ipodvideo
+# 3G                ipod3g
+# 4G gray           ipod4g
+# mini              ipodmini
+# mini 2G           ipodmini2g
+# Toshiba
+# Gigabeat Fxx      gigabeatf
+# Gigabeat Sxx      gigabeats
+#
+# Sandisk
+# Sansa E200        e200
+# Sansa C200        c200*
+#
+# Olympus
+# m:robe 100        mrobe100
+#
+# Philips
+# GoGear SA9200     sa9200
 
 <phrase>
   id: LANG_SET_BOOL_YES
@@ -259,15 +333,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Taip"
-    iriverh100,iriverh120,iriverh300: "NAVI = Taip"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Taip"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Taip"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Taip"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -279,15 +353,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Bet koks kitas = Ne"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2380,17 +2454,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Kuriama duomenų bazė... %d rasta (OFF grįžimui)"
-    iriverh100,iriverh120,iriverh300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
+    h100,h120,h300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
     ipod*: "Kuriama duomenų bazė... %d rasta (PREV grįžimui)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
+    x5,m5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3190,7 +3264,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3204,7 +3278,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3218,7 +3292,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3850,17 +3924,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    sansafuze*,sansae200*: "Rato apšvietimo laikas"
+    fuze*,e200*: "Rato apšvietimo laikas"
   </dest>
   <voice>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    sansafuze*,sansae200*: "Rato apšvietimo laikas"
+    fuze*,e200*: "Rato apšvietimo laikas"
   </voice>
 </phrase>
 <phrase>
@@ -4141,18 +4215,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Nustatyti"
-    iriverh100,iriverh120,iriverh300: "NAVI = Nustatyti"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Nustatyti"
+    h100,h120,h300: "NAVI = Nustatyti"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Nustatyti"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4162,22 +4236,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Atstatyti"
-    iriverh100,iriverh120,iriverh300: "STOP = Atstatyti"
-    ipod*,sansac200*,gogearsa9200: "MENU = Atstatyti"
-    iaudiox5,iaudiom5: "RECORD = Atstatyti"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atstatyti"
-    gigabeatfx: "POWER = Atstatyti"
+    h100,h120,h300: "STOP = Atstatyti"
+    ipod*,c200*,sa9200: "MENU = Atstatyti"
+    x5,m5: "RECORD = Atstatyti"
+    h10,h10_5gb,e200*,fuze*: "PREV = Atstatyti"
+    gigabeatf: "POWER = Atstatyti"
     mrobe100: "DISPLAY = Atstatyti"
     gigabeats: "BACK = Atstatyti"
   </dest>
@@ -4705,14 +4779,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Nustatyti OFF=Atšaukti"
     ipod*: "SELECT=Nustatyti MENU=Atšaukti"
-    iriverh10,iriverh10_5gb: "SELECT=Nustatyti PREV=Atšaukti"
+    h10,h10_5gb: "SELECT=Nustatyti PREV=Atšaukti"
     gigabeats: "SELECT=Nustatyti POWER=Atšaukti"
   </dest>
   <voice>
@@ -5887,17 +5961,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofonas"
-    iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
+    h100,h120,h300: "Vidinis mikrofonas"
   </dest>
   <voice>
     *: none
     recording: "Mikrofonas"
-    iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
+    h100,h120,h300: "Vidinis mikrofonas"
   </voice>
 </phrase>
 <phrase>
@@ -5923,15 +5997,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6861,11 +6935,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buferis:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buferio dydis"
@@ -6877,13 +6951,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Baterijos lygis"
@@ -6941,19 +7015,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8065,11 +8139,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Dainų sąrašo pabaiga"
-    archosplayer: "Sąrašo pabaiga"
+    player: "Sąrašo pabaiga"
   </dest>
   <voice>
     *: "Dainų sąrašo pabaiga"
@@ -8312,20 +8386,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Diskas pilnas. Spauskite OFF."
-    iriverh100,iriverh120,iriverh300: "Diskas pilnas. Spauskite STOP."
-    iaudiom5,iaudiox5: "Diskas pilnas. Spauskite POWER."
-    sansae200*,sansac200*: "Diskas pilnas. Spauskite PREV."
+    h100,h120,h300: "Diskas pilnas. Spauskite STOP."
+    m5,x5: "Diskas pilnas. Spauskite POWER."
+    e200*,c200*: "Diskas pilnas. Spauskite PREV."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8409,25 +8483,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF atšaukimui"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP atšaukimui"
+    player,h100,h120,h300: "STOP atšaukimui"
     ipod*: "PLAY/PAUSE atšaukimui"
-    iaudiox5,iaudiom5: "Ilgas PLAY atšaukimui"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV atšaukimui"
+    x5,m5: "Ilgas PLAY atšaukimui"
+    h10,h10_5gb,e200*,c200*: "PREV atšaukimui"
     gigabeats: "BACK atšaukimui"
-    gigabeatfx: "POWER atšaukimui"
+    gigabeatf: "POWER atšaukimui"
   </dest>
   <voice>
     *: ""
@@ -8651,19 +8725,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Baterija: Pilna"
+    recorder: "Baterija: Pilna"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Pilanas pakrovimas"
+    recorder: "Pilanas pakrovimas"
   </voice>
 </phrase>
 <phrase>
@@ -10480,7 +10554,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11691,15 +11765,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Jautrumas lietimui"
+    gigabeatf: "Jautrumas lietimui"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Jautrumas lietimui"
+    gigabeatf: "Jautrumas lietimui"
   </voice>
 </phrase>
 <phrase>
@@ -11708,15 +11782,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Aukštas"
+    gigabeatf: "Aukštas"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Aukštas"
+    gigabeatf: "Aukštas"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index 8a83ace1b3..e0eaa2aec5 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -260,15 +260,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Igen"
-    iriverh100,iriverh120,iriverh300: "NAVI = Igen"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Igen"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Igen"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Igen"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -280,15 +280,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Egyéb = Mégsem"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2363,17 +2363,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Készítem az adatbázist... %d-t találtam (OFF - vissza)"
-    iriverh100,iriverh120,iriverh300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)"
+    h100,h120,h300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)"
     ipod*: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Készítem az adatbázist... %d-t találtam (BAL - vissza)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
+    x5,m5,gigabeat*,mrobe100: "Készítem az adatbázist... %d-t találtam (BAL - vissza)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3172,7 +3172,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3186,7 +3186,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3200,7 +3200,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3832,17 +3832,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Gomb világításának hossza"
-    sansafuze*,sansae200*: "Kerék világításának hossza"
+    fuze*,e200*: "Kerék világításának hossza"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -3859,7 +3859,7 @@
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Button Light Brightness"
+    gigabeatf: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
@@ -4123,18 +4123,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Beállít"
-    iriverh100,iriverh120,iriverh300: "NAVI = Beállít"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Beállít"
+    h100,h120,h300: "NAVI = Beállít"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Beállít"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeatfx: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeatf: ""
   </voice>
 </phrase>
 <phrase>
@@ -4144,28 +4144,28 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "KI = mégsem"
-    iriverh100,iriverh120,iriverh300: "STOP = mégsem"
-    ipod*,sansac200*,gogearsa9200: "MENU = mégsem"
-    iaudiox5,iaudiom5: "RECORD = mégsem"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = mégsem"
-    gigabeatfx: "POWER = mégsem"
+    h100,h120,h300: "STOP = mégsem"
+    ipod*,c200*,sa9200: "MENU = mégsem"
+    x5,m5: "RECORD = mégsem"
+    h10,h10_5gb,e200*,fuze*: "PREV = mégsem"
+    gigabeatf: "POWER = mégsem"
     mrobe100: "DISPLAY = mégsem"
     gigabeats: "VISSZA = mégsem"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,h10_gb,gigabeatfx: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_gb,gigabeatf: ""
   </voice>
 </phrase>
 <phrase>
@@ -4688,14 +4688,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=OK KI=Mégsem"
     ipod*: "SELECT=OK MENU=Mégsem"
-    iriverh10,iriverh10_5gb: "SELECT=OK PREV=Mégsem"
+    h10,h10_5gb: "SELECT=OK PREV=Mégsem"
     gigabeats: "SELECT=OK POWER=Mégsem"
   </dest>
   <voice>
@@ -5869,17 +5869,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Belső mikrofon"
+    h100,h120,h300: "Belső mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -5905,15 +5905,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6843,11 +6843,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Puffer:"
-    archosplayer: "Puf:"
+    player: "Puf:"
   </dest>
   <voice>
     *: ""
@@ -6859,13 +6859,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %d óra %d perc"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Akku: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6923,18 +6923,18 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD"
+    e200*,c200*,fuze*: "mSD"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:"
+    e200*,c200*,fuze*: "micro Secure Digital card:"
     ondio*: "Multimedia card"
   </voice>
 </phrase>
@@ -8046,15 +8046,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Vége a számok listájának"
-    archosplayer: "Lista vége"
+    player: "Lista vége"
   </dest>
   <voice>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -8294,20 +8294,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "A merevlemez tele van. Folytatáshoz nyomj OFF-ot."
-    iriverh100,iriverh120,iriverh300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot."
-    iaudiom5,iaudiox5: "A merevlemez tele van. Folytatáshoz nyomd meg a POWER gombot."
-    sansae200*,sansac200*: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot."
+    h100,h120,h300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot."
+    m5,x5: "A merevlemez tele van. Folytatáshoz nyomd meg a POWER gombot."
+    e200*,c200*: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8391,25 +8391,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF - megszakít"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP - megszakít"
+    player,h100,h120,h300: "STOP - megszakít"
     ipod*: "PLAY/PAUSE - megszakít"
-    iaudiox5,iaudiom5: "PLAY hosszan - megszakít"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV - megszakít"
+    x5,m5: "PLAY hosszan - megszakít"
+    h10,h10_5gb,e200*,c200*: "PREV - megszakít"
     gigabeats: "VISSZA - megszakít"
-    gigabeatfx: "POWER - megszakít"
+    gigabeatf: "POWER - megszakít"
   </dest>
   <voice>
     *: ""
@@ -8633,19 +8633,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Top off charge"
+    recorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10461,7 +10461,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11385,15 +11385,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Érintőpad érzékenysége"
+    gigabeatf: "Érintőpad érzékenysége"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -12200,15 +12200,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Magas"
+    gigabeatf: "Magas"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 1c15e61996..0c18667cd8 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -2193,15 +2193,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Lijn ingang"
+    recording,player: "Lijn ingang"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Lijn ingang"
+    recording,player: "Lijn ingang"
   </voice>
 </phrase>
 <phrase>
@@ -2447,17 +2447,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfoon"
-    iriverh100,iriverh120,iriverh300: "Interne microfoon"
+    h100,h120,h300: "Interne microfoon"
   </dest>
   <voice>
     *: none
     recording: "Microfoon"
-    iriverh100,iriverh120,iriverh300: "Interne microfoon"
+    h100,h120,h300: "Interne microfoon"
   </voice>
 </phrase>
 <phrase>
@@ -3309,7 +3309,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3323,7 +3323,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3337,7 +3337,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4342,19 +4342,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batterij: Vol Laden"
+    recorder: "Batterij: Vol Laden"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Batterij vol laden"
+    recorder: "Batterij vol laden"
   </voice>
 </phrase>
 <phrase>
@@ -4380,13 +4380,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterij: %d%% %du %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterij niveau"
@@ -4444,19 +4444,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "Multimedia kaart"
   </voice>
 </phrase>
@@ -4588,26 +4588,26 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = terugzetten"
-    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
-    ipod*,sansac200*: "MENU = terugzetten"
-    iaudiox5,iaudiom5: "RECORD = terugzetten"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
-    gigabeatfx: "POWER = terugzetten"
+    h100,h120,h300: "STOP = terugzetten"
+    ipod*,c200*: "MENU = terugzetten"
+    x5,m5: "RECORD = terugzetten"
+    h10,h10_5gb,e200*,fuze*: "PREV = terugzetten"
+    gigabeatf: "POWER = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
     gigabeats: "BACK = terugzetten"
-    gogearsa9200: "LINKS = terugzetten"
+    sa9200: "LINKS = terugzetten"
   </dest>
   <voice>
     *: ""
@@ -4688,16 +4688,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "De schijf is vol. Druk OFF om door te gaan."
-    iriverh100,iriverh120,iriverh300: "De schijf is vol. Druk STOP om door te gaan."
-    iaudiom5,iaudiox5: "De schijf is vol. Druk POWER om door te gaan."
-    sansae200*,sansac200*: "De schijf is vol. Druk PREV om door te gaan."
+    h100,h120,h300: "De schijf is vol. Druk STOP om door te gaan."
+    m5,x5: "De schijf is vol. Druk POWER om door te gaan."
+    e200*,c200*: "De schijf is vol. Druk PREV om door te gaan."
   </dest>
   <voice>
     *: ""
@@ -4864,21 +4864,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Instellen OFF=Afbreken"
     ipod*: "SELECT=Instellen MENU=Afbreken"
-    iriverh10,iriverh10_5gb: "SELECT=Instellen PREV=Afbreken"
+    h10,h10_5gb: "SELECT=Instellen PREV=Afbreken"
     gigabeats: "SELECT=Instellen POWER=Afbreken"
   </dest>
   <voice>
     *: none
     alarm: "PLAY=Instellen OFF=Afbreken"
     ipod*: "SELECT=Instellen MENU=Afbreken"
-    iriverh10,iriverh10_5gb: "SELECT=Instellen PREV=Afbreken"
+    h10,h10_5gb: "SELECT=Instellen PREV=Afbreken"
     gigabeats: "SELECT=Instellen POWER=Afbreken"
   </voice>
 </phrase>
@@ -7393,25 +7393,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF om af te breken"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP om af te breken"
+    player,h100,h120,h300: "STOP om af te breken"
     ipod*: "PLAY/PAUSE om af te breken"
-    iaudiox5,iaudiom5: "Long PLAY om af te breken"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV om af te breken"
+    x5,m5: "Long PLAY om af te breken"
+    h10,h10_5gb,e200*,c200*: "PREV om af te breken"
     gigabeats: "BACK om af te breken"
-    gigabeatfx: "POWER om af te breken"
+    gigabeatf: "POWER om af te breken"
   </dest>
   <voice>
     *: ""
@@ -8806,7 +8806,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9961,19 +9961,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Aanmaken van database... %d gevonden (OFF = terug)"
-    iriverh100,iriverh120,iriverh300: "Aanmaken van database... %d gevonden (STOP = terug)"
+    h100,h120,h300: "Aanmaken van database... %d gevonden (STOP = terug)"
     ipod*: "Aanmaken van database... %d gevonden (PREV = terug)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Aanmaken van database... %d gevonden (LINKS = terug)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Aanmaken van database... %d gevonden (PREV = terug)"
-    gogearsa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
+    x5,m5,gigabeat*,mrobe100: "Aanmaken van database... %d gevonden (LINKS = terug)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Aanmaken van database... %d gevonden (PREV = terug)"
+    sa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
   </dest>
   <voice>
     *: "Aanmaken van database"
@@ -10281,17 +10281,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    sansafuze*,sansae200*: "Wiel Licht Vertraging"
+    fuze*,e200*: "Wiel Licht Vertraging"
   </dest>
   <voice>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    sansafuze*,sansae200*: "Wiel Licht Vertraging"
+    fuze*,e200*: "Wiel Licht Vertraging"
   </voice>
 </phrase>
 <phrase>
@@ -10483,11 +10483,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffergrootte"
@@ -10530,15 +10530,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ja"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip,sansafuze*: "SELECT = Ja"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Ja"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip,fuze*: "SELECT = Ja"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -10551,19 +10551,19 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Instellen"
-    iriverh100,iriverh120,iriverh300: "NAVI = Instellen"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Instellen"
+    h100,h120,h300: "NAVI = Instellen"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Instellen"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,gigabeatfx: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,gigabeatf: ""
   </voice>
 </phrase>
 <phrase>
@@ -10572,15 +10572,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Elke andere = Nee"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -10634,11 +10634,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Einde van de titellijst"
-    archosplayer: "Einde lijst"
+    player: "Einde lijst"
   </dest>
   <voice>
     *: "Einde lijst"
@@ -11686,15 +11686,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Touchpad gevoeligheid"
+    gigabeatf: "Touchpad gevoeligheid"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad gevoeligheid"
+    gigabeatf: "Touchpad gevoeligheid"
   </voice>
 </phrase>
 <phrase>
@@ -11703,15 +11703,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Hoog"
+    gigabeatf: "Hoog"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Hoog"
+    gigabeatf: "Hoog"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index f54af0f521..aae615c8c4 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -2145,15 +2145,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linje inn"
+    recording,player: "Linje inn"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linje inn"
+    recording,player: "Linje inn"
   </voice>
 </phrase>
 <phrase>
@@ -2399,17 +2399,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -3256,7 +3256,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3270,7 +3270,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3284,7 +3284,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4285,15 +4285,15 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batteri: Top-off-lading"
+    recorder: "Batteri: Top-off-lading"
   </dest>
   <voice>
     *: none
@@ -4321,12 +4321,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
@@ -4382,12 +4382,12 @@
   user: core
   <source>
     *: none
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
   </dest>
   <voice>
     *: none
@@ -4518,22 +4518,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "A = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "A = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "AV = tilbakestill"
-    iriverh100,iriverh120,iriverh300: "STOPP = tilbakestill"
-    ipod*,sansac200*,gogearsa9200: "MENY = tilbakestill"
-    iaudiox5,iaudiom5: "OPPTAK = tilbakestill"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "TILBAKE = tilbakestill"
-    gigabeatfx: "A = tilbakestill"
+    h100,h120,h300: "STOPP = tilbakestill"
+    ipod*,c200*,sa9200: "MENY = tilbakestill"
+    x5,m5: "OPPTAK = tilbakestill"
+    h10,h10_5gb,e200*,fuze*: "TILBAKE = tilbakestill"
+    gigabeatf: "A = tilbakestill"
     mrobe100: "VIS = tilbakestill"
     gigabeats: "TILBAKE = tilbakestill"
   </dest>
@@ -4614,14 +4614,14 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press UP to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press UP to continue."
   </source>
   <dest>
     *: none
     recording: "Disken er full. Trykk AV for å halda fram."
-    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOPP for å halda fram."
+    h100,h120,h300: "Disken er full. Trykk STOPP for å halda fram."
   </dest>
   <voice>
     *: none
@@ -4784,14 +4784,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPEL = vel – AV = avbryt"
     ipod*: "VEL = vel  – MENY = avbryt"
-    iriverh10,iriverh10_5gb: "VEL = vel – TILBAKE = avbryt"
+    h10,h10_5gb: "VEL = vel – TILBAKE = avbryt"
     gigabeats: "VEL = vel – PÅ/AV = avbryt"
   </dest>
   <voice>
@@ -7277,21 +7277,21 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
   </source>
   <dest>
     *: "AV for å avbryta"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOPP for å avbryta"
+    player,h100,h120,h300: "STOPP for å avbryta"
     ipod*: "SPEL/PAUSE for å avbryta"
-    iaudiox5,iaudiom5: "SPEL (lenge) for å avbryta"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "TILBAKE for å avbryta"
+    x5,m5: "SPEL (lenge) for å avbryta"
+    h10,h10_5gb,e200*,c200*: "TILBAKE for å avbryta"
   </dest>
   <voice>
     *: ""
@@ -8591,7 +8591,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9688,17 +9688,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Byggjer database … Fann %d. (AV for å gå tilbake.)"
-    iriverh100,iriverh120,iriverh300: "Byggjer database … Fann %d. (STOPP for å gå tilbake.)"
+    h100,h120,h300: "Byggjer database … Fann %d. (STOPP for å gå tilbake.)"
     ipod*: "Byggjer database … Fann %d. (SPEL/PAUSE for å gå tilbake.)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Byggjer database … Fann %d. (VENSTRE for å gå tilbake.)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Byggjer database … Fann %d. (TILBAKE for å gå tilbake.)"
+    x5,m5,gigabeat*,mrobe100: "Byggjer database … Fann %d. (VENSTRE for å gå tilbake.)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Byggjer database … Fann %d. (TILBAKE for å gå tilbake.)"
   </dest>
   <voice>
     *: "oppføringar funne til databasen"
@@ -9871,17 +9871,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Avbrotstid for knappelys"
-    sansafuze*,sansae200*: "Avbrotstid for hjullys"
+    fuze*,e200*: "Avbrotstid for hjullys"
   </dest>
   <voice>
     *: none
     button_light: "Avbrotstid for knappelys"
-    sansafuze*,sansae200*: "Avbrotstid for hjullys"
+    fuze*,e200*: "Avbrotstid for hjullys"
   </voice>
 </phrase>
 <phrase>
@@ -10149,11 +10149,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: ""
@@ -10227,15 +10227,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "SPEL = ja"
-    iriverh100,iriverh120,iriverh300: "NAVI = ja"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "VEL = ja"
-    archosplayer: "(SPEL/STOPP)"
+    h100,h120,h300: "NAVI = ja"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "VEL = ja"
+    player: "(SPEL/STOPP)"
   </dest>
   <voice>
     *: ""
@@ -10248,14 +10248,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "PÅ = vel"
-    iriverh100,iriverh120,iriverh300: "NAVI = vel"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "VEL = ja"
+    h100,h120,h300: "NAVI = vel"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "VEL = ja"
   </dest>
   <voice>
     *: none
@@ -10267,15 +10267,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Andre = nei"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -10416,15 +10416,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Slutt på songliste"
-    archosplayer: "Slutt på liste"
+    player: "Slutt på liste"
   </dest>
   <voice>
     *: "Slutt på songliste"
-    archosplayer: "Slutt på liste"
+    player: "Slutt på liste"
   </voice>
 </phrase>
 <phrase>
@@ -11413,15 +11413,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Styreputefølsemd"
+    gigabeatf: "Styreputefølsemd"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Styreputefølsemd"
+    gigabeatf: "Styreputefølsemd"
   </voice>
 </phrase>
 <phrase>
@@ -11827,14 +11827,14 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Høg"
+    gigabeatf: "Høg"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Høg"
+    gigabeatf: "Høg"
   </voice>
 </phrase>
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index e8e7aba75c..c5c1b8a6a8 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -1836,15 +1836,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linjeinngang"
+    recording,player: "Linjeinngang"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linjeinngang"
+    recording,player: "Linjeinngang"
   </voice>
 </phrase>
 <phrase>
@@ -2090,17 +2090,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -2785,7 +2785,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -2799,7 +2799,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2813,7 +2813,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3644,19 +3644,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batteri: top-off-lading"
+    recorder: "Batteri: top-off-lading"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Batteri top-off-lading"
+    recorder: "Batteri top-off-lading"
   </voice>
 </phrase>
 <phrase>
@@ -3682,18 +3682,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
-    iriverh10,ipodmini1g,ipodmini2g: ""
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
+    h10,ipodmini,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -3748,19 +3748,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "mikro S D"
+    e200*,c200*,fuze*: "mikro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -3892,28 +3892,28 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Tilbakestill"
-    iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
-    ipod*,sansac200*,gogearsa9200: "MENU = Tilbakestill"
-    iaudiox5,iaudiom5: "RECORD = Tilbakestill"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Tilbakestill"
-    gigabeatfx: "POWER = Tilbakestill"
+    h100,h120,h300: "STOP = Tilbakestill"
+    ipod*,c200*,sa9200: "MENU = Tilbakestill"
+    x5,m5: "RECORD = Tilbakestill"
+    h10,h10_5gb,e200*,fuze*: "PREV = Tilbakestill"
+    gigabeatf: "POWER = Tilbakestill"
     mrobe100: "DISPLAY = Tilbakestill"
     gigabeats: "BACK = Tilbakestill"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -3991,20 +3991,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disken er full. Trykk OFF for å fortsette."
-    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOP for å fortsette."
-    iaudiom5,iaudiox5: "Disken er full. Trykk POWER for å fortsette."
-    sansae200*,sansac200*: "Disken er full. Trykk PREV for å fortsette."
+    h100,h120,h300: "Disken er full. Trykk STOP for å fortsette."
+    m5,x5: "Disken er full. Trykk POWER for å fortsette."
+    e200*,c200*: "Disken er full. Trykk PREV for å fortsette."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4168,21 +4168,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Sett OFF=Avbryt"
     ipod*: "SELECT=Sett MENU=Avbryt"
-    iriverh10,iriverh10_5gb: "SELECT=Sett PREV=Avbryt"
+    h10,h10_5gb: "SELECT=Sett PREV=Avbryt"
     gigabeats: "SELECT=Sett POWER=Avbryt"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    iriverh10,iriverh10_5gb: ""
+    h10,h10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -6604,25 +6604,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF for å avbryte"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
+    player,h100,h120,h300: "STOP for å avbryte"
     ipod*: "PLAY/PAUSE for å avbryte"
-    iaudiox5,iaudiom5: "Hold PLAY for å avbryte"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV for å avbryte"
+    x5,m5: "Hold PLAY for å avbryte"
+    h10,h10_5gb,e200*,c200*: "PREV for å avbryte"
     gigabeats: "BACK for å avbryte"
-    gigabeatfx: "POWER for å avbryte"
+    gigabeatf: "POWER for å avbryte"
   </dest>
   <voice>
     *: "" 
@@ -8398,7 +8398,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9757,17 +9757,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Bygger database... %d funnet (OFF for å gå tilbake)"
-    iriverh100,iriverh120,iriverh300: "Bygger database... %d funnet (STOP for å gå tilbake)"
+    h100,h120,h300: "Bygger database... %d funnet (STOP for å gå tilbake)"
     ipod*: "Bygger database... %d funnet (PREV for å gå tilbake)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bygger database... %d funnet (LEFT for å gå tilbake)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Bygger database... %d funnet (PREV for å gå tilbake)"
+    x5,m5,gigabeat*,mrobe100: "Bygger database... %d funnet (LEFT for å gå tilbake)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Bygger database... %d funnet (PREV for å gå tilbake)"
   </dest>
   <voice>
     *: "filer funnet for database"
@@ -10030,17 +10030,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Slukketid for knapplys"
-    sansafuze*,sansae200*: "Slukketid for hjullys"
+    fuze*,e200*: "Slukketid for hjullys"
   </dest>
   <voice>
     *: none
     button_light: "Tid før lys på knapper slukker"
-    sansafuze*,sansae200*: "Tid før lys på hjul slukker"
+    fuze*,e200*: "Tid før lys på hjul slukker"
   </voice>
 </phrase>
 <phrase>
@@ -10432,15 +10432,15 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Bufferstørrelse"
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -10511,21 +10511,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ja"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Ja"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Ja"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Ja"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
-    iriverh100,iriverh120,iriverh300: ""
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
-    archosplayer: ""
+    h100,h120,h300: ""
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -10535,20 +10535,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Sett"
-    iriverh100,iriverh120,iriverh300: "NAVI = Sett"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Sett"
+    h100,h120,h300: "NAVI = Sett"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Sett"
   </dest>
   <voice>
     *: none
     rtc: ""
-    iriverh100,iriverh120,iriverh300: ""
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    h100,h120,h300: ""
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -10557,15 +10557,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Andre = Nei"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -10737,15 +10737,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Slutt på sporliste"
-    archosplayer: "Slutt på liste"
+    player: "Slutt på liste"
   </dest>
   <voice>
     *: "Slutt på sporliste"
-    archosplayer: "Slutt på liste"
+    player: "Slutt på liste"
   </voice>
 </phrase>
 <phrase>
@@ -11511,15 +11511,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Styreflatefølsomhet"
+    gigabeatf: "Styreflatefølsomhet"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11792,15 +11792,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Høy"
+    gigabeatf: "Høy"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Høy"
+    gigabeatf: "Høy"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 6354f998a7..5595526145 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -269,17 +269,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Tak"
     covond2*: "MENU = Tak"
-    iriverh100,iriverh120,iriverh300: "NAVI = Tak"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Tak"
+    h100,h120,h300: "NAVI = Tak"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Tak"
     mrobe500: "PLAY lub POWER = Tak"
-    archosplayer: "(PLAY/STOP)"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -291,15 +291,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Każdy inny = Nie"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2392,19 +2392,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Budowanie biblioteki... %d znalezionych (OFF żeby wrócić)"
-    iriverh100,iriverh120,iriverh300: "Budowanie biblioteki... %d znalezionych (STOP żeby wrócić)"
+    h100,h120,h300: "Budowanie biblioteki... %d znalezionych (STOP żeby wrócić)"
     ipod*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Budowanie biblioteki... %d znalezionych (LEFT żeby wrócić)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)"
-    gogearsa9200: "Budowanie biblioteki... %d znalezionych (REW żeby wrócić)"
+    x5,m5,gigabeat*,mrobe100: "Budowanie biblioteki... %d znalezionych (LEFT żeby wrócić)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)"
+    sa9200: "Budowanie biblioteki... %d znalezionych (REW żeby wrócić)"
   </dest>
   <voice>
     *: "Znaleziono wpisy do biblioteki"
@@ -3204,7 +3204,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3218,7 +3218,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3232,7 +3232,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3864,17 +3864,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Wygaszanie klawiszy"
-    sansafuze*,sansae200*: "Wygaszanie koła sterującego"
+    fuze*,e200*: "Wygaszanie koła sterującego"
   </dest>
   <voice>
     *: none
     button_light: "Wygaszanie klawiszy"
-    sansafuze*,sansae200*: "Wygaszanie koła sterującego"
+    fuze*,e200*: "Wygaszanie koła sterującego"
   </voice>
 </phrase>
 <phrase>
@@ -4156,21 +4156,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Ustaw"
     mrobe500: "HEART = Ustaw"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ustaw"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Ustaw"
-    gogearsa9200:"PLAY = Ustaw"
+    h100,h120,h300: "NAVI = Ustaw"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Ustaw"
+    sa9200:"PLAY = Ustaw"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4181,31 +4181,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Przywróć"
     mrobe500: "POWER = Przywróć"
-    iriverh100,iriverh120,iriverh300: "STOP = Przywróć"
-    ipod*,sansac200*: "MENU = Przywróć"
-    iaudiox5,iaudiom5: "RECORD = Przywróć"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Przywróć"
-    gigabeatfx: "POWER = Przywróć"
+    h100,h120,h300: "STOP = Przywróć"
+    ipod*,c200*: "MENU = Przywróć"
+    x5,m5: "RECORD = Przywróć"
+    h10,h10_5gb,e200*,fuze*: "PREV = Przywróć"
+    gigabeatf: "POWER = Przywróć"
     mrobe100: "DISPLAY = Przywróć"
     gigabeats: "BACK = Przywróć"
-    gogearsa9200: "LEFT = Przywróć"
+    sa9200: "LEFT = Przywróć"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4728,21 +4728,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Ustaw OFF=Anuluj"
     ipod*: "WYBIERZ=Ustaw MENU=Anuluj"
-    iriverh10,iriverh10_5gb: "WYBIERZ=Ustaw COFNIJ=Anuluj"
+    h10,h10_5gb: "WYBIERZ=Ustaw COFNIJ=Anuluj"
     gigabeats: "WYBIERZ=Ustaw POWER=Anuluj"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    iriverh10,iriverh10_5gb: ""
+    h10,h10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -5913,17 +5913,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Wewnętrzny mikrofon"
+    h100,h120,h300: "Wewnętrzny mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Wewnętrzny mikrofon"
+    h100,h120,h300: "Wewnętrzny mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -5949,15 +5949,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Wejście liniowe"
+    recording,player: "Wejście liniowe"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Wejście liniowe"
+    recording,player: "Wejście liniowe"
   </voice>
 </phrase>
 <phrase>
@@ -6887,11 +6887,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Bufor:"
-    archosplayer: "Bufor:"
+    player: "Bufor:"
   </dest>
   <voice>
     *: "Rozmiar bufora"
@@ -6903,13 +6903,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bateria: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Bateria: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Poziom baterii"
@@ -6967,19 +6967,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "microSD:"
+    e200*,c200*,fuze*: "microSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "ha de 1"
-    sansae200*,sansac200*,sansafuze*: "mikro es di"
+    e200*,c200*,fuze*: "mikro es di"
     ondio*: "em em ce"
   </voice>
 </phrase>
@@ -8091,15 +8091,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Koniec listy piosenek"
-    archosplayer: "Koniec listy"
+    player: "Koniec listy"
   </dest>
   <voice>
     *: "Koniec listy piosenek"
-    archosplayer: "Koniec listy"
+    player: "Koniec listy"
   </voice>
 </phrase>
 <phrase>
@@ -8339,16 +8339,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Pamięć jest pełna. Wciśnij OFF żeby kontynuować."
-    iriverh100,iriverh120,iriverh300: "Pamięć jest pełna. Wciśnij STOP żeby kontynuować."
-    iaudiom5,iaudiox5: "Pamięć jest pełna. Wciśnij POWER żeby kontynuować."
-    sansae200*,sansac200*: "Pamięć jest pełna. Wciśnij PREV żeby kontynuować."
+    h100,h120,h300: "Pamięć jest pełna. Wciśnij STOP żeby kontynuować."
+    m5,x5: "Pamięć jest pełna. Wciśnij POWER żeby kontynuować."
+    e200*,c200*: "Pamięć jest pełna. Wciśnij PREV żeby kontynuować."
   </dest>
   <voice>
     *: none
@@ -8435,25 +8435,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF = Anuluj"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP = Anuluj"
+    player,h100,h120,h300: "STOP = Anuluj"
     ipod*: "PLAY/PAUSE = Anuluj"
-    iaudiox5,iaudiom5: "Przytrzymaj PLAY = Anuluj"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV = Anuluj"
+    x5,m5: "Przytrzymaj PLAY = Anuluj"
+    h10,h10_5gb,e200*,c200*: "PREV = Anuluj"
     gigabeats: "BACK = Anuluj"
-    gigabeatfx: "POWER = Anuluj"
+    gigabeatf: "POWER = Anuluj"
   </dest>
   <voice>
     *: ""
@@ -8677,19 +8677,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Bateria: doładowywanie"
+    recorder: "Bateria: doładowywanie"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Doładowywanie baterii"
+    recorder: "Doładowywanie baterii"
   </voice>
 </phrase>
 <phrase>
@@ -10506,7 +10506,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11717,15 +11717,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Czułość panelu dotykowego"
+    gigabeatf: "Czułość panelu dotykowego"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Czułość panelu dotykowego"
+    gigabeatf: "Czułość panelu dotykowego"
   </voice>
 </phrase>
 <phrase>
@@ -11734,15 +11734,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Wysoka"
+    gigabeatf: "Wysoka"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Wysoka"
+    gigabeatf: "Wysoka"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 50916b1db4..86b56d7831 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -260,15 +260,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sim"
-    iriverh100,iriverh120,iriverh300: "NAVI = Sim"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sim"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Sim"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sim"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -280,15 +280,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Algum Outro = Não"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2381,17 +2381,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construindo Base de Dados... %d encontrados (OFF para retornar)"
-    iriverh100,iriverh120,iriverh300: "Construindo Base de Dados... %d encontrados (STOP para retornar)"
+    h100,h120,h300: "Construindo Base de Dados... %d encontrados (STOP para retornar)"
     ipod*: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construindo Base de Dados... %d encontrados (LEFT para retornar)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
+    x5,m5,gigabeat*,mrobe100: "Construindo Base de Dados... %d encontrados (LEFT para retornar)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
   </dest>
   <voice>
     *: "entradas encontradas para a base de dados"
@@ -3191,7 +3191,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3205,7 +3205,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3219,7 +3219,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3851,17 +3851,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Duração da Luz do Botão"
-    sansafuze*,sansae200*: "Duração da Luz da Roda"
+    fuze*,e200*: "Duração da Luz da Roda"
   </dest>
   <voice>
     *: none
     button_light: "Duração da Luz do Botão"
-    sansafuze*,sansae200*: "Duração da Luz da Roda"
+    fuze*,e200*: "Duração da Luz da Roda"
   </voice>
 </phrase>
 <phrase>
@@ -4142,18 +4142,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Ajustar"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ajustar"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Ajustar"
+    h100,h120,h300: "NAVI = Ajustar"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Ajustar"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4163,28 +4163,28 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Reverter"
-    iriverh100,iriverh120,iriverh300: "STOP = Reverter"
-    ipod*,sansac200*,gogearsa9200: "MENU = Reverter"
-    iaudiox5,iaudiom5: "RECORD = Reverter"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Reverter"
-    gigabeatfx: "POWER = Reverter"
+    h100,h120,h300: "STOP = Reverter"
+    ipod*,c200*,sa9200: "MENU = Reverter"
+    x5,m5: "RECORD = Reverter"
+    h10,h10_5gb,e200*,fuze*: "PREV = Reverter"
+    gigabeatf: "POWER = Reverter"
     mrobe100: "DISPLAY = Reverter"
     gigabeats: "BACK = Reverter"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4707,14 +4707,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Alterar OFF=Cancelar"
     ipod*: "SELECT=Alterar MENU=Cancelar"
-    iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar"
+    h10,h10_5gb: "SELECT=Alterar PREV=Cancelar"
     gigabeats: "SELECT=Alterar POWER=Cancelar"
   </dest>
   <voice>
@@ -5889,17 +5889,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfone"
-    iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    h100,h120,h300: "Microfone Interno"
   </dest>
   <voice>
     *: none
     recording: "Microfone"
-    iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    h100,h120,h300: "Microfone Interno"
   </voice>
 </phrase>
 <phrase>
@@ -5925,15 +5925,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording,player: "Entrada de Linha"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording,player: "Entrada de Linha"
   </voice>
 </phrase>
 <phrase>
@@ -6863,11 +6863,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Tamanho do buffer"
@@ -6879,13 +6879,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nível da bateria"
@@ -6943,19 +6943,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8067,11 +8067,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fim da Lista de Músicas"
-    archosplayer: "Fim da Lista"
+    player: "Fim da Lista"
   </dest>
   <voice>
     *: "Fim da Lista de Músicas"
@@ -8314,20 +8314,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "O disco está cheio. Pressione OFF para continuar."
-    iriverh100,iriverh120,iriverh300: "O disco está cheio. Pressione STOP para continuar."
-    iaudiom5,iaudiox5: "O disco está cheio. Pressione POWER para continuar."
-    sansae200*,sansac200*: "O disco está cheio. Pressione PREV para continuar."
+    h100,h120,h300: "O disco está cheio. Pressione STOP para continuar."
+    m5,x5: "O disco está cheio. Pressione POWER para continuar."
+    e200*,c200*: "O disco está cheio. Pressione PREV para continuar."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8411,25 +8411,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF para abortar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para abortar"
+    player,h100,h120,h300: "STOP para abortar"
     ipod*: "PLAY/PAUSE para abortar"
-    iaudiox5,iaudiom5: "PLAY Longo para abortar"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para abortar"
+    x5,m5: "PLAY Longo para abortar"
+    h10,h10_5gb,e200*,c200*: "PREV para abortar"
     gigabeats: "BACK para abortar"
-    gigabeatfx: "POWER para abortar"
+    gigabeatf: "POWER para abortar"
   </dest>
   <voice>
     *: ""
@@ -8653,19 +8653,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Bateria: Carregamento Completado"
+    recorder: "Bateria: Carregamento Completado"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Máximo da carga"
+    recorder: "Máximo da carga"
   </voice>
 </phrase>
 <phrase>
@@ -10482,7 +10482,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11693,15 +11693,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensibilidade do Touchpad"
+    gigabeatf: "Sensibilidade do Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensibilidade do Touchpad"
+    gigabeatf: "Sensibilidade do Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11710,15 +11710,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 914cf64527..8f5a4dd0cc 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -2073,15 +2073,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording,player: "Entrada de Linha"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording,player: "Entrada de Linha"
   </voice>
 </phrase>
 <phrase>
@@ -2299,17 +2299,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfone"
-    iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    h100,h120,h300: "Microfone Interno"
   </dest>
   <voice>
     *: none
     recording: "Microfone"
-    iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    h100,h120,h300: "Microfone Interno"
   </voice>
 </phrase>
 <phrase>
@@ -3113,7 +3113,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3127,7 +3127,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3141,7 +3141,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4028,19 +4028,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Bateria: Carregamento Completo"
+    recorder: "Bateria: Carregamento Completo"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Bateria: Carregamento Completado"
+    recorder: "Bateria: Carregamento Completado"
   </voice>
 </phrase>
 <phrase>
@@ -4066,13 +4066,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nível de bateria"
@@ -4130,19 +4130,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -4257,22 +4257,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF Para Reverter"
-    iriverh100,iriverh120,iriverh300: "STOP Para Reverter"
-    ipod*,sansac200*,gogearsa9200: "MENU Para Reverter"
-    iaudiox5,iaudiom5: "RECORD Para Reverter"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV Para Reverter"
-    gigabeatfx: "POWER Para Reverter"
+    h100,h120,h300: "STOP Para Reverter"
+    ipod*,c200*,sa9200: "MENU Para Reverter"
+    x5,m5: "RECORD Para Reverter"
+    h10,h10_5gb,e200*,fuze*: "PREV Para Reverter"
+    gigabeatf: "POWER Para Reverter"
     mrobe100: "DISPLAY Para Reverter"
     gigabeats: "BACK Para Reverter"
   </dest>
@@ -4372,16 +4372,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "O Disco Está Cheio. Carregue OFF Para Continuar"
-    iriverh100,iriverh120,iriverh300: "O Disco Está Cheio. Carregue STOP Para Continuar"
-    iaudiom5,iaudiox5: "O Disco Está Cheio. Carregue POWER Para Continuar"
-    sansae200*,sansac200*: "O Disco Está Cheio. Carregue PREV Para Continuar"
+    h100,h120,h300: "O Disco Está Cheio. Carregue STOP Para Continuar"
+    m5,x5: "O Disco Está Cheio. Carregue POWER Para Continuar"
+    e200*,c200*: "O Disco Está Cheio. Carregue PREV Para Continuar"
   </dest>
   <voice>
     *: none
@@ -4566,14 +4566,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Alterar OFF=Cancelar"
     ipod*: "SELECT=Alterar MENU=Cancelar"
-    iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar"
+    h10,h10_5gb: "SELECT=Alterar PREV=Cancelar"
     gigabeats: "SELECT=Alterar POWER=Cancelar"
   </dest>
   <voice>
@@ -7001,24 +7001,24 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF para Abortar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para Abortar"
+    player,h100,h120,h300: "STOP para Abortar"
     ipod*: "PLAY/PAUSE para Abortar"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para Abortar"
+    h10,h10_5gb,e200*,c200*: "PREV para Abortar"
     gigabeats: "BACK para Abortar"
-    gigabeatfx: "POWER para Abortar"
+    gigabeatf: "POWER para Abortar"
   </dest>
   <voice>
     *: ""
@@ -7809,7 +7809,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8258,11 +8258,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "tamanho do buffer"
@@ -8367,15 +8367,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sim"
-    iriverh100,iriverh120,iriverh300: "NAVI = Sim"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sim"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Sim"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sim"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -8388,14 +8388,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Definir"
-    iriverh100,iriverh120,iriverh300: "NAVI = Definir"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Definir"
+    h100,h120,h300: "NAVI = Definir"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Definir"
   </dest>
   <voice>
     *: none
@@ -8407,15 +8407,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Any Other = Não"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -8703,15 +8703,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fim da Lista de Músicas"
-    archosplayer: "Fim da Lista"
+    player: "Fim da Lista"
   </dest>
   <voice>
     *: "Fim da Lista de Músicas"
-    archosplayer: "Fim da Lista"
+    player: "Fim da Lista"
   </voice>
 </phrase>
 <phrase>
@@ -10731,17 +10731,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construindo Base da Dados... %d encontrado (OFF para voltar)"
-    iriverh100,iriverh120,iriverh300: "Construindo Base da Dados... %d encontrado (STOP para voltar)"
+    h100,h120,h300: "Construindo Base da Dados... %d encontrado (STOP para voltar)"
     ipod*: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
+    x5,m5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -10936,15 +10936,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensitividade do Touchpad"
+    gigabeatf: "Sensitividade do Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensitividade do Touchpad"
+    gigabeatf: "Sensitividade do Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11460,15 +11460,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index ebf959a3c2..18d1178754 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -759,17 +759,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfon"
-    iriverh100,iriverh120,iriverh300: "Microfon intern"
+    h100,h120,h300: "Microfon intern"
   </dest>
   <voice>
     *: none
     recording: "Microfon"
-    iriverh100,iriverh120,iriverh300: "Microfon intern"
+    h100,h120,h300: "Microfon intern"
   </voice>
 </phrase>
 <phrase>
@@ -1411,19 +1411,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Nivel maxim de incarcare"
+    recorder: "Nivel maxim de incarcare"
   </dest>
   <voice>
     *: none
-    archosrecorder: ""
+    recorder: ""
   </voice>
 </phrase>
 <phrase>
@@ -1449,13 +1449,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: ""
@@ -1516,22 +1516,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF pentru anulare"
-    iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
-    ipod*,sansac200*,gogearsa9200: "MENU pentru anulare"
-    iaudiox5,iaudiom5: "RECORD pentru anulare"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV pentru anulare"
-    gigabeatfx: "POWER pentru anulare"
+    h100,h120,h300: "STOP pentru anulare"
+    ipod*,c200*,sa9200: "MENU pentru anulare"
+    x5,m5: "RECORD pentru anulare"
+    h10,h10_5gb,e200*,fuze*: "PREV pentru anulare"
+    gigabeatf: "POWER pentru anulare"
     mrobe100: "DISPLAY pentru anulare"
     gigabeats: "BACK  pentru anulare"
   </dest>
@@ -1666,14 +1666,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Setat OFF=Anulare"
     ipod*: "SELECT=Setat MENU=Anulare"
-    iriverh10,iriverh10_5gb: "SELECT=Setat PREV=Anulare"
+    h10,h10_5gb: "SELECT=Setat PREV=Anulare"
     gigabeats: "SELECT=Setat POWER=Anulare"
   </dest>
   <voice>
@@ -3226,17 +3226,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Creare bază de date... %d găsite (OFF pentru revenire)"
-    iriverh100,iriverh120,iriverh300: "Creare bază de date... %d găsite (STOP pentru revenire)"
+    h100,h120,h300: "Creare bază de date... %d găsite (STOP pentru revenire)"
     ipod*: "Creare bază de date... %d găsite (PREV pentru revenire)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Creare bază de date... %d găsite (LEFT pentru revenire)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Creare bază de date... %d găsite (PREV pentru revenire)"
+    x5,m5,gigabeat*,mrobe100: "Creare bază de date... %d găsite (LEFT pentru revenire)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Creare bază de date... %d găsite (PREV pentru revenire)"
   </dest>
   <voice>
     *: "intrări găsite pentru baza de date"
@@ -3757,7 +3757,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4905,23 +4905,23 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Discul este plin. Apasati OFF pentru a continua."
-    iriverh100,iriverh120,iriverh300: "Discul este plin. Apasati STOP pentru a continua."
-    iaudiom5,iaudiox5: "Discul este plin. Apasati POWER pentru a continua."
-    sansae200*,sansac200*: "Discul este plin. Apasati PREV pentru a continua."
+    h100,h120,h300: "Discul este plin. Apasati STOP pentru a continua."
+    m5,x5: "Discul este plin. Apasati POWER pentru a continua."
+    e200*,c200*: "Discul este plin. Apasati PREV pentru a continua."
   </dest>
   <voice>
     *: none
     recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    h100,h120,h300: ""
+    m5,x5: ""
+    e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5012,15 +5012,15 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -5243,15 +5243,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Da"
-    iriverh100,iriverh120,iriverh300: "NAVI = Da"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Da"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Da"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Da"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -5278,14 +5278,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Setat"
-    iriverh100,iriverh120,iriverh300: "NAVI = Setat"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Setat"
+    h100,h120,h300: "NAVI = Setat"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Setat"
   </dest>
   <voice>
     *: none
@@ -5297,15 +5297,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Oricare altul = Nu"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -5668,25 +5668,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF pentru anulare"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
+    player,h100,h120,h300: "STOP pentru anulare"
     ipod*: "PLAY/PAUSE pentru anulare"
-    iaudiox5,iaudiom5: "PLAY (apasare lunga) pentru anulare"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pentru anulare"
+    x5,m5: "PLAY (apasare lunga) pentru anulare"
+    h10,h10_5gb,e200*,c200*: "PREV pentru anulare"
     gigabeats: "BACK pentru anulare"
-    gigabeatfx: "POWER pentru anulare"
+    gigabeatf: "POWER pentru anulare"
   </dest>
   <voice>
     *: ""
@@ -5965,11 +5965,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Sfarsit lista melodii"
-    archosplayer: "Sfarsit lista"
+    player: "Sfarsit lista"
   </dest>
   <voice>
     *: "End of Song List"
@@ -6827,7 +6827,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -6872,7 +6872,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -7885,15 +7885,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Intrare"
+    recording,player: "Intrare"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Intrare"
+    recording,player: "Intrare"
   </voice>
 </phrase>
 <phrase>
@@ -8982,19 +8982,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -10287,17 +10287,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Timp iluminare butoane"
-    sansafuze*,sansae200*: "Timp iluminare rotita"
+    fuze*,e200*: "Timp iluminare rotita"
   </dest>
   <voice>
     *: none
     button_light: "Timp iluminare butoane"
-    sansafuze*,sansae200*: "Timp iluminare rotita"
+    fuze*,e200*: "Timp iluminare rotita"
   </voice>
 </phrase>
 <phrase>
@@ -10547,7 +10547,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -11544,15 +11544,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensibilitate Touchpad"
+    gigabeatf: "Sensibilitate Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensibilitate Touchpad"
+    gigabeatf: "Sensibilitate Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11947,15 +11947,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Mare"
+    gigabeatf: "Mare"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Mare"
+    gigabeatf: "Mare"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index a18bdda320..990456bcaa 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -2051,15 +2051,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Линейный вход"
+    recording,player: "Линейный вход"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Линейный вход"
+    recording,player: "Линейный вход"
   </voice>
 </phrase>
 <phrase>
@@ -2305,17 +2305,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Микрофон"
-    iriverh100,iriverh120,iriverh300: "Внутренний микрофон"
+    h100,h120,h300: "Внутренний микрофон"
   </dest>
   <voice>
     *: none
     recording: "Микрофон"
-    iriverh100,iriverh120,iriverh300: "Внутренний микрофон"
+    h100,h120,h300: "Внутренний микрофон"
   </voice>
 </phrase>
 <phrase>
@@ -3068,7 +3068,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3082,7 +3082,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3096,7 +3096,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3986,19 +3986,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Аккумулятор: Выше возможного"
+    recorder: "Аккумулятор: Выше возможного"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Аккумулятор: Выше возможного"
+    recorder: "Аккумулятор: Выше возможного"
   </voice>
 </phrase>
 <phrase>
@@ -4024,13 +4024,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dч %dм"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм"
-    iriverh10,ipodmini1g,ipodmini2g: "%d%% %dч %dм"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dм"
+    h10,ipodmini,ipodmini2g: "%d%% %dч %dм"
   </dest>
   <voice>
     *: "Заряд аккумулятора"
@@ -4088,19 +4088,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Эйч Ди 1"
-    sansae200*,sansac200*,sansafuze*: "микро Эс Ди"
+    e200*,c200*,fuze*: "микро Эс Ди"
     ondio*: "Эм Эм Си"
   </voice>
 </phrase>
@@ -4232,22 +4232,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "ВЫКЛ. = Отмена"
-    iriverh100,iriverh120,iriverh300: "СТОП = Отмена"
-    ipod*,sansac200*,gogearsa9200: "МЕНЮ = Отмена"
-    iaudiox5,iaudiom5: "ЗАПИСЬ = Отмена"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПРЕД. = Отмена"
-    gigabeatfx: "ВЫКЛ. = Отмена"
+    h100,h120,h300: "СТОП = Отмена"
+    ipod*,c200*,sa9200: "МЕНЮ = Отмена"
+    x5,m5: "ЗАПИСЬ = Отмена"
+    h10,h10_5gb,e200*,fuze*: "ПРЕД. = Отмена"
+    gigabeatf: "ВЫКЛ. = Отмена"
     mrobe100: "ПОКАЗ. = Отмена"
     gigabeats: "НАЗАД = Отмена"
   </dest>
@@ -4330,16 +4330,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
-    iriverh100,iriverh120,iriverh300: "Диск заполнен. Нажмите СТОП для продолжения."
-    iaudiom5,iaudiox5: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
-    sansae200*,sansac200*: "Диск заполнен. Нажмите ПРЕД. для продолжения."
+    h100,h120,h300: "Диск заполнен. Нажмите СТОП для продолжения."
+    m5,x5: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
+    e200*,c200*: "Диск заполнен. Нажмите ПРЕД. для продолжения."
   </dest>
   <voice>
     *: none
@@ -4506,21 +4506,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "ВОСПР.=Уст., ВЫКЛ.=Отм."
     ipod*: "ВЫБОР=Уст., МЕНЮ=Отм."
-    iriverh10,iriverh10_5gb: "ВЫБОР=Уст., ПРЕД.=Отм."
+    h10,h10_5gb: "ВЫБОР=Уст., ПРЕД.=Отм."
     gigabeats: "ВЫБОР=Уст., ВЫКЛ.=Отм."
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    iriverh10,iriverh10_5gb: ""
+    h10,h10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -6942,25 +6942,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "ВЫКЛ. для отмены"
-    archosplayer,iriverh100,iriverh120,iriverh300: "СТОП для отмены"
+    player,h100,h120,h300: "СТОП для отмены"
     ipod*: "ПАУЗА для отмены"
-    iaudiox5,iaudiom5: "ВОСПР. для отмены"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "ПРЕД. для отмены"
+    x5,m5: "ВОСПР. для отмены"
+    h10,h10_5gb,e200*,c200*: "ПРЕД. для отмены"
     gigabeats: "НАЗАД для отмены"
-    gigabeatfx: "ВЫКЛ. для отмены"
+    gigabeatf: "ВЫКЛ. для отмены"
   </dest>
   <voice>
     *: ""
@@ -7768,7 +7768,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8136,17 +8136,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Построение базы... %d найдено (ВЫКЛ. для отмены)"
-    iriverh100,iriverh120,iriverh300: "Построение базы... %d найдено (СТОП для отмены)"
+    h100,h120,h300: "Построение базы... %d найдено (СТОП для отмены)"
     ipod*: "Построение базы... %d найдено (ПРЕД. для отмены)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Построение базы... %d найдено (ВЛЕВО для отмены)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Построение базы... %d найдено (ПРЕД. для отмены)"
+    x5,m5,gigabeat*,mrobe100: "Построение базы... %d найдено (ВЛЕВО для отмены)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Построение базы... %d найдено (ПРЕД. для отмены)"
   </dest>
   <voice>
     *: "найдено записей в базе"
@@ -8826,11 +8826,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Буфер:"
-    archosplayer: "Буф:"
+    player: "Буф:"
   </dest>
   <voice>
     *: "Буфер:"
@@ -8918,21 +8918,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "ВОСПР. = Да"
-    iriverh100,iriverh120,iriverh300: "НАВИГ. = Да"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "ВЫБОР = Да"
-    archosplayer: "(ВОСПР./СТОП)"
+    h100,h120,h300: "НАВИГ. = Да"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "ВЫБОР = Да"
+    player: "(ВОСПР./СТОП)"
   </dest>
   <voice>
     *: ""
-    iriverh100,iriverh120,iriverh300: ""
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
-    archosplayer: ""
+    h100,h120,h300: ""
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -8942,20 +8942,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ВКЛ. = Установить"
-    iriverh100,iriverh120,iriverh300: "НАВИГ. = Установить"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "ВЫБОР = Установить"
+    h100,h120,h300: "НАВИГ. = Установить"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "ВЫБОР = Установить"
   </dest>
   <voice>
     *: none
     rtc: ""
-    iriverh100,iriverh120,iriverh300: ""
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    h100,h120,h300: ""
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -8964,15 +8964,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Любая другая = Нет"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -9296,11 +9296,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Конец списка"
-    archosplayer: "Конец списка"
+    player: "Конец списка"
   </dest>
   <voice>
     *: "Конец списка"
@@ -10928,17 +10928,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Таймаут подсветки клавиш"
-    sansafuze*,sansae200*: "Таймаут подсветки колёсика"
+    fuze*,e200*: "Таймаут подсветки колёсика"
   </dest>
   <voice>
     *: none
     button_light: "Таймаут подсветки клавиш"
-    sansafuze*,sansae200*: "Таймаут подсветки колёсика"
+    fuze*,e200*: "Таймаут подсветки колёсика"
   </voice>
 </phrase>
 <phrase>
@@ -11589,15 +11589,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Чувствительность тачпада"
+    gigabeatf: "Чувствительность тачпада"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Чувствительность тачпада"
+    gigabeatf: "Чувствительность тачпада"
   </voice>
 </phrase>
 <phrase>
@@ -11805,15 +11805,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Высокий"
+    gigabeatf: "Высокий"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Высокий"
+    gigabeatf: "Высокий"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index 2b304b3117..073bc735d5 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -88,7 +88,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (archosplayer) the jump scroll shall be done "always
+  desc: (player) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -480,14 +480,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic archosrecorder string to use to confirm
+  desc: Generic recorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = Da"
-    iriverh100,iriverh120,iriverh300: "NAVI = Da"
+    h100,h120,h300: "NAVI = Da"
   </dest>
   <voice>
     *: ""
@@ -495,7 +495,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic archosrecorder string to use to cancel
+  desc: Generic recorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -1391,7 +1391,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu altarnative for jump scroll
+  desc: (player) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -1405,7 +1405,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time
+  desc: (player) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -1419,7 +1419,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -1951,7 +1951,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
+  desc: the buffer size player-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -1965,7 +1965,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3099,7 +3099,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -3113,7 +3113,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on archosplayer models
+  desc: Used on player models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 106591b973..5f9b71cce2 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -260,21 +260,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Да"
-    iriverh100,iriverh120,iriverh300: "NAVI = Да"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Да"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Да"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Да"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
-    iriverh100,iriverh120,iriverh300: ""
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
-    archosplayer: ""
+    h100,h120,h300: ""
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -283,15 +283,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Било које друго = Не"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2367,24 +2367,24 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Креирам базу података... %d пронађено (OFF за повратак)"
-    iriverh100,iriverh120,iriverh300: "Креирам базу података... %d пронађено (STOP за повратак)"
+    h100,h120,h300: "Креирам базу података... %d пронађено (STOP за повратак)"
     ipod*: "Креирам базу података... %d пронађено (PREV за повратак)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Креирам базу података... %d пронађено (PREV за повратак)"
+    x5,m5,gigabeat*,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Креирам базу података... %d пронађено (PREV за повратак)"
   </dest>
   <voice>
     *: "улази за базу података"
-    iriverh100,iriverh120,iriverh300: ""
+    h100,h120,h300: ""
     ipod*: ""
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
+    x5,m5,gigabeat*,mrobe100: ""
+    h10,h10_5gb,e200*,c200*,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -3181,7 +3181,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3195,7 +3195,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3209,7 +3209,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3841,17 +3841,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Тајмаут светла за дугмиће"
-    sansafuze*,sansae200*: "Тајмаут светла за точак"
+    fuze*,e200*: "Тајмаут светла за точак"
   </dest>
   <voice>
     *: none
     button_light: "Тајмаут светла за дугмиће"
-    sansafuze*,sansae200*: "Тајмаут светла за точак"
+    fuze*,e200*: "Тајмаут светла за точак"
   </voice>
 </phrase>
 <phrase>
@@ -4132,20 +4132,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Постави"
-    iriverh100,iriverh120,iriverh300: "NAVI = Постави"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Постави"
+    h100,h120,h300: "NAVI = Постави"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Постави"
   </dest>
   <voice>
     *: none
     rtc: ""
-    iriverh100,iriverh120,iriverh300: ""
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    h100,h120,h300: ""
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4155,33 +4155,33 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Врати на старо"
-    iriverh100,iriverh120,iriverh300: "STOP = Врати на старо"
-    ipod*,sansac200*,gogearsa9200: "MENU = Врати на старо"
-    iaudiox5,iaudiom5: "RECORD = Врати на старо"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Врати на старо"
-    gigabeatfx: "POWER = Врати на старо"
+    h100,h120,h300: "STOP = Врати на старо"
+    ipod*,c200*,sa9200: "MENU = Врати на старо"
+    x5,m5: "RECORD = Врати на старо"
+    h10,h10_5gb,e200*,fuze*: "PREV = Врати на старо"
+    gigabeatf: "POWER = Врати на старо"
     mrobe100: "DISPLAY = Врати на старо"
     gigabeats: "BACK = Врати на старо"
   </dest>
   <voice>
     *: none
     rtc: ""
-    iriverh100,iriverh120,iriverh300: ""
-    ipod*,sansae200*,sansac200*,gogearsa9200: ""
-    iaudiox5,iaudiom5: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeatfx: ""
+    h100,h120,h300: ""
+    ipod*,e200*,c200*,sa9200: ""
+    x5,m5: ""
+    h10,h10_5gb: ""
+    gigabeatf: ""
     mrobe100: ""
     gigabeats: ""
   </voice>
@@ -4706,14 +4706,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Постави OFF=Одустани"
     ipod*: "SELECT=Постави MENU=Одустани"
-    iriverh10,iriverh10_5gb: "SELECT=Постави PREV=Одустани"
+    h10,h10_5gb: "SELECT=Постави PREV=Одустани"
     gigabeats: "SELECT=Постави POWER=Одустани"
   </dest>
   <voice>
@@ -5888,17 +5888,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Микрофон"
-    iriverh100,iriverh120,iriverh300: "Уграђени микрофон"
+    h100,h120,h300: "Уграђени микрофон"
   </dest>
   <voice>
     *: none
     recording: "Микрофон"
-    iriverh100,iriverh120,iriverh300: "Уграђени микрофон"
+    h100,h120,h300: "Уграђени микрофон"
   </voice>
 </phrase>
 <phrase>
@@ -5924,15 +5924,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Линијски улаз"
+    recording,player: "Линијски улаз"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Линијски улаз"
+    recording,player: "Линијски улаз"
   </voice>
 </phrase>
 <phrase>
@@ -6862,11 +6862,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Бафер:"
-    archosplayer: "Баф:"
+    player: "Баф:"
   </dest>
   <voice>
     *: "Величина бафера"
@@ -6878,13 +6878,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерија: %d%% %dч %dм"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм"
-    iriverh10,ipodmini1g,ipodmini2g: "Бат: %d%% %dч %dм"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dм"
+    h10,ipodmini,ipodmini2g: "Бат: %d%% %dч %dм"
   </dest>
   <voice>
     *: "Ниво батерије"
@@ -6942,19 +6942,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "мајкро Ес Де"
+    e200*,c200*,fuze*: "мајкро Ес Де"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8066,15 +8066,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Крај листе песама"
-    archosplayer: "Крај листе"
+    player: "Крај листе"
   </dest>
   <voice>
     *: "Крај листе песама"
-    archosplayer: "Крај листе"
+    player: "Крај листе"
   </voice>
 </phrase>
 <phrase>
@@ -8314,20 +8314,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Диск је пун. Притисните OFF за наставак."
-    iriverh100,iriverh120,iriverh300: "Диск је пун. Притисните STOP за наставак."
-    iaudiom5,iaudiox5: "Диск је пун. Притисните POWER за наставак."
-    sansae200*,sansac200*: "Диск је пун. Притисните PREV за наставак."
+    h100,h120,h300: "Диск је пун. Притисните STOP за наставак."
+    m5,x5: "Диск је пун. Притисните POWER за наставак."
+    e200*,c200*: "Диск је пун. Притисните PREV за наставак."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8411,25 +8411,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP за прекид"
+    player,h100,h120,h300: "STOP за прекид"
     ipod*: "PLAY/PAUSE за прекид"
-    iaudiox5,iaudiom5: "Long PLAY за прекид"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV за прекид"
+    x5,m5: "Long PLAY за прекид"
+    h10,h10_5gb,e200*,c200*: "PREV за прекид"
     gigabeats: "BACK за прекид"
-    gigabeatfx: "POWER за прекид"
+    gigabeatf: "POWER за прекид"
   </dest>
   <voice>
     *: ""
@@ -8653,19 +8653,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Батерија: Top-Off Chg"
+    recorder: "Батерија: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Top off пуњење"
+    recorder: "Top off пуњење"
   </voice>
 </phrase>
 <phrase>
@@ -10482,7 +10482,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11727,15 +11727,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Осетљивост Touchpad-а"
+    gigabeatf: "Осетљивост Touchpad-а"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Осетљивост Touchpad-а"
+    gigabeatf: "Осетљивост Touchpad-а"
   </voice>
 </phrase>
 <phrase>
@@ -11961,15 +11961,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Високо"
+    gigabeatf: "Високо"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Високо"
+    gigabeatf: "Високо"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index fff559ce9c..7a1564bded 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -267,16 +267,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "SPELA = Ja"
     cowond2*: "MENY = Ja"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÄLJ = Ja"
-    archosplayer: "SPELA/STOPP"
+    h100,h120,h300: "NAVI = Ja"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "VÄLJ = Ja"
+    player: "SPELA/STOPP"
   </dest>
   <voice>
     *: ""
@@ -288,15 +288,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Annan = Nej"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2389,19 +2389,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Skapar databas... %d hittade (AV = Återgå)"
-    iriverh100,iriverh120,iriverh300: "Skapar databas... %d hittade (STOPP = Återgå)"
+    h100,h120,h300: "Skapar databas... %d hittade (STOPP = Återgå)"
     ipod*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Skapar databas... %d hittade (VÄNSTER = Återgå)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
-    gogearsa9200: "Skapar databas... %d hittade (REW = Återgå)"
+    x5,m5,gigabeat*,mrobe100: "Skapar databas... %d hittade (VÄNSTER = Återgå)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
+    sa9200: "Skapar databas... %d hittade (REW = Återgå)"
   </dest>
   <voice>
     *: "objekt hittade för databasen"
@@ -3201,7 +3201,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3215,7 +3215,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3229,7 +3229,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3861,17 +3861,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knappbelysning"
-    sansafuze*,sansae200*: "Hjulbelysning"
+    fuze*,e200*: "Hjulbelysning"
   </dest>
   <voice>
     *: none
     button_light: "Knappbelysning"
-    sansafuze*,sansae200*: "Hjulbelysning"
+    fuze*,e200*: "Hjulbelysning"
   </voice>
 </phrase>
 <phrase>
@@ -4153,21 +4153,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "PÅ = Ställ"
     mrobe500: "HJÄRTA = Ställ"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ställ"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "VÄLJ = Ställ"
-    gogearsa9200: "SPELA = Ställ"
+    h100,h120,h300: "NAVI = Ställ"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "VÄLJ = Ställ"
+    sa9200: "SPELA = Ställ"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4178,31 +4178,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "AV = Avbryt"
     mrobe500: "PÅ/AV = Avbryt"
-    iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
-    ipod*,sansac200*: "MENY = Avbryt"
-    iaudiox5,iaudiom5: "SPELA IN = Avbryt"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FÖREGÅENDE = Avbryt"
-    gigabeatfx: "PÅ/AV = Avbryt"
+    h100,h120,h300: "STOPP = Avbryt"
+    ipod*,c200*: "MENY = Avbryt"
+    x5,m5: "SPELA IN = Avbryt"
+    h10,h10_5gb,e200*,fuze*: "FÖREGÅENDE = Avbryt"
+    gigabeatf: "PÅ/AV = Avbryt"
     mrobe100: "VISA = Avbryt"
     gigabeats: "BAKÅT = Avbryt"
-    gogearsa9200: "VÄNSTER = Avbryt"
+    sa9200: "VÄNSTER = Avbryt"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4725,14 +4725,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPELA=Sätt AV=Avbryt"
     ipod*: "VÄLJ=Sätt MENY=Avbryt"
-    iriverh10,iriverh10_5gb: "VÄLJ=Sätt FÖREGÅENDE=Avbryt"
+    h10,h10_5gb: "VÄLJ=Sätt FÖREGÅENDE=Avbryt"
     gigabeats: "VÄLJ=Sätt PÅ/AV=Avbryt"
   </dest>
   <voice>
@@ -5907,17 +5907,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    h100,h120,h300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -5943,15 +5943,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linjeingång"
+    recording,player: "Linjeingång"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linjeingång"
+    recording,player: "Linjeingång"
   </voice>
 </phrase>
 <phrase>
@@ -6881,11 +6881,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffert:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffertstorlek"
@@ -6897,13 +6897,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
@@ -6961,19 +6961,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "mikro S D"
+    e200*,c200*,fuze*: "mikro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8085,11 +8085,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Slut på spellistan"
-    archosplayer: "Listan slut"
+    player: "Listan slut"
   </dest>
   <voice>
     *: "Slut på spellistan"
@@ -8332,20 +8332,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disken är full. Tryck AV för att fortsätta."
-    iriverh100,iriverh120,iriverh300: "Disken är full. Tryck STOPP för att fortsätta."
-    iaudiom5,iaudiox5: "Disken är full. Tryck PÅ/AV för att fortsätta."
-    sansae200*,sansac200*: "Disken är full. Tryck FÖREGÅENDE för att fortsätta."
+    h100,h120,h300: "Disken är full. Tryck STOPP för att fortsätta."
+    m5,x5: "Disken är full. Tryck PÅ/AV för att fortsätta."
+    e200*,c200*: "Disken är full. Tryck FÖREGÅENDE för att fortsätta."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8429,25 +8429,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "AV = avbryt"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
+    player,h100,h120,h300: "STOPP = Avbryt"
     ipod*: "SPELA/PAUSA = Avbryt"
-    iaudiox5,iaudiom5: "Lång SPELA = Avbryt"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "FÖREGÅENDE = Avbryt"
+    x5,m5: "Lång SPELA = Avbryt"
+    h10,h10_5gb,e200*,c200*: "FÖREGÅENDE = Avbryt"
     gigabeats: "BAKÅT = Avbryt"
-    gigabeatfx: "PÅ/AV = Avbryt"
+    gigabeatf: "PÅ/AV = Avbryt"
   </dest>
   <voice>
     *: ""
@@ -8671,19 +8671,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batteri: Toppladdning"
+    recorder: "Batteri: Toppladdning"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Toppladdning"
+    recorder: "Toppladdning"
   </voice>
 </phrase>
 <phrase>
@@ -10500,7 +10500,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11711,15 +11711,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Pekskärmskänslighet"
+    gigabeatf: "Pekskärmskänslighet"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Pekskärmskänslighet"
+    gigabeatf: "Pekskärmskänslighet"
   </voice>
 </phrase>
 <phrase>
@@ -11728,15 +11728,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Hög"
+    gigabeatf: "Hög"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Hög"
+    gigabeatf: "Hög"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 963415f074..667a9d8c28 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -261,16 +261,16 @@
  <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
  </source>
  <dest>
     *: "PLAY = Oo"
     cowond2*: "MENU = Oo"
-    iriverh100,iriverh120,iriverh300: "NAVI = Oo"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oo"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Oo"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oo"
+    player: "(PLAY/STOP)"
  </dest>
  <voice>
     *: ""
@@ -282,15 +282,15 @@
  user: core
  <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
  </source>
  <dest>
     *: "Ibang wala = Hindi"
-    archosplayer: none
+    player: none
  </dest>
  <voice>
     *: ""
-    archosplayer: none
+    player: none
  </voice>
 </phrase>
 <phrase>
@@ -2366,19 +2366,19 @@
  user: core
  <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
  </source>
  <dest>
     *: "Gumawa database... %d found (OFF sa pagbalik)"
-    iriverh100,iriverh120,iriverh300: "Gumawa database... %d found (STOP sa pagbalik)"
+    h100,h120,h300: "Gumawa database... %d found (STOP sa pagbalik)"
     ipod*: "Gumawa database... %d found (PLAY/PAUSE sa pagbalik)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Gumawa database... %d found (LEFT sa pagbalik)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Gumawa database... %d found (PREV sa pagbalik)"
-    gogearsa9200: "Gumawa database... %d found (REW sa pagbalik)"
+    x5,m5,gigabeat*,mrobe100: "Gumawa database... %d found (LEFT sa pagbalik)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Gumawa database... %d found (PREV sa pagbalik)"
+    sa9200: "Gumawa database... %d found (REW sa pagbalik)"
  </dest>
  <voice>
     *: "entries found for database"
@@ -3178,7 +3178,7 @@
 </phrase>
 <phrase>
  id: LANG_JUMP_SCROLL
- desc: (archosplayer) menu alternative for jump scroll
+ desc: (player) menu alternative for jump scroll
  user: core
  <source>
     *: "Jump Scroll"
@@ -3192,7 +3192,7 @@
 </phrase>
 <phrase>
  id: LANG_ONE_TIME
- desc: (archosplayer) the jump scroll shall be done "one time"
+ desc: (player) the jump scroll shall be done "one time"
  user: core
  <source>
     *: "One time"
@@ -3206,7 +3206,7 @@
 </phrase>
 <phrase>
  id: LANG_JUMP_SCROLL_DELAY
- desc: (archosplayer) Delay before making a jump scroll
+ desc: (player) Delay before making a jump scroll
  user: core
  <source>
     *: "Jump Scroll Delay"
@@ -3838,17 +3838,17 @@
  <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
  </source>
  <dest>
     *: none
     button_light: "Pahintuin buttones sa ilaw"
-    sansafuze*,sansae200*: "Pahintuin gulong sa ilaw"
+    fuze*,e200*: "Pahintuin gulong sa ilaw"
  </dest>
  <voice>
     *: none
     button_light: ""
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
  </voice>
 </phrase>
 <phrase>
@@ -4130,17 +4130,17 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
  </source>
  <dest>
     *: none
     rtc: "ON = Ilagay"
     mrobe500: "HEART =Ilagay"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ilagay"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Ilagay"
-    gogearsa9200: "PLAY = Ilagay"
+    h100,h120,h300: "NAVI = Ilagay"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Ilagay"
+    sa9200: "PLAY = Ilagay"
  </dest>
  <voice>
     *: none
@@ -4154,27 +4154,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
  </source>
  <dest>
     *: none
     rtc: "OFF = Mabalik"
     mrobe500: "POWER = Mabalik"
-    iriverh100,iriverh120,iriverh300: "STOP = Mabalik"
-    ipod*,sansac200*: "MENU = Mabalik"
-    iaudiox5,iaudiom5: "RECORD = Mabalik"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Mabalik"
-    gigabeatfx: "POWER = Mabalik"
+    h100,h120,h300: "STOP = Mabalik"
+    ipod*,c200*: "MENU = Mabalik"
+    x5,m5: "RECORD = Mabalik"
+    h10,h10_5gb,e200*,fuze*: "PREV = Mabalik"
+    gigabeatf: "POWER = Mabalik"
     mrobe100: "DISPLAY = Mabalik"
     gigabeats: "BACK = Mabalik"
-    gogearsa9200: "LEFT = Mabalik"
+    sa9200: "LEFT = Mabalik"
  </dest>
  <voice>
     *: none
@@ -4700,21 +4700,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
  </source>
  <dest>
     *: none
     alarm: "PLAY=Ilagay OFF=Kanselahin"
     ipod*: "SELECT=Ilagay MENU=Kanselahin"
-    iriverh10,iriverh10_5gb: "SELECT = Ilagay MENU = Kanselahin"
+    h10,h10_5gb: "SELECT = Ilagay MENU = Kanselahin"
     gigabeats: "SELECT = Ilagay POWER = Kanselahin"
  </dest>
  <voice>
     *: none
     alarm: ""
     ipod*: ""
-    iriverh10,iriverh10_5gb: ""
+    h10,h10_5gb: ""
     gigabeats: ""
  </voice>
 </phrase>
@@ -5885,17 +5885,17 @@
  <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
  </source>
  <dest>
     *: none
     recording: "Mikropono"
-    iriverh100,iriverh120,iriverh300: "Panloob mikropono"
+    h100,h120,h300: "Panloob mikropono"
  </dest>
  <voice>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
  </voice>
 </phrase>
 <phrase>
@@ -5921,15 +5921,15 @@
  user: core
  <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
  </source>
  <dest>
     *: none
-    recording,archosplayer: "Sa Guhit"
+    recording,player: "Sa Guhit"
  </dest>
  <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
  </voice>
 </phrase>
 <phrase>
@@ -7021,7 +7021,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7609,20 +7609,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Puno disk. Magpatuloy Pindutin OFF."
-    iriverh100,iriverh120,iriverh300: "Puno disk. Magpatuloy Pindutin STOP."
-    iaudiom5,iaudiox5: "Puno disk. Magpatuloy Pindutin POWER."
-    sansae200*,sansac200*: "Puno disk. Magpatuloy Pindutin PREV."
+    h100,h120,h300: "Puno disk. Magpatuloy Pindutin STOP."
+    m5,x5: "Puno disk. Magpatuloy Pindutin POWER."
+    e200*,c200*: "Puno disk. Magpatuloy Pindutin PREV."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7682,15 +7682,15 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
-    archosplayer: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -8066,25 +8066,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF sa agas"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP sa agas"
+    player,h100,h120,h300: "STOP sa agas"
     ipod*: "PLAY/PAUSE sa agas"
-    iaudiox5,iaudiom5: "Long PLAY sa agas"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV sa agas"
+    x5,m5: "Long PLAY sa agas"
+    h10,h10_5gb,e200*,c200*: "PREV sa agas"
     gigabeats: "BACK sa agas"
-    gigabeatfx: "POWER sa agas"
+    gigabeatf: "POWER sa agas"
   </dest>
   <voice>
     *: ""
@@ -8138,13 +8138,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -8333,15 +8333,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Magtapos kanta listahan"
-    archosplayer: "Magtapos listahan"
+    player: "Magtapos listahan"
   </dest>
   <voice>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -9664,19 +9664,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batirya: Top-Off Chg"
+    recorder: "Batirya: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Top off charge"
+    recorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10111,19 +10111,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1:"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D Isa"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -11508,15 +11508,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensitibo Touchpad"
+    gigabeatf: "Sensitibo Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensitibo Touchpad"
+    gigabeatf: "Sensitibo Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11806,15 +11806,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Mataas"
+    gigabeatf: "Mataas"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Mataas"
+    gigabeatf: "Mataas"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index a1415a1353..4980180dd4 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -261,15 +261,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = ใช่"
-    iriverh100,iriverh120,iriverh300: "NAVI = ใช่"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = ใช่"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = ใช่"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = ใช่"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -281,15 +281,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "ปุ่มอื่นๆ = ไม่ใช่"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2365,17 +2365,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (OFF เพื่อย้อนกลับ)"
-    iriverh100,iriverh120,iriverh300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)"
+    h100,h120,h300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)"
     ipod*: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
+    x5,m5,gigabeat*,mrobe100: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)"
+    h10,h10_5gb,e200*,c200*,sa9200: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3175,7 +3175,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3189,7 +3189,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3203,7 +3203,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3835,17 +3835,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "เวลาเปิดไฟปุ่ม"
-    sansafuze*,sansae200*: "เวลาเปิดไฟล้อหมุน"
+    fuze*,e200*: "เวลาเปิดไฟล้อหมุน"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -4109,14 +4109,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = ตั้งค่า"
-    iriverh100,iriverh120,iriverh300: "NAVI = ตั้งค่า"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = ตั้งค่า"
+    h100,h120,h300: "NAVI = ตั้งค่า"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = ตั้งค่า"
   </dest>
   <voice>
     *: none
@@ -4129,22 +4129,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = ยกเลิก"
-    iriverh100,iriverh120,iriverh300: "STOP = ยกเลิก"
-    ipod*,sansac200*,gogearsa9200: "MENU = ยกเลิก"
-    iaudiox5,iaudiom5: "RECORD = ยกเลิก"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ยกเลิก"
-    gigabeatfx: "POWER = ยกเลิก"
+    h100,h120,h300: "STOP = ยกเลิก"
+    ipod*,c200*,sa9200: "MENU = ยกเลิก"
+    x5,m5: "RECORD = ยกเลิก"
+    h10,h10_5gb,e200*,fuze*: "PREV = ยกเลิก"
+    gigabeatf: "POWER = ยกเลิก"
     mrobe100: "DISPLAY = ยกเลิก"
     gigabeats: "BACK = ยกเลิก"
   </dest>
@@ -4672,14 +4672,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=ตั้งเวลา OFF=ยกเลิก"
     ipod*: "SELECT=ตั้งเวลา MENU=ยกเลิก"
-    iriverh10,iriverh10_5gb: "SELECT=ตั้งเวลา PREV=ยกเลิก"
+    h10,h10_5gb: "SELECT=ตั้งเวลา PREV=ยกเลิก"
     gigabeats: "SELECT=ตั้งเวลา POWER=ยกเลิก"
   </dest>
   <voice>
@@ -5853,17 +5853,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "ไมโครโฟน"
-    iriverh100,iriverh120,iriverh300: "ไมโครโฟนภายใน"
+    h100,h120,h300: "ไมโครโฟนภายใน"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -5889,15 +5889,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6827,11 +6827,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "บัฟเฟอร์:"
-    archosplayer: "บัฟเฟอร์:"
+    player: "บัฟเฟอร์:"
   </dest>
   <voice>
     *: ""
@@ -6843,13 +6843,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "แบตเตอรี่: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "แบต: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "แบต: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6907,19 +6907,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:"
+    e200*,c200*,fuze*: "micro Secure Digital card:"
     ondio*: "Multimedia card"
   </voice>
 </phrase>
@@ -8031,15 +8031,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "สิ้นสุดรายการเพลง"
-    archosplayer: "สิ้นสุดรายการ"
+    player: "สิ้นสุดรายการ"
   </dest>
   <voice>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -8279,20 +8279,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "ดีสก์เต็ม กดปุ่ม OFF เพื่อทำงานต่อ"
-    iriverh100,iriverh120,iriverh300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ"
-    iaudiom5,iaudiox5: "ดีสก์เต็ม กดปุ่ม POWER เพื่อทำงานต่อ"
-    sansae200*,sansac200*: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ"
+    h100,h120,h300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ"
+    m5,x5: "ดีสก์เต็ม กดปุ่ม POWER เพื่อทำงานต่อ"
+    e200*,c200*: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8376,25 +8376,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF เพื่อยกเลิก"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP เพื่อยกเลิก"
+    player,h100,h120,h300: "STOP เพื่อยกเลิก"
     ipod*: "PLAY/PAUSE เพื่อยกเลิก"
-    iaudiox5,iaudiom5: "Long PLAY เพื่อยกเลิก"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV เพื่อยกเลิก"
+    x5,m5: "Long PLAY เพื่อยกเลิก"
+    h10,h10_5gb,e200*,c200*: "PREV เพื่อยกเลิก"
     gigabeats: "BACK เพื่อยกเลิก"
-    gigabeatfx: "POWER เพื่อยกเลิก"
+    gigabeatf: "POWER เพื่อยกเลิก"
   </dest>
   <voice>
     *: ""
@@ -8618,19 +8618,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "แบตเตอรี่: ชาร์จสูงสุด"
+    recorder: "แบตเตอรี่: ชาร์จสูงสุด"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Top off charge"
+    recorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10447,7 +10447,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11571,15 +11571,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "ความไวแผ่นสัมผัส"
+    gigabeatf: "ความไวแผ่นสัมผัส"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -12104,14 +12104,14 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "สูง"
+    gigabeatf: "สูง"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </voice>
 </phrase>
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index dec12fcf3d..7fbdff2d21 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -248,15 +248,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Devam et"
-    iriverh100,iriverh120,iriverh300: "NAVI = Devam et"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Devam et"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Devam et"
+    ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Devam et"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -268,17 +268,17 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Herhangi PLAY'dan başka = İptal et"
-    iriverh100,iriverh120,iriverh300: "Herhangi NAVI'den başka = İptal et"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "Herhangi SELECT'ten başka = İptal et"
-    archosplayer: none
+    h100,h120,h300: "Herhangi NAVI'den başka = İptal et"
+    ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "Herhangi SELECT'ten başka = İptal et"
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -1554,17 +1554,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200,c200*,sa9200: "Building database... %d found (PREV to return)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -1996,18 +1996,18 @@
   user: core
   <source>
     *: none
-    sansae200: "Wheel Light Timeout"
-    sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout"
+    e200: "Wheel Light Timeout"
+    c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
-    sansae200: "Wheel Light Timeout"
-    sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout"
+    e200: "Wheel Light Timeout"
+    c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </dest>
   <voice>
     *: none
-    sansae200: "Wheel Light Timeout"
-    sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout"
+    e200: "Wheel Light Timeout"
+    c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -2016,15 +2016,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,mrobe100: "Button Light Brightness"
+    gigabeatf,mrobe100: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatfx,mrobe100: "Button Light Brightness"
+    gigabeatf,mrobe100: "Button Light Brightness"
   </dest>
   <voice>
     *: none
-    gigabeatfx,mrobe100: "Button Light Brightness"
+    gigabeatf,mrobe100: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
@@ -2093,19 +2093,19 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -2115,29 +2115,29 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -2624,11 +2624,11 @@
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
-    archosplayer: "Buf: %d.%03dMB"
+    player: "Buf: %d.%03dMB"
   </source>
   <dest>
     *: "Buffer: %d.%03dMB"
-    archosplayer: "Buf: %d.%03dMB"
+    player: "Buf: %d.%03dMB"
   </dest>
   <voice>
     *: "Buffer size"
@@ -2640,17 +2640,17 @@
   user: core
   <source>
     *: none
-    sansae200,sansac200*: "mSD:"
+    e200,c200*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    sansae200,sansac200*: "MSD:"
+    e200,c200*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    sansae200,sansac200*: "micro S D"
+    e200,c200*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -2887,40 +2887,40 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200,sansac200*: "The disk is full. Press UP to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200,c200*: "The disk is full. Press UP to continue."
   </source>
   <dest>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200,sansac200*: "The disk is full. Press UP to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200,c200*: "The disk is full. Press UP to continue."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200,sansac200*: ""
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200,c200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200,c200*: "PREV to abort"
   </source>
   <dest>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200,c200*: "PREV to abort"
   </dest>
   <voice>
     *: ""
@@ -3032,19 +3032,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Pil en son yüklemeler yapıyor"
+    recorder: "Pil en son yüklemeler yapıyor"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Pil en son yüklemeler yapıyor"
+    recorder: "Pil en son yüklemeler yapıyor"
   </voice>
 </phrase>
 <phrase>
@@ -3524,7 +3524,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4342,15 +4342,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Touchpad Duyarlık"
+    gigabeatf: "Touchpad Duyarlık"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Duyarlık"
+    gigabeatf: "Touchpad Duyarlık"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 74b62407c7..641870e122 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -261,15 +261,15 @@
   user: core

   <source>

     *: "PLAY = Yes"

-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"

-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"

-    archosplayer: "(PLAY/STOP)"

+    h100,h120,h300: "NAVI = Yes"

+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"

+    player: "(PLAY/STOP)"

   </source>

   <dest>

     *: "ВIДТВОР. = Так"

-    iriverh100,iriverh120,iriverh300: "НАВIГ. = Так"

-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "ВИБIР = Так"

-    archosplayer: "(ВIДТВОР./СТОП)"

+    h100,h120,h300: "НАВIГ. = Так"

+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "ВИБIР = Так"

+    player: "(ВIДТВОР./СТОП)"

   </dest>

   <voice>

     *: ""

@@ -281,15 +281,15 @@
   user: core

   <source>

     *: "Any Other = No"

-    archosplayer: none

+    player: none

   </source>

   <dest>

     *: "Будь-яка Iнша Кнопка = Нi"

-    archosplayer: none

+    player: none

   </dest>

   <voice>

     *: ""

-    archosplayer: none

+    player: none

   </voice>

 </phrase>

 <phrase>

@@ -2382,19 +2382,19 @@
   user: core

   <source>

     *: "Building database... %d found (OFF to return)"

-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"

+    h100,h120,h300: "Building database... %d found (STOP to return)"

     ipod*: "Building database... %d found (PREV to return)"

-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"

-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"

-    gogearsa9200: "Building database... %d found (REW to return)"

+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"

+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"

+    sa9200: "Building database... %d found (REW to return)"

   </source>

   <dest>

     *: "Створення Бази Даних ... %d знайдено (ВИМК. для вiдмiни)"

-    iriverh100,iriverh120,iriverh300: "Створення Бази Даних... %d знайдено (СТОП для вiдмiни)"

+    h100,h120,h300: "Створення Бази Даних... %d знайдено (СТОП для вiдмiни)"

     ipod*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)"

-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Створення Бази Даних... %d знайдено (ЛIВО для вiдмiни)"

-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)"

-    gogearsa9200: "Створення Бази Даних... %d знайденр (ПЕРЕМ. для вiдмiни)"

+    x5,m5,gigabeat*,mrobe100: "Створення Бази Даних... %d знайдено (ЛIВО для вiдмiни)"

+    h10,h10_5gb,e200*,c200*,fuze*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)"

+    sa9200: "Створення Бази Даних... %d знайденр (ПЕРЕМ. для вiдмiни)"

   </dest>

   <voice>

     *: "Знайдено записiв в базi даних"

@@ -3194,7 +3194,7 @@
 </phrase>

 <phrase>

   id: LANG_JUMP_SCROLL

-  desc: (archosplayer) menu alternative for jump scroll

+  desc: (player) menu alternative for jump scroll

   user: core

   <source>

     *: "Jump Scroll"

@@ -3208,7 +3208,7 @@
 </phrase>

 <phrase>

   id: LANG_ONE_TIME

-  desc: (archosplayer) the jump scroll shall be done "one time"

+  desc: (player) the jump scroll shall be done "one time"

   user: core

   <source>

     *: "One time"

@@ -3222,7 +3222,7 @@
 </phrase>

 <phrase>

   id: LANG_JUMP_SCROLL_DELAY

-  desc: (archosplayer) Delay before making a jump scroll

+  desc: (player) Delay before making a jump scroll

   user: core

   <source>

     *: "Jump Scroll Delay"

@@ -3854,17 +3854,17 @@
   <source>

     *: none

     button_light: "Button Light Timeout"

-    sansafuze*,sansae200*: "Wheel Light Timeout"

+    fuze*,e200*: "Wheel Light Timeout"

   </source>

   <dest>

     *: none

     button_light: "Таймаут Пiдсвiтки Кнопок"

-    sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса"

+    fuze*,e200*: "Таймаут Пiдсвiтки Колеса"

   </dest>

   <voice>

     *: none

     button_light: "Таймаут Пiдсвiтки Кнопок"

-    sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса"

+    fuze*,e200*: "Таймаут Пiдсвiтки Колеса"

   </voice>

 </phrase>

 <phrase>

@@ -4145,20 +4145,20 @@
   <source>

     *: none

     rtc: "ON = Set"

-    iriverh100,iriverh120,iriverh300: "NAVI = Set"

-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"

-    gogearsa9200: "PLAY = Set"

+    h100,h120,h300: "NAVI = Set"

+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"

+    sa9200: "PLAY = Set"

   </source>

   <dest>

     *: none

     rtc: "ВВIМК. = Встановити"

-    iriverh100,iriverh120,iriverh300: "НАВIГ. = Встановити"

-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "ВИБIР = Встановити"

-    gogearsa9200: "ПРОГРАВ. = Встановити"

+    h100,h120,h300: "НАВIГ. = Встановити"

+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "ВИБIР = Встановити"

+    sa9200: "ПРОГРАВ. = Встановити"

   </dest>

   <voice>

     *: none

-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""

+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""

   </voice>

 </phrase>

 <phrase>

@@ -4168,30 +4168,30 @@
   <source>

     *: none

     rtc: "OFF = Revert"

-    iriverh100,iriverh120,iriverh300: "STOP = Revert"

-    ipod*,sansac200*: "MENU = Revert"

-    iaudiox5,iaudiom5: "RECORD = Revert"

-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"

-    gigabeatfx: "POWER = Revert"

+    h100,h120,h300: "STOP = Revert"

+    ipod*,c200*: "MENU = Revert"

+    x5,m5: "RECORD = Revert"

+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"

+    gigabeatf: "POWER = Revert"

     mrobe100: "DISPLAY = Revert"

     gigabeats: "BACK = Revert"

-    gogearsa9200: "LEFT = Revert"

+    sa9200: "LEFT = Revert"

   </source>

   <dest>

     *: none

     rtc: "ВИМК. = Вiдмiнити"

-    iriverh100,iriverh120,iriverh300: "СТОП = Вiдмiнити"

-    ipod*,sansac200*: "МЕНЮ = Вiдмiнити"

-    iaudiox5,iaudiom5: "ЗАПИС = Вiдмiнити"

-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПОПЕРЕД. = Вiдмiнити"

-    gigabeatfx: "ЖИВЛЕННЯ = Вiдмiнити"

+    h100,h120,h300: "СТОП = Вiдмiнити"

+    ipod*,c200*: "МЕНЮ = Вiдмiнити"

+    x5,m5: "ЗАПИС = Вiдмiнити"

+    h10,h10_5gb,e200*,fuze*: "ПОПЕРЕД. = Вiдмiнити"

+    gigabeatf: "ЖИВЛЕННЯ = Вiдмiнити"

     mrobe100: "ДИСПЛЕЙ = Вiдмiнити"

     gigabeats: "НАЗАД = Вiдмiнити"

-    gogearsa9200: "ВЛIВО = Вiдмiнити"

+    sa9200: "ВЛIВО = Вiдмiнити"

   </dest>

   <voice>

     *: none

-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""

+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""

   </voice>

 </phrase>

 <phrase>

@@ -4714,14 +4714,14 @@
     *: none

     alarm: "PLAY=Set OFF=Cancel"

     ipod*: "SELECT=Set MENU=Cancel"

-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"

+    h10,h10_5gb: "SELECT=Set PREV=Cancel"

     gigabeats: "SELECT=Set POWER=Cancel"

   </source>

   <dest>

     *: none

     alarm: "ВIДТВОР.=Встановити ВИМК.=Вiдмiнити"

     ipod*: "ВИБIР=Встановити МЕНЮ=Вiдмiнити"

-    iriverh10,iriverh10_5gb: "ВИБIР=Встановити ПОПЕРЕД.=Вiдмiнити"

+    h10,h10_5gb: "ВИБIР=Встановити ПОПЕРЕД.=Вiдмiнити"

     gigabeats: "ВИБIР=Встановити ЖИВЛ.=Вiдмiнити"

   </dest>

   <voice>

@@ -5896,17 +5896,17 @@
   <source>

     *: none

     recording: "Microphone"

-    iriverh100,iriverh120,iriverh300: "Internal Microphone"

+    h100,h120,h300: "Internal Microphone"

   </source>

   <dest>

     *: none

     recording: "Мiкрофон"

-    iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон"

+    h100,h120,h300: "Вбудований Мiкрофон"

   </dest>

   <voice>

     *: none

     recording: "Мiкрофон"

-    iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон"

+    h100,h120,h300: "Вбудований Мiкрофон"

   </voice>

 </phrase>

 <phrase>

@@ -5932,15 +5932,15 @@
   user: core

   <source>

     *: none

-    recording,archosplayer: "Line In"

+    recording,player: "Line In"

   </source>

   <dest>

     *: none

-    recording,archosplayer: "Лiнiйний Вхiд"

+    recording,player: "Лiнiйний Вхiд"

   </dest>

   <voice>

     *: none

-    recording,archosplayer: "Лiнiйний Вхiд"

+    recording,player: "Лiнiйний Вхiд"

   </voice>

 </phrase>

 <phrase>

@@ -6870,11 +6870,11 @@
   user: core

   <source>

     *: "Buffer:"

-    archosplayer: "Buf:"

+    player: "Buf:"

   </source>

   <dest>

     *: "Буфер:"

-    archosplayer: "Буф:"

+    player: "Буф:"

   </dest>

   <voice>

     *: "Розмiр буферу"

@@ -6886,13 +6886,13 @@
   user: core

   <source>

     *: "Battery: %d%% %dh %dm"

-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"

-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"

+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"

+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"

   </source>

   <dest>

     *: "Акумулятор: %d%% %dh %dm"

-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"

-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"

+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"

+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"

   </dest>

   <voice>

     *: "Рiвень Заряду Акумулятору"

@@ -6950,19 +6950,19 @@
   <source>

     *: none

     multivolume: "HD1"

-    sansae200*,sansac200*,sansafuze*: "mSD:"

+    e200*,c200*,fuze*: "mSD:"

     ondio*: "MMC:"

   </source>

   <dest>

     *: none

     multivolume: "HD1"

-    sansae200*,sansac200*,sansafuze*: "microSD:"

+    e200*,c200*,fuze*: "microSD:"

     ondio*: "MMC:"

   </dest>

   <voice>

     *: none

     multivolume: "H D 1"

-    sansae200*,sansac200*,sansafuze*: "micro S D"

+    e200*,c200*,fuze*: "micro S D"

     ondio*: "M M C"

   </voice>

 </phrase>

@@ -8074,11 +8074,11 @@
   user: core

   <source>

     *: "End of Song List"

-    archosplayer: "End of List"

+    player: "End of List"

   </source>

   <dest>

     *: "Кiнець Списку Пiсень"

-    archosplayer: "Кiнець Списку"

+    player: "Кiнець Списку"

   </dest>

   <voice>

     *: "Кiнець Списку Пiсень"

@@ -8323,20 +8323,20 @@
   <source>

     *: none

     recording: "The disk is full. Press OFF to continue."

-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."

-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."

-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."

+    h100,h120,h300: "The disk is full. Press STOP to continue."

+    m5,x5: "The disk is full. Press POWER to continue."

+    e200*,c200*: "The disk is full. Press PREV to continue."

   </source>

   <dest>

     *: none

     recording: "Диск повний. Натичнiть OFF для продовження."

-    iriverh100,iriverh120,iriverh300: "Диск повний. Натичнiть STOP для продовження."

-    iaudiom5,iaudiox5: "Диск повний. Натичнiть POWER для продовження."

-    sansae200*,sansac200*: "Диск повний. Натичнiть PREV для продовження."

+    h100,h120,h300: "Диск повний. Натичнiть STOP для продовження."

+    m5,x5: "Диск повний. Натичнiть POWER для продовження."

+    e200*,c200*: "Диск повний. Натичнiть PREV для продовження."

   </dest>

   <voice>

     *: none

-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""

+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""

   </voice>

 </phrase>

 <phrase>

@@ -8420,25 +8420,25 @@
 </phrase>

 <phrase>

   id: LANG_OFF_ABORT

-  desc: Used on archosrecorder models

+  desc: Used on recorder models

   user: core

   <source>

     *: "OFF to abort"

-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"

+    player,h100,h120,h300: "STOP to abort"

     ipod*: "PLAY/PAUSE to abort"

-    iaudiox5,iaudiom5: "Long PLAY to abort"

-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"

+    x5,m5: "Long PLAY to abort"

+    h10,h10_5gb,e200*,c200*: "PREV to abort"

     gigabeats: "BACK to abort"

-    gigabeatfx: "POWER to abort"

+    gigabeatf: "POWER to abort"

   </source>

   <dest>

     *: "OFF для вiдмiни"

-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP для вiдмiни"

+    player,h100,h120,h300: "STOP для вiдмiни"

     ipod*: "PLAY/PAUSE для вiдмiни"

-    iaudiox5,iaudiom5: "Довге натискання PLAY для вiдмiни"

-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV для вiдмiни"

+    x5,m5: "Довге натискання PLAY для вiдмiни"

+    h10,h10_5gb,e200*,c200*: "PREV для вiдмiни"

     gigabeats: "BACK для вiдмiни"

-    gigabeatfx: "POWER для вiдмiни"

+    gigabeatf: "POWER для вiдмiни"

   </dest>

   <voice>

     *: ""

@@ -8662,19 +8662,19 @@
 </phrase>

 <phrase>

   id: LANG_BATTERY_TOPOFF_CHARGE

-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder

+  desc: in info display, shows that top off charge is running Only for V1 recorder

   user: core

   <source>

     *: none

-    archosrecorder: "Battery: Top-Off Chg"

+    recorder: "Battery: Top-Off Chg"

   </source>

   <dest>

     *: none

-    archosrecorder: "Акумулятор: Більше Можливого"

+    recorder: "Акумулятор: Більше Можливого"

   </dest>

   <voice>

     *: none

-    archosrecorder: "Акумулятор: Більше Можливого"

+    recorder: "Акумулятор: Більше Можливого"

   </voice>

 </phrase>

 <phrase>

@@ -10491,7 +10491,7 @@
   </dest>

   <voice>

     *: none

-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""

+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""

   </voice>

 </phrase>

 <phrase>

@@ -11702,15 +11702,15 @@
   user: core

   <source>

     *: none

-    gigabeatfx: "Touchpad Sensitivity"

+    gigabeatf: "Touchpad Sensitivity"

   </source>

   <dest>

     *: none

-    gigabeatfx: "Чутливiсть Тачпаду"

+    gigabeatf: "Чутливiсть Тачпаду"

   </dest>

   <voice>

     *: none

-    gigabeatfx: "Чутливiсть Тачпаду"

+    gigabeatf: "Чутливiсть Тачпаду"

   </voice>

 </phrase>

 <phrase>

@@ -11719,15 +11719,15 @@
   user: core

   <source>

     *: none

-    gigabeatfx: "High"

+    gigabeatf: "High"

   </source>

   <dest>

     *: none

-    gigabeatfx: "Висока"

+    gigabeatf: "Висока"

   </dest>

   <voice>

     *: none

-    gigabeatfx: "Висока"

+    gigabeatf: "Висока"

   </voice>

 </phrase>

 <phrase>

diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index d827db99c8..2b8ed26936 100644
--- a/apps/lang/wallisertitsch.lang
+++ b/apps/lang/wallisertitsch.lang
@@ -88,7 +88,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (archosplayer) the jump scroll shall be done "always
+  desc: (player) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -746,14 +746,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic archosrecorder string to use to confirm
+  desc: Generic recorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = Ja"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
+    h100,h120,h300: "NAVI = Ja"
   </dest>
   <voice>
     *: ""
@@ -761,7 +761,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic archosrecorder string to use to cancel
+  desc: Generic recorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -2203,7 +2203,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu altarnative for jump scroll
+  desc: (player) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -2217,7 +2217,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time
+  desc: (player) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -2231,7 +2231,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -2875,7 +2875,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
+  desc: the buffer size player-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -2889,7 +2889,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3148,7 +3148,7 @@
   </source>
   <dest>
     *: "PLAY = üswählu"
-    iriverh100,iriverh120,iriverh300: "NAVI = üswählu"
+    h100,h120,h300: "NAVI = üswählu"
   </dest>
   <voice>
     *: ""
@@ -3163,7 +3163,7 @@
   </source>
   <dest>
     *: "ON+PLAY = leschu"
-    iriverh100,iriverh120,iriverh300: "ON+NAVI = leschu"
+    h100,h120,h300: "ON+NAVI = leschu"
   </dest>
   <voice>
     *: ""
@@ -5663,7 +5663,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -5677,7 +5677,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on archosplayer models
+  desc: Used on player models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index ca41bda2f7..c645ad10a2 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -266,17 +266,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Oyi"
     cowond2*: "MENU = Oyi"
-    iriverh100,iriverh120,iriverh300: "NAVI = Oyi"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oyi"
+    h100,h120,h300: "NAVI = Oyi"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oyi"
     mrobe500: "PLAY or POWER = Oyi"
-    archosplayer: "(PLAY/STOP)"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -288,15 +288,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Tolminme kés ôtes = Neni"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2389,19 +2389,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Bastixhaedje del båze di dnêyes... %d di trovés (OFF po-z eraler en erî)"
-    iriverh100,iriverh120,iriverh300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)"
+    h100,h120,h300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)"
     ipod*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
-    gogearsa9200: "Bastixhaedje del båze di dnêyes... %d di trovés (REW po-z eraler en erî)"
+    x5,m5,gigabeat*,mrobe100: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
+    sa9200: "Bastixhaedje del båze di dnêyes... %d di trovés (REW po-z eraler en erî)"
   </dest>
   <voice>
     *: "intrêyes trovêyes pol båze di dnêyes"
@@ -3201,7 +3201,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3215,7 +3215,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3229,7 +3229,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3861,17 +3861,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tins k' les botons s' loumèt"
-    sansafuze*,sansae200*: "Tins ki l' rôlete si loume"
+    fuze*,e200*: "Tins ki l' rôlete si loume"
   </dest>
   <voice>
     *: none
     button_light: "Tins k' les botons s' loumèt"
-    sansafuze*,sansae200*: "Tins ki l' rôlete si loume"
+    fuze*,e200*: "Tins ki l' rôlete si loume"
   </voice>
 </phrase>
 <phrase>
@@ -4153,21 +4153,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Eployî"
     mrobe500: "HEART = Eployî"
-    iriverh100,iriverh120,iriverh300: "NAVI = Eployî"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Eployî"
-    gogearsa9200: "PLAY = Eployî"
+    h100,h120,h300: "NAVI = Eployî"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Eployî"
+    sa9200: "PLAY = Eployî"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4178,31 +4178,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Rinoncî"
     mrobe500: "POWER = Rinoncî"
-    iriverh100,iriverh120,iriverh300: "STOP = Rinoncî"
-    ipod*,sansac200*: "MENU = Rinoncî"
-    iaudiox5,iaudiom5: "RECORD = Rinoncî"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Rinoncî"
-    gigabeatfx: "POWER = Rinoncî"
+    h100,h120,h300: "STOP = Rinoncî"
+    ipod*,c200*: "MENU = Rinoncî"
+    x5,m5: "RECORD = Rinoncî"
+    h10,h10_5gb,e200*,fuze*: "PREV = Rinoncî"
+    gigabeatf: "POWER = Rinoncî"
     mrobe100: "DISPLAY = Rinoncî"
     gigabeats: "BACK = Rinoncî"
-    gogearsa9200: "LEFT = Rinoncî"
+    sa9200: "LEFT = Rinoncî"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4725,14 +4725,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Rinoncî"
     ipod*: "SELECT=Set MENU=Rinoncî"
-    iriverh10,iriverh10_5gb: "SELECT=Defini PREV=Rinoncî"
+    h10,h10_5gb: "SELECT=Defini PREV=Rinoncî"
     gigabeats: "SELECT=Defini POWER=Rinoncî"
   </dest>
   <voice>
@@ -5907,17 +5907,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Dvintrin micro"
-    iriverh100,iriverh120,iriverh300: "Dvintrin micro"
+    h100,h120,h300: "Dvintrin micro"
   </dest>
   <voice>
     *: none
     recording: "Dvintrin micro"
-    iriverh100,iriverh120,iriverh300: "Dvintrin micro"
+    h100,h120,h300: "Dvintrin micro"
   </voice>
 </phrase>
 <phrase>
@@ -5943,15 +5943,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Intrêye"
+    recording,player: "Intrêye"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "intrêye"
+    recording,player: "intrêye"
   </voice>
 </phrase>
 <phrase>
@@ -6881,11 +6881,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Tampon:"
-    archosplayer: "Tamp.:"
+    player: "Tamp.:"
   </dest>
   <voice>
     *: "Tampon"
@@ -6897,13 +6897,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batreye: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batr: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batr: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Livea del batreye"
@@ -6961,19 +6961,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "DP1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "D P 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8085,11 +8085,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Coron del djivêye di boket"
-    archosplayer: "Coron del djivêye"
+    player: "Coron del djivêye"
   </dest>
   <voice>
     *: "Coron del djivêye di boket"
@@ -8332,20 +8332,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Li plake est plinne. Tchôkîz OFF et tcheryî pus lon."
-    iriverh100,iriverh120,iriverh300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon."
-    iaudiom5,iaudiox5: "Li plake est plinne. Tchôkîz POWER et tcheryî pus lon."
-    sansae200*,sansac200*: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon."
+    h100,h120,h300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon."
+    m5,x5: "Li plake est plinne. Tchôkîz POWER et tcheryî pus lon."
+    e200*,c200*: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8429,25 +8429,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF po-z abandner"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP po-z abandner"
+    player,h100,h120,h300: "STOP po-z abandner"
     ipod*: "PLAY/PAUSE po-z abandner"
-    iaudiox5,iaudiom5: "Long PLAY po-z abandner"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV po-z abandner"
+    x5,m5: "Long PLAY po-z abandner"
+    h10,h10_5gb,e200*,c200*: "PREV po-z abandner"
     gigabeats: "BACK po-z abandner"
-    gigabeatfx:"POWER po-z abandner"
+    gigabeatf:"POWER po-z abandner"
   </dest>
   <voice>
     *: ""
@@ -8671,19 +8671,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batreye: pår ritcherdjeye"
+    recorder: "Batreye: pår ritcherdjeye"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Batreye: pår ritcherdjeye"
+    recorder: "Batreye: pår ritcherdjeye"
   </voice>
 </phrase>
 <phrase>
@@ -10500,7 +10500,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11711,15 +11711,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Tinrûlisté do pavé-taprece"
+    gigabeatf: "Tinrûlisté do pavé-taprece"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Tinrûlisté do pavé-taprece"
+    gigabeatf: "Tinrûlisté do pavé-taprece"
   </voice>
 </phrase>
 <phrase>
@@ -11728,15 +11728,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Hôte"
+    gigabeatf: "Hôte"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Hôte"
+    gigabeatf: "Hôte"
   </voice>
 </phrase>
 <phrase>
diff --git a/firmware/export/config/sansac100.h b/firmware/export/config-c100.h
index 5cc29e32f6..5cc29e32f6 100644
--- a/firmware/export/config/sansac100.h
+++ b/firmware/export/config-c100.h
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config-c200.h
index 654ac7b9cf..654ac7b9cf 100644
--- a/firmware/export/config/sansac200.h
+++ b/firmware/export/config-c200.h
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config-c200v2.h
index d6c2159e8c..d6c2159e8c 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config-c200v2.h
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config-clip.h
index 3b82a25159..3b82a25159 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config-clip.h
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config-cowond2.h
index 453fa0d4c1..453fa0d4c1 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config-cowond2.h
diff --git a/firmware/export/config/zenvision.h b/firmware/export/config-creativezv.h
index 48a9653ee9..48a9653ee9 100644
--- a/firmware/export/config/zenvision.h
+++ b/firmware/export/config-creativezv.h
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config-creativezvm.h
index 752ec4eb22..752ec4eb22 100644
--- a/firmware/export/config/zenvisionm30gb.h
+++ b/firmware/export/config-creativezvm.h
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config-creativezvm60gb.h
index 6d6228304b..6d6228304b 100644
--- a/firmware/export/config/zenvisionm60gb.h
+++ b/firmware/export/config-creativezvm60gb.h
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config-e200.h
index 8b7e0d68b2..8b7e0d68b2 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config-e200.h
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config-e200v2.h
index dff99cde16..dff99cde16 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config-e200v2.h
diff --git a/firmware/export/config/archosfmrecorder.h b/firmware/export/config-fmrecorder.h
index acc1c74dcf..acc1c74dcf 100644
--- a/firmware/export/config/archosfmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config-fuze.h
index 4ca583ca60..4ca583ca60 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config-fuze.h
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config-gigabeat-s.h
index 3f001af737..3f001af737 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config-gigabeat-s.h
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config-gigabeat.h
index 4c06a4d134..4c06a4d134 100644
--- a/firmware/export/config/gigabeatfx.h
+++ b/firmware/export/config-gigabeat.h
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config-h10.h
index 0dc845c23b..0dc845c23b 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config-h10.h
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config-h100.h
index f06aaf8335..f06aaf8335 100644
--- a/firmware/export/config/iriverh100.h
+++ b/firmware/export/config-h100.h
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config-h10_5gb.h
index 8275e50dc6..8275e50dc6 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config-h10_5gb.h
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config-h120.h
index da75c60ecf..da75c60ecf 100644
--- a/firmware/export/config/iriverh120.h
+++ b/firmware/export/config-h120.h
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config-h300.h
index 9fad6cc503..9fad6cc503 100644
--- a/firmware/export/config/iriverh300.h
+++ b/firmware/export/config-h300.h
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config-hdd1630.h
index 05450e01c2..05450e01c2 100644..100755
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config-hdd1630.h
diff --git a/firmware/export/config/iaudio7.h b/firmware/export/config-iaudio7.h
index 68393f1293..68393f1293 100644
--- a/firmware/export/config/iaudio7.h
+++ b/firmware/export/config-iaudio7.h
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config-iaudiom3.h
index b3d7fb83b3..b3d7fb83b3 100644
--- a/firmware/export/config/iaudiom3.h
+++ b/firmware/export/config-iaudiom3.h
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config-iaudiom5.h
index b10ac9ad09..b10ac9ad09 100644
--- a/firmware/export/config/iaudiom5.h
+++ b/firmware/export/config-iaudiom5.h
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config-iaudiox5.h
index 0cf39325a4..0cf39325a4 100644
--- a/firmware/export/config/iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
diff --git a/firmware/export/config/iriverifp7xx.h b/firmware/export/config-ifp7xx.h
index 901f78f0ea..901f78f0ea 100644
--- a/firmware/export/config/iriverifp7xx.h
+++ b/firmware/export/config-ifp7xx.h
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config-ipod1g2g.h
index 549af02fdc..549af02fdc 100644
--- a/firmware/export/config/ipod1g2g.h
+++ b/firmware/export/config-ipod1g2g.h
diff --git a/firmware/export/config/ipod3g.h b/firmware/export/config-ipod3g.h
index 197f80fe72..197f80fe72 100644
--- a/firmware/export/config/ipod3g.h
+++ b/firmware/export/config-ipod3g.h
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config-ipod4g.h
index 7db9836462..7db9836462 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config-ipod4g.h
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config-ipodcolor.h
index 0dc691934f..0dc691934f 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config-ipodmini.h
index ca82d5a560..ca82d5a560 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config-ipodmini.h
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index 37dd3ef559..37dd3ef559 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config-ipodnano.h
index 8483f56613..8483f56613 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config-ipodnano.h
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config-ipodnano2g.h
index 31830fd2c1..31830fd2c1 100644
--- a/firmware/export/config/ipodnano2g.h
+++ b/firmware/export/config-ipodnano2g.h
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config-ipodvideo.h
index 7dca65706c..7dca65706c 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config-logikdax.h
index 8cfbbd8bd8..8cfbbd8bd8 100644
--- a/firmware/export/config/logikdax.h
+++ b/firmware/export/config-logikdax.h
diff --git a/firmware/export/config/lyreproto1.h b/firmware/export/config-lyre_proto1.h
index d157f5be2d..d157f5be2d 100644
--- a/firmware/export/config/lyreproto1.h
+++ b/firmware/export/config-lyre_proto1.h
diff --git a/firmware/export/config/sansam200.h b/firmware/export/config-m200.h
index 3ec721cc7c..3ec721cc7c 100644
--- a/firmware/export/config/sansam200.h
+++ b/firmware/export/config-m200.h
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config-m200v4.h
index 21038349fd..21038349fd 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config-m200v4.h
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config-meizu-m3.h
index 7da1759a61..7da1759a61 100644
--- a/firmware/export/config/meizum3.h
+++ b/firmware/export/config-meizu-m3.h
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config-meizu-m6sl.h
index 033dc619a0..033dc619a0 100644
--- a/firmware/export/config/meizum6sl.h
+++ b/firmware/export/config-meizu-m6sl.h
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config-meizu-m6sp.h
index b5aad58667..b5aad58667 100644
--- a/firmware/export/config/meizum6sp.h
+++ b/firmware/export/config-meizu-m6sp.h
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config-mrobe100.h
index 4fdea149ae..4fdea149ae 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config-mrobe100.h
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config-mrobe500.h
index 45733a644f..45733a644f 100644
--- a/firmware/export/config/mrobe500.h
+++ b/firmware/export/config-mrobe500.h
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config-ondavx747.h
index dee18663d1..dee18663d1 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config-ondavx747.h
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config-ondavx767.h
index 5aa755bfa4..5aa755bfa4 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config-ondavx767.h
diff --git a/firmware/export/config/archosondiofm.h b/firmware/export/config-ondiofm.h
index 7a2b30dbf1..7a2b30dbf1 100644
--- a/firmware/export/config/archosondiofm.h
+++ b/firmware/export/config-ondiofm.h
diff --git a/firmware/export/config/archosondiosp.h b/firmware/export/config-ondiosp.h
index 134f7e3cfa..134f7e3cfa 100644
--- a/firmware/export/config/archosondiosp.h
+++ b/firmware/export/config-ondiosp.h
diff --git a/firmware/export/config/archosplayer.h b/firmware/export/config-player.h
index 5f6cf17fbe..5f6cf17fbe 100644
--- a/firmware/export/config/archosplayer.h
+++ b/firmware/export/config-player.h
diff --git a/firmware/export/config/archosrecorder.h b/firmware/export/config-recorder.h
index 37c2222985..37c2222985 100644
--- a/firmware/export/config/archosrecorder.h
+++ b/firmware/export/config-recorder.h
diff --git a/firmware/export/config/archosrecorderv2.h b/firmware/export/config-recorderv2.h
index 5ca9459750..5ca9459750 100644
--- a/firmware/export/config/archosrecorderv2.h
+++ b/firmware/export/config-recorderv2.h
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config-sa9200.h
index 7af50b5145..7af50b5145 100644..100755
--- a/firmware/export/config/gogearsa9200.h
+++ b/firmware/export/config-sa9200.h
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config-tpj1022.h
index cdb1eb93ac..cdb1eb93ac 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config-tpj1022.h
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config-view.h
index 4ba5d916ba..4ba5d916ba 100644
--- a/firmware/export/config/sansaview.h
+++ b/firmware/export/config-view.h
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config-yh820.h
index 4005ec0267..4005ec0267 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config-yh820.h
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config-yh920.h
index e5a0fc8f71..e5a0fc8f71 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config-yh920.h
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config-yh925.h
index 4119118678..4119118678 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config-yh925.h
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config-yps3.h
index cd7cf5050a..cd7cf5050a 100644
--- a/firmware/export/config/samsungyps3.h
+++ b/firmware/export/config-yps3.h
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 387652bb77..a1a8a9df2a 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -279,121 +279,121 @@ Lyre prototype 1*/
 
 /* now go and pick yours */
 #if defined(ARCHOS_PLAYER)
-#include "config/archosplayer.h"
+#include "config-player.h"
 #elif defined(ARCHOS_RECORDER)
-#include "config/archosrecorder.h"
+#include "config-recorder.h"
 #elif defined(ARCHOS_FMRECORDER)
-#include "config/archosfmrecorder.h"
+#include "config-fmrecorder.h"
 #elif defined(ARCHOS_RECORDERV2)
-#include "config/archosrecorderv2.h"
+#include "config-recorderv2.h"
 #elif defined(ARCHOS_ONDIOSP)
-#include "config/archosondiosp.h"
+#include "config-ondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
-#include "config/archosondiofm.h"
+#include "config-ondiofm.h"
 #elif defined(ARCHOS_AV300)
-#include "config/archosav300.h"
+#include "config-av300.h"
 #elif defined(IRIVER_H100)
-#include "config/iriverh100.h"
+#include "config-h100.h"
 #elif defined(IRIVER_H120)
-#include "config/iriverh120.h"
+#include "config-h120.h"
 #elif defined(IRIVER_H300)
-#include "config/iriverh300.h"
+#include "config-h300.h"
 #elif defined(IAUDIO_X5)
-#include "config/iaudiox5.h"
+#include "config-iaudiox5.h"
 #elif defined(IAUDIO_M5)
-#include "config/iaudiom5.h"
+#include "config-iaudiom5.h"
 #elif defined(IAUDIO_M3)
-#include "config/iaudiom3.h"
+#include "config-iaudiom3.h"
 #elif defined(IPOD_COLOR)
-#include "config/ipodcolor.h"
+#include "config-ipodcolor.h"
 #elif defined(IPOD_NANO)
-#include "config/ipodnano1g.h"
+#include "config-ipodnano.h"
 #elif defined(IPOD_VIDEO)
-#include "config/ipodvideo.h"
+#include "config-ipodvideo.h"
 #elif defined(IPOD_1G2G)
-#include "config/ipod1g2g.h"
+#include "config-ipod1g2g.h"
 #elif defined(IPOD_3G)
-#include "config/ipod3g.h"
+#include "config-ipod3g.h"
 #elif defined(IPOD_4G)
-#include "config/ipod4g.h"
+#include "config-ipod4g.h"
 #elif defined(IPOD_NANO2G)
-#include "config/ipodnano2g.h"
+#include "config-ipodnano2g.h"
 #elif defined(IRIVER_IFP7XX)
-#include "config/iriverifp7xx.h"
+#include "config-ifp7xx.h"
 #elif defined(GIGABEAT_F)
-#include "config/gigabeatfx.h"
+#include "config-gigabeat.h"
 #elif defined(GIGABEAT_S)
-#include "config/gigabeats.h"
+#include "config-gigabeat-s.h"
 #elif defined(IPOD_MINI)
-#include "config/ipodmini1g.h"
+#include "config-ipodmini.h"
 #elif defined(IPOD_MINI2G)
-#include "config/ipodmini2g.h"
+#include "config-ipodmini2g.h"
 #elif defined(IRIVER_H10)
-#include "config/iriverh10.h"
+#include "config-h10.h"
 #elif defined(IRIVER_H10_5GB)
-#include "config/iriverh10_5gb.h"
+#include "config-h10_5gb.h"
 #elif defined(SANSA_E200)
-#include "config/sansae200.h"
+#include "config-e200.h"
 #elif defined(SANSA_C200)
-#include "config/sansac200.h"
+#include "config-c200.h"
 #elif defined(SANSA_M200)
-#include "config/sansam200.h"
+#include "config-m200.h"
 #elif defined(ELIO_TPJ1022)
-#include "config/tatungtpj1022.h"
+#include "config-tpj1022.h"
 #elif defined(MROBE_100)
-#include "config/mrobe100.h"
+#include "config-mrobe100.h"
 #elif defined(MROBE_500)
-#include "config/mrobe500.h"
+#include "config-mrobe500.h"
 #elif defined(LOGIK_DAX)
-#include "config/logikdax.h"
+#include "config-logikdax.h"
 #elif defined(IAUDIO_7)
-#include "config/iaudio7.h"
+#include "config-iaudio7.h"
 #elif defined(COWON_D2)
-#include "config/cowond2.h"
+#include "config-cowond2.h"
 #elif defined(CREATIVE_ZVM)
-#include "config/zenvisionm30gb.h"
+#include "config-creativezvm.h"
 #elif defined(CREATIVE_ZVM60GB)
-#include "config/zenvisionm60gb.h"
+#include "config-creativezvm60gb.h"
 #elif defined(CREATIVE_ZV)
-#include "config/zenvision.h"
+#include "config-creativezv.h"
 #elif defined(PHILIPS_SA9200)
-#include "config/gogearsa9200.h"
+#include "config-sa9200.h"
 #elif defined(PHILIPS_HDD1630)
-#include "config/gogearhdd1630.h"
+#include "config-hdd1630.h"
 #elif defined(SANSA_C100)
-#include "config/sansac100.h"
+#include "config-c100.h"
 #elif defined(MEIZU_M6SL)
-#include "config/meizum6sl.h"
+#include "config-meizu-m6sl.h"
 #elif defined(MEIZU_M6SP)
-#include "config/meizum6sp.h"
+#include "config-meizu-m6sp.h"
 #elif defined(MEIZU_M3)
-#include "config/meizum3.h"
+#include "config-meizu-m3.h"
 #elif defined(ONDA_VX747) || defined(ONDA_VX747P) || defined(ONDA_VX777)
-#include "config/ondavx747.h"
+#include "config-ondavx747.h"
 #elif defined(ONDA_VX767)
-#include "config/ondavx767.h"
+#include "config-ondavx767.h"
 #elif defined(SANSA_CLIP)
-#include "config/sansaclip.h"
+#include "config-clip.h"
 #elif defined(SANSA_E200V2)
-#include "config/sansae200v2.h"
+#include "config-e200v2.h"
 #elif defined(SANSA_M200V4)
-#include "config/sansam200v4.h"
+#include "config-m200v4.h"
 #elif defined(SANSA_FUZE)
-#include "config/sansafuze.h"
+#include "config-fuze.h"
 #elif defined(SANSA_C200V2)
-#include "config/sansac200v2.h"
+#include "config-c200v2.h"
 #elif defined(SANSA_VIEW)
-#include "config/view.h"
+#include "config-view.h"
 #elif defined(LYRE_PROTO1)
-#include "config/lyre_proto1.h"
+#include "config-lyre_proto1.h"
 #elif defined(SAMSUNG_YH820)
-#include "config/samsungyh820.h"
+#include "config-yh820.h"
 #elif defined(SAMSUNG_YH920)
-#include "config/samsungyh920.h"
+#include "config-yh920.h"
 #elif defined(SAMSUNG_YH925)
-#include "config/samsungyh925.h"
+#include "config-yh925.h"
 #elif defined(SAMSUNG_YPS3)
-#include "config/samsungyps3.h"
+#include "config-yps3.h"
 #else
 /* no known platform */
 #endif
diff --git a/manual/advanced_topics/archos-flashing.tex b/manual/advanced_topics/archos-flashing.tex
index a964444f5b..4f6c622cd4 100644
--- a/manual/advanced_topics/archos-flashing.tex
+++ b/manual/advanced_topics/archos-flashing.tex
@@ -2,18 +2,18 @@
 
 \subsection{Introduction}
 
-When you bought your \archosplayertype, it came with the \archosplayerman\ firmware in
-flash ROM. When you power on your \dap, this \archosplayerman\ firmware starts,
+When you bought your \playertype, it came with the \playerman\ firmware in
+flash ROM. When you power on your \dap, this \playerman\ firmware starts,
 and then loads an updated firmware from disk if present (\firmwarefilename).
 An ordinary Rockbox installation only replaces the on-disk firmware, leaving
-the flash ROM contents intact. That means the \archosplayerman\ firmware still
+the flash ROM contents intact. That means the \playerman\ firmware still
 controls the boot process.
 
 The main reason to change this is to improve the startup time of your player.
-The \archosplayerman\ bootloader is rather slow. With Rockbox in flash, your \dap\
+The \playerman\ bootloader is rather slow. With Rockbox in flash, your \dap\
 will boot much faster, typically in three to five seconds. Furthermore you
 might prefer a clean Rockbox environment, with as little remnants of the
-\archosplayerman\ software as possible.
+\playerman\ software as possible.
 \opt{rombox}{On your \dap\ it is also possible to execute Rockbox directly
   from flash ROM, increasing the amount of free RAM for buffering music. This
   is called \emph{Rombox}.
@@ -28,11 +28,11 @@ might prefer a clean Rockbox environment, with as little remnants of the
   of them fails, it will not program.
 }
 
-\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \archosplayerman\
+\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \playerman\
     firmware
-    \opt{archosondiofm}{versions 1.31f or 1.32b! These versions are flash updates
+    \opt{ondiofm}{versions 1.31f or 1.32b! These versions are flash updates
       themselves. If they are}
-    \opt{archosondiosp}{version 1.32b! This version is a flash update itself.
+    \opt{ondiosp}{version 1.32b! This version is a flash update itself.
       If it is}
     applied when Rockbox is flashed, you'll end up with a garbled flash ROM
     and hence a dead box.
@@ -76,14 +76,14 @@ screen. To get out of it, perform a hardware shutdown of your \dap.
 \subsection{Initial Flashing Procedure}
 
 You only need to perform this procedure the first time you flash your
-\archosplayertype. You may also want to perform it in case the update procedure for
+\playertype. You may also want to perform it in case the update procedure for
 the second image recommends it. In the latter case do not perform the steps
 listed under "Preparation".
 
 \subsubsection{Preparation}
 
 \nopt{ondio}{
-  First, check whether your \archosplayertype\ is flashable at all. Select
+  First, check whether your \playertype\ is flashable at all. Select
   \setting{System $\rightarrow$ Debug (Keep Out!) $\rightarrow$ View HW
   Info}. 
   \opt{lcd_charcell}{Cycle through the displayed values with \ButtonRight /
@@ -115,7 +115,7 @@ a safe place.
   \nopt{ondio}{This will extract two files to the root,
     \fname{firmware\_{\textless}model{\textgreater}.bin} and
     \fname{firmware\_{\textless}model{\textgreater}\_norom.bin}.
-    \opt{archosrecorder,archosrecorderv2fm}{(The {\textless}model{\textgreater} part is
+    \opt{recorder,recorderv2fm}{(The {\textless}model{\textgreater} part is
       slighty different from that in the .zip file name.)
     }
     The flash plugin will select the correct one for your \dap.
@@ -152,14 +152,14 @@ a safe place.
 
 \note{There are no separate flash packages for {\dap}s modified to have 8MB
   of RAM. You need to use the corresponding package for non-modified
-  \archosplayertype. You should then install a Rockbox image that makes use of all
+  \playertype. You should then install a Rockbox image that makes use of all
   available RAM as described in the following section.
 }
 
 \subsection{Updating the Rockbox Image in Flash}
 
 When Rockbox is booted from flash, it does not check for an updated firmware
-on disk. This is one of the reasons why it boots faster than the \archosplayerman\
+on disk. This is one of the reasons why it boots faster than the \playerman\
 firmware. It means that whenever you update Rockbox, you also need to update
 the image in the flash. This is a simple and safe procedure:
 
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 23748da18a..53bb984f2e 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -213,7 +213,7 @@ all the tags that are available.
   the last number giving the colour depth in bits) when
   designing your own WPS, or if you use a WPS designed for another target.
   \opt{HAVE_REMOTE_LCD}{The resolution of the remote is
-  \opt{iriverh100,iriverh300}{128x64x1}\opt{iaudiox5,iaudiom5}{128x96x2} pixels.}}
+  \opt{h100,h300}{128x64x1}\opt{x5,m5}{128x96x2} pixels.}}
 
 \nopt{lcd_charcell}{
 \subsubsection{\label{ref:Viewports}Viewports}
@@ -554,7 +554,7 @@ Example of a configuration file:
 \end{description}
 
 \section{\label{ref:FirmwareLoading}Firmware Loading}
-\opt{archosplayer,archosrecorder,archosrecorderv2fm,ondio}{
+\opt{player,recorder,recorderv2fm,ondio}{
   When your \dap{} powers on, it loads the Archos firmware in ROM, which
   automatically checks your \daps{} root directory for a file named 
   \firmwarefilename. Note that Archos firmware can only read the first 
@@ -567,14 +567,14 @@ Example of a configuration file:
 \subsection{\label{ref:using_rolo}Using ROLO (Rockbox Loader)}
 Rockbox is able to load and start another firmware file without rebooting. 
 You just ``play'' a file with the extension %
-\opt{archosrecorder,archosrecorderv2fm,ondio}{\fname{.ajz}.} %
-\opt{archosplayer}{\fname{.mod}.} %
-\opt{iriverh100,iriverh300}{\fname{.iriver}.} %
+\opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} %
+\opt{player}{\fname{.mod}.} %
+\opt{h100,h300}{\fname{.iriver}.} %
 \opt{ipod}{\fname{.ipod}.} %
 \opt{iaudio}{\fname{.iaudio}.} %
-\opt{sansa,iriverh10,iriverh10_5gb}{\fname{.mi4}.} %
+\opt{sansa,h10,h10_5gb}{\fname{.mi4}.} %
 \opt{sansaAMS}{\fname{.sansa}.} %
-\opt{gigabeatfx,gigabeats}{\fname{.gigabeat}.} %
+\opt{gigabeatf,gigabeats}{\fname{.gigabeat}.} %
 This can be used to test new firmware versions without deleting your
 current version.
 
diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index f06d8380e6..9aeadba56d 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -95,7 +95,7 @@ The recording hardware (the MAS) does not allow us to do this
   do that. The MAS chip is programmable, but we have no access to the chip 
   documentation.
 }
-\nopt{iriverh300,iaudiox5}{
+\nopt{h300,x5}{
 \item Interfacing with other USB devices (like cameras) or 2 player games over USB\\
   The USB system demands that there is a master that talks to a slave. The
   \dap{} can only serve as a slave, as most other USB devices such as
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 41b90e6a32..d0fa073635 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -13,25 +13,25 @@
     \midrule\localendhead % endhead breaks with htlatex
     volume      & \opt{masd}{-78 to +18}%
                   \opt{masf}{-100 -to +12}%
-                  \opt{iriverh100,iriverh300}{-84 to 0}%
-                  \opt{ipodnano1g}{-72 to +6}%
+                  \opt{h100,h300}{-84 to 0}%
+                  \opt{ipodnano}{-72 to +6}%
                   \opt{ipodvideo}{-57 to +6}%
-                  \opt{iaudiox5}{-73 to +6}
-                  \opt{sansae200}{-74 to +6}
+                  \opt{x5}{-73 to +6}
+                  \opt{e200}{-74 to +6}
                   \opt{ipodcolor}{-74 to +6}%
                                         & dB\\
-    \nopt{iaudiox5}{%
+    \nopt{x5}{%
       bass      & \opt{masd}{-15 to +15}%
                   \opt{masf}{-12 to +12}%
-                  \opt{iriverh100,iriverh300}{0 to +24}%
+                  \opt{h100,h300}{0 to +24}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{sansae200}{-24 to +24}%
+                  \opt{e200}{-24 to +24}%
                                         & dB\\
       treble    & \opt{masd}{-15 to +15}%
                   \opt{masf}{-12 to +12}%
-                  \opt{iriverh100,iriverh300}{0 to +6}%
+                  \opt{h100,h300}{0 to +6}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{sansae200}{-24 to +24}%
+                  \opt{e200}{-24 to +24}%
                                         & dB\\
     }%
     balance         & -100 to +100      & \%\\
@@ -299,7 +299,7 @@
                 & on, off               & N/A\\
       remote iconset & /path/filename.bmp & N/A\\
       remote viewers iconset & /path/filename.bmp & N/A\\
-      \opt{iriverh100,iriverh300}{
+      \opt{h100,h300}{
         remote reduce ticking
                 & on, off               & N/A\\
       }%
@@ -333,7 +333,7 @@
       force fm mono
                 & off, on               & N/A\\
     }%
-    \opt{archosplayer}{
+    \opt{player}{
       jump scroll
                 & 0 to 5                & N/A\\
       jump scroll delay
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 2ca8582388..cbf1ab2c07 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -25,9 +25,9 @@
     the first file \\
 \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & 
-    \opt{archosplayer}{\fname{.mod}}\opt{archosrecorder,archosrecorderv2fm,archosondiofm,archosondiosp}{\fname{.ajz}}%
-    \opt{iriverh100,iriverh300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
-    \opt{iriverh10,iriverh10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
+    \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}%
+    \opt{h100,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
+    \opt{h10,h10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
     \opt{sansaAMS}{\fname{.sansa}}
   & Load the new firmware with ROLO \\
 \includegraphics[width=0.37cm]{appendix/images/icon-wps.png} 
@@ -100,16 +100,16 @@
     Apple Lossless & \fname{.m4a, .mp4} & \\
     Wavpack & \fname{.wv} & \\
     Shorten & \fname{.shn} & Seeking not supported.\\
-    \opt{iriverh100,iriverh300,iaudiox5,iaudiom5,iaudiom3}{
+    \opt{h100,h300,x5,m5,m3}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode
       fast enough to be useful.}
-    \opt{gigabeatfx}{
+    \opt{gigabeatf}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000
       files decode fast enough to be useful.}
     \opt{gigabeats}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c4000 files decode
       fast enough to be useful.}
-    \opt{ipod,iriverh10,iriverh10_5gb,mrobe100,sansa}{
+    \opt{ipod,h10,h10_5gb,mrobe100,sansa}{
       Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast
       enough to be useful.}
     \\
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 828a379d23..7c4fd5418a 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -112,7 +112,7 @@ produce the information for the next file to be played.
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%pb} & Progress Bar\\
-    \opt{archosplayer}{
+    \opt{player}{
           & This will display a one character ``cup''
             that empties as the time progresses.}
     \opt{lcd_bitmap}{
@@ -120,13 +120,13 @@ produce the information for the next file to be played.
          & You can set the position, width and height of the progressbar %
            (in pixels) and load a custom image for it: %
            \config{\%pb{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\
-    \opt{archosplayer}{%
+    \opt{player}{%
     \config{\%pf} & Full-line progress bar \& time display\\
     }%
     \config{\%px} & Percentage Played In Song\\
     \config{\%pc} & Current Time In Song\\
     \config{\%pe} & Total Number of Playlist Entries\\
-    \nopt{archosplayer}{%
+    \nopt{player}{%
     \config{\%pm} & Peak Meter. The entire line is used as %
                     volume peak meter.\\%
     }%
@@ -202,7 +202,7 @@ produce the information for the next file to be played.
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%mm} & Repeat mode, 0-4, in the order: Off, All, One, Shuffle
-           \opt{archosplayer,archosrecorder,archosrecorderv2fm}{, A-B}\\
+           \opt{player,recorder,recorderv2fm}{, A-B}\\
   \end{tagmap}
 \end{table}
 Example: \config{\%?mm{\textless}Off{\textbar}All{\textbar}One{\textbar}Shuffle%
@@ -422,9 +422,9 @@ used as a conditional. This can be very useful for designing a WPS that works on
 multiple targets, some with and some without a clock. By using this tag as a
 conditional it is possible to display current date and time on those targets that
 support this
-\opt{rtc}{ (like the \archosplayertype)},
+\opt{rtc}{ (like the \playertype)},
 or alternate information on those that do not
-\nopt{rtc}{ (like the \archosplayertype)}%
+\nopt{rtc}{ (like the \playertype)}%
 .
 
 Example:
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 823a313adc..9ea7e4713c 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -70,12 +70,12 @@
       }
     } % \opt{HAVE_BACKLIGHT}
     
-    \opt{archos,iriverh100,ipodmini1g,ipod3g,ipod4g,iaudiox5}{
+    \opt{archos,h100,ipodmini,ipod3g,ipod4g,x5}{
       \item[Contrast:]
       Changes the contrast of your LCD display.
       \warn{Setting the contrast too dark or too light can make it hard to
         find this menu option again!}
-    } % \opt{archos,iriverh100,ipodmini1g,ipod4g,iaudiox5}
+    } % \opt{archos,h100,ipodmini,ipod4g,x5}
 
     \opt{lcd_invert}{
       \item[LCD Mode:]
@@ -124,7 +124,7 @@
          Displays the screen so that the top of the display is nearest 
          the buttons. This is sometimes useful when carrying the \dap\ in a
          pocket for easy access to the headphone socket.
-       \opt{iriverh100,iriverh300}{
+       \opt{h100,h300}{
          \item[Reduce Ticking:]
            Enable this option if you can hear a ticking sound in your headphones
            when using your remote.
@@ -163,11 +163,11 @@
     \opt{lcd_bitmap}{
       \item[Screen Scrolls Out of View:]
         Screens can be manually scrolled horizontally by pressing
-        \opt{archosrecorder,archosrecorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
+        \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
         \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
-        \opt{sansac200,sansae200,iriverh100,iriverh300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini1g,ipodnano1g,
-        ipodvideo,iaudiox5,mrobe100,gigabeatfx,gigabeats}
-        {Long \ButtonRight/\ButtonLeft}\opt{iriverh10,iriverh10_5gb}{Long \ButtonRew/\ButtonFF}.
+        \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
+        ipodvideo,x5,mrobe100,gigabeatf,gigabeats}
+        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
         Setting this option to \setting{Yes}
         will keep the list entries at their fixed positions and allow them to be
         scrolled out of view, whereas \setting{No} will only scroll those entries
@@ -176,7 +176,7 @@
         Defines the number of pixels the horizontal manual screen scroll should move
         for each step.
     }
-    \opt{archosplayer}{
+    \opt{player}{
       \item[Jump Scroll:]
         This setting makes text scroll a page at a time instead of a character
         at a time. If set to \setting{One time}, \setting{2}, \setting{3} or
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index e8f1fdac12..27db3e86ce 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -45,8 +45,8 @@
    \nopt{sansa}{
     Choose the recording frequency (sample rate).
     \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz}
-    \opt{iriverh100,iriverh300}{44.1kHz, 22.05kHz and 11.025kHz}
-    \opt{iaudiox5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
+    \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz}
+    \opt{x5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
     are available. Higher sample rates use up more disk space, but give better
     sound quality.
     \opt{swcodec}{\note{The 11.025kHz setting is not available when using%
@@ -58,19 +58,19 @@
       MPEG v1 for 48, 44.1 and 32\\
       MPEG v2 for 24, 22.05 and 16\\
     }
-    \opt{archosrecorder,archosrecorderv2fm,iriverh100}
+    \opt{recorder,recorderv2fm,h100}
       {\note{You cannot change the sample rate for digital recordings.}
     }
    } % nopt e200  
-   \opt{sansae200}{ 
+   \opt{e200}{ 
        Recordings can only be made at a 22.05kHz frequency (sample rate)
          on this \dap. 
     } % opt e200
 
 \section{Source}
   Choose the source of the recording. The options are: 
-  \opt{archosrecorder,archosrecorderv2fm,iriverh100}{\setting{SPDIF (digital)}, }%
-  \nopt{ipodnano1g,ipodvideo}{\setting{Mic}}%
+  \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
+  \nopt{ipodnano,ipodvideo}{\setting{Mic}}%
   \nopt{sansa}{, and {\setting{Line In}}}. %
   \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
 
@@ -228,7 +228,7 @@
   
 More information can be found at \wikilink{VolumeTriggeredRecording}.
   
-\opt{iriverh100,iriverh300}{%
+\opt{h100,h300}{%
   \section{Automatic Gain Control}
     The \setting{Automatic Gain Control} has five different presets for
     automatically controlling the gain while recording.
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index a395b7f0d6..c24b38a891 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -10,35 +10,35 @@ change to customise your listening experience.
   where 0 dB is a reference that indicates the maximum volume that the \dap{}
   can produce without possible distortion (clipping). All values lower than
   this reference will be negative and yield a progressively softer volume.
-  \opt{archosplayer,archosrecorder,archosrecorderv2fm,ondio,iaudiox5,iaudiom5,ipodnano1g,ipodvideo,
-       ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS,gigabeats,gigabeatfx}{
+  \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodvideo,
+       ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf}{
   Values higher than 0 dB are available and can be used to raise the
   volume more than would otherwise be possible. These volume levels will
   ordinarily lead to distorted sound, but might work nicely for music that has
   an otherwise low volume level.}
   The volume can be adjusted from a
-  \opt{archosplayer}{minimum of -78 dB to a maximum of +18 dB.}%
-  \opt{archosrecorder,archosrecorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
-  \opt{iriverh100,iriverh300}{minimum of -84 dB to a maximum of 0 dB.}%
-  \opt{iaudiox5,iaudiom5,ipod3g,ipod4g,gigabeatfx,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
-  \opt{ipodnano1g}{minimum of -72 dB to a maximum of +6 dB.}%
+  \opt{player}{minimum of -78 dB to a maximum of +18 dB.}%
+  \opt{recorder,recorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
+  \opt{h100,h300}{minimum of -84 dB to a maximum of 0 dB.}%
+  \opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
+  \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}%
   \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}%
-  \opt{ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum
+  \opt{ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum
   of +6 db.}%
   \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}%
-  \opt{gigabeatfx}{minimum of -74 dB to a maximum of +6 dB.}%
+  \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}%
 
 \section{Bass}
   This setting emphasises
-  \nopt{iriverh100,iriverh300}{or suppresses}
+  \nopt{h100,h300}{or suppresses}
   the lower (bass) frequencies in the sound. A value of 0 dB means that bass
   sounds are unaltered (flat response).
   \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
   \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
-  \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
+  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
+  \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
   \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
 
 \opt{ipodvideo}{
 \section{Bass Cutoff}
@@ -50,15 +50,15 @@ change to customise your listening experience.
 
 \section{Treble}
   This setting emphasises
-  \nopt{iriverh100,iriverh300}{or suppresses}
+  \nopt{h100,h300}{or suppresses}
   the higher (treble) frequencies in the sound. A value of 0 dB means that
   treble sounds are unaltered (flat response).
   \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
   \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
-  \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
+  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
+  \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
   \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
-  \opt{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
 
 \opt{ipodvideo}{
 \section{Treble Cutoff}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index d1cf61061a..52c42e0ccf 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -15,19 +15,19 @@
   \begin{description}
     \item [Battery Capacity: ]This setting can be used to tell Rockbox what
       capacity (in mAh) the battery being used has. The default is
-      \opt{archosplayer,archosrecorder}{1500mAh}%
-      \opt{archosrecorderv2fm}{2200mAh}%
-      \opt{archosondiosp,archosondiofm}{1000mAh}%
-      \opt{iriverh100,iriverh300}{1300mAh}%
-      \opt{ipodmini1g}{400mAh (1G) or 630mAh (2G)}%
+      \opt{player,recorder}{1500mAh}%
+      \opt{recorderv2fm}{2200mAh}%
+      \opt{ondiosp,ondiofm}{1000mAh}%
+      \opt{h100,h300}{1300mAh}%
+      \opt{ipodmini}{400mAh (1G) or 630mAh (2G)}%
       \opt{ipodcolor}{700mAh}%
-      \opt{ipodnano1g}{300mAh}%
+      \opt{ipodnano}{300mAh}%
       \opt{ipodvideo}{400mAh (30GB) or 600mAh (60/80GB)}%
       \opt{ipod4g}{630mAh}%
       \opt{ipod3g}{630mAh}%
       \opt{ipod1g2g}{1200mAh}%
-      \opt{iaudiom5,iaudiox5}{950mAh}%
-      \opt{gigabeatfx}{2000mAh}%
+      \opt{m5,x5}{950mAh}%
+      \opt{gigabeatf}{2000mAh}%
       \opt{gigabeats}{700mAh}%
       , which is the capacity value for the standard
       \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
@@ -37,9 +37,9 @@
         runtime estimation as shown on screen.
       \opt{iaudio}{Rockbox does not automatically distinguish between the
         ``L'' models and the ``simple'' models which determine the default
-        value. If your dap{} is an \opt{iaudiom5}{M5L}\opt{iaudiox5}{X5L} set the value
+        value. If your dap{} is an \opt{m5}{M5L}\opt{x5}{X5L} set the value
         to 2250mAh for more accuracy in the runtime estimation.}
-      \opt{ipod,sansa}{This value is fairly meaningless in the \archosplayerman{}
+      \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
         family at present, and work is on-going into finding a better way to
         determine battery life.}
 
@@ -117,7 +117,7 @@ This sub menu relates to limits in the Rockbox operating system.
   \end{description}
 
 % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
-\opt{archosplayer}{
+\opt{player}{
   \subsection{Line In} This option activates the line in port on \dap, which is
     off by default. This is useful for such applications as:
     \begin{itemize}
@@ -161,7 +161,7 @@ this option \setting{On}. If it is not required, then turning this setting
 } 
 
 \opt{HAVE_BUTTON_LIGHTS}{
-  \opt{sansae200}{
+  \opt{e200}{
   \subsection{Wheel Light Timeout}
     This setting controls the amount of time the wheel lights shine after a
     button press or wheel turn. If set to \setting{Off}, the LEDs will not
@@ -169,7 +169,7 @@ this option \setting{On}. If it is not required, then turning this setting
     never shut off. If set to a time (1 to 120 seconds), the wheel will stay
     lit for that amount of time after a button press or wheel turn.
   }
-  \nopt{sansae200}{
+  \nopt{e200}{
   \subsection{Button Light Timeout}
     This setting controls the amount of time the button lights shine after a
     button press. If set to \setting{Off}, the LEDs will not light when a
@@ -177,7 +177,7 @@ this option \setting{On}. If it is not required, then turning this setting
     If set to a time (1 to 120 seconds), the buttons will stay lit for
     that amount of time after a button press.
   }
-  \opt{gigabeatfx}{
+  \opt{gigabeatf}{
     \subsection{Button Light Brightness}
       Changes the brightness of the button lights.
   }
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 2acb88c454..b87c0f8583 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -14,28 +14,28 @@ customize the visual apperance of Rockbox.
 
   There are a number of themes that ship with Rockbox. If none of
   these suit your needs, many more can be downloaded from 
-  \opt{archosplayer}{\url{http://themes.rockbox.org/index.php?target=player}}%
-  \opt{archosrecorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{archosrecorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{archosondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
-  \opt{archosondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
-  \opt{iaudiom5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
-  \opt{iaudiox5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
-  \opt{iaudiom3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
-  \opt{iriverh100}{\url{http://themes.rockbox.org/index.php?target=h100}}%
-  \opt{iriverh300}{\url{http://themes.rockbox.org/index.php?target=h300}}%
-  \opt{iriverh10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}%
-  \opt{iriverh10}{\url{http://themes.rockbox.org/index.php?target=h10}}%
+  \opt{player}{\url{http://themes.rockbox.org/index.php?target=player}}%
+  \opt{recorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
+  \opt{recorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
+  \opt{ondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
+  \opt{ondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
+  \opt{m5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
+  \opt{x5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
+  \opt{m3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
+  \opt{h100}{\url{http://themes.rockbox.org/index.php?target=h100}}%
+  \opt{h300}{\url{http://themes.rockbox.org/index.php?target=h300}}%
+  \opt{h10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}%
+  \opt{h10}{\url{http://themes.rockbox.org/index.php?target=h10}}%
   \opt{ipod1g2g}{\url{http://themes.rockbox.org/index.php?target=ipod1g2g}}%
   \opt{ipod3g}{\url{http://themes.rockbox.org/index.php?target=ipod3g}}%
   \opt{ipod4g}{\url{http://themes.rockbox.org/index.php?target=ipod4g}}%
   \opt{ipodcolor}{\url{http://themes.rockbox.org/index.php?target=ipodcolor}}%
   \opt{ipodvideo}{\url{http://themes.rockbox.org/index.php?target=ipodvideo}}%
-  \opt{ipodmini1g}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
-  \opt{ipodnano1g}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
-  \opt{sansae200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
-  \opt{sansac200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
-  \opt{gigabeatfx}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
+  \opt{ipodmini}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
+  \opt{ipodnano}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
+  \opt{e200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
+  \opt{c200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
+  \opt{gigabeatf}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
   \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}%
   \opt{mrobe100}{\url{http://themes.rockbox.org/index.php?target=mrobe100}}%
   .
@@ -49,7 +49,7 @@ customize the visual apperance of Rockbox.
   \item[Font.]
     Browse the installed fonts on your \dap{}. Selecting one will activate it.
     See \reference{ref:Loadingfonts} for further details about fonts.
-} % \nopt{archosplayer}
+} % \nopt{player}
 
 \item[While Playing Screen.]
   Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and
diff --git a/manual/frontpage/frontpage.tex b/manual/frontpage/frontpage.tex
index 4f5eeef2e7..bfeb192fd6 100644
--- a/manual/frontpage/frontpage.tex
+++ b/manual/frontpage/frontpage.tex
@@ -4,7 +4,7 @@
 \ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}}
 {\includegraphics{frontpage/rockbox-web.png}}\\
 \vspace{2cm}
-\huge{The Rockbox Manual\\for\\\archosplayername}\vspace{1cm}\\
+\huge{The Rockbox Manual\\for\\\playername}\vspace{1cm}\\
 
 \vspace{\fill}
 
diff --git a/manual/getting_started/gigabeat_install.tex b/manual/getting_started/gigabeat_install.tex
index 9929449340..c248527c20 100644
--- a/manual/getting_started/gigabeat_install.tex
+++ b/manual/getting_started/gigabeat_install.tex
@@ -9,7 +9,7 @@
   to show hidden files or you may be unable to see \fname{FWIMG}.
 \item In that directory you'll find a file called \fname{FWIMG01.DAT}. This too
   may be hidden. Rename the file to \fname{FWIMG01.DAT.ORIG}. Make sure you
-  spelled that name  correctly as it is needed for booting the \archosplayerman{} firmware.
+  spelled that name  correctly as it is needed for booting the \playerman{} firmware.
   \warn{If you do not complete this step then you will be unable to uninstall Rockbox
   without a copy of the original firmware from the original install CD.}
 \item Now copy the file \fname{FWIMG01.DAT} you downloaded to that directory.
diff --git a/manual/getting_started/gigabeats_install.tex b/manual/getting_started/gigabeats_install.tex
index 9b6402548f..317e190fe0 100644
--- a/manual/getting_started/gigabeats_install.tex
+++ b/manual/getting_started/gigabeats_install.tex
@@ -1,14 +1,14 @@
 % $Id$
 
 \warn{Before starting this procedure, ensure that you have a copy
-of the original \archosplayerman{} firmware. Without this, it is
-\emph{not} possible to uninstall Rockbox. The \archosplayerman{}
+of the original \playerman{} firmware. Without this, it is
+\emph{not} possible to uninstall Rockbox. The \playerman{}
 firmware can be downloaded from
 \url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}.\\}
 
 Installing the bootloader is only needed once. It involves replacing the
 existing firmware file on your \dap{} with another version.
-When running the original \archosplayerman{} firmware (a version of Windows CE), it is
+When running the original \playerman{} firmware (a version of Windows CE), it is
 only possible to connect the \dap{} to a PC in ``MTP mode'', which hides
 the actual content of your \daps{} disk and provides restricted access
 to its contents.
diff --git a/manual/getting_started/h10_install.tex b/manual/getting_started/h10_install.tex
index a8909e68dc..ff72f6661e 100644
--- a/manual/getting_started/h10_install.tex
+++ b/manual/getting_started/h10_install.tex
@@ -1,17 +1,17 @@
 \subsubsection{Installation}
 \begin{enumerate}
   \item Download 
-  \opt{iriverh10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
-  \opt{iriverh10_5gb}{
+  \opt{h10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
+  \opt{h10_5gb}{
     \begin{itemize}
       \item \url{http://download.rockbox.org/bootloader/iriver/H10.mi4} if your \dap{} is UMS or
       \item \url{http://download.rockbox.org/bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP.
     \end{itemize}}
-  \item Connect your \archosplayertype{} to the computer using UMS mode and the UMS trick\opt{iriverh10_5gb}{ if necessary}.
-  \item Rename the \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} file to \fname{OF.mi4} in the \fname{System} directory on your \archosplayertype{}.
-    \opt{iriverh10_5gb}{\note{If you have a Pure model \archosplayertype{} (which does not have a FM radio) it is possible that this file will be called \fname{H10EMP.mi4} instead. If so, rename the \fname{H10.mi4} you downloaded in step 1 to \fname{H10EMP.mi4}.}}
-    \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \archosplayerman{} firmware.}
+  \item Connect your \playertype{} to the computer using UMS mode and the UMS trick\opt{h10_5gb}{ if necessary}.
+  \item Rename the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.
+    \opt{h10_5gb}{\note{If you have a Pure model \playertype{} (which does not have a FM radio) it is possible that this file will be called \fname{H10EMP.mi4} instead. If so, rename the \fname{H10.mi4} you downloaded in step 1 to \fname{H10EMP.mi4}.}}
+    \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
     \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.}
 
-  \item Copy the \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4} (or \fname{H10EMP.mi4} if you have a \archosplayertype{} Pure)} file you downloaded to the System directory on your \dap{}.
+  \item Copy the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4} (or \fname{H10EMP.mi4} if you have a \playertype{} Pure)} file you downloaded to the System directory on your \dap{}.
 \end{enumerate}
diff --git a/manual/getting_started/iaudio_install.tex b/manual/getting_started/iaudio_install.tex
index cb56027fc9..1ef566173e 100644
--- a/manual/getting_started/iaudio_install.tex
+++ b/manual/getting_started/iaudio_install.tex
@@ -1,8 +1,8 @@
-The \archosplayername{} has a built-in bootloader which performs the
+The \playername{} has a built-in bootloader which performs the
 firmware update and can also access the hard drive via USB.  The
 Rockbox bootloader can therefore be very minimalistic, as it does not require
  it's own USB mode.  This makes it less dangerous to install the Rockbox bootloader
- as you can always restore it using the \archosplayerman{} bootloader.
+ as you can always restore it using the \playerman{} bootloader.
 
 \note{The Rockbox bootloader overwrites the original firmware, making it
    impossible to dual-boot.}
@@ -11,9 +11,9 @@ Rockbox bootloader can therefore be very minimalistic, as it does not require
 \begin{itemize}
 \item Download the Rockbox bootloader binary from 
 \url{http://download.rockbox.org/bootloader/iaudio/}.
-  \opt{iaudiox5}{Use the \fname{iaudiox5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5
-    or X5L, use the \fname{iaudiox5\_fw.bin} file.}
-  \opt{iaudiom5}{Use the \fname{iaudiom5\_fw.bin} file.}
-  \opt{iaudiom3}{Use the \fname{cowon\_m3.bin} file.}
+  \opt{x5}{Use the \fname{x5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5
+    or X5L, use the \fname{x5\_fw.bin} file.}
+  \opt{m5}{Use the \fname{m5\_fw.bin} file.}
+  \opt{m3}{Use the \fname{cowon\_m3.bin} file.}
 \item Copy it to the \fname{FIRMWARE} directory on your \dap{}.
 \end{itemize}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index c42afa6815..582937f9ed 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -6,16 +6,16 @@ before beginning there are a few things it is important to know.
 
 \section{Before Starting}
 
-\opt{sansae200}{\fixme{NOTE: These instructions will not work on the 
+\opt{e200}{\fixme{NOTE: These instructions will not work on the 
 ``Rhapsody'' version of the E200 series (also known as E200R). Please 
 follow the instructions at 
 \url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}}
 
-\opt{ipodnano1g,ipodvideo,sansae200,sansac200}{
+\opt{ipodnano,ipodvideo,e200,c200}{
 \begin{description}  
 \item[Supported hardware versions.] 
-    \opt{ipodnano1g}{
-    The \archosplayertype{} is available in multiple versions, not
+    \opt{ipodnano}{
+    The \playertype{} is available in multiple versions, not
     all of which run Rockbox.  Rockbox presently runs only on 
     the original Ipod Nano. Rockbox does
     \emph{not} run on the second, third, or fourth generation Ipod Nano.
@@ -23,13 +23,13 @@ follow the instructions at
     Apple's website: \url{http://www.info.apple.com/kbnum/n61688}.
   }
   \opt{ipodvideo}{
-    The \archosplayertype{} is the 5th/5.5th generation \archosplayerman{} only.
+    The \playertype{} is the 5th/5.5th generation \playerman{} only.
     Rockbox does \emph{not} run on the newer, 6th/Classic generation Ipod. 
     For information on identifying which Ipod you own, see this page on Apple's 
     website: \url{http://www.info.apple.com/kbnum/n61688}.
   }
-  \opt{sansae200,sansac200}{
-    The \archosplayertype{} is available in multiple versions, not
+  \opt{e200,c200}{
+    The \playertype{} is available in multiple versions, not
     all of which run Rockbox.  Rockbox doesn't run on the
     newer v2 models. They can be identified
     by checking the Sandisk firmware version number under 
@@ -39,7 +39,7 @@ follow the instructions at
 \end{description}
 }
 
-\opt{iriverh300}{
+\opt{h300}{
 \begin{description}  
   \item[DRM capability.] If your \dap{} has a US firmware, then by installing Rockbox you will
   \emph{permanently} lose the ability to playback files with DRM.
@@ -77,7 +77,7 @@ follow the instructions at
     and hold the \ButtonSelect{} and \ButtonPlay{} buttons simultaneously. Your
     \dap{} should enter disk mode and you can try reconnecting to the computer.
   }
-  \opt{iaudiox5}{
+  \opt{x5}{
     When instructed to connect/disconnect the USB cable, always use
     the USB port through the subpack, not the side 'USB Host' port. The side port
     is intended to be used for USB OTG connections only (digital cameras, memory
@@ -89,15 +89,15 @@ follow the instructions at
 
     \warn{Never extract files to your \dap{} while it is in recovery mode.}
   }
-  \opt{iriverh10,iriverh10_5gb}{
+  \opt{h10,h10_5gb}{
     The installation requires you to use UMS mode and so
     may require use of the UMS trick, whereby it is possible to force a MTP
-    \archosplayertype{} to start up in UMS mode as follows:
+    \playertype{} to start up in UMS mode as follows:
       \begin{enumerate}
-        \item Ensure the \dap{} is fully powered off by \opt{iriverh10}{using a pin to
+        \item Ensure the \dap{} is fully powered off by \opt{h10}{using a pin to
         push the small reset button inside the hole between the Hold switch and
-        remote control connector.}\opt{iriverh10_5gb}{removing the battery and putting it back in again.}
-        \item Connect your \archosplayertype{} to the computer using the data cable.
+        remote control connector.}\opt{h10_5gb}{removing the battery and putting it back in again.}
+        \item Connect your \playertype{} to the computer using the data cable.
         \item Hold \ButtonRight{} and push \ButtonPower{} to turn the \dap{} on.
         \item Continue holding \ButtonRight{} until the USB Connected screen appears.
         \item The \dap{} will now appear as a regular disk on your computer.
@@ -105,7 +105,7 @@ follow the instructions at
       \note{Once Rockbox has been installed, when you shut down your \dap{} from Rockbox it will totally
        power the player off so step 1 is no longer necessary.}
   }
-  \opt{gigabeatfx}{During installation, do not connect your \dap{}
+  \opt{gigabeatf}{During installation, do not connect your \dap{}
   using the cradle but plug the USB cable directly to the \dap{}.
   } 
 \end{description}
@@ -141,7 +141,7 @@ for you. However, should you encounter a problem, then the manual way is
 still available to you.\\
 
 \opt{gigabeats}{\note{The automated install is not yet available for the
-  \archosplayertype{}. For now you can use the manual method to install Rockbox.
+  \playertype{}. For now you can use the manual method to install Rockbox.
   Please still read the section on the automatic install as it explains
   various important aspects of Rockbox, such as the different versions
   available.\\}}
@@ -156,31 +156,31 @@ still available to you.\\
 
 \begin{description}
 \opt{HAVE_RB_BL_ON_DISK}{
-\item[The \archosplayerman{} bootloader.]
-  The \archosplayerman{} bootloader is the program that tells your \dap{} how to load
+\item[The \playerman{} bootloader.]
+  The \playerman{} bootloader is the program that tells your \dap{} how to load
   and start the original firmware. It is also responsible for any emergency,
   recovery, or disk modes on your \dap{}. This bootloader is stored in special flash
-  memory in your \archosplayerman{} and comes factory-installed. It is not necessary
+  memory in your \playerman{} and comes factory-installed. It is not necessary
   to modify this in order to install Rockbox.}
 
 \item[The Rockbox bootloader.] \index{Bootloader}
   \opt{HAVE_RB_BL_ON_DISK}{The Rockbox bootloader is loaded from disk by
-  the \archosplayerman{} bootloader. It is responsible for loading the Rockbox
+  the \playerman{} bootloader. It is responsible for loading the Rockbox
   firmware and for providing the dual boot function. It directly replaces the
-  \archosplayerman{} firmware in the \daps{} boot sequence.
-  \opt{gigabeatfx}{\note{Dual boot does not currently work on the Gigabeat.}}}
+  \playerman{} firmware in the \daps{} boot sequence.
+  \opt{gigabeatf}{\note{Dual boot does not currently work on the Gigabeat.}}}
 
   \opt{HAVE_RB_BL_IN_FLASH}{
   The bootloader is the program that tells your
   \dap{} how to load and start other components of Rockbox and for providing
   the dual boot function. This is the component of Rockbox that is installed
-  to the flash memory of your \archosplayerman.
-  \opt{iaudio}{\note{Dual boot does not currently work on the \archosplayertype{}.}}}
+  to the flash memory of your \playerman.
+  \opt{iaudio}{\note{Dual boot does not currently work on the \playertype{}.}}}
 
 \item[The Rockbox firmware.]
-  \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \archosplayerman{} firmware, which runs
+  \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs
   entirely from flash memory,}
-  \opt{HAVE_RB_BL_ON_DISK}{Similar to the \archosplayerman{} firmware,}
+  \opt{HAVE_RB_BL_ON_DISK}{Similar to the \playerman{} firmware,}
   most of the Rockbox code is contained in a
   ``build'' that resides on your \daps{} drive. This makes it easy to
   update Rockbox. The build consists of a directory called
@@ -190,7 +190,7 @@ still available to you.\\
 \end{description}
 }
 
-\nopt{archosplayer} {
+\nopt{player} {
     Apart from the required parts there are some addons you might be interested
     in installing.
     \begin{description}
@@ -214,7 +214,7 @@ housekeeping tool \caps{Rockbox Utility}. It allows you to:
         (``Minimal Installation'').
 \item Automatically install all suggested components (``Complete Installation'').
 \item Selectively install optional components.
-\nopt{archosplayer}{\item Install additional fonts and themes.}
+\nopt{player}{\item Install additional fonts and themes.}
 \item Install voice files and generate talk clips.
 \item Uninstall all components you installed using Rockbox Utility.
 \end{itemize}
@@ -232,35 +232,35 @@ filesystem.\\*
 
 \opt{ipodvideo}
     {\note{Autodetection is unable to distinguish between the
-    \archosplayerman{} 30~GB and 60~GB / 80~GB models and defaults to the
+    \playerman{} 30~GB and 60~GB / 80~GB models and defaults to the
     30~GB model. This will usually work but you might want to check the
     detected value, especially if you experience problems with Rockbox.}
 }
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
   Rockbox Utility will ask you for a compatible copy of the original
   firmware. This is because for legal reasons we cannot distribute
   the bootloader directly. Instead, we have to patch the Iriver firmware
   with the Rockbox bootloader.
 
   Download a supported version of the Iriver firmware for your 
-  \archosplayername{} from the Iriver website, links can be found on 
+  \playername{} from the Iriver website, links can be found on 
   \wikilink{IriverBoot}.
  
   Supported Iriver firmware versions currently include 
-  \opt{iriverh100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 
+  \opt{h100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 
     1.66EU and 1.66K. Note that the H140 uses the same firmware as the H120;
     H120 and H140 owners should use the firmware called \fname{ihp\_120.hex}.
     Likewise, the iHP110 and iHP115 use the same firmware, called 
     \fname{ihp\_100.hex}. Be sure to use the correct firmware file for 
     your player.}
-    \opt{iriverh300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
-    \note{The US \archosplayername{} firmware is not supported and cannot be
+    \opt{h300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
+    \note{The US \playername{} firmware is not supported and cannot be
     patched to be used with the bootloader. If you wish to install Rockbox
-    on a US \archosplayername{}, you must first install a non-US version of the
+    on a US \playername{}, you must first install a non-US version of the
     original firmware and then install one of the supported versions patched
     with the Rockbox bootloader.}
-    \warn{Installing a non-US firmware on a US \archosplayername{} will
+    \warn{Installing a non-US firmware on a US \playername{} will
     \emph{permanently} remove DRM support from the player.}}
 
   If the file that you downloaded is a \fname{.zip} file, use an unzip 
@@ -339,7 +339,7 @@ data partiton.}}
 \dap{}.}}
 
 \item Connect your \dap{} to the computer via USB
-  \opt{ipod3g,ipod4g,ipodmini1g,ipodcolor}{ or Firewire} as described in
+  \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire} as described in
   the manual that came with your \dap{}.
 
 \item Take the \fname{.zip} file that you downloaded and use
@@ -370,18 +370,18 @@ structure that Rockbox needs.\\}
 
 \opt{swcodec}{\nopt{gigabeats}{
   \subsubsection{Installing the bootloader}
-  \opt{iriverh100,iriverh300}{\input{getting_started/iriver_install.tex}}
+  \opt{h100,h300}{\input{getting_started/iriver_install.tex}}
   \opt{ipod}{\input{getting_started/ipod_install.tex}}
-  \opt{iaudiom3,iaudiom5,iaudiox5}{\input{getting_started/iaudio_install.tex}}
-  \opt{iriverh10,iriverh10_5gb}{\input{getting_started/h10_install.tex}}
-  \opt{gigabeatfx}{\input{getting_started/gigabeat_install.tex}}
+  \opt{m3,m5,x5}{\input{getting_started/iaudio_install.tex}}
+  \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}}
+  \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}}
   \opt{sansa}{\input{getting_started/sansa_install.tex}}
   \opt{mrobe100}{\input{getting_started/mrobe100_install.tex}}
 }}
 
 \subsection{Finishing the install}\label{ref:finish_install}
 
-\opt{gigabeatfx}{
+\opt{gigabeatf}{
   After installing you \emph{need} to power-cycle the 
   \dap{} by doing the following steps. Failure to do so may result in problems.
   \begin{itemize}
@@ -394,7 +394,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{iaudiom3,iaudiom5,iaudiox5}{
+\opt{m3,m5,x5}{
   After installing you \emph{need} to power-cycle the 
   \dap{} by doing the following steps.
   \begin{itemize}
@@ -407,7 +407,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,archos}{
+\opt{h10,h10_5gb,ipod,mrobe100,sansa,archos}{
   Safely eject / unmount the USB drive, unplug the cable and restart.
 }
 
@@ -415,7 +415,7 @@ structure that Rockbox needs.\\}
   Safely eject / unmount your \dap{}.
 }
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
   \begin{itemize}
   \item Safely eject / unmount your \dap{}.
   
@@ -426,14 +426,14 @@ structure that Rockbox needs.\\}
   the jukebox on. Press and hold the \ButtonSelect{} button to enter the main menu,
   and navigate to \setting{General $\rightarrow$ Firmware Upgrade}. Select
   \setting{Yes} when asked to confirm if you want to upgrade the 
-  firmware. The \archosplayerman{} will display a message indicating that the
+  firmware. The \playerman{} will display a message indicating that the
   firmware update is in progress. Do \emph{not} interrupt this process. When the
   firmware update is complete the player will turn itself off. (The update
   firmware process usually takes a minute or so.). You are now ready to go.
 \end{itemize}
 }
 
-\opt{sansae200}{Your e200 will automatically reboot and Rockbox should load.}
+\opt{e200}{Your e200 will automatically reboot and Rockbox should load.}
 
 
 
@@ -463,10 +463,10 @@ you turn the unit on, Rockbox should load.}
 \opt{gigabeats}{Rockbox should automatically load when you turn on your player.\\
 
   \note{
-    If you have loaded music onto your \dap{} using the \archosplayerman{}
+    If you have loaded music onto your \dap{} using the \playerman{}
     firmware, you will not be able to see your music properly in the
     \setting{File Browser} as MTP mode changes the location and file names. 
-    Files placed on your \dap{} using the \archosplayerman{} firmware can be
+    Files placed on your \dap{} using the \playerman{} firmware can be
     viewed by initialising and using Rockbox's database.
     See \reference{ref:database} for more information.}
 }
@@ -482,7 +482,7 @@ you turn the unit on, Rockbox should load.}
   }
 }
 
-\opt{iaudiom3}{
+\opt{m3}{
   \fixme{Add a note about the charging trick and place it here?}
 }
 
@@ -512,7 +512,7 @@ The new build will be installed over your current build.\\
 
 \section{Uninstalling Rockbox}\index{Installation!uninstall}
 
-\nopt{gigabeatfx,iaudiom5,iaudiox5,archos,mrobe100,gigabeats}{
+\nopt{gigabeatf,m5,x5,archos,mrobe100,gigabeats}{
   \note{The Rockbox bootloader allows you to choose between Rockbox and 
   the original firmware. (See \reference{ref:Dualboot} for more information.)}
 }
@@ -524,37 +524,37 @@ You can uninstall Rockbox automatically by using Rockbox Utility. If you
 installed Rockbox manually you can still use Rockbox Utility for uninstallation
 but will not be able to do this selectively.
 
-\opt{iriverh100,iriverh300}{\note{Rockbox Utility cannot uninstall the bootloader due to
+\opt{h100,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to
 the fact that it requires a flashing procedure. To uninstall the bootloader
 completely follow the manual uninstallation instructions below.}}
 
 \subsection{Manual Uninstallation}
 
 \opt{archos}{
-  If you would like to go back to using the original \archosplayerman{} software,
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
   \fname{\firmwarefilename} file.
 }
 
-\opt{iriverh10,iriverh10_5gb}{
-  If you would like to go back to using the original \archosplayerman{} software,
+\opt{h10,h10_5gb}{
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
-  \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} file and rename
-  \fname{OF.mi4} to \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}}
-  in the \fname{System} directory on your \archosplayertype{}. As in the installation,
+  \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename
+  \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}}
+  in the \fname{System} directory on your \playertype{}. As in the installation,
   it may be necessary to first put your device into UMS mode.
 }
 
 \opt{mrobe100}{
-  If you would like to go back to using the original \archosplayerman{} software,
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
   \fname{pp5020.mi4} file and rename
   \fname{OF.mi4} to \fname{pp5020.mi4}
-  in the \fname{System} directory on your \archosplayertype{}.
+  in the \fname{System} directory on your \playertype{}.
 }
 
-\opt{sansae200}{
-  If you would like to go back to using the original \archosplayerman{} software,
+\opt{e200}{
+  If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and follow the instructions to install
   the bootloader, but when prompted by sansapatcher, enter \texttt{u} for uninstall,
   instead of \texttt{i} for install. As in the installation, it may be necessary to
@@ -568,26 +568,26 @@ completely follow the manual uninstallation instructions below.}}
   instead of \texttt{i} for install.
 }
 
-\opt{iaudiom5,iaudiox5}{
-  If you would like to go back to using the original \archosplayerman{} software,
-  connect the \dap{} to your computer, download the original \archosplayername{}
-  firmware from the \archosplayerman{} website, and copy it to the \fname{FIRMWARE}
-  directory on your \archosplayername{}. Turn off the \dap{}, remove the USB cable
+\opt{m5,x5}{
+  If you would like to go back to using the original \playerman{} software,
+  connect the \dap{} to your computer, download the original \playername{}
+  firmware from the \playerman{} website, and copy it to the \fname{FIRMWARE}
+  directory on your \playername{}. Turn off the \dap{}, remove the USB cable
   and insert the charger. The original firmware will automatically be flashed.
 }
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
     If you want to remove the Rockbox bootloader, simply flash an unpatched
-    \archosplayerman{} firmware. Be aware that doing so will also remove the bootloader
+    \playerman{} firmware. Be aware that doing so will also remove the bootloader
     USB mode. As that mode can come in quite handy (especially if you experience
    disk errors) it is recommended to keep the bootloader. It also
     gives you the possibility of trying Rockbox anytime later by simply
     installing the distribution files.
-    \opt{iriverh100}{
+    \opt{h100}{
       The Rockbox bootloader will automatically start the original firmware if
       the \fname{.rockbox} directory has been deleted.
     }
-    \opt{iriverh300}{
+    \opt{h300}{
       Although if you retain the Rockbox bootloader, you will need to hold the
       \ButtonRec{} button each time you want to start the original firmware.
     }
@@ -596,8 +596,8 @@ completely follow the manual uninstallation instructions below.}}
 \nopt{gigabeats}{
   If you wish to clean up your disk, you may also wish to delete the
   \fname{.rockbox} directory and its contents.
-  \nopt{iaudiom5,iaudiox5}{Turn the \archosplayerman{} off.
-    Turn the \dap{} back on and the original \archosplayerman{} software will load.}
+  \nopt{m5,x5}{Turn the \playerman{} off.
+    Turn the \dap{} back on and the original \playerman{} software will load.}
 }
 
 \opt{gigabeats}{
@@ -605,7 +605,7 @@ completely follow the manual uninstallation instructions below.}}
   \fname{.rockbox} directory and its contents, this must be done
   before uninstalling the bootloader in the next step.
 
-  Before installation you should have downloaded a copy of the \archosplayerman{}
+  Before installation you should have downloaded a copy of the \playerman{}
   firmware from
   \url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}.
   \begin{itemize}
@@ -633,7 +633,7 @@ completely follow the manual uninstallation instructions below.}}
   please ensure that you are either logged in as an administrator (Windows), or
   you have root rights (Linux)}
 
-\opt{iriverh100,iriverh300}{
+\opt{h100,h300}{
   \item[Immediately loading original firmware.]
   If the original firmware is immediately
   loaded without the Rockbox bootloader appearing first, then the Rockbox bootloader
@@ -641,10 +641,10 @@ completely follow the manual uninstallation instructions below.}}
   the update if the filename is correct, including case. Make sure that the patched
   Iriver firmware is called \fname{.hex}.}
 
-\nopt{iriverh100,iriverh300}{\item[``File Not Found'']}
-\opt{iriverh100,iriverh300}{\item[``-1 error'']}
+\nopt{h100,h300}{\item[``File Not Found'']}
+\opt{h100,h300}{\item[``-1 error'']}
   If you receive a
-  \nopt{iriverh100,iriverh300}{``File Not Found''}\opt{iriverh100,iriverh300}{``-1 error''} from the
+  \nopt{h100,h300}{``File Not Found''}\opt{h100,h300}{``-1 error''} from the
   bootloader, then the bootloader cannot find the Rockbox firmware. This is
   usually a result of not extracting the contents of the \fname{.zip} file
   to the proper location, and should not happen when Rockbox has been
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index 5d9e812784..f5eba1fae8 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -60,7 +60,7 @@ We have some conventions (especially for naming) that are intended to be
 consistent throughout this manual.
 
 Manufacturer and product names are formatted in accordance with the standard
-rules of English grammar, e.g. ``\archosplayerman{} playback is currently
+rules of English grammar, e.g. ``\playerman{} playback is currently
 unsupported''. Manufacturer and model names are proper nouns, and
 thus are written beginning with a capital letter.
 
diff --git a/manual/getting_started/mrobe100_install.tex b/manual/getting_started/mrobe100_install.tex
index 0ddc966c4a..41fafac073 100644
--- a/manual/getting_started/mrobe100_install.tex
+++ b/manual/getting_started/mrobe100_install.tex
@@ -2,9 +2,9 @@
 \begin{enumerate}

   \item Download 

   {\url{http://download.rockbox.org/bootloader/olympus/mrobe100/pp5020.mi4}}

-  \item Connect your \archosplayertype{} to the computer.

-  \item Rename the original \fname{pp5020.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \archosplayertype{}.

-    \warn{You should keep a safe backup of this file for use if you ever wish to switch back to the \archosplayerman{} firmware.}

+  \item Connect your \playertype{} to the computer.

+  \item Rename the original \fname{pp5020.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.

+    \warn{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}

     \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.}

 

   \item Copy the \fname{pp5020.mi4} file you downloaded to the System directory on your \dap{}.

diff --git a/manual/getting_started/sansaAMS_install.tex b/manual/getting_started/sansaAMS_install.tex
index 9e07c1b28a..9f2e25c64b 100644
--- a/manual/getting_started/sansaAMS_install.tex
+++ b/manual/getting_started/sansaAMS_install.tex
@@ -1,6 +1,6 @@
 % $Id: %
 
-In order to make your \archosplayertype{} load and execute the Rockbox
+In order to make your \playertype{} load and execute the Rockbox
 firmware you have just installed, you will need to install the
 Rockbox bootloader. Unless bugs are found in the bootloader code, or
 significant new features are added, you will only have to perform this
diff --git a/manual/getting_started/sansa_install.tex b/manual/getting_started/sansa_install.tex
index edfb3b646d..7956e94f76 100644
--- a/manual/getting_started/sansa_install.tex
+++ b/manual/getting_started/sansa_install.tex
@@ -8,7 +8,7 @@
 and run it whilst logged in with an administrator account.
 
 \item If all has gone well, you should see some information displayed about
-your \archosplayertype{} and a message asking you if you wish to install the Rockbox
+your \playertype{} and a message asking you if you wish to install the Rockbox
 bootloader. Press i followed by ENTER, and sansapatcher will now
 install the bootloader. After a short time you should see the message
 ``[INFO] Bootloader installed successfully.'' Press ENTER again to exit
@@ -58,7 +58,7 @@ steps will assume you have saved it in your home directory.
 sufficient permission to perform raw disk access to your \dap{}.}
 
 \item If all has gone well, you should see some information displayed about
-your \archosplayertype{} and a message asking you if you wish to install the Rockbox
+your \playertype{} and a message asking you if you wish to install the Rockbox
 bootloader. Press i followed by ENTER, and sansapatcher will now install the
 bootloader. After a short time you should see the message ``[INFO] Bootloader
 installed successfully.'' Press ENTER again to exit sansapatcher.
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 50bdd4c657..6eb539c718 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -181,7 +181,7 @@ utilities. A detailed description of the different plugins is to be found in
 \reference{ref:plugins}.
 
 \section{\label{ref:Info}System}
-\opt{archosplayer}{Use the MINUS and PLUS keys to step through several 
+\opt{player}{Use the MINUS and PLUS keys to step through several 
 pages of information.}
 
 \begin{description}
@@ -224,7 +224,7 @@ pages of information.}
   given seperately for internal memory (\emph{Int}) and for a plugged in
   memory card
   \opt{ondio}{(\emph{MMC})}
-  \opt{sansa,sansae200v2,sansafuze}{(\emph{MSD})}.
+  \opt{sansa,e200v2,fuze}{(\emph{MSD})}.
 }%
 \nopt{multivolume}{Hard disk size and the amount of free space on the disk.}
 
@@ -248,7 +248,7 @@ pages of information.}
   settings before asking for help.}
 \end{description}
 
-\opt{archosplayer}{
+\opt{player}{
   \section{Shutdown}
   This menu option saves the Rockbox configuration and turns off the hard
   drive before shutting down the machine. For maximum safety this procedure
diff --git a/manual/platform/sansac200.tex b/manual/platform/c200.tex
index 732faded82..0c7473ee18 100644
--- a/manual/platform/sansac200.tex
+++ b/manual/platform/c200.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{sansac200}
+\def\UseOption{c200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_C200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{sansac200 Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{c200 Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{132x80x16}
-\newcommand{\specimg}{sansac200}
+\newcommand{\specimg}{c200}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/sansaclip.tex b/manual/platform/clip.tex
index 0ac35127e4..c6811b6316 100644
--- a/manual/platform/sansaclip.tex
+++ b/manual/platform/clip.tex
@@ -1,20 +1,20 @@
 % Id: %
-\def\UseOption{sansaclip}
+\def\UseOption{clip}
 \edef\UseOption{\UseOption,SANSA_CLIP_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{Clip}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{Clip}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x64x1-clip}
-\newcommand{\specimg}{sansaclip}
+\newcommand{\specimg}{clip}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
 \newcommand{\firmwareextension}{\fname{sansa}}
 \newcommand{\screenshotsize}{3cm}
diff --git a/manual/platform/sansae200.tex b/manual/platform/e200.tex
index 821346e39d..d20d34f2d7 100644
--- a/manual/platform/sansae200.tex
+++ b/manual/platform/e200.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{sansae200}
+\def\UseOption{e200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_E200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{sansae200 and e200R Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{e200 and e200R Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{176x220x16}
-\newcommand{\specimg}{sansae200}
+\newcommand{\specimg}{e200}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/sansafuze.tex b/manual/platform/fuze.tex
index e00939f94e..887d62ea89 100644
--- a/manual/platform/sansafuze.tex
+++ b/manual/platform/fuze.tex
@@ -1,20 +1,20 @@
 % $Id$ %
-\def\UseOption{sansafuze}
+\def\UseOption{fuze}
 \edef\UseOption{\UseOption,SANSA_FUZE_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{Fuze}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{Fuze}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{sansafuze}
+\newcommand{\specimg}{fuze}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
 \newcommand{\firmwareextension}{\fname{sansa}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/gigabeatfx.tex b/manual/platform/gigabeatf.tex
index b1803f02b8..e49f1593c8 100644
--- a/manual/platform/gigabeatfx.tex
+++ b/manual/platform/gigabeatf.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{gigabeatfx}
+\def\UseOption{gigabeatf}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,GIGABEAT_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -10,20 +10,20 @@
 \edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Toshiba}
-\newcommand{\archosplayertype}{Gigabeat F and X Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Toshiba}
+\newcommand{\playertype}{Gigabeat F and X Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{240x320x16}
-\newcommand{\specimg}{gigabeatfx}
+\newcommand{\specimg}{gigabeatf}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
 \newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-gigabeatfx.tex}
+\input{platform/keymap-gigabeatf.tex}
 \input{platform/remote-keymap-gigabeat.tex}
diff --git a/manual/platform/gigabeats.tex b/manual/platform/gigabeats.tex
index 664bf85fb1..920eb1789f 100644
--- a/manual/platform/gigabeats.tex
+++ b/manual/platform/gigabeats.tex
@@ -9,15 +9,15 @@
 \edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Toshiba}
-\newcommand{\archosplayertype}{Gigabeat S Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Toshiba}
+\newcommand{\playertype}{Gigabeat S Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{240x320x16}
 \newcommand{\specimg}{gigabeats}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
 \newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
diff --git a/manual/platform/iriverh10.tex b/manual/platform/h10.tex
index d810ac42d5..4b99b1ba51 100644
--- a/manual/platform/iriverh10.tex
+++ b/manual/platform/h10.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh10}
+\def\UseOption{h10}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H10}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 20GB}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H10}
+\newcommand{\playerlongtype}{\playertype{} 20GB}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{iriverh10}
+\newcommand{\specimg}{h10}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh10.tex}
+\input{platform/keymap-h10.tex}
diff --git a/manual/platform/iriverh100.tex b/manual/platform/h100.tex
index 96f9e00d8b..19e4ef0677 100644
--- a/manual/platform/iriverh100.tex
+++ b/manual/platform/h100.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh100}
+\def\UseOption{h100}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H100_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -10,21 +10,21 @@
 \edef\UseOption{\UseOption,IRIVER_RC_H100_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H100}
-\newcommand{\archosplayerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H100}
+\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{iriverh100}
+\newcommand{\specimg}{h100}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
 \newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh100_h300.tex}
-\input{platform/remote-keymap-iriverh100.tex}
+\input{platform/keymap-h100_h300.tex}
+\input{platform/remote-keymap-h100.tex}
 
diff --git a/manual/platform/iriverh10_5gb.tex b/manual/platform/h10_5gb.tex
index 37bfb8d22c..d89e1eabcd 100644
--- a/manual/platform/iriverh10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh10_5gb}
+\def\UseOption{h10_5gb}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H10}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 5GB and 6GB}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H10}
+\newcommand{\playerlongtype}{\playertype{} 5GB and 6GB}
 \newcommand{\genericimg}{128x128x16}
-\newcommand{\specimg}{iriverh10_5gb}
+\newcommand{\specimg}{h10_5gb}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh10.tex}
+\input{platform/keymap-h10.tex}
diff --git a/manual/platform/iriverh300.tex b/manual/platform/h300.tex
index 00370b2887..211bc1a9b0 100644
--- a/manual/platform/iriverh300.tex
+++ b/manual/platform/h300.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh300}
+\def\UseOption{h300}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H300_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,20 +8,20 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H3xx}
-\newcommand{\archosplayerlongtype}{H320 and H340}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H3xx}
+\newcommand{\playerlongtype}{H320 and H340}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{iriverh300}
+\newcommand{\specimg}{h300}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
 \newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh100_h300.tex}
+\input{platform/keymap-h100_h300.tex}
 
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index 884834344d..28679a5025 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{1G / 2G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{1G / 2G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod1g2g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 2ca6e60053..21ca69adbb 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{3G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{3G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod3g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 72ab509239..06483fa6e2 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{4G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{4G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod4g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index dd9755114d..04dc457a81 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Color}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Color}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
 \newcommand{\specimg}{ipodcolor}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{6cm}
diff --git a/manual/platform/ipodmini1g.tex b/manual/platform/ipodmini.tex
index f9f8673048..7671a4fb1a 100644
--- a/manual/platform/ipodmini1g.tex
+++ b/manual/platform/ipodmini.tex
@@ -1,20 +1,20 @@
 % $Id$ %
-\def\UseOption{ipodmini1g}
+\def\UseOption{ipodmini}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Mini}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Mini}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{138x110x2}
-\newcommand{\specimg}{ipodmini1g}
+\newcommand{\specimg}{ipodmini}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodnano1g.tex b/manual/platform/ipodnano.tex
index d5078ea9d6..974fe687ec 100644
--- a/manual/platform/ipodnano1g.tex
+++ b/manual/platform/ipodnano.tex
@@ -1,19 +1,19 @@
 % $Id$ %
-\def\UseOption{ipodnano1g}
+\def\UseOption{ipodnano}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Nano}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 1st generation}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Nano}
+\newcommand{\playerlongtype}{\playertype{} 1st generation}
 \newcommand{\genericimg}{176x132x16}
-\newcommand{\specimg}{ipodnano1g}
+\newcommand{\specimg}{ipodnano}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 52d892c2d4..ff18551266 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Video}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Video}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{320x240x16}
 \newcommand{\specimg}{ipodvideo}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{8cm}
diff --git a/manual/platform/keymap-sansac200.tex b/manual/platform/keymap-c200.tex
index 8fbed84de3..8fbed84de3 100644
--- a/manual/platform/keymap-sansac200.tex
+++ b/manual/platform/keymap-c200.tex
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-clip.tex
index 1ddc718e44..1ddc718e44 100644
--- a/manual/platform/keymap-sansaclip.tex
+++ b/manual/platform/keymap-clip.tex
diff --git a/manual/platform/keymap-sansae200.tex b/manual/platform/keymap-e200.tex
index ce2bc5a47a..ce2bc5a47a 100644
--- a/manual/platform/keymap-sansae200.tex
+++ b/manual/platform/keymap-e200.tex
diff --git a/manual/platform/keymap-sansafuze.tex b/manual/platform/keymap-fuze.tex
index 351db621b0..351db621b0 100644
--- a/manual/platform/keymap-sansafuze.tex
+++ b/manual/platform/keymap-fuze.tex
diff --git a/manual/platform/keymap-gigabeatfx.tex b/manual/platform/keymap-gigabeatf.tex
index 39d51b0dd5..39d51b0dd5 100644
--- a/manual/platform/keymap-gigabeatfx.tex
+++ b/manual/platform/keymap-gigabeatf.tex
diff --git a/manual/platform/keymap-iriverh10.tex b/manual/platform/keymap-h10.tex
index 364504fcd7..364504fcd7 100644
--- a/manual/platform/keymap-iriverh10.tex
+++ b/manual/platform/keymap-h10.tex
diff --git a/manual/platform/keymap-iriverh100_h300.tex b/manual/platform/keymap-h100_h300.tex
index 419dc0bfcf..419dc0bfcf 100644
--- a/manual/platform/keymap-iriverh100_h300.tex
+++ b/manual/platform/keymap-h100_h300.tex
diff --git a/manual/platform/keymap-iaudiom3.tex b/manual/platform/keymap-m3.tex
index 098422b21d..098422b21d 100644
--- a/manual/platform/keymap-iaudiom3.tex
+++ b/manual/platform/keymap-m3.tex
diff --git a/manual/platform/keymap-iaudiomx5.tex b/manual/platform/keymap-mx5.tex
index aea09f4496..aea09f4496 100644
--- a/manual/platform/keymap-iaudiomx5.tex
+++ b/manual/platform/keymap-mx5.tex
diff --git a/manual/platform/keymap-archosondio.tex b/manual/platform/keymap-ondio.tex
index dd0cf25061..dd0cf25061 100644
--- a/manual/platform/keymap-archosondio.tex
+++ b/manual/platform/keymap-ondio.tex
diff --git a/manual/platform/keymap-archosplayer.tex b/manual/platform/keymap-player.tex
index 651239b4d9..651239b4d9 100644
--- a/manual/platform/keymap-archosplayer.tex
+++ b/manual/platform/keymap-player.tex
diff --git a/manual/platform/keymap-archosrecorder.tex b/manual/platform/keymap-recorder.tex
index ac194a4422..ac194a4422 100644
--- a/manual/platform/keymap-archosrecorder.tex
+++ b/manual/platform/keymap-recorder.tex
diff --git a/manual/platform/iaudiom3.tex b/manual/platform/m3.tex
index 032c9007a0..bbdd255299 100644
--- a/manual/platform/iaudiom3.tex
+++ b/manual/platform/m3.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiom3}
+\def\UseOption{m3}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_M3_PAD}
 \edef\UseOption{\UseOption,IAUDIO_RC_PAD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,iaudio}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{M3}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{M3}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x96x2}
-\newcommand{\specimg}{iaudiom3}
+\newcommand{\specimg}{m3}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap files
-\input{platform/keymap-iaudiom3.tex}
+\input{platform/keymap-m3.tex}
 \input{platform/remote-keymap-iaudio.tex}
diff --git a/manual/platform/iaudiom5.tex b/manual/platform/m5.tex
index 2dbcd06584..c7233b11f2 100644
--- a/manual/platform/iaudiom5.tex
+++ b/manual/platform/m5.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiom5}
+\def\UseOption{m5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{M5}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{M5}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{iaudiom5}
+\newcommand{\specimg}{m5}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link to external keymap file
-\input{platform/keymap-iaudiomx5.tex}
+\input{platform/keymap-mx5.tex}
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index 6a07a35f7a..ddac2fda67 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,olympus}
 
-\newcommand{\archosplayerman}{Olympus}
-\newcommand{\archosplayertype}{m:robe 100}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Olympus}
+\newcommand{\playertype}{m:robe 100}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x1}
 \newcommand{\specimg}{mrobe100}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/archosondiofm.tex b/manual/platform/ondiofm.tex
index d78f1c53fa..c49a1363d7 100644
--- a/manual/platform/archosondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -1,24 +1,24 @@
 % $Id$ %
 %platform file for the Ondio FM
-\def\UseOption{archosondiofm}
+\def\UseOption{ondiofm}
 % To not break the current manual
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Ondio}
-\newcommand{\archosplayerlongtype}{Ondio 128 FM}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Ondio}
+\newcommand{\playerlongtype}{Ondio 128 FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosondiofm}
+\newcommand{\specimg}{ondiofm}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-archosondio.tex}
+\input{platform/keymap-ondio.tex}
diff --git a/manual/platform/archosondiosp.tex b/manual/platform/ondiosp.tex
index 9414d2ba72..43d74e76fd 100644
--- a/manual/platform/archosondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -1,24 +1,24 @@
 % $Id$ %
 %platform file for the Ondio SP
-\def\UseOption{archosondiosp}
+\def\UseOption{ondiosp}
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Ondio}
-\newcommand{\archosplayerlongtype}{Ondio 128 SP}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Ondio}
+\newcommand{\playerlongtype}{Ondio 128 SP}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosondiosp}
+\newcommand{\specimg}{ondiosp}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-archosondio.tex}
+\input{platform/keymap-ondio.tex}
diff --git a/manual/platform/archosplayer.tex b/manual/platform/player.tex
index 8fcf375b42..eddd5eddfc 100644
--- a/manual/platform/archosplayer.tex
+++ b/manual/platform/player.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{archosplayer}
+\def\UseOption{player}
 \edef\UseOption{\UseOption,PLAYER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Studio/Player}
-\newcommand{\archosplayerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Studio/Player}
+\newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
 \newcommand{\genericimg}{charx11x1}
-\newcommand{\specimg}{archosplayer}
+\newcommand{\specimg}{player}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{archos.mod}}
 \newcommand{\firmwareextension}{\fname{mod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosplayer.tex}
+\input{platform/keymap-player.tex}
diff --git a/manual/platform/archosrecorder.tex b/manual/platform/recorder.tex
index 6897947de5..9eaf9091d8 100644
--- a/manual/platform/archosrecorder.tex
+++ b/manual/platform/recorder.tex
@@ -1,25 +1,25 @@
 % $Id$ %
-\def\UseOption{archosrecorder}
+\def\UseOption{recorder}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Recorder}
-\newcommand{\archosplayerlongtype}{Recorder 6, 10, 15 and 20}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Recorder}
+\newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20}
 \newcommand{\genericimg}{112x64x1}
 
-\newcommand{\specimg}{archosrecorder}
+\newcommand{\specimg}{recorder}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosrecorder.tex}
+\input{platform/keymap-recorder.tex}
diff --git a/manual/platform/archosrecorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 1fd9e78bed..99b829d8a5 100644
--- a/manual/platform/archosrecorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -1,24 +1,24 @@
 % $Id$ %
-\def\UseOption{archosrecorderv2fm}
+\def\UseOption{recorderv2fm}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Recorder V2/FM}
-\newcommand{\archosplayerlongtype}{Recorder V2 and FM}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Recorder V2/FM}
+\newcommand{\playerlongtype}{Recorder V2 and FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosrecorderv2fm}
+\newcommand{\specimg}{recorderv2fm}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosrecorder.tex}
+\input{platform/keymap-recorder.tex}
diff --git a/manual/platform/remote-keymap-iriverh100.tex b/manual/platform/remote-keymap-h100.tex
index cc0537047b..cc0537047b 100644
--- a/manual/platform/remote-keymap-iriverh100.tex
+++ b/manual/platform/remote-keymap-h100.tex
diff --git a/manual/platform/iaudiox5.tex b/manual/platform/x5.tex
index 9864a6ffec..df8473c602 100644
--- a/manual/platform/iaudiox5.tex
+++ b/manual/platform/x5.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiox5}
+\def\UseOption{x5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{X5}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{X5}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{iaudiox5}
+\newcommand{\specimg}{x5}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iaudiomx5.tex}
+\input{platform/keymap-mx5.tex}
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}%
diff --git a/manual/preamble.tex b/manual/preamble.tex
index e1e192dfe1..1e3ccce95a 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -41,7 +41,7 @@
 \input{platform/\platform.tex}
 \input{features.tex}
 
-\newcommand{\archosplayername}{\archosplayerman\ \archosplayerlongtype}
+\newcommand{\playername}{\playerman\ \playerlongtype}
 
 \hypersetup{% add some values to the pdf properties
   colorlinks = true,
@@ -51,7 +51,7 @@
   urlcolor = blue,
   pdftitle = {Rockbox user manual},
   pdfauthor = {The Rockbox Team},
-  pdfsubject = {Rockbox user manual for \archosplayername}
+  pdfsubject = {Rockbox user manual for \playername}
 }
 
 \newcommand{\fname}[1]{\texttt{#1}}
@@ -94,7 +94,7 @@
 \fancyhead[L]{{\nouppercase{\textsc{\leftmark}}}}
 \fancyhead[R]{\iffloatpage{}{\thepage}}
 \fancyfoot[L]{\textsc{The Rockbox manual}}
-\fancyfoot[R]{\textsc{\archosplayerman{} \archosplayertype}}
+\fancyfoot[R]{\textsc{\playerman{} \playertype}}
 \fancypagestyle{plain}{}
 
 \renewcommand{\headrulewidth}{\iffloatpage{0pt}{0.4pt}}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 9be15adeb1..bdbb97ef5c 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -35,7 +35,7 @@ generated as \fname{<MMC1>}, and will behave exactly as any other directory
 on the \dap{}.
 }
 
-\opt{iriverh10,iriverh10_5gb}{\note{
+\opt{h10,h10_5gb}{\note{
 If your \dap{} is a MTP model, the Music directory where all your music is stored
 may be hidden in the \setting{File Browser}. This may be fixed by either
 either changing its properties (on a computer) to not hidden, or by changing
@@ -78,7 +78,7 @@ the \setting{Show Files} setting to all.
          & If there is an audio file playing, returns to the
          \setting{While Playing Screen} (WPS) without stopping playback.\\
       %
-      \nopt{archosplayer,sansac200}%
+      \nopt{player,c200}%
         {%
           \ActionTreeStop 
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop}
@@ -317,7 +317,7 @@ can be easily changed by making a text file with the required layout.  More
   \end{table}
 }
 
-\opt{archosplayer}{
+\opt{player}{
   The current text line to be entered or edited is always listed on the first
   line of the display. The second line of the display can contain the character
   selection bar, as in the screenshot above.
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 72a1fa5fe4..f8768c3ceb 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -9,7 +9,7 @@
 % The extension is selected in the preamble, so no further \ifpdfoutput
 % is necessary.
 \includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front}
-\opt{iaudiom3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
+\opt{m3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
   \end{center}
   % spacing between the two pictures, could possibly be improved
   \begin{center}
@@ -27,7 +27,7 @@ described in detail in the following paragraph.
   \wikilink{BlindFAQ}.
   
   %
-  \opt{iriverh100}{
+  \opt{h100}{
   Hold or lay the \dap{} so that the side with the joystick and LCD is facing
   towards you, and the curved side is at the top. The joystick functions as
   the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when
@@ -48,7 +48,7 @@ described in detail in the following paragraph.
   \dap{} hard locks, you can reset it by inserting a paper clip into the hole
   where the reset switch is.}
   % 
-  \opt{iriverh300}{
+  \opt{h300}{
   Hold or lay the \dap{} so that the side with the button pad and
   LCD is facing towards you.  The buttons on the button pad are as follows:  top 
   left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: 
@@ -74,7 +74,7 @@ described in detail in the following paragraph.
   used in Rockbox. 
   }
   %
-  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini1g}{ 
+  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{ 
   The main controls on the \dap{} are a slightly indented scroll wheel 
   with a flat round button in the center. Hold the \dap{} with these controls 
   facing you. 
@@ -84,7 +84,7 @@ described in detail in the following paragraph.
   \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{} 
     switch.}
   \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.}
-  \opt{ipodmini1g}{\ButtonHold{} switch, remote connector, headphone jack.}     
+  \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone jack.}       
 
   The dock connector that is used to connect your \dap{} to your computer is on 
   the bottom panel of the \dap{}.
@@ -156,7 +156,7 @@ described in detail in the following paragraph.
   \ButtonHold{} is off before trying to use your player. 
   }
   %
-  \opt{ipodnano1g}{
+  \opt{ipodnano}{
   The main controls on the \dap{} are a slightly indented wheel with a
   flat round button in the center. Hold the \dap{} with these controls on the
   top surface. There is a \ButtonHold{} switch at one end, and
@@ -194,7 +194,7 @@ described in detail in the following paragraph.
   round crosspad is labelled \ButtonMenu{}.
   }
   %
-  \opt{iriverh10,iriverh10_5gb}{
+  \opt{h10,h10_5gb}{
   Hold or lay the \dap{} so that the side with the scroll pad and
   LCD is facing towards you. In the centre below the lcd is the scroll pad. It
   is oriented vertically. Touching the top and bottom half of it acts as the 
@@ -207,12 +207,12 @@ described in detail in the following paragraph.
   hand side is the \ButtonPower{} button.
 
   On the top panel of the \dap{}, from left to right, you can find the 
-  following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port and
+  following: \ButtonHold{} switch, \opt{h10}{reset pin hole, }remote port and
   headphone mini jack plug. 
   
   On the bottom panel of the \dap{} is the data cable port.}
   %
-  \opt{gigabeatfx}{
+  \opt{gigabeatf}{
   \note{The following description is for the Gigabeat F, but can also apply for the
   Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the
   Gigabeat X is smaller and has a slightly tapered back.}
@@ -285,7 +285,7 @@ described in detail in the following paragraph.
   bottom of the unit, there is a connector for the docking station or the 
   proprietary USB connector for connecting directly to USB.}
   %
-  \opt{iaudiox5,iaudiom5}{
+  \opt{x5,m5}{
   The \dap{} is curved so that the end with the screen on it is thicker than the 
   other end.  Hold the \dap{} wih the thick end towards the top and the screen
   facing towards you.  Half way up the front of the unit on the right hand side
@@ -306,14 +306,14 @@ described in detail in the following paragraph.
   reset by inserting a paper clip.
   
   On the bottom of the unit is the connector for the 
-  \archosplayerman{} subpack or dock.  On the top of the unit is a charge 
+  \playerman{} subpack or dock.  On the top of the unit is a charge 
   indicator light, which may feel a bit like a button, but is not.
   
   From the top of the \dap{} on the left hand side is the headphone socket, then the 
-  remote connector.  Below this is a cover which protects the \opt{iaudiox5}{USB host
-  connector.}\opt{iaudiom5}{USB and charging connector}.}
+  remote connector.  Below this is a cover which protects the \opt{x5}{USB host
+  connector.}\opt{m5}{USB and charging connector}.}
   %
-  \opt{sansae200}{
+  \opt{e200}{
   Hold the \dap{} with the turning wheel at the front and bottom.  On the bottom left
   of the front of the \dap{} is a raised round button, the \ButtonPower{} button.
   Above and to the left of this, on the outside of the turning wheel are four 
@@ -329,7 +329,7 @@ described in detail in the following paragraph.
   other buttons have any effect.  Just to the left of the \ButtonHold{} switch is a
   small hole which contains the internal microphone.}
   %
-  \opt{sansac200}{
+  \opt{c200}{
   Hold the \dap{} with the buttons on the right and the screen on the left. On
   the right side of the unit, there is a series of four connected buttons that
   form a square. The four sides of the square are the \ButtonUp{},
@@ -351,7 +351,7 @@ described in detail in the following paragraph.
   Immediately above the headphone socket is a lanyard loop and the microphone.
   }
   %
-  \opt{sansaclip}{
+  \opt{clip}{
   Hold the \dap{} with the controls on the bottom and the screen on the top. The main
   controls are a four-way pad with a button in the centre; pressing this centre button
   functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains
@@ -369,7 +369,7 @@ described in detail in the following paragraph.
   above this button is the headphone jack.
   }
   %
-  \opt{archosplayer}{
+  \opt{player}{
   The main controls of this player are a four-way button on the right below
   the screen, and two round buttons to the left of it. Hold the \dap{} with
   these controls on the bottom and facing you.
@@ -384,7 +384,7 @@ described in detail in the following paragraph.
   the DC-In jack on the right, and the USB connector in the centre.
   }
   %
-  \opt{archosrecorder}{
+  \opt{recorder}{
   Holding the Jukebox in front of you, there should be three rectangular buttons
   in a horizontal line towards the middle of the unit, and below this to the left
   there is a circular four button array with the circular \ButtonPlay{} button
@@ -405,7 +405,7 @@ described in detail in the following paragraph.
   the right. On the bottom of the \dap{} is the Line-In jack on the left, the
   DC-In jack on the right, and the USB connector in the centre.
   }
-  \opt{archosrecorderv2fm}{
+  \opt{recorderv2fm}{
   Holding the Jukebox in front of you, there should be three rectangular buttons
   in a horizontal line towards the middle of the unit, and below this centred on the
   middle button there are four radial arc shaped buttons placed in a cross formation
@@ -441,8 +441,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
       & Start Rockbox\\
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
-      \opt{ONDIO_PAD,archosrecorderv2fm}{Long \ButtonOff}%
-      \opt{archosrecorder}{Double tap \ButtonOff\ when playback is stopped}%
+      \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
+      \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
       \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}%
           {Long \ButtonPower}%
@@ -476,11 +476,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   performed by inserting a paperclip gently into the Reset hole.
 }%
 
-\nopt{gigabeatfx,iaudiom3,iaudiom5,iaudiox5,archos}
+\nopt{gigabeatf,m3,m5,x5,archos}
   {
   \subsection{Starting the original firmware}
   \label{ref:Dualboot}
-  \opt{ipod4g,ipodcolor,ipodvideo,ipodnano1g,ipodmini1g}
+  \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodmini}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware, shut
     down the device as described above. Turn on the \ButtonHold{} switch
@@ -512,22 +512,22 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     simultaneously until the player hard resets.
     }
 
-  \opt{iriverh100,iriverh300}
+  \opt{h100,h300}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware,
     when the \dap{} is turned off, press and hold the \ButtonRec{} button,
     and then press the \ButtonOn{} button.
     }
 
-  \opt{iriverh10,iriverh10_5gb}
+  \opt{h10,h10_5gb}
     {
     Rockbox has a dual-boot feature. It loads the original firmware from
     the file \fname{/System/OF.mi4}. To boot into the original firmware,
     press and hold the \ButtonLeft{} button while turning on the player.
     \note{The iriver firmware does not shut down properly when you turn it off,
     it only goes to sleep. To get back into Rockbox when exiting from the
-    iriver firmware, you will need to reset the player by \opt{iriverh10}{inserting a
-    pin in the reset hole}\opt{iriverh10_5gb}{removing and reinserting the battery}.}
+    iriver firmware, you will need to reset the player by \opt{h10}{inserting a
+    pin in the reset hole}\opt{h10_5gb}{removing and reinserting the battery}.}
     }
     
   \opt{sansa,sansaAMS}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 362311ddaf..2c8ecfa17d 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -30,7 +30,7 @@ currently playing audio file.
   \item Peak meter.
   \end{itemize}
 }
-\opt{archosrecorder,archosrecorderv2fm,ondio}{
+\opt{recorder,recorderv2fm,ondio}{
   \note{
   \begin{itemize}
   \item The number of lines shown depends on the size of the font used.
@@ -40,7 +40,7 @@ currently playing audio file.
   }
 }
 %
-\opt{archosplayer}{
+\opt{player}{
   \note{
   \begin{itemize}
   \item Playlist index/Playlist size: Artist {}- Title.
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index 4970445773..9c32587fa1 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -1,13 +1,13 @@
 CFLAGS=-Wall -W
 
-BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini1g.h ipodmini2g.h ipodnano1g.h ipodvideo.h
+BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h
 
 # Uncomment the next two lines to build with embedded bootloaders and the 
 # --install option and interactive mode.  You need the full set of Rockbox 
 # bootloaders in this directory - download them from
 # http://download.rockbox.org/bootloader/ipod/bootloaders.zip
 
-#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini1g.c ipodmini2g.c ipodnano1g.c ipodvideo.c
+#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c
 #CFLAGS += -DWITH_BOOTOBJS
 
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
@@ -69,14 +69,14 @@ ipod4g.c: bootloader-ipod4g.ipod ipod2c
 ipodcolor.c: bootloader-ipodcolor.ipod ipod2c
         ./ipod2c bootloader-ipodcolor.ipod ipodcolor
 
-ipodmini1g.c: bootloader-ipodmini1g.ipod ipod2c
-        ./ipod2c bootloader-ipodmini1g.ipod ipodmini1g
+ipodmini.c: bootloader-ipodmini.ipod ipod2c
+        ./ipod2c bootloader-ipodmini.ipod ipodmini
 
 ipodmini2g.c: bootloader-ipodmini2g.ipod ipod2c
         ./ipod2c bootloader-ipodmini2g.ipod ipodmini2g
 
-ipodnano1g.c: bootloader-ipodnano1g.ipod ipod2c
-        ./ipod2c bootloader-ipodnano1g.ipod ipodnano1g
+ipodnano.c: bootloader-ipodnano.ipod ipod2c
+        ./ipod2c bootloader-ipodnano.ipod ipodnano
 
 ipodvideo.c: bootloader-ipodvideo.ipod ipod2c
         ./ipod2c bootloader-ipodvideo.ipod ipodvideo
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index 361232cd27..1a5268bb6d 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -37,10 +37,10 @@
 #include "ipod1g2g.h"
 #include "ipod3g.h"
 #include "ipod4g.h"
-#include "ipodmini1g.h"
+#include "ipodmini.h"
 #include "ipodmini2g.h"
 #include "ipodcolor.h"
-#include "ipodnano1g.h"
+#include "ipodnano.h"
 #include "ipodvideo.h"
 #endif
 
@@ -1224,7 +1224,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version)
             ipod->modelstr="1st Generation Nano";
             ipod->modelnum = 4;
             ipod->modelname = "nano";
-            ipod->targetname = "ipodnano1g";
+            ipod->targetname = "ipodnano";
 #ifdef WITH_BOOTOBJS
             ipod->bootloader = ipodnano;
             ipod->bootloader_len = LEN_ipodnano;
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index df3f5ef6c9..7230e2c08c 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -16,20 +16,20 @@ genlang_url=http://www.rockbox.org/genlang/
 rbutil_url=http://download.rockbox.org/rbutil/
 
 [platforms]
-platform01=archosplayer
-platform02=archosrecorder
-platform03=archosrecorder8mb
-platform04=archosrecorderv2
-platform05=archosfmrecorder
-platform06=archosfmrecorder8mb
-platform07=archosondiosp
-platform08=archosondiofm
-platform10=iriverh100
-platform11=iriverh120
-platform12=iriverh300
-platform13=iriverh10_5gbums
-platform14=iriverh10_5gbmtp
-platform15=iriverh10
+platform01=player
+platform02=recorder
+platform03=recorder8mb
+platform04=recorderv2
+platform05=fmrecorder
+platform06=fmrecorder8mb
+platform07=ondiosp
+platform08=ondiofm
+platform10=h100
+platform11=h120
+platform12=h300
+platform13=h10_5gbums
+platform14=h10_5gbmtp
+platform15=h10
 platform20=ipod1g2g
 platform21=ipod3g
 platform22=ipod4gray
@@ -38,12 +38,12 @@ platform24=ipodvideo
 platform25=ipodvideo64mb
 platform26=ipodmini1g
 platform27=ipodmini2g
-platform28=ipodnano1g
+platform28=ipodnano
 platform30=iaudiox5
 platform31=iaudiom5
 platform32=iaudiox5v
 platform33=iaudiom3
-platform40=gigabeatfx
+platform40=gigabeatf
 platform44=ondavx747
 platform45=ondavx747p
 platform46=ondavx777
@@ -54,154 +54,154 @@ platform53=sansafuze
 platform54=sansam200v4
 platform55=sansaclip
 platform60=mrobe100
-platform70=samsungyh820
-platform71=samsungyh920
-platform72=samsungyh925
+platform70=smsgyh820
+platform71=smsgyh920
+platform72=smsgyh925
 
 
-[archosplayer]
+[player]
 name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20"
-buildserver_modelname=archosplayer
+buildserver_modelname=player
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosplayer
+configure_modelname=player
 encoder=lame
 
-[archosrecorder]
+[recorder]
 name="Jukebox Recorder 6 / 10 / 15 / 20"
-buildserver_modelname=archosrecorder
+buildserver_modelname=recorder
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosrecorder
+configure_modelname=recorder
 encoder=lame
 
-[archosrecorder8mb]
+[recorder8mb]
 name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)"
-buildserver_modelname=archosrecorder8mb
+buildserver_modelname=recorder8mb
 bootloadermethod=none
 bootloadername=
-manualname=rockbox-archosrecorder
+manualname=rockbox-recorder
 brand=Archos
-configure_modelname=archosrecorder
+configure_modelname=recorder
 encoder=lame
 
-[archosrecorderv2]
+[recorderv2]
 name="Jukebox Recorder v2 (20GB)"
-buildserver_modelname=archosrecorderv2
+buildserver_modelname=recorderv2
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosrecorderv2
+configure_modelname=recorderv2
 encoder=lame
 
-[archosfmrecorder]
+[fmrecorder]
 name="Jukebox Recorder FM"
-buildserver_modelname=archosfmrecorder
+buildserver_modelname=fmrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosfmrecorder
+configure_modelname=fmrecorder
 encoder=lame
 
-[archosfmrecorder8mb]
+[fmrecorder8mb]
 name="Jukebox Recorder FM (with 8MiB memory)"
-buildserver_modelname=archosfmrecorder8mb
+buildserver_modelname=fmrecorder8mb
 bootloadermethod=none
 bootloadername=
-manualname=rockbox-archosfmrecorder
+manualname=rockbox-fmrecorder
 brand=Archos
-configure_modelname=archosfmrecorder
+configure_modelname=fmrecorder
 encoder=lame
 
-[iriverondiosp]
+[ondiosp]
 name="Ondio SP"
-buildserver_modelname=archosondiosp
+buildserver_modelname=ondiosp
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosondiosp
+configure_modelname=ondiosp
 encoder=lame
 
-[iriverondiofm]
+[ondiofm]
 name="Ondio FM"
-buildserver_modelname=archosondiofm
+buildserver_modelname=ondiofm
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosondiofm
+configure_modelname=ondiofm
 encoder=lame
 
-[iriverh100]
+[h100]
 name="iHP100 / iHP110"
-buildserver_modelname=iriverh100
+buildserver_modelname=h100
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h100.bin
 bootloaderfile=/ihp_100.hex
-manualname=rockbox-iriverh100
+manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063001
-configure_modelname=iriverh100
+configure_modelname=h100
 encoder=rbspeex
 
-[iriverh120]
+[h120]
 name="iHP120 / iHP140 / H120 / H140"
-buildserver_modelname=iriverh120
+buildserver_modelname=h120
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h120.bin
 bootloaderfile=/ihp_120.hex
-manualname=rockbox-iriverh100
+manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063002
-configure_modelname=iriverh120
+configure_modelname=h120
 encoder=rbspeex
 
-[iriverh300]
+[h300]
 name="H320 / H340"
-buildserver_modelname=iriverh300
+buildserver_modelname=h300
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h300.bin
 bootloaderfile=/H300.hex
-manualname=rockbox-iriverh300
+manualname=rockbox-h300
 brand=Iriver
 usbid=0x10063003
-configure_modelname=iriverh300
+configure_modelname=h300
 encoder=rbspeex
 
-[iriverh10_5gbums]
+[h10_5gbums]
 name="H10 (5 / 6GB) UMS"
-buildserver_modelname=iriverh10_5gb
+buildserver_modelname=h10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022002
-configure_modelname=iriverh10_5gb
+configure_modelname=h10_5gb
 encoder=rbspeex
 
-[iriverh10_5gbmtp]
+[h10_5gbmtp]
 name="H10 (5 / 6GB) MTP"
-buildserver_modelname=iriverh10_5gb
+buildserver_modelname=h10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10_5GB-MTP/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022105
-configure_modelname=iriverh10_5gb
+configure_modelname=h10_5gb
 encoder=rbspeex
 
-[iriverh10]
+[h10]
 name="H10 (20GB)"
-buildserver_modelname=iriverh10
+buildserver_modelname=h10
 bootloadermethod=mi4
 bootloadername=/iriver/H10_20GC.mi4
 bootloaderfile=/System/H10_20GC.mi4
@@ -209,7 +209,7 @@ manualname=
 brand=Iriver
 usbid=0x0b7000ba
 usberror=0x41022101
-configure_modelname=iriverh10
+configure_modelname=h10
 encoder=rbspeex
 
 [ipod1g2g]
@@ -232,14 +232,14 @@ brand=Apple
 configure_modelname=ipodcolor
 encoder=rbspeex
 
-[ipodnano1g]
+[ipodnano]
 name="Ipod Nano (1st gen)"
-buildserver_modelname=ipodnano1g
+buildserver_modelname=ipodnano
 bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodnano1g.ipod
+bootloadername=/ipod/bootloader-ipodnano.ipod
 manualname=
 brand=Apple
-configure_modelname=ipodnano1g
+configure_modelname=ipodnano
 encoder=rbspeex
 
 [ipod4gray]
@@ -287,7 +287,7 @@ encoder=rbspeex
 name="Ipod Mini (1st gen)"
 buildserver_modelname=ipodmini1g
 bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodmini1g.ipod
+bootloadername=/ipod/bootloader-ipodmini.ipod
 manualname=rockbox-ipodmini2g
 brand=Apple
 configure_modelname=ipodmini
@@ -312,7 +312,7 @@ bootloaderfile=/FIRMWARE/x5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210510, 0x0e210513
-configure_modelname=iaudiox5
+configure_modelname=x5
 encoder=rbspeex
 
 [iaudiox5v]
@@ -323,7 +323,7 @@ bootloadername=/iaudio/x5v_fw.bin
 bootloaderfile=/FIRMWARE/x5v_fw.bin
 manualname=
 brand=Cowon
-configure_modelname=iaudiox5
+configure_modelname=x5
 encoder=rbspeex
 
 [iaudiom5]
@@ -335,7 +335,7 @@ bootloaderfile=/FIRMWARE/m5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210520
-configure_modelname=iaudiom5
+configure_modelname=m5
 encoder=rbspeex
 
 [iaudiom3]
@@ -347,19 +347,19 @@ bootloaderfile=/FIRMWARE/cowon_m3.bin
 manualname=
 brand=Cowon
 usbid=0x0e210500
-configure_modelname=iaudiom3
+configure_modelname=m3
 encoder=rbspeex
 
-[gigabeatfx]
+[gigabeatf]
 name="Gigabeat F / X"
-buildserver_modelname=gigabeatfx
+buildserver_modelname=gigabeatf
 bootloadermethod=file
 bootloadername=/gigabeat/FWIMG01.DAT
 bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT
 manualname=
 brand=Toshiba
 usbid=0x09300009
-configure_modelname=gigabeatfx
+configure_modelname=gigabeatf
 encoder=rbspeex
 
 [sansae200]
@@ -371,7 +371,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817421
 usberror=0x07810720
-configure_modelname=sansae200
+configure_modelname=e200
 encoder=rbspeex
 
 [sansac200]
@@ -382,7 +382,7 @@ bootloadername=/sandisk-sansa/c200/firmware.mi4
 manualname=
 brand=Sandisk
 usbid=0x07817450, 0x07817451
-configure_modelname=sansac200
+configure_modelname=c200
 encoder=rbspeex
 
 [sansae200v2]
@@ -395,7 +395,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817423
 usberror=0x07817422
-configure_modelname=sansae200v2
+configure_modelname=e200v2
 encoder=rbspeex
 
 [sansafuze]
@@ -408,7 +408,7 @@ manualname=
 brand=Sandisk
 usbid=0x078174c1
 usberror=0x078174c0
-configure_modelname=sansafuze
+configure_modelname=fuze
 encoder=rbspeex
 
 [sansam200v4]
@@ -421,7 +421,7 @@ manualname=
 brand=Sandisk
 usbid=
 usberror=
-configure_modelname=sansam200v4
+configure_modelname=m200v4
 encoder=rbspeex
 status=disabled
 
@@ -435,7 +435,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817433
 usberror=0x07817432
-configure_modelname=sansaclip
+configure_modelname=clip
 encoder=rbspeex
 status=disabled
 
@@ -490,42 +490,42 @@ configure_modelname=ondavx777
 encoder=rbspeex
 status=disabled
 
-[samsungyh820]
+[smsgyh820]
 name="YH-820"
-buildserver_modelname=samsungyh820
+buildserver_modelname=yh820
 bootloadermethod=mi4
 bootloadername=/samsung/FW_YH820.mi4
 bootloaderfile=/SYSTEM/FW_YH820.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85023
-configure_modelname=samsungyh820
+configure_modelname=yh820
 encoder=rbspeex
 status=disabled
 
-[samsungyh920]
+[smsgyh920]
 name="YH-920"
-buildserver_modelname=samsungyh920
+buildserver_modelname=yh920
 bootloadermethod=mi4
 bootloadername=/samsung/PP5020.mi4
 bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85022, 0x04e8501d
-configure_modelname=samsungyh920
+configure_modelname=yh920
 encoder=rbspeex
 status=disabled
 
-[samsungyh925]
+[smsgyh925]
 name="YH-925"
-buildserver_modelname=samsungyh925
+buildserver_modelname=yh925
 bootloadermethod=mi4
 bootloadername=/samsung/FW_YH925.mi4
 bootloaderfile=/SYSTEM/FW_YH925.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85024
-configure_modelname=samsungyh925
+configure_modelname=yh925
 encoder=rbspeex
 status=disabled
 
diff --git a/tools/builds.pm b/tools/builds.pm
deleted file mode 100644
index 634ffd0d12..0000000000
--- a/tools/builds.pm
+++ /dev/null
@@ -1,313 +0,0 @@
-$publicrelease="3.4";
-$releasedate="September 24, 2009";
-$releasenotes="/wiki/ReleaseNotes34";
-
-%builds = (
-    'archosav300' => {
-        name => 'Archos AV300',
-        status => 1, # 3=stable, 2=unstable, 1=unusable
-    },
-    'archosfmrecorder' => {
-        name => 'Archos FM Recorder',
-        status => 3,
-    },
-    'archosondiofm' => {
-        name => 'Archos Ondio FM',
-        status => 3,
-    },
-    'archosondiosp' => {
-        name => 'Archos Ondio SP',
-        status => 3,
-    },
-    'archosplayer' => {
-        name => 'Archos Player/Studio',
-        status => 3,
-    },
-    'archosrecorder' => {
-        name => 'Archos Recorder v1',
-        status => 3,
-    },
-    'archosrecorderv2' => {
-        name => 'Archos Recorder v2', 
-        status => 3,
-    },
-    'cowond2' => {
-        name => 'Cowon D2',
-        status => 2,
-    },
-    'gigabeatfx' => {
-        name => 'Toshiba Gigabeat F/X',
-        status => 3,
-    },
-    'gigabeats' => {
-        name => 'Toshiba Gigabeat S',
-        status => 2,
-    },
-    'gogearhdd1630' => {
-        name => 'Philips GoGear HDD1630',
-        status => 1,
-    },
-    'gogearsa9200' => {
-        name => 'Philips GoGear SA9200',
-        status => 1,
-    },
-    'iaudio7' => {
-        name => 'iAudio 7',
-        status => 1,
-    },
-    'iaudiom3' => {
-        name => 'iAudio M3',
-        status => 3,
-    },
-    'iaudiom5' => {
-        name => 'iAudio M5',
-        status => 3,
-    },
-    'iaudiox5' => {
-        name => 'iAudio X5',
-        status => 3,
-    },
-    'ipod1g2g' => {
-        name => 'iPod 1st and 2nd gen',
-        status => 3,
-    },
-    'ipod3g' => {
-        name => 'iPod 3rd gen',
-        status => 3,
-    },
-    'ipod4g' => {
-        name => 'iPod 4th gen Grayscale',
-        status => 3,
-    },
-    'ipodcolor' => {
-        name => 'iPod color/Photo',
-        status => 3,
-    },
-    'ipodmini1g' => {
-        name => 'iPod Mini 1st gen',
-        status => 3,
-        manual => 'ipodmini2g',
-    },
-    'ipodmini2g' => {
-        name => 'iPod Mini 2nd gen',
-        status => 3,
-        icon => 'ipodmini1g',
-    },
-    'ipodnano1g' => {
-        name => 'iPod Nano 1st gen',
-        status => 3,
-    },
-    'ipodnano2g' => {
-        name => 'iPod Nano 2nd gen',
-        status => 3,
-    },
-    'ipodvideo' => {
-        name => 'iPod Video 30GB',
-        status => 3,
-    },
-    'ipodvideo64mb' => {
-        name => 'iPod Video 60/80GB',
-        status => 3,
-        icon => 'ipodvideo',
-        manual => 'ipodvideo',
-        voice => 'ipodvideo',
-        configname => 'ipodvideo',
-        ram => 64
-    },
-    'iriverh10' => {
-        name => 'iriver H10 20GB',
-        status => 3,
-    },
-    'iriverh10_5gb' => {
-        name => 'iriver H10 5GB',
-        status => 3,
-        manual => 'iriverh10',
-    },
-    'iriverh100' => {
-        name => 'iriver H100/115',
-        status => 3,
-    },
-    'iriverh120' => {
-        name => 'iriver H120/140',
-        status => 3,
-        icon => 'iriverh100',
-        manual => 'iriverh100',
-    },
-    'iriverh300' => {
-        name => 'iriver H320/340',
-        status => 3,
-    },
-    'iriverifp7xx' => {
-        name => 'iriver iFP-7xx',
-        status => 1,
-    },
-    'logikdax' => {
-        name => 'Logik DAX',
-        status => 1,
-    },
-    'lyreproto1' => {
-        name => 'Lyre Prototype 1',
-        status => 1,
-    },
-    'mini2440' => {
-        name => 'Mini 2440',
-        status => 1,
-    },
-    'meizum3' => {
-        name => 'Meizu M3',
-        status => 1,
-    },
-    'meizum6sl' => {
-        name => 'Meizu M6SL',
-        status => 1,
-    },
-    'meizum6sp' => {
-        name => 'Meizu M6SP',
-        status => 1,
-    },
-    'mrobe100' => {
-        name => 'Olympus M-Robe 100',
-        status => 3,
-    },
-    'mrobe500' => {
-        name => 'Olympus M-Robe 500',
-        status => 2,
-    },
-    'ondavx747' => {
-        name => 'Onda VX747',
-        status => 1,
-    },
-    'ondavx747p' => {
-        name => 'Onda VX747+',
-        status => 1,
-    },
-    'ondavx767' => {
-        name => 'Onda VX767',
-        status => 1,
-    },
-    'ondavx777' => {
-        name => 'Onda VX777',
-        status => 1,
-    },
-    'samsungyh820' => {
-        name => 'Samsung YH-820',
-        status => 2,
-    },
-    'samsungyh920' => {
-        name => 'Samsung YH-920',
-        status => 2,
-    },
-    'samsungyh925' => {
-        name => 'Samsung YH-925',
-        status => 2,
-    },
-    'samsungyps3' => {
-        name => 'Samsung YP-S3',
-        status => 1,
-    },
-    'sansac100' => {
-        name => 'SanDisk Sansa c100',
-        status => 1,
-    },
-    'sansac200' => {
-        name => 'SanDisk Sansa c200',
-        status => 3,
-    },
-    'sansac200v2' => {
-        name => 'SanDisk Sansa c200 v2',
-        status => 1,
-        icon => 'sansac200',
-    },
-    'sansaclip' => {
-        name => 'SanDisk Sansa Clip',
-        status => 2,
-    },
-    'sansaclipv2' => {
-        name => 'SanDisk Sansa Clip v2',
-        status => 1,
-    },
-    'sansae200' => {
-        name => 'SanDisk Sansa e200',
-        status => 3,
-    },
-    'sansae200r' => {
-        name => 'SanDisk Sansa e200R',
-        status => 3,
-        icon => 'sansae200',
-    },
-    'sansae200v2' => {
-        name => 'SanDisk Sansa e200 v2',
-        status => 3,
-        icon => 'sansae200',
-    },
-    'sansafuze' => {
-        name => 'SanDisk Sansa Fuze',
-        status => 2,
-    },
-    'sansam200' => {
-        name => 'SanDisk Sansa m200',
-        status => 1,
-    },
-    'sansam200v4' => {
-        name => 'SanDisk Sansa m200 v4',
-        status => 1,
-    },
-    'sansaview' => {
-        name => 'SanDisk Sansa View',
-        status => 1,
-    },
-    'tatungtpj1022' => {
-        name => 'Tatung Elio TPJ-1022',
-        status => 1,
-    },
-    'zenvision' => {
-        name => 'Creative Zen Vision',
-        status => 1,
-    },
-    'zenvisionm30gb' => {
-        name => 'Creative Zen Vision:M 30GB',
-        status => 1,
-    },
-    'zenvisionm60gb' => {
-        name => 'Creative Zen Vision:M 60GB',
-        status => 1,
-    },
-);
-
-sub manualname {
-    my $m = shift @_;
-
-    return $builds{$m}{manual} ? "$builds{$m}{manual}" : $m;
-}    
-
-sub voicename {
-    my $m = shift @_;
-
-    return $builds{$m}{voice} ? "$builds{$m}{voice}" : $m;
-}
-
-sub byname {
-    return $builds{$a}{name} cmp $builds{$b}{name};
-}
-
-sub usablebuilds {
-    my @list;
-
-    for my $b (sort byname keys %builds) {
-        push @list, $b if ($builds{$b}{status} >= 2);
-    }
-
-    return @list;
-}
-
-sub stablebuilds {
-    my @list;
-
-    for my $b (sort byname keys %builds) {
-        push @list, $b if ($builds{$b}{status} >= 3);
-    }
-
-    return @list;
-}
-
-1;
diff --git a/tools/checkwps/targets.txt b/tools/checkwps/targets.txt
index 711d6784fa..33684b75a7 100644
--- a/tools/checkwps/targets.txt
+++ b/tools/checkwps/targets.txt
@@ -1,39 +1,39 @@
-ARCHOS_RECORDER archosrecorder
-ARCHOS_FMRECORDER archosfmrecorder
-ARCHOS_RECORDERV2 archosrecorderv2
-ARCHOS_ONDIOSP archosondiosp
-ARCHOS_ONDIOFM archosondiofm
-IRIVER_H120 iriverh120
-IRIVER_H300 iriverh300
-IRIVER_H100 iriverh100
-IRIVER_IFP7XX iriverifp7xx
-IRIVER_H10 iriverh10
-IRIVER_H10_5GB iriverh10_5gb
+ARCHOS_RECORDER recorder
+ARCHOS_FMRECORDER fmrecorder
+ARCHOS_RECORDERV2 recorderv2
+ARCHOS_ONDIOSP ondiosp
+ARCHOS_ONDIOFM ondiofm
+IRIVER_H120 h120
+IRIVER_H300 h300
+IRIVER_H100 h100
+IRIVER_IFP7XX ifp7xx
+IRIVER_H10 h10
+IRIVER_H10_5GB h10_5gb
 IPOD_COLOR ipodcolor
-IPOD_NANO ipodnano1g
+IPOD_NANO ipodnano
 IPOD_VIDEO ipodvideo
 IPOD_3G ipod3g
 IPOD_4G ipod4g
-IPOD_MINI ipodmini1g
+IPOD_MINI ipodmini
 IPOD_MINI2G ipodmini2g
 IPOD_1G2G ipod1g2g
-IAUDIO_X5 iaudiox5
-IAUDIO_M5 iaudiom5
+IAUDIO_X5 x5
+IAUDIO_M5 m5
 COWON_D2 cowond2
-IAUDIO_M3 iaudiom3
-GIGABEAT_F gigabeatfx
+IAUDIO_M3 m3
+GIGABEAT_F gigabeatf
 GIGABEAT_S gigabeats
 MROBE_500 mrobe500
 MROBE_100 mrobe100
 LOGIK_DAX logikdax
-CREATIVE_ZVM zenvisionm30gb
-CREATIVE_ZVM60GB zenvisionm60gb
-CREATIVE_ZV zenvision
-SANSA_E200 sansae200
-SANSA_E200 sansae200r
-SANSA_C200 sansac200
-SANSA_M200 sansam200
-SANSA_C100 sansac100
-ELIO_TPJ1022 tatungtpj1022
+CREATIVE_ZVM creativezvm30gb
+CREATIVE_ZVM60GB creativezvm60gb
+CREATIVE_ZV creativezenvision
+SANSA_E200 e200
+SANSA_E200 e200r
+SANSA_C200 c200
+SANSA_M200 m200
+SANSA_C100 c100
+ELIO_TPJ1022 tpj1022
 ONDA_VX747 ondavx747
 ONDA_VX777 ondavx777
diff --git a/tools/configure b/tools/configure
index 9745ae2a53..693113e19f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -315,16 +315,16 @@ whichadvanced () {
     if [ "$memory" = "2" ]; then
       printf ", (8)MB MOD"
     fi
-    if [ "$modelname" = "archosplayer" ]; then
+    if [ "$modelname" = "player" ]; then
       printf ", Use (A)TA poweroff"
     fi
     if [ "$t_model" = "ondio" ]; then
       printf ", (B)acklight MOD"
     fi
-    if [ "$modelname" = "iaudiom5" ]; then
+    if [ "$modelname" = "m5" ]; then
       printf ", (F)M radio MOD"
     fi
-    if [ "$modelname" = "iriverh120" ]; then
+    if [ "$modelname" = "h120" ]; then
       printf ", (R)TC MOD"
     fi
     echo ""
@@ -375,7 +375,7 @@ whichadvanced () {
         fi
         ;;
       [Aa])
-        if [ "$modelname" = "archosplayer" ]; then
+        if [ "$modelname" = "player" ]; then
           have_ata_poweroff="#define HAVE_ATA_POWEROFF"
           echo "ATA poweroff enabled"
         fi
@@ -387,13 +387,13 @@ whichadvanced () {
         fi
         ;;
       [Ff])
-        if [ "$modelname" = "iaudiom5" ]; then
+        if [ "$modelname" = "m5" ]; then
           have_fmradio_in="#define HAVE_FMRADIO_IN"
           echo "FM radio functions enabled"
         fi
         ;;
       [Rr])
-        if [ "$modelname" = "iriverh120" ]; then
+        if [ "$modelname" = "h120" ]; then
           config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231"
           have_rtc_alarm="#define HAVE_RTC_ALARM"
           echo "RTC functions enabled (DS1339/DS3231)"
@@ -839,7 +839,7 @@ else
 cat <<EOF
  ==Archos==               ==iriver==             ==Apple iPod==
   0) Player/Studio        10) H120/H140          20) Color/Photo
-  1) Recorder             11) H320/H340          21) Nano 1G
+  1) Recorder             11) H320/H340          21) Nano
   2) FM Recorder          12) iHP-100/110/115    22) Video
   3) Recorder v2          13) iFP-790            23) 3G
   4) Ondio SP             14) H10 20Gb           24) 4G Grayscale
@@ -928,9 +928,9 @@ fi
 
   case $buildfor in
 
-   0|archosplayer)
+   0|player)
     target_id=1
-    modelname="archosplayer"
+    modelname="player"
     target="-DARCHOS_PLAYER"
     shcc
     tool="$rootdir/tools/scramble"
@@ -954,9 +954,9 @@ fi
     t_model="player"
     ;;
 
-   1|archosrecorder)
+   1|recorder)
     target_id=2
-    modelname="archosrecorder"
+    modelname="recorder"
     target="-DARCHOS_RECORDER"
     shcc
     tool="$rootdir/tools/scramble"
@@ -976,9 +976,9 @@ fi
     t_model="recorder"
     ;;
 
-   2|archosfmrecorder)
+   2|fmrecorder)
     target_id=3
-    modelname="archosfmrecorder"
+    modelname="fmrecorder"
     target="-DARCHOS_FMRECORDER"
     shcc
     tool="$rootdir/tools/scramble -fm"
@@ -998,9 +998,9 @@ fi
     t_model="fm_v2"
     ;;
 
-   3|archosrecorderv2)
+   3|recorderv2)
     target_id=4
-    modelname="archosrecorderv2"
+    modelname="recorderv2"
     target="-DARCHOS_RECORDERV2"
     shcc
     tool="$rootdir/tools/scramble -v2"
@@ -1020,9 +1020,9 @@ fi
     t_model="fm_v2"
     ;;
 
-   4|archosondiosp)
+   4|ondiosp)
     target_id=7
-    modelname="archosondiosp"
+    modelname="ondiosp"
     target="-DARCHOS_ONDIOSP"
     shcc
     tool="$rootdir/tools/scramble -osp"
@@ -1042,9 +1042,9 @@ fi
     t_model="ondio"
     ;;
 
-   5|archosondiofm)
+   5|ondiofm)
     target_id=8
-    modelname="archosondiofm"
+    modelname="ondiofm"
     target="-DARCHOS_ONDIOFM"
     shcc
     tool="$rootdir/tools/scramble -ofm"
@@ -1062,9 +1062,9 @@ fi
     t_model="ondio"
     ;;
 
-   6|archosav300)
+   6|av300)
     target_id=38
-    modelname="archosav300"
+    modelname="av300"
     target="-DARCHOS_AV300"
     memory=16 # always
     arm7tdmicc
@@ -1084,9 +1084,9 @@ fi
     t_model="av300"
     ;;
 
-  10|iriverh120)
+  10|h120)
     target_id=9
-    modelname="iriverh120"
+    modelname="h120"
     target="-DIRIVER_H120"
     memory=32 # always
     coldfirecc
@@ -1108,9 +1108,9 @@ fi
     t_model="h100"
     ;;
 
-   11|iriverh300)
+   11|h300)
     target_id=10
-    modelname="iriverh300"
+    modelname="h300"
     target="-DIRIVER_H300"
     memory=32 # always
     coldfirecc
@@ -1131,9 +1131,9 @@ fi
     t_model="h300"
     ;;
 
-   12|iriverh100)
+   12|h100)
     target_id=11
-    modelname="iriverh100"
+    modelname="h100"
     target="-DIRIVER_H100"
     memory=16 # always
     coldfirecc
@@ -1155,9 +1155,9 @@ fi
     t_model="h100"
     ;;
 
-   13|iriverifp7xx)
+   13|ifp7xx)
     target_id=19
-    modelname="iriverifp7xx"
+    modelname="ifp7xx"
     target="-DIRIVER_IFP7XX"
     memory=1
     arm7tdmicc short
@@ -1176,9 +1176,9 @@ fi
     t_model="iriver-ifp7xx"
     ;;
 
-   14|iriverh10)
+   14|h10)
     target_id=22
-    modelname="iriverh10"
+    modelname="h10"
     target="-DIRIVER_H10"
     memory=32 # always
     arm7tdmicc
@@ -1200,9 +1200,9 @@ fi
     t_model="h10"
     ;;
 
-   15|iriverh10_5gb)
+   15|h10_5gb)
     target_id=24
-    modelname="iriverh10_5gb"
+    modelname="h10_5gb"
     target="-DIRIVER_H10_5GB"
     memory=32 # always
     arm7tdmicc
@@ -1247,9 +1247,9 @@ fi
     t_model="color"
     ;;
 
-   21|ipodnano1g)
+   21|ipodnano)
     target_id=14
-    modelname="ipodnano1g"
+    modelname="ipodnano"
     target="-DIPOD_NANO"
     memory=32 # always
     arm7tdmicc
@@ -1338,9 +1338,9 @@ fi
     t_model="4g"
     ;;
 
-   25|ipodmini1g)
+   25|ipodmini)
     target_id=18
-    modelname="ipodmini1g"
+    modelname="ipodmini"
     target="-DIPOD_MINI"
     memory=32 # always
     arm7tdmicc
@@ -1431,9 +1431,9 @@ fi
     t_model="ipodnano2g"
     ;;
 
-   30|iaudiox5)
+   30|x5)
     target_id=12
-    modelname="iaudiox5"
+    modelname="x5"
     target="-DIAUDIO_X5"
     memory=16 # always
     coldfirecc
@@ -1455,9 +1455,9 @@ fi
     t_model="x5"
     ;;
 
-   31|iaudiom5)
+   31|m5)
     target_id=28
-    modelname="iaudiom5"
+    modelname="m5"
     target="-DIAUDIO_M5"
     memory=16 # always
     coldfirecc
@@ -1524,9 +1524,9 @@ fi
     t_model="cowond2"
     ;;
     
-   34|iaudiom3)
+   34|m3)
     target_id=37
-    modelname="iaudiom3"
+    modelname="m3"
     target="-DIAUDIO_M3"
     memory=16 # always
     coldfirecc
@@ -1546,9 +1546,9 @@ fi
     t_model="m3"
     ;;
 
-   40|gigabeatfx)
+   40|gigabeatf)
     target_id=20
-    modelname="gigabeatfx"
+    modelname="gigabeatf"
     target="-DGIGABEAT_F"
     memory=32 # always
     arm9tdmicc
@@ -1664,9 +1664,9 @@ fi
     t_model="logikdax"
     ;;
         
-    90|zenvisionm30gb)
+    90|creativezvm30gb)
     target_id=35
-    modelname="zenvisionm30gb"
+    modelname="creativezvm30"
     target="-DCREATIVE_ZVM"
     memory=64
     arm926ejscc
@@ -1687,9 +1687,9 @@ fi
     t_model="creative-zvm"
     ;;
     
-    91|zenvisionm60gb)
+    91|creativezvm60gb)
     target_id=40
-    modelname="creativezvm60gb"
+    modelname="creativezvm60"
     target="-DCREATIVE_ZVM60GB"
     memory=64
     arm926ejscc
@@ -1710,9 +1710,9 @@ fi
     t_model="creative-zvm"
     ;;
     
-    92|zenvision)
+    92|creativezenvision)
     target_id=39
-    modelname="zenvision"
+    modelname="creativezv"
     target="-DCREATIVE_ZV"
     memory=64
     arm926ejscc
@@ -1733,9 +1733,9 @@ fi
     t_model="creative-zvm"
     ;;
 
-   50|sansae200)
+   50|e200)
     target_id=23
-    modelname="sansae200"
+    modelname="e200"
     target="-DSANSA_E200"
     memory=32 # supposedly
     arm7tdmicc
@@ -1757,12 +1757,12 @@ fi
     t_model="sansa-e200"
     ;;
 
-   51|sansae200r)
+   51|e200r)
     # the e200R model is pretty much identical to the e200, it only has a
     # different option to the scramble tool when building a bootloader and
     # makes the bootloader output file name in all lower case.
     target_id=27
-    modelname="sansae200r"
+    modelname="e200r"
     target="-DSANSA_E200"
     memory=32 # supposedly
     arm7tdmicc
@@ -1784,9 +1784,9 @@ fi
     t_model="sansa-e200"
     ;;
 
-   52|sansac200)
+   52|c200)
     target_id=30
-    modelname="sansac200"
+    modelname="c200"
     target="-DSANSA_C200"
     memory=32 # supposedly
     arm7tdmicc
@@ -1808,9 +1808,9 @@ fi
     t_model="sansa-c200"
     ;;
 
-   53|sansam200)
+   53|m200)
     target_id=48
-    modelname="sansam200"
+    modelname="m200"
     target="-DSANSA_M200"
     memory=1 # always
     arm946cc
@@ -1832,9 +1832,9 @@ fi
     t_model="m200"
     ;;
 
-   54|sansac100)
+   54|c100)
     target_id=42 
-    modelname="sansac100" 
+    modelname="c100" 
     target="-DSANSA_C100"     
     memory=2
     arm946cc
@@ -1856,9 +1856,9 @@ fi
     t_model="c100"
     ;;
 
-   55|sansaclip)
+   55|Clip|clip)
     target_id=50
-    modelname="sansaclip"
+    modelname="clip"
     target="-DSANSA_CLIP"
     memory=2
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1877,9 +1877,9 @@ fi
     ;;
 
 
-   56|sansae200v2)
+   56|e200v2)
     target_id=51
-    modelname="sansae200v2"
+    modelname="e200v2"
     target="-DSANSA_E200V2"
     memory=8
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1898,9 +1898,9 @@ fi
     ;;
 
 
-   57|sansam200v4)
+   57|m200v4)
     target_id=52
-    modelname="sansam200v4"
+    modelname="m200v4"
     target="-DSANSA_M200V4"
     memory=2
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1919,9 +1919,9 @@ fi
     ;;
 
 
-   58|sansafuze)
+   58|fuze)
     target_id=53
-    modelname="sansafuze"
+    modelname="fuze"
     target="-DSANSA_FUZE"
     memory=8
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1940,9 +1940,9 @@ fi
     ;;
 
 
-   59|sansac200v2)
+   59|c200v2)
     target_id=55
-    modelname="sansac200v2"
+    modelname="c200v2"
     target="-DSANSA_C200V2"
     memory=2 # as per OF diagnosis mode
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1963,11 +1963,11 @@ fi
     arm9tdmicc
     ;;
 
-   60|sansaclipv2)
+   60|Clipv2|clipv2)
     echo "Sansa Clipv2 is not yet supported !"
     exit 1
     target_id=60
-    modelname="sansaclipv2"
+    modelname="clipv2"
     target="-DSANSA_CLIPV2"
     memory=8
     arm926ejscc
@@ -1985,11 +1985,11 @@ fi
     t_model="sansa-clipv2"
     ;;
 
-   61|sansaview)
+   61|view)
     echo "Sansa View is not yet supported!"
     exit 1
     target_id=63
-    modelname="sansaview"
+    modelname="view"
     target="-DSANSA_VIEW"
     memory=32
     arm1176jzscc
@@ -2009,10 +2009,10 @@ fi
     t_model="sansa-view"
     ;;
 
-   150|tatungtpj1022)
+   150|tpj1022)
     target_id=25
-    modelname="tatungtpj1022"
-    target="-DTATUNG_TPJ1022"
+    modelname="tpj1022"
+    target="-DELIO_TPJ1022"
     memory=32 # always
     arm7tdmicc
     tool="$rootdir/tools/scramble -add tpj2"
@@ -2033,9 +2033,9 @@ fi
     t_model="tpj1022"
     ;;
 
-   100|gogearsa9200)
+   100|sa9200)
     target_id=41
-    modelname="gogearsa9200"
+    modelname="sa9200"
     target="-DPHILIPS_SA9200"
     memory=32 # supposedly
     arm7tdmicc
@@ -2057,9 +2057,9 @@ fi
     t_model="sa9200"
     ;;
 
-   101|gogearhdd1630)
+   101|hdd1630)
     target_id=43
-    modelname="gogearhdd1630"
+    modelname="hdd1630"
     target="-DPHILIPS_HDD1630"
     memory=32 # supposedly
     arm7tdmicc
@@ -2235,9 +2235,9 @@ fi
     t_model="onda_vx747"
     ;;
     
-    130|lyreproto1)
+    130|lyre_proto1)
     target_id=56
-    modelname="lyreproto1"
+    modelname="lyre_proto1"
     target="-DLYRE_PROTO1"
     memory=64
     arm926ejscc
@@ -2257,9 +2257,9 @@ fi
     t_model="lyre_proto1"
     ;;
 
-   140|samsungyh820)
+   140|yh820)
     target_id=57
-    modelname="samsungyh820"
+    modelname="yh820"
     target="-DSAMSUNG_YH820"
     memory=32 # always
     arm7tdmicc
@@ -2281,9 +2281,9 @@ fi
     t_model="yh820"
     ;;
 
-   141|samsungyh920)
+   141|yh920)
     target_id=58
-    modelname="samsungyh920"
+    modelname="yh920"
     target="-DSAMSUNG_YH920"
     memory=32 # always
     arm7tdmicc
@@ -2305,9 +2305,9 @@ fi
     t_model="yh920"
     ;;
 
-   142|samsungyh925)
+   142|yh925)
     target_id=59
-    modelname="samsungyh925"
+    modelname="yh925"
     target="-DSAMSUNG_YH925"
     memory=32 # always
     arm7tdmicc
@@ -2329,9 +2329,9 @@ fi
     t_model="yh925"
     ;;
 
-   143|samsungyps3)
+   143|yps3)
     target_id=60
-    modelname="samsungyps3"
+    modelname="yps3"
     target="-DSAMSUNG_YPS3"
     memory=16 # always
     arm940tbecc
@@ -2415,13 +2415,13 @@ fi
   # the ifp7x0 is the only platform that supports building a gdb stub like
   # this
 case $modelname in
-  iriverifp7xx)
+  ifp7xx)
      gdbstub="(G)DB stub, "
      ;;
-  sansae200r|sansae200)
+  e200r|e200)
      gdbstub="(I)nstaller, "
      ;;
-  sansac200)
+  c200)
      gdbstub="(E)raser, "
      ;;
   *)
@@ -2498,7 +2498,7 @@ fi
       appsdir='\$(ROOTDIR)/gdb'
       apps="stub"
       case $modelname in
-          iriverifp7xx)
+          ifp7xx)
               output="stub.wma"
               ;;
           *)
@@ -2523,7 +2523,7 @@ fi
       echo "CheckWPS build selected"
       ;;
     *)
-      if [ "$modelname" = "sansae200r" ]; then
+      if [ "$modelname" = "e200r" ]; then
           echo "Do not use the e200R target for regular builds.  Use e200 instead."
           exit 8
       fi
@@ -2535,17 +2535,17 @@ fi
   esac
   # to be able running "make manual" from non-manual configuration
   case $modelname in
-      archosfmrecorder)
-          manualdev="archosrecorderv2fm"
+      fmrecorder)
+          manualdev="recorderv2fm"
           ;;
-      archosrecorderv2)
-          manualdev="archosrecorderv2fm"
+      recorderv2)
+          manualdev="recorderv2fm"
           ;;
-      iriverh1??)
-          manualdev="iriverh100"
+      h1??)
+          manualdev="h100"
           ;;
       ipodmini2g)
-          manualdev="ipodmini1g"
+          manualdev="ipodmini"
           ;;
       *)
           manualdev=$modelname
diff --git a/tools/release/bins.pl b/tools/release/bins.pl
index 343315808b..b96c7d863c 100755
--- a/tools/release/bins.pl
+++ b/tools/release/bins.pl
@@ -1,8 +1,6 @@
 #!/usr/bin/perl
 
-require "../builds.pm";
-
-$version=$publicrelease;
+$version="3.4";
 
 my $verbose;
 if($ARGV[0] eq "-v") {
@@ -75,7 +73,7 @@ sub fonts {
     chdir "build-$dir";
     print "Build fonts in build-$dir\n" if($verbose);
 
-    # build the fonts
+    # build the manual(s)
     $a = buildfonts($dir, $confnum, $newl);
 
     chdir "..";
@@ -100,8 +98,8 @@ sub buildit {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $ram = $extra ? $extra : -1;
-    my $c = "../tools/configure --type=n --target=$confnum --ram=$ram";
+    my $c = sprintf('printf "%s\n%sn\n" | ../tools/configure',
+                    $confnum, $extra);
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -121,8 +119,8 @@ sub buildfonts {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $ram = $extra ? $extra : -1;
-    my $c = "../tools/configure --type=n --target=$confnum --ram=$ram";
+    my $c = sprintf("printf '%s\n%sn\n' | ../tools/configure",
+                    $confnum, $newl?'\n':'');
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -135,10 +133,37 @@ sub buildfonts {
 print "cd tools && make\n" if($verbose);
 `(cd tools && make ) >/dev/null 2>&1`;
 
-for my $b (&stablebuilds) {
-    my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b;
-    runone($b, $configname, $builds{b}{ram});
-}
+runone("player", "player", '\n');
+runone("recorder", "recorder", '\n');
+runone("recorder8mb", "recorder", '8\n');
+runone("fmrecorder", "fmrecorder", '\n');
+runone("fmrecorder8mb", "fmrecorder", '8\n');
+runone("recorderv2", "recorderv2", '\n');
+runone("ondiosp", "ondiosp", '\n');
+runone("ondiofm", "ondiofm", '\n');
+runone("h100", "h100");
+runone("h120", "h120");
+runone("h300", "h300");
+runone("ipodcolor", "ipodcolor");
+runone("ipodnano", "ipodnano");
+runone("ipod4gray", "ipod4g");
+runone("ipodvideo", "ipodvideo", '32\n');
+runone("ipodvideo64mb", "ipodvideo", '64\n');
+runone("ipod3g", "ipod3g");
+runone("ipod1g2g", "ipod1g2g");
+runone("iaudiox5", "x5");
+runone("iaudiom5", "m5");
+runone("iaudiom3", "m3");
+runone("ipodmini1g", "ipodmini");
+runone("ipodmini2g", "ipodmini2g");
+runone("h10", "h10");
+runone("h10_5gb", "h10_5gb");
+runone("gigabeatf", "gigabeatf");
+runone("sansae200", "e200");
+runone("sansac200", "c200");
+#runone("mrobe500", "mrobe500");
+runone("mrobe100", "mrobe100");
+runone("cowond2", "cowond2");
+fonts("fonts", "x5");
 
-fonts("fonts", "iaudiox5");
 
diff --git a/tools/release/manuals.pl b/tools/release/manuals.pl
index 7b24ea4880..02783d356b 100755
--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
-require "../builds.pm";
-my $version = $publicrelease;
+$version="3.4";
 
 my $verbose;
 if($ARGV[0] eq "-v") {
@@ -17,7 +16,7 @@ if($ARGV[0]) {
 
 # made once for all targets
 sub runone {
-    my ($dir)=@_;
+    my ($dir, $conf, $nl)=@_;
     my $a;
 
     if($doonly && ($doonly ne $dir)) {
@@ -29,7 +28,7 @@ sub runone {
     print "Build in buildm-$dir\n" if($verbose);
 
     # build the manual(s)
-    $a = buildit($dir);
+    $a = buildit($dir, $conf, $nl);
 
     chdir "..";
 
@@ -54,11 +53,12 @@ sub runone {
 };
 
 sub buildit {
-    my ($target)=@_;
+    my ($target, $confnum, $newl)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = "../tools/configure --target=$target --type=m";
+    my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure',
+                    $confnum, $newl?'\n':'');
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -73,8 +73,27 @@ sub buildit {
 # run make in tools first to make sure they're up-to-date
 `(cd tools && make ) >/dev/null 2>&1`;
 
-for my $b (&stablebuilds) {
-    next if ($builds{$b}{configname} < 3); # no variants
-
-    runone($b);
-}
+runone("player", "player", 1);
+runone("recorder", "recorder", 1);
+runone("fmrecorder", "fmrecorder", 1);
+runone("recorderv2", "recorderv2", 1);
+runone("ondiosp", "ondiosp", 1);
+runone("ondiofm", "ondiofm", 1);
+runone("h100", "h100");
+#runone("h120", 9);
+runone("h300", "h300");
+runone("ipodcolor", "ipodcolor");
+runone("ipodnano", "ipodnano");
+runone("ipod4gray", "ipod4g");
+runone("ipodvideo", "ipodvideo", 1);
+runone("ipod3g", "ipod3g");
+runone("ipod1g2g", "ipod1g2g");
+runone("iaudiox5", "x5");
+runone("iaudiom5", "m5");
+runone("ipodmini2g", "ipodmini2g");
+runone("h10", "h10");
+runone("h10_5gb", "h10_5gb");
+runone("gigabeatf", "gigabeatf");
+runone("sansae200", "e200");
+runone("sansac200", "c200");
+runone("mrobe100", "mrobe100");
diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index 79eeb5652a..0481234189 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -4,8 +4,6 @@ use File::Basename;
 use File::Path;
 use Cwd;
 
-require "../builds.pm";
-
 my $verbose, $strip, $update, $doonly, $version;
 my @doonly;
 
@@ -90,7 +88,7 @@ if (!defined($version)) {
 
 # made once for all targets
 sub runone {
-    my ($dir)=@_;
+    my ($dir, $confnum, $extra)=@_;
     my $a;
 
     if(@doonly > 0 && !grep(/^$dir$/, @doonly)) {
@@ -102,7 +100,7 @@ sub runone {
     print "Build in build-$dir\n" if($verbose);
 
     # build the target
-    $a = buildit($dir);
+    $a = buildit($dir, $confnum, $extra);
 
     if ($strip) {
         print "Stripping binaries\n" if ($verbose);
@@ -151,11 +149,12 @@ sub runone {
 };
 
 sub buildit {
-    my ($target)=@_;
+    my ($target, $confnum, $extra)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = "../tools/configure --type=s --target=$target";
+    my $c = sprintf('printf "%s\n%ss\n" | ../tools/configure',
+                    $confnum, $extra);
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -167,9 +166,52 @@ sub buildit {
     `make install 2>/dev/null`;
 }
 
-for my $b (keys %builds) {
-    next if ($builds{$b}{status} < 3); # only stable builds
-    next if ($builds{$b}{configname} < 3); # no memsize variants
-
-    runone($b);
-}
+runone("player", "player", '\n');
+runone("recorder", "recorder", '\n');
+#runone("recorder8mb", "recorder", '8\n');
+runone("fmrecorder", "fmrecorder", '\n');
+#runone("fmrecorder8mb", "fmrecorder", '8\n');
+runone("recorderv2", "recorderv2", '\n');
+runone("ondiosp", "ondiosp", '\n');
+runone("ondiofm", "ondiofm", '\n');
+runone("h100", "h100");
+runone("h120", "h120");
+runone("h300", "h300");
+runone("ipodcolor", "ipodcolor");
+runone("ipodnano", "ipodnano");
+runone("ipod4gray", "ipod4g");
+runone("ipodvideo", "ipodvideo", '32\n');
+#runone("ipodvideo64mb", "ipodvideo", '64\n');
+runone("ipod3g", "ipod3g");
+runone("ipod1g2g", "ipod1g2g");
+runone("iaudiox5", "x5");
+runone("iaudiom5", "m5");
+runone("iaudiom3", "m3");
+runone("ipodmini1g", "ipodmini");
+runone("ipodmini2g", "ipodmini2g");
+runone("h10", "h10");
+runone("h10_5gb", "h10_5gb");
+runone("gigabeatf", "gigabeatf");
+runone("gigabeats", "gigabeats");
+runone("sansae200", "e200");
+runone("sansae200v2", "e200v2");
+runone("sansac200", "c200");
+runone("mrobe500", "mrobe500");
+runone("mrobe100", "mrobe100");
+runone("cowond2", "cowond2");
+runone("clip", "clip");
+runone("zvm30gb", "creativezvm30gb");
+runone("zvm60gb", "creativezvm60gb");
+runone("zenvision", "creativezenvision");
+runone("hdd1630", "hdd1630");
+runone("fuze", "fuze");
+runone("m200v4", "m200v4");
+runone("sa9200", "sa9200");
+runone("sansac200v2", "c200v2");
+runone("yh820", "yh_820");
+runone("yh920", "yh_920");
+runone("yh925", "yh_925");
+runone("ondavx747", "ondavx747");
+runone("ondavx747p", "ondavx747p");
+runone("ondavx777", "ondavx777");
+runone("ifp7xx", "ifp7xx");
diff --git a/tools/release/voices.pl b/tools/release/voices.pl
index d51c3208df..056f6d06a9 100755
--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
-require "../builds.pm";
-my $version = $publicrelease;
+$version="3.4";
 
 my $verbose;
 if($ARGV[0] eq "-v") {
@@ -17,7 +16,7 @@ if($ARGV[0]) {
 
 # made once for all targets
 sub runone {
-    my ($dir)=@_;
+    my ($dir, $select, $newl)=@_;
     my $a;
 
     if($doonly && ($doonly ne $dir)) {
@@ -29,7 +28,7 @@ sub runone {
     print "Build in buildv-$dir\n" if($verbose);
 
     # build the manual(s)
-    $a = buildit($dir);
+    $a = buildit($dir, $select, $newl);
 
     chdir "..";
 
@@ -51,11 +50,13 @@ sub runone {
 };
 
 sub buildit {
-    my ($model)=@_;
+    my ($dir, $select, $newl)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f";
+    # V (voice), F (festival), L (lame), [blank] (English)
+    my $c = sprintf('printf "%s\n%sa\nv\n\n\nf\n\n" | ../tools/configure',
+                    $select, $newl?'\n':"");
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -74,8 +75,31 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
 `rm -f $pool/*`;
 $ENV{'POOL'}="$pool";
 
-for my $b (&stablebuilds) {
-    next if ($builds{$b}{configname} < 3); # no variants
+runone("player", "player", 1);
+runone("recorder", "recorder", 1);
+runone("fmrecorder", "fmrecorder", 1);
+runone("recorderv2", "recorderv2", 1);
+runone("ondiosp", "ondiosp", 1);
+runone("ondiofm", "ondiofm", 1);
+runone("h100", "h100");
+runone("h120", "h120");
+runone("h300", "h300");
+runone("ipodcolor", "ipodcolor");
+runone("ipodnano", "ipodnano");
+runone("ipod4gray", "ipod4g");
+runone("ipodvideo", "ipodvideo", 1);
+runone("ipod3g", "ipod3g");
+runone("ipod1g2g", "ipod1g2g");
+runone("iaudiox5", "x5");
+runone("iaudiom5", "m5");
+runone("iaudiom3", "m3");
+runone("ipodmini2g", "ipodmini2g");
+runone("ipodmini1g", "ipodmini");
+runone("h10", "h10");
+runone("h10_5gb", "h10_5gb");
+runone("gigabeatf", "gigabeatf");
+runone("sansae200", "e200");
+runone("sansac200", "c200");
+runone("mrobe100", "mrobe100");
+#runone("cowond2", "cowond2");
 
-    runone($b);
-}
diff --git a/uisimulator/sdl/UI-archosav300.bmp b/uisimulator/sdl/UI-av300.bmp
index e86221ca7e..e86221ca7e 100644
--- a/uisimulator/sdl/UI-archosav300.bmp
+++ b/uisimulator/sdl/UI-av300.bmp
diff --git a/uisimulator/sdl/UI-sansac200.bmp b/uisimulator/sdl/UI-c200.bmp
index d4b169260d..d4b169260d 100644
--- a/uisimulator/sdl/UI-sansac200.bmp
+++ b/uisimulator/sdl/UI-c200.bmp
diff --git a/uisimulator/sdl/UI-sansac200v2.bmp b/uisimulator/sdl/UI-c200v2.bmp
index d4b169260d..d4b169260d 100644
--- a/uisimulator/sdl/UI-sansac200v2.bmp
+++ b/uisimulator/sdl/UI-c200v2.bmp
diff --git a/uisimulator/sdl/UI-sansaclip.bmp b/uisimulator/sdl/UI-clip.bmp
index 597f3f9ede..597f3f9ede 100644
--- a/uisimulator/sdl/UI-sansaclip.bmp
+++ b/uisimulator/sdl/UI-clip.bmp
diff --git a/uisimulator/sdl/UI-zenvisionm30.bmp b/uisimulator/sdl/UI-creativezvm30.bmp
index d244b8d6e7..d244b8d6e7 100644
--- a/uisimulator/sdl/UI-zenvisionm30.bmp
+++ b/uisimulator/sdl/UI-creativezvm30.bmp
diff --git a/uisimulator/sdl/UI-zenvisionm60.bmp b/uisimulator/sdl/UI-creativezvm60.bmp
index d244b8d6e7..d244b8d6e7 100644
--- a/uisimulator/sdl/UI-zenvisionm60.bmp
+++ b/uisimulator/sdl/UI-creativezvm60.bmp
diff --git a/uisimulator/sdl/UI-sansae200.bmp b/uisimulator/sdl/UI-e200.bmp
index 4b6d4f5b8e..4b6d4f5b8e 100644
--- a/uisimulator/sdl/UI-sansae200.bmp
+++ b/uisimulator/sdl/UI-e200.bmp
diff --git a/uisimulator/sdl/UI-sansae200v2.bmp b/uisimulator/sdl/UI-e200v2.bmp
index 4b6d4f5b8e..4b6d4f5b8e 100644
--- a/uisimulator/sdl/UI-sansae200v2.bmp
+++ b/uisimulator/sdl/UI-e200v2.bmp
diff --git a/uisimulator/sdl/UI-archosfmrecorder.bmp b/uisimulator/sdl/UI-fmrecorder.bmp
index 53f705b9ef..53f705b9ef 100644
--- a/uisimulator/sdl/UI-archosfmrecorder.bmp
+++ b/uisimulator/sdl/UI-fmrecorder.bmp
diff --git a/uisimulator/sdl/UI-sansafuze.bmp b/uisimulator/sdl/UI-fuze.bmp
index 02b07b61ba..02b07b61ba 100644
--- a/uisimulator/sdl/UI-sansafuze.bmp
+++ b/uisimulator/sdl/UI-fuze.bmp
diff --git a/uisimulator/sdl/UI-gigabeatfx.bmp b/uisimulator/sdl/UI-gigabeatf.bmp
index 7d60aebe8a..7d60aebe8a 100644
--- a/uisimulator/sdl/UI-gigabeatfx.bmp
+++ b/uisimulator/sdl/UI-gigabeatf.bmp
diff --git a/uisimulator/sdl/UI-gigabeats.bmp b/uisimulator/sdl/UI-gigabeats.bmp
index affdbdaf69..affdbdaf69 100644..100755
--- a/uisimulator/sdl/UI-gigabeats.bmp
+++ b/uisimulator/sdl/UI-gigabeats.bmp
diff --git a/uisimulator/sdl/UI-iriverh10.bmp b/uisimulator/sdl/UI-h10.bmp
index 1a3b91ded2..1a3b91ded2 100644
--- a/uisimulator/sdl/UI-iriverh10.bmp
+++ b/uisimulator/sdl/UI-h10.bmp
diff --git a/uisimulator/sdl/UI-iriverh100.bmp b/uisimulator/sdl/UI-h100.bmp
index caeb81bc4b..caeb81bc4b 100644
--- a/uisimulator/sdl/UI-iriverh100.bmp
+++ b/uisimulator/sdl/UI-h100.bmp
diff --git a/uisimulator/sdl/UI-iriverh10_5gb.bmp b/uisimulator/sdl/UI-h10_5gb.bmp
index 03542d8f69..03542d8f69 100644
--- a/uisimulator/sdl/UI-iriverh10_5gb.bmp
+++ b/uisimulator/sdl/UI-h10_5gb.bmp
diff --git a/uisimulator/sdl/UI-iriverh120.bmp b/uisimulator/sdl/UI-h120.bmp
index caeb81bc4b..caeb81bc4b 100644
--- a/uisimulator/sdl/UI-iriverh120.bmp
+++ b/uisimulator/sdl/UI-h120.bmp
diff --git a/uisimulator/sdl/UI-iriverh300.bmp b/uisimulator/sdl/UI-h300.bmp
index 5f099b717a..5f099b717a 100644
--- a/uisimulator/sdl/UI-iriverh300.bmp
+++ b/uisimulator/sdl/UI-h300.bmp
diff --git a/uisimulator/sdl/UI-gogearhdd1630.bmp b/uisimulator/sdl/UI-hdd1630.bmp
index ac665cf96d..ac665cf96d 100644
--- a/uisimulator/sdl/UI-gogearhdd1630.bmp
+++ b/uisimulator/sdl/UI-hdd1630.bmp
diff --git a/uisimulator/sdl/UI-iriverifp7xx.bmp b/uisimulator/sdl/UI-ifp7xx.bmp
index 95424ac2a6..95424ac2a6 100644
--- a/uisimulator/sdl/UI-iriverifp7xx.bmp
+++ b/uisimulator/sdl/UI-ifp7xx.bmp
diff --git a/uisimulator/sdl/UI-ipodmini1g.bmp b/uisimulator/sdl/UI-ipodmini.bmp
index 63b69d5a08..63b69d5a08 100644
--- a/uisimulator/sdl/UI-ipodmini1g.bmp
+++ b/uisimulator/sdl/UI-ipodmini.bmp
diff --git a/uisimulator/sdl/UI-ipodnano1g.bmp b/uisimulator/sdl/UI-ipodnano.bmp
index 8abbb16845..8abbb16845 100644
--- a/uisimulator/sdl/UI-ipodnano1g.bmp
+++ b/uisimulator/sdl/UI-ipodnano.bmp
diff --git a/uisimulator/sdl/UI-sansam200v4.bmp b/uisimulator/sdl/UI-m200v4.bmp
index 6461b3ec62..6461b3ec62 100644
--- a/uisimulator/sdl/UI-sansam200v4.bmp
+++ b/uisimulator/sdl/UI-m200v4.bmp
diff --git a/uisimulator/sdl/UI-iaudiom3.bmp b/uisimulator/sdl/UI-m3.bmp
index add298cc89..add298cc89 100644
--- a/uisimulator/sdl/UI-iaudiom3.bmp
+++ b/uisimulator/sdl/UI-m3.bmp
diff --git a/uisimulator/sdl/UI-iaudiom5.bmp b/uisimulator/sdl/UI-m5.bmp
index b2d4d0620e..b2d4d0620e 100644
--- a/uisimulator/sdl/UI-iaudiom5.bmp
+++ b/uisimulator/sdl/UI-m5.bmp
diff --git a/uisimulator/sdl/UI-mrobe500.bmp b/uisimulator/sdl/UI-mrobe500.bmp
index 2d47aa6a1f..2d47aa6a1f 100644..100755
--- a/uisimulator/sdl/UI-mrobe500.bmp
+++ b/uisimulator/sdl/UI-mrobe500.bmp
diff --git a/uisimulator/sdl/UI-ondavx747.bmp b/uisimulator/sdl/UI-ondavx747.bmp
index 364003d720..364003d720 100644..100755
--- a/uisimulator/sdl/UI-ondavx747.bmp
+++ b/uisimulator/sdl/UI-ondavx747.bmp
diff --git a/uisimulator/sdl/UI-ondavx747p.bmp b/uisimulator/sdl/UI-ondavx747p.bmp
index 364003d720..364003d720 100644..100755
--- a/uisimulator/sdl/UI-ondavx747p.bmp
+++ b/uisimulator/sdl/UI-ondavx747p.bmp
diff --git a/uisimulator/sdl/UI-archosondiofm.bmp b/uisimulator/sdl/UI-ondiofm.bmp
index e258720d28..e258720d28 100644
--- a/uisimulator/sdl/UI-archosondiofm.bmp
+++ b/uisimulator/sdl/UI-ondiofm.bmp
diff --git a/uisimulator/sdl/UI-archosondiosp.bmp b/uisimulator/sdl/UI-ondiosp.bmp
index c62c2334a3..c62c2334a3 100644
--- a/uisimulator/sdl/UI-archosondiosp.bmp
+++ b/uisimulator/sdl/UI-ondiosp.bmp
diff --git a/uisimulator/sdl/UI-archosplayer.bmp b/uisimulator/sdl/UI-player.bmp
index db4003b120..db4003b120 100644
--- a/uisimulator/sdl/UI-archosplayer.bmp
+++ b/uisimulator/sdl/UI-player.bmp
diff --git a/uisimulator/sdl/UI-archosrecorder.bmp b/uisimulator/sdl/UI-recorder.bmp
index 98937fea2d..98937fea2d 100644
--- a/uisimulator/sdl/UI-archosrecorder.bmp
+++ b/uisimulator/sdl/UI-recorder.bmp
diff --git a/uisimulator/sdl/UI-archosrecorderv2.bmp b/uisimulator/sdl/UI-recorderv2.bmp
index 53f705b9ef..53f705b9ef 100644
--- a/uisimulator/sdl/UI-archosrecorderv2.bmp
+++ b/uisimulator/sdl/UI-recorderv2.bmp
diff --git a/uisimulator/sdl/UI-gogearsa9200.bmp b/uisimulator/sdl/UI-sa9200.bmp
index b801640988..b801640988 100644
--- a/uisimulator/sdl/UI-gogearsa9200.bmp
+++ b/uisimulator/sdl/UI-sa9200.bmp
diff --git a/uisimulator/sdl/UI-iaudiox5.bmp b/uisimulator/sdl/UI-x5.bmp
index 18bdf9a512..18bdf9a512 100644
--- a/uisimulator/sdl/UI-iaudiox5.bmp
+++ b/uisimulator/sdl/UI-x5.bmp
diff --git a/uisimulator/sdl/UI-samsungyh820.bmp b/uisimulator/sdl/UI-yh820.bmp
index b74aedba91..b74aedba91 100644
--- a/uisimulator/sdl/UI-samsungyh820.bmp
+++ b/uisimulator/sdl/UI-yh820.bmp
diff --git a/uisimulator/sdl/UI-samsungyh920.bmp b/uisimulator/sdl/UI-yh920.bmp
index 6d330d417d..6d330d417d 100644
--- a/uisimulator/sdl/UI-samsungyh920.bmp
+++ b/uisimulator/sdl/UI-yh920.bmp
diff --git a/uisimulator/sdl/UI-samsungyh925.bmp b/uisimulator/sdl/UI-yh925.bmp
index 6d330d417d..6d330d417d 100644
--- a/uisimulator/sdl/UI-samsungyh925.bmp
+++ b/uisimulator/sdl/UI-yh925.bmp