--- a/cellular/PsetNotesUi/Group/Psui.mmp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Group/Psui.mmp	Fri Apr 16 15:31:58 2010 +0300
@@ -25,22 +25,22 @@
 TARGETTYPE dll
 UID 0x1000008d 0x100059C6
 
-SOURCEPATH ../Src 
-SOURCE PsuiBarringObs.cpp 
-SOURCE PsuiWaitingObs.cpp 
-SOURCE PsuiDivertObs.cpp 
-SOURCE PsuiNoteMaster.cpp 
-SOURCE PsuiResourceLoader.cpp 
-SOURCE PsuiContainer.cpp 
-SOURCE PsuiCliObserver.cpp 
-SOURCE PsuiVariationProxy.cpp 
+SOURCEPATH ../src 
+SOURCE psuibarringobs.cpp 
+SOURCE psuiwaitingobs.cpp 
+SOURCE psuidivertobs.cpp 
+SOURCE psuinotemaster.cpp 
+SOURCE psuiresourceloader.cpp 
+SOURCE psuicontainer.cpp 
+SOURCE psuicliobserver.cpp 
+SOURCE psuivariationproxy.cpp 
 #ifdef RD_PHONE_NG
-SOURCE PsuiQueryDialog.cpp 
+SOURCE psuiquerydialog.cpp 
 #endif // RD_PHONE_NG
-SOURCE PsuiReqObserver.cpp 
-SOURCE PsuiNoteController.cpp 
+SOURCE psuireqobserver.cpp 
+SOURCE psuinotecontroller.cpp 
 
-START RESOURCE ../data/Psui.rss 
+START RESOURCE ../data/psui.rss 
 HEADER
 TARGETPATH RESOURCE_FILES_DIR
 // Language definition
@@ -50,7 +50,7 @@
 
 SYSTEMINCLUDE     ../../../inc
 
-USERINCLUDE    . ../Inc 
+USERINCLUDE    . ../inc 
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY bafl.lib 

--- a/cellular/PsetNotesUi/Group/bld.inf	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Group/bld.inf	Fri Apr 16 15:31:58 2010 +0300
@@ -22,15 +22,15 @@
 DEFAULT
 
 PRJ_MMPFILES
-../Group/Psui.mmp
+../group/psui.mmp
 
 PRJ_EXPORTS
-../inc/PsuiResourceLoader.h |../../../inc/PsuiResourceLoader.h
-../data/psui_stub.SIS       /epoc32/data/z/system/install/psui_stub.SIS
+../inc/psuiresourceloader.h |../../../inc/psuiresourceloader.h
+../data/psui_stub.sis       /epoc32/data/z/system/install/psui_stub.sis
 
 // IBY Files
-../rom/Psui.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(Psui.iby)
-../rom/PsuiResources.iby    LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(PsuiResources.iby)
+../rom/psui.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(psui.iby)
+../rom/psuiresources.iby    LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(psuiresources.iby)
 
 // LOC files
 ../loc/psui.loc             MW_LAYER_LOC_EXPORT_PATH(psui.loc)

--- a/cellular/PsetNotesUi/Inc/PsuiNoteController.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Inc/PsuiNoteController.h	Fri Apr 16 15:31:58 2010 +0300
@@ -22,7 +22,7 @@
 
 // INCLUDES
 #include <coemain.h>
-#include "PsuiNoteMaster.h" 
+#include "psuinotemaster.h" 
 
 // CLASS DECLARATION
 

--- a/cellular/PsetNotesUi/Inc/PsuiNoteMaster.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Inc/PsuiNoteMaster.h	Fri Apr 16 15:31:58 2010 +0300
@@ -26,7 +26,7 @@
 #include <aknnotewrappers.h>
 #include <bldvariant.hrh>
 #include "psuiconstants.h" 
-#include "PsuiInternalConstants.h" 
+#include "psuiinternalconstants.h" 
 #include "psetcalldiverting.h" 
  
 // FORWARD DECLARATIONS

--- a/cellular/PsetNotesUi/Inc/PsuiReqObserver.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Inc/PsuiReqObserver.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 
 // INCLUDES
 #include <mservicerequestobserver.h>          
-#include "PsuiNoteMaster.h" 
+#include "psuinotemaster.h" 
 
 // FORWARD DECLARATIONS
  

--- a/cellular/PsetNotesUi/Src/PsuiBarringObs.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiBarringObs.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,8 +22,8 @@
 #include <exterror.h>
 #include <etelsat.h>
 
-#include "PsuiInternalConstants.h" 
-#include "PsuiNoteController.h" 
+#include "psuiinternalconstants.h" 
+#include "psuinotecontroller.h" 
 
 //  MEMBER FUNCTIONS
 // ---------------------------------------------------------------------------

--- a/cellular/PsetNotesUi/Src/PsuiCliObserver.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiCliObserver.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -23,7 +23,7 @@
  
 #include "psuicliobserver.h" 
 #include "psuicontainer.h" 
-#include "PsuiNoteController.h" 
+#include "psuinotecontroller.h" 
 
 //  MEMBER FUNCTIONS
 

--- a/cellular/PsetNotesUi/Src/PsuiContainer.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiContainer.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -19,7 +19,7 @@
 //INCLUDES
 #include <psuicontainer.h> 
 
-#include "PsuiResourceLoader.h" 
+#include "psuiresourceloader.h" 
 
 // ---------------------------------------------------------------------------
 // Symbian OS two-phased constructor.

--- a/cellular/PsetNotesUi/Src/PsuiDivertObs.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiDivertObs.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -23,7 +23,7 @@
 #include <psuicontainer.h> 
 #include <etelsat.h>
 
-#include "PsuiNoteController.h" 
+#include "psuinotecontroller.h" 
 
 
 // ---------------------------------------------------------------------------

--- a/cellular/PsetNotesUi/Src/PsuiNoteController.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiNoteController.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,8 +17,8 @@
 
 
 // INCLUDE FILES
-#include "PsuiNoteController.h" 
-#include "PsuiInternalConstants.h" 
+#include "psuinotecontroller.h" 
+#include "psuiinternalconstants.h" 
 
 // ================= MEMBER FUNCTIONS =======================
 

--- a/cellular/PsetNotesUi/Src/PsuiNoteMaster.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiNoteMaster.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -30,10 +30,10 @@
 #include <e32property.h>
 #include <BTSapDomainPSKeys.h> 
 
-#include "PsuiInternalConstants.h" 
-#include "PsuiNoteMaster.h" 
-#include "PsuiReqObserver.h" 
-#include "PsuiQueryDialog.h" 
+#include "psuiinternalconstants.h" 
+#include "psuinotemaster.h" 
+#include "psuireqobserver.h" 
+#include "psuiquerydialog.h" 
  
 #include <centralrepository.h>
 #include <NumberGroupingCRKeys.h> 

--- a/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include "PsuiQueryDialog.h" 
+#include "psuiquerydialog.h" 
 
 // ================= MEMBER FUNCTIONS =======================
 

--- a/cellular/PsetNotesUi/Src/PsuiReqObserver.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiReqObserver.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <psuicontainer.h> 
 
-#include "PsuiReqObserver.h" 
+#include "psuireqobserver.h" 
   
 // MACROS
 

