diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index d0e19bfb2a..748a6471eb 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -18,33 +18,33 @@ rbutil_url=http://download.rockbox.org/rbutil/
 [platforms]
 platform01=archosplayer
 platform02=archosrecorder
-platform03=archosrecorder8mb
+platform03=archosrecorder.8mb
 platform04=archosrecorderv2
 platform05=archosfmrecorder
-platform06=archosfmrecorder8mb
+platform06=archosfmrecorder.8mb
 platform07=archosondiosp
 platform08=archosondiofm
 platform10=iriverh100
 platform11=iriverh120
 platform12=iriverh300
-platform13=iriverh10_5gbums
-platform14=iriverh10_5gbmtp
+platform13=iriverh10_5gb.ums
+platform14=iriverh10_5gb.mtp
 platform15=iriverh10
 platform20=ipod1g2g
 platform21=ipod3g
-platform22=ipod4gray
+platform22=ipod4g
 platform23=ipodcolor
 platform24=ipodvideo
-platform25=ipodvideo64mb
+platform25=ipodvideo.64mb
 platform26=ipodmini1g
 platform27=ipodmini2g
 platform28=ipodnano1g
 platform29=ipodnano2g
 platform30=iaudiox5
 platform31=iaudiom5
-platform32=iaudiox5v
+platform32=iaudiox5.v
 platform33=iaudiom3
-platform40=gigabeatf
+platform40=gigabeatfx
 platform44=ondavx747
 platform45=ondavx747p
 platform46=ondavx777
@@ -55,9 +55,9 @@ platform53=sansafuze
 platform54=sansam200v4
 platform55=sansaclip
 platform60=mrobe100
-platform70=smsgyh820
-platform71=smsgyh920
-platform72=smsgyh925
+platform70=samsungyh820
+platform71=samsungyh920
+platform72=samsungyh925
 platform73=cowond2
 
 [archosplayer]
@@ -80,7 +80,7 @@ brand=Archos
 configure_modelname=archosrecorder
 encoder=lame
 
-[archosrecorder8mb]
+[archosrecorder.8mb]
 name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)"
 buildserver_modelname=archosrecorder8mb
 bootloadermethod=none
@@ -110,7 +110,7 @@ brand=Archos
 configure_modelname=archosfmrecorder
 encoder=lame
 
-[archosfmrecorder8mb]
+[archosfmrecorder.8mb]
 name="Jukebox Recorder FM (with 8MiB memory)"
 buildserver_modelname=archosfmrecorder8mb
 bootloadermethod=none
@@ -176,7 +176,7 @@ usbid=0x10063003
 configure_modelname=iriverh300
 encoder=rbspeex
 
-[iriverh10_5gbums]
+[iriverh10_5gb.ums]
 name="H10 (5 / 6GB) UMS"
 buildserver_modelname=iriverh10_5gb
 bootloadermethod=mi4
@@ -188,7 +188,7 @@ usbid=0x41022002
 configure_modelname=iriverh10_5gb
 encoder=rbspeex
 
-[iriverh10_5gbmtp]
+[iriverh10_5gb.mtp]
 name="H10 (5 / 6GB) MTP"
 buildserver_modelname=iriverh10_5gb
 bootloadermethod=mi4
@@ -253,7 +253,7 @@ brand=Apple
 configure_modelname=ipodnano2g
 encoder=rbspeex
 
-[ipod4gray]
+[ipod4g]
 name="Ipod (4th gen, greyscale)"
 buildserver_modelname=ipod4gray
 bootloadermethod=ipod
@@ -273,7 +273,7 @@ brand=Apple
 configure_modelname=ipodvideo
 encoder=rbspeex
 
-[ipodvideo64mb]
+[ipodvideo.64mb]
 name="Ipod Video (5th gen) 60/80GB"
 buildserver_modelname=ipodvideo64mb
 bootloadermethod=ipod
@@ -326,7 +326,7 @@ usbid=0x0e210510, 0x0e210513
 configure_modelname=iaudiox5
 encoder=rbspeex
 
-[iaudiox5v]
+[iaudiox5.v]
 name="iAudio X5V"
 buildserver_modelname=iaudiox5
 bootloadermethod=file
@@ -361,7 +361,7 @@ usbid=0x0e210500
 configure_modelname=iaudiom3
 encoder=rbspeex
 
-[gigabeatf]
+[gigabeatfx]
 name="Gigabeat F / X"
 buildserver_modelname=gigabeatfx
 bootloadermethod=file
@@ -500,7 +500,7 @@ configure_modelname=ondavx777
 encoder=rbspeex
 status=disabled
 
-[smsgyh820]
+[samsungyh820]
 name="YH-820"
 buildserver_modelname=samsungyh820
 bootloadermethod=mi4
@@ -512,7 +512,7 @@ usbid=0x04e85023
 configure_modelname=samsungyh820
 encoder=rbspeex
 
-[smsgyh920]
+[samsungyh920]
 name="YH-920"
 buildserver_modelname=samsungyh920
 bootloadermethod=mi4
@@ -524,7 +524,7 @@ usbid=0x04e85022, 0x04e8501d
 configure_modelname=samsungyh920
 encoder=rbspeex
 
-[smsgyh925]
+[samsungyh925]
 name="YH-925"
 buildserver_modelname=samsungyh925
 bootloadermethod=mi4