--- a/phoneclientserver/CallUI/Src/CaUiEngine/CaUiEngine.cpp	Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/CallUI/Src/CaUiEngine/CaUiEngine.cpp	Wed Sep 01 12:15:03 2010 +0100
@@ -17,43 +17,43 @@
 
 
 // INCLUDE FILES
-#include    "cauiengine.h" 
-#include    "cauiquery.h" // CCaUiQuery. 
+#include    "CaUiEngine.h"
+#include    "CaUiQuery.h"               // CCaUiQuery.
 #include    <mcauireconnectqueryobserver.h>  // MCaUiReconnectQueryObserver.
-#include    <callui.rsg> // Resources. 
-#include    <cphcltdialer.h> // CPhcltDialer. 
+#include    <CallUI.rsg>                // Resources.
+#include    <cphcltdialer.h>            // CPhCltDialer.
 #include    <cphonecntfactory.h>
 #include    <cphcntsingleitemfetch.h>
 #include    <aiwinternaldialdata.h>
-#include    <aiwservicehandler.h> 
-#include    <cphcltextphonedialdata.h> // CPhCltExtPhoneDialData 
+#include    <AiwServiceHandler.h>
+#include    <cphcltextphonedialdata.h>  // CPhCltExtPhoneDialData
 
 #include    "callui.loc"                // Localized strings.
 
-#include    <stringloader.h> // String Loader. 
+#include    <StringLoader.h>            // String Loader.
 #include    <aknnotewrappers.h>         // CAknInformationNote.
-#include    <akngloballistquery.h> // CAknGloballistQuery. 
+#include    <AknGlobalListQuery.h>      // CAknGlobalListQuery.
 #include    <featmgr.h>                 // FeatureManager.
 
-#include    <aknglobalconfirmationquery.h> // Confirmation query.
+#include    <AknGlobalConfirmationQuery.h> // Confirmation query.
 
-#include    <phcltutils.h> // Character removal. 
-#include    <aiwcommon.h> // AIW dialdata. 
+#include    <PhCltUtils.h>              // Character removal.
+#include    <AiwCommon.h>               // AIW dialdata.
 
-#include    <networkhandlingdomainpskeys.h> 
+#include    <NetworkHandlingDomainPSKeys.h>
 #include    <e32property.h>             // Pub&Sub functionality.
 
-#include    "cauivoipextension.h" // VoIP/SCCP profile store 
+#include    "CaUiVoIPExtension.h"        // VoIP/SCCP profile store
 
 #include    <centralrepository.h>
-#include    <settingsinternalcrkeys.h> 
-#include     "cauilogger.h" // Call Ui Logger 
+#include    <settingsinternalcrkeys.h>
+#include     "cauilogger.h"        // Call Ui Logger
 #include    <aknmessagequerydialog.h> 
-#include    <aknglobalnote.h>
+#include    <AknGlobalNote.h>
 #include    <mphcntstoreloader.h>
-#include    <mvpbkcontactstore.h> 
+#include    <MVPbkContactStore.h>
 
-#include "cauidialogs.h" 
+#include "CaUiDialogs.h"
 
 // CONSTANTS