--- a/cellular/PsetNotesUi/Src/PsuiResourceLoader.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiResourceLoader.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -20,7 +20,7 @@
 #include <coemain.h>
 #include <ConeResLoader.h> 
 
-#include "PsuiResourceLoader.h" 
+#include "psuiresourceloader.h" 
 
 // CONSTANTS
 _LIT( KPsuiResourceFileNameAndPath, "Z:\\resource\\Psui.rsc" );

--- a/cellular/PsetNotesUi/Src/PsuiVariationProxy.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiVariationProxy.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 
-#include "PsuiVariationProxy.h" 
+#include "psuivariationproxy.h" 
 #include <centralrepository.h>
 #include <settingsinternalcrkeys.h> 
 

--- a/cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/Src/PsuiWaitingObs.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -21,9 +21,9 @@
 #include <psuicontainer.h> 
 #include <etelsat.h>
  
-#include "PsuiInternalConstants.h" 
-#include "PsuiNoteController.h" 
-#include "PsuiVariationProxy.h" 
+#include "psuiinternalconstants.h" 
+#include "psuinotecontroller.h" 
+#include "psuivariationproxy.h" 
 
 //  MEMBER FUNCTIONS
 // ---------------------------------------------------------------------------

--- a/cellular/PsetNotesUi/tsrc/public/basic/Src/T_PSetNotesUi.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/PsetNotesUi/tsrc/public/basic/Src/T_PSetNotesUi.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,7 +22,7 @@
 //  EXTERNAL INCLUDES
 #include <EUnitMacros.h>
 #include <EUnitDecorators.h>
-#include <PsuiContainer.h>
+#include <psuicontainer.h>
 
 //  INTERNAL INCLUDES
 

--- a/cellular/SSSettings/Logger/SSSettingsLogger.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/Logger/SSSettingsLogger.h	Fri Apr 16 15:31:58 2010 +0300
@@ -22,7 +22,7 @@
 #ifndef SSSETTINGSLOGGER_H
 #define SSSETTINGSLOGGER_H
 
-#include "SSSettingsLoggingConf.h" 
+#include "sssettingsloggingconf.h" 
 #include <e32std.h>
 #include <flogger.h>
 #include <e32svr.h>

--- a/cellular/SSSettings/group/SSSettings.mmp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/group/SSSettings.mmp	Fri Apr 16 15:31:58 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../logger/SSSettingsLoggingConf.h" 
+#include "../logger/sssettingsloggingconf.h" 
 
 
 TARGET          sssettings.dll
@@ -29,16 +29,16 @@
 CAPABILITY      CAP_GENERAL_DLL
 
 sourcepath    ../src
-SOURCE        RSSSettings.cpp 
-SOURCE        CSSSettingsNotifier.cpp 
-SOURCE        CSSSettingsAlsNotifier.cpp 
-SOURCE        RCustomerServiceProfileCache.cpp 
-SOURCE        CSSSettingsRefreshContainer.cpp 
-SOURCE        CSSSettingsRefreshHandler.cpp 
-SOURCE        CSSSettingsActiveObject.cpp 
+SOURCE        rsssettings.cpp 
+SOURCE        csssettingsnotifier.cpp 
+SOURCE        csssettingsalsnotifier.cpp 
+SOURCE        rcustomerserviceprofilecache.cpp 
+SOURCE        csssettingsrefreshcontainer.cpp 
+SOURCE        csssettingsrefreshhandler.cpp 
+SOURCE        csssettingsactiveobject.cpp 
 
 USERINCLUDE     ../inc
-USERINCLUDE     ../Logger 
+USERINCLUDE     ../logger 
 SYSTEMINCLUDE   ../inc
 
 MW_LAYER_SYSTEMINCLUDE

--- a/cellular/SSSettings/group/bld.inf	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/group/bld.inf	Fri Apr 16 15:31:58 2010 +0300
@@ -23,15 +23,15 @@
 
 PRJ_EXPORTS
 
-../inc/CSSSettingsRefreshContainer.h  |../../../inc/CSSSettingsRefreshContainer.h
-../inc/MSSSettingsRefreshHandler.h    |../../../inc/MSSSettingsRefreshHandler.h
+../inc/csssettingsrefreshcontainer.h  |../../../inc/csssettingsrefreshcontainer.h
+../inc/msssettingsrefreshhandler.h    |../../../inc/msssettingsrefreshhandler.h
 
-../group/SSSettings_stub.SIS          /epoc32/data/z/system/install/SSSettings_stub.SIS
+../group/sssettings_stub.sis          /epoc32/data/z/system/install/sssettings_stub.sis
 
 // IBY files
-../rom/SSSettings.iby                 CORE_APP_LAYER_IBY_EXPORT_PATH(SSSettings.iby)
+../rom/sssettings.iby                 CORE_APP_LAYER_IBY_EXPORT_PATH(sssettings.iby)
 
 PRJ_MMPFILES
-../group/SSSettings.mmp
+../group/sssettings.mmp
 
 //End of file

--- a/cellular/SSSettings/inc/CSSSettingsAlsNotifier.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/inc/CSSSettingsAlsNotifier.h	Fri Apr 16 15:31:58 2010 +0300
@@ -24,7 +24,7 @@
 #include <cenrepnotifyhandler.h>
 
 #include "rsssettings.h" 
-#include "CSSSettingsActiveObject.h" 
+#include "csssettingsactiveobject.h" 
 
 // FORWARD DECLARATIONS
 class RMmCustomAPI;

--- a/cellular/SSSettings/inc/CSSSettingsNotifier.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/inc/CSSSettingsNotifier.h	Fri Apr 16 15:31:58 2010 +0300
@@ -23,7 +23,7 @@
 #include <cenrepnotifyhandler.h>
 
 #include "rsssettings.h" 
-#include "CSSSettingsActiveObject.h" 
+#include "csssettingsactiveobject.h" 
 
 // FORWARD DECLARATIONS
 class CSSSettingsAlsNotifier;

--- a/cellular/SSSettings/inc/CSSSettingsRefreshContainer.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/inc/CSSSettingsRefreshContainer.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 
 
 //  INCLUDES
-#include <MSSSettingsRefreshHandler.h> 
+#include <msssettingsrefreshhandler.h> 
 
 
 // FORWARD DECLARATIONS

--- a/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h	Fri Apr 16 15:31:58 2010 +0300
@@ -22,7 +22,7 @@
 
 
 //  INCLUDES
-#include <MSSSettingsRefreshHandler.h> 
+#include <msssettingsrefreshhandler.h> 
 #include <msatrefreshobserver.h>
 #include <msssettingsrefreshobserver.h> 
 #include <rsssettings.h> 
@@ -30,7 +30,7 @@
 #include <RSatRefresh.h> 
 #include <RSatSession.h> 
 #include <cenrepnotifyhandler.h>
-#include "CSSSettingsActiveObject.h" 
+#include "csssettingsactiveobject.h" 
 
 // DATA TYPES
 

--- a/cellular/SSSettings/rom/SSSettings.iby	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/rom/SSSettings.iby	Fri Apr 16 15:31:58 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef __SSSETTINGS_IBY__
 #define __SSSETTINGS_IBY__
 
