--- a/radioengine/engine/group/radioengine.mmp	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioengine/engine/group/radioengine.mmp	Thu Jul 22 16:33:45 2010 +0100
@@ -21,15 +21,16 @@
 
 #include <data_caging_paths.hrh>
 
-TARGET                  radioengine.dll
+TARGET                  fmradioengine.dll
 TARGETTYPE              DLL
-UID                     0x1000008D 0x10281CB2
+UID                     0x1000008D 0x2002FF4F
 VERSION                 11.0
 
 CAPABILITY              CAP_GENERAL_DLL
 VENDORID                VID_DEFAULT
 
 PAGED
+SMPSAFE
 
 SOURCEPATH              ../src
 SOURCE                  cradioengine.cpp
@@ -38,11 +39,6 @@
 SOURCE                  cradiordsreceiverbase.cpp
 SOURCE                  cradionetworkinfolistener.cpp
 
-#ifdef __FEATURE_RDS_SIMULATOR
-MACRO __FEATURE_RDS_SIMULATOR
-SOURCE                  t_cradiordsreceiversimulator.cpp
-#endif // __FEATURE_RDS_SIMULATOR
-
 USERINCLUDE             ../api
 USERINCLUDE             ../inc
 USERINCLUDE             ../../utils/api
@@ -52,8 +48,8 @@
 // Default system include paths for application layer modules.
 APP_LAYER_SYSTEMINCLUDE
 
-LIBRARY                 radioengineutils.lib
-LIBRARY                 radioenginesettings.lib
+LIBRARY                 fmradioengineutils.lib
+LIBRARY                 fmradioenginesettings.lib
 
 LIBRARY                 AudioOutputRouting.lib
 LIBRARY                 euser.lib