diff -r 6bcf277166c1 -r 451b2e1545b2 rom/fmradio.iby
--- a/rom/fmradio.iby	Fri Jun 11 16:24:13 2010 +0100
+++ b/rom/fmradio.iby	Thu Jul 22 16:33:45 2010 +0100
@@ -23,23 +23,24 @@
 // Use standard macros
 #include <data_caging_paths_for_iby.hrh>
 
-S60_APP_EXE(qtfmradio)
-data=ZPRIVATE\10003a3f\import\apps\qtfmradio_reg.rsc                private\10003a3f\import\apps\qtfmradio_reg.rsc
+S60_APP_EXE(fmradio)
+data=ZRESOURCE\apps\fmradio.mif                                     APP_RESOURCE_DIR\fmradio.mif
+data=ZPRIVATE\10003a3f\import\apps\fmradio_reg.rsc                  private\10003a3f\import\apps\fmradio_reg.rsc
 
-file=ABI_DIR\BUILD_DIR\radioenginewrapper.dll                       SHARED_LIB_DIR\radioenginewrapper.dll       PAGED
-file=ABI_DIR\BUILD_DIR\radiopresetstorage.dll                       SHARED_LIB_DIR\radiopresetstorage.dll       PAGED
-file=ABI_DIR\BUILD_DIR\radiouiengine.dll                            SHARED_LIB_DIR\radiouiengine.dll            PAGED
-file=ABI_DIR\BUILD_DIR\radiowidgets.dll                             SHARED_LIB_DIR\radiowidgets.dll             PAGED
-file=ABI_DIR\BUILD_DIR\radiowidgetsplugin.dll                       SHARED_LIB_DIR\radiowidgetsplugin.dll       PAGED
-data=\epoc32\data\z\resource\plugins\radiowidgetsplugin.qtplugin    resource\plugins\radiowidgetsplugin.qtplugin
+file=ABI_DIR\BUILD_DIR\fmradioenginewrapper.dll                     SHARED_LIB_DIR\fmradioenginewrapper.dll       PAGED
+file=ABI_DIR\BUILD_DIR\fmradiopresetstorage.dll                     SHARED_LIB_DIR\fmradiopresetstorage.dll       PAGED
+file=ABI_DIR\BUILD_DIR\fmradiouiengine.dll                          SHARED_LIB_DIR\fmradiouiengine.dll            PAGED
+file=ABI_DIR\BUILD_DIR\fmradiowidgets.dll                           SHARED_LIB_DIR\fmradiowidgets.dll             PAGED
+file=ABI_DIR\BUILD_DIR\fmradiowidgetsplugin.dll                     SHARED_LIB_DIR\fmradiowidgetsplugin.dll       PAGED
+data=\epoc32\data\z\resource\plugins\fmradiowidgetsplugin.qtplugin  resource\plugins\fmradiowidgetsplugin.qtplugin
 
-file=ABI_DIR\BUILD_DIR\radioengine.dll                              SHARED_LIB_DIR\radioengine.dll              PAGED
-file=ABI_DIR\BUILD_DIR\radioengineutils.dll                         SHARED_LIB_DIR\radioengineutils.dll         PAGED
-file=ABI_DIR\BUILD_DIR\radioenginesettings.dll                      SHARED_LIB_DIR\radioenginesettings.dll      PAGED
+file=ABI_DIR\BUILD_DIR\fmradioengine.dll                            SHARED_LIB_DIR\fmradioengine.dll              PAGED
+file=ABI_DIR\BUILD_DIR\fmradioengineutils.dll                       SHARED_LIB_DIR\fmradioengineutils.dll         PAGED
+file=ABI_DIR\BUILD_DIR\fmradioenginesettings.dll                    SHARED_LIB_DIR\fmradioenginesettings.dll      PAGED
 
-data=ZPRIVATE\10202be9\101FF976.txt                                 private\10202be9\101FF976.txt
-data=\epoc32\data\z\resource\radioenginesettings.rsc                \resource\radioenginesettings.rsc
+data=ZPRIVATE\10202be9\2002FF52.txt                                 private\10202be9\2002FF52.txt
+data=\epoc32\data\z\resource\fmradioenginesettings.rsc              \resource\fmradioenginesettings.rsc
 
-data=\epoc32\data\z\system\install\qtfmradio_stub.sis               system\install\qtfmradio_stub.sis
+data=\epoc32\data\z\system\install\fmradio_stub.sis                 system\install\fmradio_stub.sis
 
 #endif