-file=ABI_DIR\BUILD_DIR\SSSettings.dll       SHARED_LIB_DIR\sssettings.dll
-data=ZSYSTEM\install\sssettings_stub.SIS    System\Install\sssettings_stub.SIS
+file=ABI_DIR\BUILD_DIR\sssettings.dll       SHARED_LIB_DIR\sssettings.dll
+data=ZSYSTEM\install\sssettings_stub.sis    System\Install\sssettings_stub.sis
 
 #endif

--- a/cellular/SSSettings/src/CSSSettingsActiveObject.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/src/CSSSettingsActiveObject.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include    "CSSSettingsActiveObject.h" 
+#include    "csssettingsactiveobject.h" 
 #include    <e32property.h>
 
 

--- a/cellular/SSSettings/src/CSSSettingsAlsNotifier.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/src/CSSSettingsAlsNotifier.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -21,13 +21,13 @@
 #include    <rmmcustomapi.h>
 #include    <startupdomainpskeys.h>
 #include    <centralrepository.h>
-#include    <SSSettingsPrivatePSKeys.h> // sssettings pub&sub keys. 
-#include    <SSSettingsPrivateCRKeys.h> // sssettings centrep keys. 
+#include    <sssettingsprivatepskeys.h> // sssettings pub&sub keys. 
+#include    <sssettingsprivatecrkeys.h> // sssettings centrep keys. 
 #include    <PSVariables.h> 
 
-#include    "CSSSettingsAlsNotifier.h" 
-#include    "CSSSettingsActiveObject.h" 
-#include    "SSSettingsLogger.h" 
+#include    "csssettingsalsnotifier.h" 
+#include    "csssettingsactiveobject.h" 
+#include    "sssettingslogger.h" 
 
 // ================= MEMBER FUNCTIONS =======================
 // -----------------------------------------------------------------------------

--- a/cellular/SSSettings/src/CSSSettingsNotifier.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/src/CSSSettingsNotifier.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -19,12 +19,12 @@
 // INCLUDE FILES
 #include    <rmmcustomapi.h>
 #include    <centralrepository.h>
-#include    <SSSettingsPrivateCRKeys.h> 
+#include    <sssettingsprivatecrkeys.h> 
 
-#include    "CSSSettingsNotifier.h" 
+#include    "csssettingsnotifier.h" 
 #include    "msssettingsobserver.h" 
-#include    "CSSSettingsAlsNotifier.h" 
-#include    "SSSettingsLogger.h" 
+#include    "csssettingsalsnotifier.h" 
+#include    "sssettingslogger.h" 
 
 
 // DATA TYPES

--- a/cellular/SSSettings/src/CSSSettingsRefreshContainer.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/src/CSSSettingsRefreshContainer.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -18,8 +18,8 @@
 
 
 // INCLUDE FILES
-#include    <CSSSettingsRefreshContainer.h> 
-#include    "CSSSettingsRefreshHandler.h" 
+#include    <csssettingsrefreshcontainer.h> 
+#include    "csssettingsrefreshhandler.h" 
 
 
 // ============================ MEMBER FUNCTIONS ===============================

--- a/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -23,9 +23,9 @@
 #include    <BTSapDomainPSKeys.h> // bt sap central repository key. 
 #include    <featmgr.h>
 
-#include    "CSSSettingsRefreshHandler.h" 
-#include    "SSSettingsLogger.h" 
-#include    "CSSSettingsActiveObject.h" 
+#include    "csssettingsrefreshhandler.h" 
+#include    "sssettingslogger.h" 
+#include    "csssettingsactiveobject.h" 
 
 // ============================= LOCAL FUNCTIONS ===============================
 

--- a/cellular/SSSettings/src/RCustomerServiceProfileCache.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/src/RCustomerServiceProfileCache.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -19,13 +19,13 @@
 // INCLUDE FILES
 #include    <bldvariant.hrh> // for feature definitions
 #include    <etel.h>  
-#include    <SSSettingsPrivatePSKeys.h> 
+#include    <sssettingsprivatepskeys.h> 
 #include    <centralrepository.h>
 #include    <mmtsy_names.h>
 #include    <featmgr.h>
       
 #include    "rcustomerserviceprofilecache.h" 
-#include    "SSSettingsLogger.h" 
+#include    "sssettingslogger.h" 
 
 // CONSTANTS
 #define KSSSettingsTSYName KMmTsyModuleName

--- a/cellular/SSSettings/src/RSSSettings.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/src/RSSSettings.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -26,15 +26,15 @@
 #include    <PSVariables.h> 
 #include    <startupdomainpskeys.h>
 #include    <centralrepository.h> // central repository 
-#include    <SSSettingsPrivateCRKeys.h> // settings central repository keys. 
+#include    <sssettingsprivatecrkeys.h> // settings central repository keys. 
 #include    <telservicesinternalcrkeys.h>
 #include    <telservicesvariant.hrh>
 
 #include    "rsssettings.h" 
 #include    "msssettingsobserver.h" 
-#include    "CSSSettingsNotifier.h" 
-#include    "CSSSettingsAlsNotifier.h" 
-#include    "SSSettingsLogger.h" 
+#include    "csssettingsnotifier.h" 
+#include    "csssettingsalsnotifier.h" 
+#include    "sssettingslogger.h" 
 
 // CONSTANTS
 _LIT( KPanicCat, "SSSettings" );

--- a/cellular/SSSettings/tsrc/public/basic/EunitTest/Group/bld.inf	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/tsrc/public/basic/EunitTest/Group/bld.inf	Fri Apr 16 15:31:58 2010 +0300
@@ -29,6 +29,6 @@
 PRJ_MMPFILES
 
 PRJ_TESTMMPFILES
-../Group/MT_SSSettings.mmp
+../group/MT_SSSettings.mmp
 
 // End of file

--- a/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,8 +22,8 @@
 //  EXTERNAL INCLUDES
 #include <EUnitMacros.h>
 #include <CSSSettingsRefreshContainer.h>
-#include <RCustomerServiceProfileCache.h>
-#include <RSSSettings.h>
+#include <rcustomerserviceprofilecache.h>
+#include <rsssettings.h>
 #include <mmtsy_names.h>
 
 //  INTERNAL INCLUDES

--- a/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/tsrc/public/basic/EunitTest/MT_SSSettings/MT_SSSettings.h	Fri Apr 16 15:31:58 2010 +0300
@@ -23,7 +23,7 @@
 #include <CEUnitTestSuiteClass.h>
 #include <etelmm.h>
 #include <MSSSettingsObserver.h>
-#include <MSSSettingsRefreshObserver.h>
+#include <msssettingsrefreshobserver.h>
 #include <MSSSettingsRefreshHandler.h>
 #include <MSatRefreshObserver.h>
 #include <etelsat.h>

--- a/cellular/SSSettings/tsrc/public/basic/group/bld.inf	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/tsrc/public/basic/group/bld.inf	Fri Apr 16 15:31:58 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-#include "../EunitTest/Group/bld.inf"
+#include "../EunitTest/group/bld.inf"
 
 
 // End of file

--- a/cellular/SSSettings/xqbindings/sssettingswrapper/tsrc/mocks/mock_rsssettings.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/SSSettings/xqbindings/sssettingswrapper/tsrc/mocks/mock_rsssettings.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -16,7 +16,7 @@
  */
  
 #include <smcmockclassincludes.h>
-#include <RSSSettings.h>
+#include <rsssettings.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 

