diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index c8f02b2cf8..5764521862 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -38,7 +38,7 @@ platform24=ipodvideo
 platform25=ipodvideo64mb
 platform26=ipodmini1g
 platform27=ipodmini2g
-platform28=ipodnano
+platform28=ipodnano1g
 platform29=ipodnano2g
 platform30=iaudiox5
 platform31=iaudiom5
@@ -60,149 +60,149 @@ platform71=smsgyh920
 platform72=smsgyh925
 platform73=cowond2
 
-[player]
+[archosplayer]
 name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20"
-buildserver_modelname=player
+buildserver_modelname=archosplayer
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=player
+configure_modelname=archosplayer
 encoder=lame
 
-[recorder]
+[archosrecorder]
 name="Jukebox Recorder 6 / 10 / 15 / 20"
-buildserver_modelname=recorder
+buildserver_modelname=archosrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=recorder
+configure_modelname=archosrecorder
 encoder=lame
 
-[recorder8mb]
+[archosrecorder8mb]
 name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)"
-buildserver_modelname=recorder8mb
+buildserver_modelname=archosrecorder8mb
 bootloadermethod=none
 bootloadername=
 manualname=rockbox-recorder
 brand=Archos
-configure_modelname=recorder
+configure_modelname=archosrecorder
 encoder=lame
 
-[recorderv2]
+[archosrecorderv2]
 name="Jukebox Recorder v2 (20GB)"
-buildserver_modelname=recorderv2
+buildserver_modelname=archosrecorderv2
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=recorderv2
+configure_modelname=archosrecorderv2
 encoder=lame
 
-[fmrecorder]
+[archosfmrecorder]
 name="Jukebox Recorder FM"
-buildserver_modelname=fmrecorder
+buildserver_modelname=archosfmrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=fmrecorder
+configure_modelname=archosfmrecorder
 encoder=lame
 
-[fmrecorder8mb]
+[archosfmrecorder8mb]
 name="Jukebox Recorder FM (with 8MiB memory)"
-buildserver_modelname=fmrecorder8mb
+buildserver_modelname=archosfmrecorder8mb
 bootloadermethod=none
 bootloadername=
 manualname=rockbox-fmrecorder
 brand=Archos
-configure_modelname=fmrecorder
+configure_modelname=archosfmrecorder
 encoder=lame
 
-[ondiosp]
+[archosondiosp]
 name="Ondio SP"
-buildserver_modelname=ondiosp
+buildserver_modelname=archosondiosp
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=ondiosp
+configure_modelname=archosondiosp
 encoder=lame
 
-[ondiofm]
+[archosondiofm]
 name="Ondio FM"
-buildserver_modelname=ondiofm
+buildserver_modelname=archosondiofm
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=ondiofm
+configure_modelname=archosondiofm
 encoder=lame
 
-[h100]
+[iriverh100]
 name="iHP100 / iHP110"
-buildserver_modelname=h100
+buildserver_modelname=iriverh100
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h100.bin
 bootloaderfile=/ihp_100.hex
 manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063001
-configure_modelname=h100
+configure_modelname=iriverh100
 encoder=rbspeex
 
-[h120]
+[iriverh120]
 name="iHP120 / iHP140 / H120 / H140"
-buildserver_modelname=h120
+buildserver_modelname=iriverh120
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h120.bin
 bootloaderfile=/ihp_120.hex
 manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063002
-configure_modelname=h120
+configure_modelname=iriverh120
 encoder=rbspeex
 
-[h300]
+[iriverh300]
 name="H320 / H340"
-buildserver_modelname=h300
+buildserver_modelname=iriverh300
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h300.bin
 bootloaderfile=/H300.hex
 manualname=rockbox-h300
 brand=Iriver
 usbid=0x10063003
-configure_modelname=h300
+configure_modelname=iriverh300
 encoder=rbspeex
 
-[h10_5gbums]
+[iriverh10_5gbums]
 name="H10 (5 / 6GB) UMS"
-buildserver_modelname=h10_5gb
+buildserver_modelname=iriverh10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022002
-configure_modelname=h10_5gb
+configure_modelname=iriverh10_5gb
 encoder=rbspeex
 
-[h10_5gbmtp]
+[iriverh10_5gbmtp]
 name="H10 (5 / 6GB) MTP"
-buildserver_modelname=h10_5gb
+buildserver_modelname=iriverh10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10_5GB-MTP/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022105
-configure_modelname=h10_5gb
+configure_modelname=iriverh10_5gb
 encoder=rbspeex
 
-[h10]
+[iriverh10]
 name="H10 (20GB)"
-buildserver_modelname=h10
+buildserver_modelname=iriverh10
 bootloadermethod=mi4
 bootloadername=/iriver/H10_20GC.mi4
 bootloaderfile=/System/H10_20GC.mi4