--- a/cellular/ServiceRequest/data/ServiceRequest.rss	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/ServiceRequest/data/ServiceRequest.rss	Fri Apr 16 15:31:58 2010 +0300
@@ -29,7 +29,7 @@
 #include <avkon.mbg>
 
 #include <avkon.loc>
-#include "ServiceRequest.hrh" 
+#include "servicerequest.hrh" 
 
 RESOURCE RSS_SIGNATURE { }
 

--- a/cellular/ServiceRequest/group/ServiceRequest.mmp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/ServiceRequest/group/ServiceRequest.mmp	Fri Apr 16 15:31:58 2010 +0300
@@ -26,10 +26,10 @@
 UID             0x1000008d 0x10005A3D
 
 SOURCEPATH      ../src
-SOURCE          CServiceRequest.cpp 
+SOURCE          cservicerequest.cpp 
 
 // Resource files
-START RESOURCE ../data/ServiceRequest.rss 
+START RESOURCE ../data/servicerequest.rss 
 TARGETPATH RESOURCE_FILES_DIR
 HEADER
 LANGUAGE_IDS

--- a/cellular/ServiceRequest/group/bld.inf	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/ServiceRequest/group/bld.inf	Fri Apr 16 15:31:58 2010 +0300
@@ -21,14 +21,14 @@
 DEFAULT
 
 PRJ_EXPORTS
-../inc/CServiceRequest.h            |../../../inc/CServiceRequest.h
-../inc/MServiceRequestObserver.h    |../../../inc/MServiceRequestObserver.h
-../data/servicerequest_stub.SIS     /epoc32/data/z/system/install/servicerequest_stub.SIS
+../inc/cservicerequest.h            |../../../inc/cservicerequest.h
+../inc/mservicerequestobserver.h    |../../../inc/mservicerequestobserver.h
+../data/servicerequest_stub.sis     /epoc32/data/z/system/install/servicerequest_stub.sis
 ../rom/servicerequest.iby           CORE_APP_LAYER_IBY_EXPORT_PATH(servicerequest.iby)
-../rom/servicerequestResources.iby  LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(servicerequestResources.iby)
+../rom/servicerequestresources.iby  LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(servicerequestresources.iby)
 
 PRJ_MMPFILES
-../group/ServiceRequest.mmp
+../group/servicerequest.mmp
  
 
 //  End of File  

--- a/cellular/ServiceRequest/rom/servicerequest.iby	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/ServiceRequest/rom/servicerequest.iby	Fri Apr 16 15:31:58 2010 +0300
@@ -19,8 +19,8 @@
 #ifndef __SERVICEREQUEST_IBY__
 #define __SERVICEREQUEST_IBY__
 
-file=ABI_DIR\BUILD_DIR\SERVICEREQUEST.DLL  SHARED_LIB_DIR\SERVICEREQUEST.DLL
+file=ABI_DIR\BUILD_DIR\servicerequest.dll  SHARED_LIB_DIR\servicerequest.dll
 
-data=ZSYSTEM\install\Servicerequest_stub.sis    System\Install\Servicerequest_stub.sis
+data=ZSYSTEM\install\servicerequest_stub.sis    System\Install\servicerequest_stub.sis
 
 #endif

--- a/cellular/ServiceRequest/src/CServiceRequest.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/ServiceRequest/src/CServiceRequest.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -18,8 +18,8 @@
 
 
 // INCLUDE FILES
-#include    "CServiceRequest.h" 
-#include    "MServiceRequestObserver.h" 
+#include    "cservicerequest.h" 
+#include    "mservicerequestobserver.h" 
 #include    <servicerequest.rsg> 
 
 #include    <AknWaitDialog.h> 

--- a/cellular/group/bld.inf	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/group/bld.inf	Fri Apr 16 15:31:58 2010 +0300
@@ -17,8 +17,8 @@
 
 
 #include "../telephonysettings/group/bld.inf"
-#include "../SSSettings/group/bld.inf"
-#include "../PsetNotesUi/Group/bld.inf"
-#include "../ServiceRequest/group/bld.inf"
+#include "../sssettings/group/bld.inf"
+#include "../psetnotesui/group/bld.inf"
+#include "../servicerequest/group/bld.inf"
 
 // End of File
\ No newline at end of file

--- a/cellular/telephonysettings/Logger/PhoneSettingsLogger.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/Logger/PhoneSettingsLogger.h	Fri Apr 16 15:31:58 2010 +0300
@@ -22,7 +22,7 @@
 #ifndef PHONESETTINGSLOGGER_H
 #define PHONESETTINGSLOGGER_H
 
-#include "PhoneSettingsLoggingConf.h" 
+#include "phonesettingsloggingconf.h" 
 #include <e32std.h>
 #include <flogger.h>
 #include <e32svr.h>

--- a/cellular/telephonysettings/group/bld.inf	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/group/bld.inf	Fri Apr 16 15:31:58 2010 +0300
@@ -26,9 +26,9 @@
 PRJ_EXPORTS
 
 
-../group/phonesettings_stub.SIS  /epoc32/data/z/system/install/phonesettings_stub.SIS
+../group/phonesettings_stub.sis  /epoc32/data/z/system/install/phonesettings_stub.sis
 
 // IBY files
-../rom/PhoneSettings.iby      CORE_APP_LAYER_IBY_EXPORT_PATH(PhoneSettings.iby)
+../rom/phonesettings.iby      CORE_APP_LAYER_IBY_EXPORT_PATH(phonesettings.iby)
 
 // End of file

--- a/cellular/telephonysettings/group/phonesettings.mmp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/group/phonesettings.mmp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../logger/PhoneSettingsLoggingConf.h" 
+#include "../logger/phonesettingsloggingconf.h" 
 
 // Capability assignment.
 CAPABILITY CAP_GENERAL_DLL
@@ -28,26 +28,26 @@
 UID 0x1000008d 0x100058e3
 
 SOURCEPATH ../src
-SOURCE PsetCallWaiting.cpp 
-SOURCE PsetContainer.cpp 
-SOURCE PsetCallBarring.cpp 
-SOURCE PsetCallDiverting.cpp 
-SOURCE PsetTelephony.cpp 
-SOURCE PsetCli.cpp 
-SOURCE PsetVariationProxy.cpp 
-SOURCE PsetNetwork.cpp 
-SOURCE PsetSAObserver.cpp 
-SOURCE PsetCSP.cpp 
-SOURCE PSetUtility.cpp 
-SOURCE PSetRefreshHandlerImpl.cpp 
-SOURCE PSetCallDivertingBase.cpp 
-SOURCE PSetSubscriberIdCheck.cpp 
-SOURCE PSetCallDivertingBasicImpl.cpp 
-SOURCE PSetCallDivertingCreator.cpp 
-SOURCE PSetCallDivertingDualAffectImpl.cpp 
+SOURCE psetcallwaiting.cpp 
+SOURCE psetcontainer.cpp 
+SOURCE psetcallbarring.cpp 
+SOURCE psetcalldiverting.cpp 
+SOURCE psettelephony.cpp 
+SOURCE psetcli.cpp 
+SOURCE psetvariationproxy.cpp 
+SOURCE psetnetwork.cpp 
+SOURCE psetsaobserver.cpp 
+SOURCE psetcsp.cpp 
+SOURCE psetutility.cpp 
+SOURCE psetrefreshhandlerimpl.cpp 
+SOURCE psetcalldivertingbase.cpp 
+SOURCE psetsubscriberidcheck.cpp 
+SOURCE psetcalldivertingbasicimpl.cpp 
+SOURCE psetcalldivertingcreator.cpp 
+SOURCE psetcalldivertingdualaffectimpl.cpp 
 
 USERINCLUDE     ../inc
-USERINCLUDE     ../Logger 
+USERINCLUDE     ../logger 
 SYSTEMINCLUDE   ../../../inc
 // APP include needed because telephonysettings 
 // uses vmbx headers from APP layer.

--- a/cellular/telephonysettings/inc/PSetCallDivertingBase.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/inc/PSetCallDivertingBase.h	Fri Apr 16 15:31:58 2010 +0300
@@ -24,7 +24,7 @@
 #include <badesca.h>
 #include <mmretrieve.h>
 #include <ctsydomaincrkeys.h>
-#include "MCallDiverting.h" 
+#include "mcalldiverting.h" 
 #include "msssettingsobserver.h" 
 #include "nwdefs.h"             
 #include "psetconstants.h" 
@@ -66,12 +66,10 @@
         ~CPSetCallDivertingBase();
    
     public: // From base class.
-// <-- QT PHONE START -->
         /**
          * @see MCallDiverting.
          */
         void SetRequestObserver( MPsetRequestObserver* aObs );
-// <-- QT PHONE END -->
 
         /**
         * @see MCallDiverting.
@@ -117,12 +115,6 @@
         
         /**
         * @see MCallDiverting.
-        */   
-        // <-- QT PHONE START-->
-        //TInt OpenVmbxLC( TDes& aTelNumber, RVmbxNumber& aVmbx );
-        // <-- QT PHONE END-->
-        /**
-        * @see MCallDiverting.
         */
         TInt GetNumbersFromSharedDataL( TInt aType, 
                                 CDesC16ArrayFlat& aArray );        

--- a/cellular/telephonysettings/inc/PSetCallDivertingBasicImpl.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/inc/PSetCallDivertingBasicImpl.h	Fri Apr 16 15:31:58 2010 +0300
@@ -27,7 +27,7 @@
 #include "msssettingsobserver.h" 
 #include "nwdefs.h"             
 #include "psetconstants.h" 
-#include "PSetCallDivertingBase.h" 
+#include "psetcalldivertingbase.h" 
 
 // CLASS DECLARATION
 class CPsetSAObserver;

--- a/cellular/telephonysettings/inc/PSetCallDivertingCreator.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/inc/PSetCallDivertingCreator.h	Fri Apr 16 15:31:58 2010 +0300
@@ -22,13 +22,10 @@
 //  INCLUDES
 #include    <e32base.h>
 #include    <badesca.h>
-// <-- QT PHONE START -->
-//#include    <vmnumber.h>
-// <-- QT PHONE END-->
 #include    <etelmm.h>
 #include    <nwdefs.h>
 #include    "mpsetdivertobs.h" 
-#include    "MCallDiverting.h" 
+#include    "mcalldiverting.h" 
 
 /**
 *  Factory class for creating divert related classes.

--- a/cellular/telephonysettings/inc/PSetCallDivertingDualAffectImpl.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/inc/PSetCallDivertingDualAffectImpl.h	Fri Apr 16 15:31:58 2010 +0300
@@ -27,7 +27,7 @@
 #include "msssettingsobserver.h" 
 #include "nwdefs.h"             
 #include "psetconstants.h" 
-#include "PSetCallDivertingBase.h" 
+#include "psetcalldivertingbase.h" 
 
 // CLASS DECLARATION
 class CPsetSAObserver;

--- a/cellular/telephonysettings/rom/PhoneSettings.iby	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/rom/PhoneSettings.iby	Fri Apr 16 15:31:58 2010 +0300
@@ -21,6 +21,6 @@
 // Network Settings Engine Library
 file=ABI_DIR\BUILD_DIR\phonesettings.dll        SHARED_LIB_DIR\phonesettings.dll
 
-data=ZSYSTEM\install\phonesettings_stub.SIS     System\Install\phonesettings_stub.SIS
+data=ZSYSTEM\install\phonesettings_stub.sis     System\Install\phonesettings_stub.sis
 
 #endif

--- a/cellular/telephonysettings/src/PSetCallDivertingBase.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PSetCallDivertingBase.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,14 +17,11 @@
 
 
 // INCLUDE FILES
-#include "PSetCallDivertingBasicImpl.h" 
+#include "psetcalldivertingbasicimpl.h" 
 
 #include <badesca.h>
 #include <etelmm.h>           
 #include <e32math.h>
-// <-- QT PHONE START -->
-//include <vmnumber.h>
-// <-- QT PHONE END -->
 #include <e32svr.h>
 #include <featmgr.h>
 #include <centralrepository.h>
@@ -33,13 +30,13 @@
 #include "psetcalldiverting.h" 
 #include "psetcontainer.h" 
 #include "mpsetdivertobs.h" 
-#include "PsetTelephony.h" 
-#include "PSetPanic.h" 
+#include "psettelephony.h" 
+#include "psetpanic.h" 
 #include "mpsetrequestobs.h" 
-#include "PSetUtility.h" 
-#include "PhoneSettingsLogger.h" 
+#include "psetutility.h" 
+#include "phonesettingslogger.h" 
 #include "psetsaobserver.h" 
-#include "PSetCallDivertingBase.h" 
+#include "psetcalldivertingbase.h" 
 
 //  LOCAL CONSTANTS AND MACROS
 
@@ -169,7 +166,6 @@
     // Empty implementation.
     }
 
-// <-- QT PHONE START -->
 // ---------------------------------------------------------------------------
 // SetRequestObserver
 // ---------------------------------------------------------------------------
@@ -178,7 +174,6 @@
     {
     iReqObserver = aObs;
     }
-// <-- QT PHONE END -->
 
 // ---------------------------------------------------------------------------
 // SetDivertingL
@@ -827,65 +822,11 @@
     __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBase::IsVMBXDivertL" );
     
     TBool result = EFalse;
- // <-- QT PHONE START -->   
- 
- /*
-    if ( FeatureManager::FeatureSupported ( KFeatureIdVmbxCallDivertIcon ) )
-        {
-        RVmbxNumber vmbxConnection;
-        TTelNumber telNumber;
-        TInt retValue = OpenVmbxLC( telNumber, vmbxConnection );
-        __PHSLOGSTRING1("[PHS]    CPSetCallDivertingBase::IsVMBXDivertL: telNumber = %S", &telNumber );
-        __PHSLOGSTRING1("[PHS]    CPSetCallDivertingBase::IsVMBXDivertL: retValue = %d", retValue );
-
-        CleanupStack::PopAndDestroy(); //vmbxConnection is closed when popped    
-        if ( retValue == KErrNone ) //VMBX number found
-            {
-            
-            //Concatenate the existing number and add '*' to the beginning
-            TTelNumber tempStr;
-            tempStr.Zero();
-            tempStr.Append( KPSetAsterisk );
-        
-            //Match with seven characters
-            TInt matchChars = KPsetMatchingChars;
-            if ( telNumber.Length() < matchChars )
-                {                
-                matchChars = telNumber.Length();
-                }
-            tempStr.Append( telNumber.Right( matchChars ) );
-        
-            //Compare value with divert-to number
-            if ( aTelNumber.Match ( tempStr ) != KErrNotFound )
-                {
-                __PHSLOGSTRING("[PHS]    CPSetCallDivertingBase::IsVMBXDivertL: Match found" );
-                result = ETrue;
-                }
-            }
-        }
-*/
-    // <-- QT PHONE END-->
     __PHSLOGSTRING("[PHS] <--CPSetCallDivertingBase::IsVMBXDivertL" );
     return result;
     }
 
 // ---------------------------------------------------------------------------
-// Opens Vmbx. Leaves vmbx to the stack.  
-// ---------------------------------------------------------------------------
-// <-- QT PHONE START-->
-/*
-TInt CPSetCallDivertingBase::OpenVmbxLC( TDes& aTelNumber, RVmbxNumber& aVmbx )
-    {
-    __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBase::OpenVmbxLC" );
-    User::LeaveIfError( aVmbx.Open( iPhone ) );
-    CleanupClosePushL( aVmbx );         
-    __PHSLOGSTRING("[PHS]<-- CPSetCallDivertingBase::OpenVmbxLC" );
-    return aVmbx.GetVmbxNumber( aTelNumber );
-    
-    }
-*/
-// <-- QT PHONE END-->
-// ---------------------------------------------------------------------------
 // If SsSettings notifies of settings change, copy new value to member variable. 
 // ---------------------------------------------------------------------------
 void CPSetCallDivertingBase::PhoneSettingChanged( 

--- a/cellular/telephonysettings/src/PSetCallDivertingBasicImpl.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PSetCallDivertingBasicImpl.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,14 +17,11 @@
 
 
 // INCLUDE FILES
-#include "PSetCallDivertingBasicImpl.h" 
+#include "psetcalldivertingbasicimpl.h" 
 
 #include <badesca.h>
 #include <etelmm.h>           
 #include <e32math.h>
-// <-- QT PHONE START -->
-//#include <vmnumber.h>
-// <-- QT PHONE END-->
 #include <e32svr.h>
 #include <featmgr.h>
 #include <centralrepository.h>
@@ -33,11 +30,11 @@
 #include "psetcalldiverting.h" 
 #include "psetcontainer.h" 
 #include "mpsetdivertobs.h" 
-#include "PsetTelephony.h" 
-#include "PSetPanic.h" 
+#include "psettelephony.h" 
+#include "psetpanic.h" 
 #include "mpsetrequestobs.h" 
-#include "PSetUtility.h" 
-#include "PhoneSettingsLogger.h" 
+#include "psetutility.h" 
+#include "phonesettingslogger.h" 
 #include "psetsaobserver.h" 
 
 //  LOCAL CONSTANTS AND MACROS
@@ -205,11 +202,9 @@
            __PHSLOGSTRING("[PHS]--> CPSetCallDivertingBasicImpl::RunL: EPSetChangeDivert" );
            //Notify Observer            
            iDivertStatus.iStatus = PSetUtility::GetChangeInfoStatus( iChangeInfo.iAction );
-// <-- QT PHONE START -->
            iDivertStatus.iNumber = iChangeInfo.iNumber.iTelNumber;
            iDivertStatus.iCondition = PSetUtility::GetDivertReason(iReason);
            iDivertStatus.iNoReplyTimer = iChangeInfo.iTimeout;
-// <-- QT PHONE END -->
             // Check is done because of VOIP notification functionality(PSetNotesUI).
            if ( iVoiceDivert && !iVideoDivert )
                {

--- a/cellular/telephonysettings/src/PSetCallDivertingCreator.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PSetCallDivertingCreator.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -18,10 +18,10 @@
 
 
 // INCLUDE FILES
-#include    "PSetCallDivertingBasicImpl.h" 
-#include    "PSetCallDivertingDualAffectImpl.h" 
-#include    "PSetCallDivertingCreator.h" 
-#include    "PsetVariationProxy.h" 
+#include    "psetcalldivertingbasicimpl.h" 
+#include    "psetcalldivertingdualaffectimpl.h" 
+#include    "psetcalldivertingcreator.h" 
+#include    "psetvariationproxy.h" 
 
 #include    <psetcalldiverting.h> 
 #include    <centralrepository.h>

--- a/cellular/telephonysettings/src/PSetCallDivertingDualAffectImpl.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PSetCallDivertingDualAffectImpl.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,15 +17,12 @@
 
 
 // INCLUDE FILES
-#include "PSetCallDivertingDualAffectImpl.h" 
-#include "PSetSubscriberIdCheck.h" 
+#include "psetcalldivertingdualaffectimpl.h" 
+#include "psetsubscriberidcheck.h" 
 
 #include <badesca.h>
 #include <etelmm.h>
 #include <e32math.h>
-// <-- QT PHONE START -->
-//#include <vmnumber.h>
-// <-- QT PHONE END -->
 #include <e32svr.h>
 #include <featmgr.h>
 #include <centralrepository.h>
@@ -34,11 +31,11 @@
 #include "psetcalldiverting.h" 
 #include "psetcontainer.h" 
 #include "mpsetdivertobs.h" 
-#include "PsetTelephony.h" 
-#include "PSetPanic.h" 
+#include "psettelephony.h" 
+#include "psetpanic.h" 
 #include "mpsetrequestobs.h" 
-#include "PSetUtility.h" 
-#include "PhoneSettingsLogger.h" 
+#include "psetutility.h" 
+#include "phonesettingslogger.h" 
 #include "psetsaobserver.h" 
 
 //  LOCAL CONSTANTS AND MACROS

--- a/cellular/telephonysettings/src/PSetRefreshHandlerImpl.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PSetRefreshHandlerImpl.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -18,12 +18,12 @@
 
 
 // INCLUDE FILES
-#include    "PSetRefreshHandlerImpl.h" 
+#include    "psetrefreshhandlerimpl.h" 
 #include    <etelmm.h>
 #include    <msssettingsrefreshhandler.h>
 #include    <csssettingsrefreshcontainer.h>
 #include    <psetcsp.h> 
-#include    "PhoneSettingsLogger.h" 
+#include    "phonesettingslogger.h" 
 
 
 // ============================ MEMBER FUNCTIONS ===============================

--- a/cellular/telephonysettings/src/PSetSubscriberIdCheck.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PSetSubscriberIdCheck.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include    "PSetSubscriberIdCheck.h" 
+#include    "psetsubscriberidcheck.h" 
 
 _LIT( KRogersImsi, "30272" );
 const TInt KMinImsiLength = 5;

--- a/cellular/telephonysettings/src/PSetUtility.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PSetUtility.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -18,9 +18,9 @@
 
 
 // INCLUDE FILES
-#include "PSetUtility.h" 
+#include "psetutility.h" 
 #include <rsssettings.h> 
-#include "PhoneSettingsLogger.h" 
+#include "phonesettingslogger.h" 
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -311,7 +311,6 @@
         }
     }
 
-// <-- QT PHONE START -->
 // ---------------------------------------------------------------------------
 // 
 // Returns divert reason
@@ -342,7 +341,6 @@
            return EDivertConditionNotReachable;
         }
     }
-// <-- QT PHONE END -->
 
 // ---------------------------------------------------------------------------
 // Verify that ALS is really used.

--- a/cellular/telephonysettings/src/PsetCSP.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetCSP.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -24,7 +24,7 @@
 //INCLUDE FILES
 #include "psetcsp.h" 
 #include <etelmm.h>
-#include "PhoneSettingsLogger.h" 
+#include "phonesettingslogger.h" 
 
 //  MEMBER FUNCTIONS
 // ---------------------------------------------------------------------------

--- a/cellular/telephonysettings/src/PsetCallBarring.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetCallBarring.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,11 +22,11 @@
 #include <rsssettings.h> 
 #include "mpsetrequestobs.h" 
 #include "psetcallbarring.h" 
-#include "PsetTelephony.h" 
-#include "PSetPanic.h" 
+#include "psettelephony.h" 
+#include "psetpanic.h" 
 #include "psetconstants.h" 
-#include "PSetUtility.h" 
-#include "PhoneSettingsLogger.h" 
+#include "psetutility.h" 
+#include "phonesettingslogger.h" 
 
 // CONSTANTS    
 _LIT( KPSNameOfClass, "CPsetCallBarring" );

--- a/cellular/telephonysettings/src/PsetCallDiverting.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetCallDiverting.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,21 +22,18 @@
 #include <e32math.h>
 #include <e32svr.h>
 #include <badesca.h>
-// <-- QT PHONE START -->
-//#include <vmnumber.h>
-// <-- QT PHONE END-->
 #include <centralrepository.h>
 #include <settingsinternalcrkeys.h> 
 
 #include "psetcalldiverting.h" 
 #include "psetcontainer.h" 
 #include "mpsetdivertobs.h" 
-#include "PsetTelephony.h" 
-#include "PSetPanic.h" 
-#include "PhoneSettingsLogger.h" 
+#include "psettelephony.h" 
+#include "psetpanic.h" 
+#include "phonesettingslogger.h" 
 
-#include "PSetCallDivertingCreator.h" 
-#include "MCallDiverting.h" 
+#include "psetcalldivertingcreator.h" 
+#include "mcalldiverting.h" 
 
 //  MEMBER FUNCTIONS
 // ---------------------------------------------------------------------------
@@ -262,9 +259,7 @@
 EXPORT_C void CPsetCallDiverting::SetRequestObserver( MPsetRequestObserver* aObs )
     {
     iReqObserver = aObs;
-// <-- QT PHONE START -->
     iDivert->SetRequestObserver(aObs);
-// <-- QT PHONE END -->
     }
 
 // ---------------------------------------------------------------------------
@@ -274,30 +269,6 @@
 EXPORT_C void CPsetCallDiverting::VoiceMailQueryL( TDes& /*aTelNumber*/ )
     {
     __PHSLOGSTRING("[PHS]--> CPsetCallDiverting::VoiceMailQueryL" );
-// <-- QT PHONE START -->
-/*
-    RVmbxNumber vmbxConnection;
-    TBool vmbxNrChanged = ETrue;
-    TInt retValue = iDivert->OpenVmbxLC( aTelNumber, vmbxConnection );
-    __PHSLOGSTRING1("[PHS]    CPsetCallDiverting::VoiceMailQueryL: aTelNumber = %S", &aTelNumber );
-    __PHSLOGSTRING1("[PHS]    CPsetCallDiverting::VoiceMailQueryL: retValue = %d", retValue );
-
-    if ( retValue == KErrNotFound )
-        {
-        vmbxNrChanged = vmbxConnection.QueryNumberL( EVmbxNotDefinedQuery, aTelNumber );
-        }
-    else if ( retValue != KErrNone )
-        {
-        //Problem with vmbx application, better leave.
-        User::Leave( retValue );
-        }
-    if ( !vmbxNrChanged )
-        {
-        User::Leave( KErrCancel );
-        }
-    CleanupStack::PopAndDestroy(); // vmbxConnection
-    */
-// <-- QT PHONE END-->
 
     __PHSLOGSTRING("[PHS] <--CPsetCallDiverting::VoiceMailQueryL" );
     }
@@ -309,30 +280,6 @@
 EXPORT_C void CPsetCallDiverting::VideoMailQueryL( TDes& /*aTelNumber*/ )
     {
     __PHSLOGSTRING("[PHS]--> CPsetCallDiverting::VideoMailQueryL" );
-    // <-- QT PHONE START -->
-    /*
-    RVmbxNumber vmbxConnection;
-    TBool vmbxNrChanged = ETrue;
-    TInt retValue = OpenVideoMailboxLC( aTelNumber, vmbxConnection );
-    __PHSLOGSTRING1("[PHS]    CPsetCallDiverting::VideoMailQueryL: aTelNumber = %S", &aTelNumber );
-    __PHSLOGSTRING1("[PHS]    CPsetCallDiverting::VideoMailQueryL: retValue = %d", retValue );
-
-    if ( retValue == KErrNotFound )
-        {
-        vmbxNrChanged = vmbxConnection.QueryVideoMbxNumberL( EVmbxNotDefinedQuery, aTelNumber );
-        }
-    else if ( retValue != KErrNone )
-        {
-        //Problem with vmbx application, better leave.
-        User::Leave( retValue );
-        }
-    if ( !vmbxNrChanged )
-        {
-        User::Leave( KErrCancel );
-        }
-    CleanupStack::PopAndDestroy(); // vmbxConnection
-    */
-    // <-- QT PHONE END-->
 
     __PHSLOGSTRING("[PHS] <--CPsetCallDiverting::VideoMailQueryL" );
     }    
@@ -341,18 +288,9 @@
 // Opens Vmbx. Leaves vmbx to the stack. 
 // ---------------------------------------------------------------------------
 //
-// <-- QT PHONE START -->
 TInt CPsetCallDiverting::OpenVideoMailboxLC( TDes& /*aTelNumber*/, RVmbxNumber& /*aVmbx*/ )
     {
-/*
-    __PHSLOGSTRING("[PHS]--> CPsetCallDiverting::OpenVideoMailboxLC" );
-    User::LeaveIfError( aVmbx.Open( iPhone ) );
-    CleanupClosePushL( aVmbx );         
-    __PHSLOGSTRING("[PHS]<-- CPsetCallDiverting::OpenVideoMailboxLC" );
-    return aVmbx.GetVideoMbxNumber( aTelNumber );
-*/
     return 0;
-// <-- QT PHONE END -->
     }
     
 // End of File

--- a/cellular/telephonysettings/src/PsetCallWaiting.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetCallWaiting.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -21,13 +21,13 @@
 #include "psetcallwaiting.h" 
 #include "mpsetcallwaitingobs.h" 
 #include "nwdefs.h"             
-#include "PSetPanic.h" 
+#include "psetpanic.h" 
 #include "psetconstants.h" 
 #include "mpsetrequestobs.h" 
-#include "PSetUtility.h" 
-#include "PhoneSettingsLogger.h" 
+#include "psetutility.h" 
+#include "phonesettingslogger.h" 
 
-#include "PsetVariationProxy.h" 
+#include "psetvariationproxy.h" 
 #include <settingsinternalcrkeys.h> 
 
 // CONSTANTS    

--- a/cellular/telephonysettings/src/PsetCli.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetCli.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -19,7 +19,7 @@
 
 //INCLUDE FILES
 #include "psetcli.h" 
-#include "PSetPanic.h" 
+#include "psetpanic.h" 
 #include "psetconstants.h" 
 #include "mpsetrequestobs.h" 
 #include <bldvariant.hrh>

--- a/cellular/telephonysettings/src/PsetContainer.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetContainer.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,7 +22,7 @@
 // INCLUDES
 #include    "psetcontainer.h" 
 #include    "psetconstants.h" 
-#include    "PSetRefreshHandlerImpl.h" 
+#include    "psetrefreshhandlerimpl.h" 
 #include    <mmtsy_names.h>
 
 // ---------------------------------------------------------------------------

--- a/cellular/telephonysettings/src/PsetNetwork.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetNetwork.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #include "mpsetnetworkinfoobs.h" 
 #include "psetnetwork.h" 
 #include "psetsaobserver.h" 
-#include "PSetPanic.h" 
+#include "psetpanic.h" 
 #include "psetconstants.h" 
 #include "mpsetnetworkselect.h" 
 #include <etelmm.h>
@@ -29,7 +29,7 @@
 #include <rmmcustomapi.h>
 
 #include <e32svr.h>
-#include "PhoneSettingsLogger.h" 
+#include "phonesettingslogger.h" 
 
 //  LOCAL CONSTANTS AND MACROS  
 _LIT( KPSNameOfClass, "CPsetNetwork" );

--- a/cellular/telephonysettings/src/PsetSAObserver.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetSAObserver.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -26,9 +26,9 @@
 #include "psetsaobserver.h" 
 #include "mpsetnetworkinfoobs.h" 
 #include "mpsetdivertobs.h" 
-#include "PhoneSettingsLogger.h" 
-#include "PSetUtility.h" 
-#include "PsetVariationProxy.h" 
+#include "phonesettingslogger.h" 
+#include "psetutility.h" 
+#include "psetvariationproxy.h" 
 
 //CONSTANTS
 const TInt KPsetRequesterUncertain = 0;

--- a/cellular/telephonysettings/src/PsetTelephony.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetTelephony.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,8 +22,8 @@
 #include <e32svr.h>
 #include <mmtsy_names.h>
 #include "psetconstants.h" 
-#include "PsetTelephony.h" 
-#include "PhoneSettingsLogger.h" 
+#include "psettelephony.h" 
+#include "phonesettingslogger.h" 
 
 //  MEMBER FUNCTIONS
 // ---------------------------------------------------------------------------

--- a/cellular/telephonysettings/src/PsetVariationProxy.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/src/PsetVariationProxy.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 
-#include "PsetVariationProxy.h" 
+#include "psetvariationproxy.h" 
 #include <centralrepository.h>
 #include <settingsinternalcrkeys.h> 
 #include <telservicesinternalcrkeys.h>

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallDivertingObserver.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallDivertingObserver.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #define PHONESETTINGSTESTCALLDIVERTINGGOBSERVER_H
 
 #include <e32base.h>
-#include <MPsetDivertObs.h>
+#include <mpsetdivertobs.h>
 
 // CLASS DECLARATION
 

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallWaitingObserver.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCallWaitingObserver.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #define PHONESETTINGSTESTCALLWAITINGGOBSERVER_H
 
 #include <e32base.h>
-#include <MPsetCallWaitingObs.h>
+#include <mpsetcallwaitingobs.h>
 
 // CLASS DECLARATION
 

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCliObserver.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestCliObserver.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #define PHONESETTINGSTESTCLIOBSERVER_H
 
 #include <e32base.h>
-#include <MPsetCliObserver.h>
+#include <mpsetcliobserver.h>
 
 // CLASS DECLARATION
 

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkInfoObserver.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkInfoObserver.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #define PHONESETTINGSTESTNETWORKINFOOBSERVER_H
 
 #include <e32base.h>
-#include <MPsetNetworkInfoObs.h>
+#include <mpsetnetworkinfoobs.h>
 
 // CLASS DECLARATION
 

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkModeObserver.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestNetworkModeObserver.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #define PHONESETTINGSTESTNETWORKMODEOBSERVER_H
 
 #include <e32base.h>
-#include <MPsetNetworkModeObs.h>
+#include <mpsetnetworkmodeobs.h>
 
 // CLASS DECLARATION
 

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestParser.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestParser.h	Fri Apr 16 15:31:58 2010 +0300
@@ -25,10 +25,10 @@
 #include    <e32base.h>
 #include    <etelmm.h>
 #include    <RMmCustomAPI.h>
-#include    <RSSSettings.h> 
-#include    <MPsetCallWaiting.h>
-#include    <MPsetNetworkSelect.h>
-#include    <PsetSAObserver.h>
+#include    <rsssettings.h> 
+#include    <mpsetcallwaiting.h>
+#include    <mpsetnetworkselect.h>
+#include    <psetsaobserver.h>
 #include    "PhoneSettingsTest.hrh"
 
 // FORWARD DECLARATIONS

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestPsetRequestObserver.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestPsetRequestObserver.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #define PHONESETTINGSTESTPSETREQUESTOBSERVER_H
 
 #include <e32base.h>
-#include <MPsetRequestObs.h> 
+#include <mpsetrequestobs.h> 
 
 // CLASS DECLARATION
 

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestRefreshHandler.h	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/inc/PhoneSettingsTestRefreshHandler.h	Fri Apr 16 15:31:58 2010 +0300
@@ -21,7 +21,7 @@
 #define PHONESETTINGSTESTREFRESHHANDLER_H
 
 #include <e32base.h>
-#include <PSetRefreshHandler.h>
+#include <psetrefreshhandler.h>
 #include "PhoneSettingsTestParser.h"
 
 // CLASS DECLARATION

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestCSP.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestCSP.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -22,7 +22,7 @@
 #include <nwdefs.h>             
 #include <etelmm.h> 
 #include <PsetConstants.h>
-#include <PsetCSP.h>
+#include <psetcsp.h>
 #include "PhoneSettingsTest.hrh"
 #include "PhoneSettingsTest.h"
 #include "MPhoneSettingsTestMessageHandler.h"

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetwork.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetwork.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -32,7 +32,7 @@
 #include "PhoneSettingsTestPsetRequestObserver.h" 
 #include "PhoneSettingsTestNetworkInfoObserver.h" 
 #include "PhoneSettingsTestNetworkModeObserver.h" 
-#include "PsetSAObserver.h" 
+#include "psetsaobserver.h" 
 #include "PhoneSettingsTestNetwork.h"
 
 // ============================ MEMBER FUNCTIONS ===============================

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkInfoObserver.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkInfoObserver.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <MPsetNetworkInfoObs.h>
+#include <mpsetnetworkinfoobs.h>
 #include "PhoneSettingsTestNetworkInfoObserver.h"
 
 // ============================ MEMBER FUNCTIONS ===============================

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkModeObserver.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestNetworkModeObserver.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include <e32base.h>
-#include <MPsetNetworkModeObs.h>
+#include <mpsetnetworkmodeobs.h>
 #include "PhoneSettingsTestNetworkModeObserver.h"
 
 // ============================ MEMBER FUNCTIONS ===============================

--- a/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestParser.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/cellular/telephonysettings/tsrc/public/basic/PhoneSettingsTest/src/PhoneSettingsTestParser.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include <StifLogger.h>
 #include <StifTestModule.h>
-#include <RSSSettings.h> 
+#include <rsssettings.h> 
 #include "MPhoneSettingsTestMessageHandler.h"
 #include "PhoneSettingsTestParser.h"