# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1259935766 0
# Node ID 0122277b3ed5d57cde1a9880c54004686673d719
# Parent  50974a8b132e3c7b0abe7345e54b6e9c26096a95# Parent  4a5bd01d597a225f9339fb124f7d2b2c030e594f
Merge tags.

diff -r 4a5bd01d597a -r 0122277b3ed5 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Dec 04 14:09:26 2009 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="serviceapi" name="Service API" levels="os mw1 mw2 app">
+  	<!-- should break up this collection into something meaningful -->
+    <collection id="serviceproviders" name="Service Providers" level="mw1">
+      <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>
+			<!-- should test bld.inf be #included? -->
+        <!-- <unit bldFile="serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
+      </component>
+      <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_calendar/group"/>
+			<!-- should test bld.inf be #included? -->
+        <!-- <unit bldFile="serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
+      </component>
+      <component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI"  filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>
+      </component>
+      <component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_landmarks/group"/>
+			<!-- should test bld.infs be #included? -->
+        <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
+      </component>
+      <component id="sapi_location" name="Location SAPI"  filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_location/group"/>
+			<!-- should test bld.infs be #included? -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/dev/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
+      </component>
+      <component id="sapi_logging" name="Logging SAPI"  filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_logging/group"/>
+        <!-- <unit bldFile="serviceproviders/sapi_logging/tsrc/dev/group"/> -->
+      </component>
+      <component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_mediamanagement/group"/>
+			<!-- should test bld.infs be #included? -->
+        <!-- <unit bldFile="serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
+      </component>
+      <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_messaging/group"/>
+			<!-- should test bld.infs be #included? -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
+      </component>
+      <component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_sensor/group"/>
+      </component>
+      <component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_sysinfo/group"/>
+      </component>
+      <component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_serviceregistry/group"/>
+			<!-- should test bld.infs be #included? -->
+        <!-- <unit bldFile="serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
+      </component>
+    </collection>
+    <collection id="serviceapi_info" name="Service API Info" level="app">
+      <component id="serviceproviders_build" filter="s60" name="Service API Build">
+      	<!--  can the exports be distributed? -->
+        <unit bldFile="serviceproviders/group"/>
+      </component>
+      <component id="serviceapi_test" filter="s60" name="Service API Test" purpose="development">
+		<!-- Does this need to exist? -->
+        <!-- <unit bldFile="tsrc/group"/> -->
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/group/sapiincludes.mmpi
--- a/serviceproviders/group/sapiincludes.mmpi	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/group/sapiincludes.mmpi	Fri Dec 04 14:09:26 2009 +0000
@@ -12,8 +12,8 @@
 * Contributors:
 *
 * Description: 	Sapi include path dependencies.
-*	%created_by:	vahegde %
-*	%date_created:	Wed Jun 24 18:02:52 2009 %
+*	%created_by:	slathia %
+*	%date_created:	Sat Oct 31 14:39:55 2009 %
 *  Copyright © 2006-2007 Nokia.  All rights reserved.
 *  This material, including documentation and any related computer
 *  programs, is protected by copyright controlled by Nokia.  All
@@ -30,8 +30,8 @@
 #include <bldvariant.hrh>
 
 #include <platform_paths.hrh>
-SYSTEMINCLUDE \Epoc32\include\icl
-SYSTEMINCLUDE \Epoc32\include\libc
+SYSTEMINCLUDE /epoc32/include/icl
+SYSTEMINCLUDE /epoc32/include/libc
 
 APP_LAYER_SYSTEMINCLUDE
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/appmanagerservice/inc/appinfo.h
--- a/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/appinfo.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/appinfo.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,8 +22,8 @@
 #ifndef _APPINFO_H__
 #define _APPINFO_H__
 #include <e32base.h>
-#include <APAID.H> // For TApaAppInfo
-#include <BADESCA.H> // CDesC16Array
+#include <apaid.h> // For TApaAppInfo
+#include <badesca.h> // CDesC16Array
 #include "appmanagercommon.h"
 
 _LIT8(KCaption,"Caption");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/appmanagerservice/inc/pkginfo.h
--- a/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/pkginfo.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/pkginfo.h	Fri Dec 04 14:09:26 2009 +0000
@@ -29,10 +29,10 @@
 #include<javaregistryentry.h>
 #include<javaregistrypackageentry.h>
 
-#include <AppVersion.h> 
-#include <BADESCA.H> // CDesC16Array
+#include <appversion.h> 
+#include <badesca.h> // CDesC16Array
 
-#include "appManagercommon.h"
+#include "appmanagercommon.h"
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/appmanagerservice/src/appiterator.cpp
--- a/serviceproviders/sapi_applicationmanager/appmanagerservice/src/appiterator.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/appmanagerservice/src/appiterator.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,9 +18,9 @@
 
 
 #include <e32cmn.h>
-#include <APMSTD.H>
-#include <APAID.H>
-#include <APGCLI.H>
+#include <apmstd.h>
+#include <apaid.h>
+#include <apgcli.h>
 #include "appiterator.h"
 #include "appinfo.h"
 #include "appmanagercommon.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/inc/appinfomap.h
--- a/serviceproviders/sapi_applicationmanager/inc/appinfomap.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/inc/appinfomap.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #ifndef __CAPPINFOMAP_H
 #define __CAPPINFOMAP_H
 
-#include <Liwgenericparam.h> 
+#include <liwgenericparam.h> 
 
 class MInfoMap;
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/inc/appitemslist.h
--- a/serviceproviders/sapi_applicationmanager/inc/appitemslist.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/inc/appitemslist.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #ifndef __CAPPITEMSLIST_H
 #define __CAPPITEMSLIST_H
 
-#include <Liwgenericparam.h> 
+#include <liwgenericparam.h> 
 
 class MIterator;
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/inc/appmanagerinterface.h
--- a/serviceproviders/sapi_applicationmanager/inc/appmanagerinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/inc/appmanagerinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 class CAppManagerService;
 class CAppManagerServiceObserver;
 
-#include <Liwvariant.h>
+#include <liwvariant.h>
 // CLASS DECLARATION
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/inc/appmanagerservicehandler.h
--- a/serviceproviders/sapi_applicationmanager/inc/appmanagerservicehandler.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/inc/appmanagerservicehandler.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #ifndef __CAPPMANAGERSERVICEHANDLER_H
 #define __CAPPMANAGERSERVICEHANDLER_H
 
-#include <Liwserviceifbase.h>
+#include <liwserviceifbase.h>
 
 
 class CAppManagerServiceHandler : public CLiwServiceIfBase
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/src/appmanagerinterface.cpp
--- a/serviceproviders/sapi_applicationmanager/src/appmanagerinterface.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/src/appmanagerinterface.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 
-#include <Liwcommon.h>
-#include <Liwbufferextension.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
 #include <utf.h>
 
 #include "appmanagerinterface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/src/appserviceobserver.cpp
--- a/serviceproviders/sapi_applicationmanager/src/appserviceobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/src/appserviceobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include "appserviceobserver.h"
 #include "serviceerrno.h"
 //Output Keys/arguments
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/inc/testappobserver.h
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/inc/testappobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/inc/testappobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanager_testblocks.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanager_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanager_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include "appmanagertest.h"
 #include "appmanagerservice.h"
 #include "appmanagercommon.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanagertest.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanagertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanagertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "appmanagertest.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanager_testblocks.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanager_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanager_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "appmanagertest.h"
 #include "appmanagerservice.h"
 #include "appmanagercommon.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanagertest.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanagertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanagertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "appmanagertest.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertest.h
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertestobserver.h
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertestobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertestobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest_testblocks.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,12 +20,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.mmp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -41,12 +41,12 @@
 LANG              SC
 
 SOURCEPATH        ../src
-DOCUMENT		  Series_60_APP_ReadMe.txt
+DOCUMENT		  series_60_app_readme.txt
 SOURCE            testappmngui.cpp
-SOURCE            testappmnguiApplication.cpp
-SOURCE            testappmnguiAppView.cpp
-SOURCE            testappmnguiAppUi.cpp
-SOURCE            testappmnguiDocument.cpp
+SOURCE            testappmnguiapplication.cpp
+SOURCE            testappmnguiappview.cpp
+SOURCE            testappmnguiappui.cpp
+SOURCE            testappmnguidocument.cpp
 SOURCE            testappobserver.cpp
 
 SOURCEPATH        ../group
@@ -73,7 +73,7 @@
 LIBRARY         liwServiceHandler.lib
 
 #ifdef __UI_FRAMEWORKS_V2__
-START RESOURCE	testappmngui.RSS
+START RESOURCE	testappmngui.rss
 
 HEADER
 targetpath	/resource/apps
@@ -93,7 +93,7 @@
 #endif
 END
 
-start resource testappmngui_loc.RSS
+start resource testappmngui_loc.rss
 targetpath /resource/apps
 lang sc
 end
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/inc/testappmnguidocument.h
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/inc/testappmnguidocument.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/inc/testappmnguidocument.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #define __TESTAPPMNGUI_DOCUMENT_H__
 
 
-#include <akndoc.h>
+#include <AknDoc.h>
 
 // Forward references
 class CtestappmnguiAppUi;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmngui.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmngui.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmngui.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include "testappmnguiApplication.h"
+#include "testappmnguiapplication.h"
 #include <eikstart.h>
 
 #pragma message("Please ensure that you read the ReadMe file.")
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiapplication.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiapplication.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiapplication.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 
-#include "testappmnguiDocument.h"
-#include "testappmnguiApplication.h"
+#include "testappmnguidocument.h"
+#include "testappmnguiapplication.h"
 
 // UID for the application, this should correspond to the uid defined in the mmp file
 static const TUid KUidtestappmnguiApp = {0x03AB7FB5};
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,8 +20,8 @@
 #include <aknnotewrappers.h> 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
 #include "appmanagerservice.h"
 #include "appmanagercommon.h"
 #include <f32file.h>
@@ -31,8 +31,8 @@
 #include "appmanagerservice.h"
 
 #include "testappmngui.pan"
-#include "testappmnguiAppUi.h"
-#include "testappmnguiAppView.h"
+#include "testappmnguiappui.h"
+#include "testappmnguiappview.h"
 #include "testappmngui.hrh"
 #include  "testappobserver.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappview.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappview.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappview.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #include <coemain.h>
 #include <testappmngui.rsg>
 
-#include "testappmnguiAppView.h"
+#include "testappmnguiappview.h"
 
 // Standard construction sequence
 CtestappmnguiAppView* CtestappmnguiAppView::NewL(const TRect& aRect)
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguidocument.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguidocument.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguidocument.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 
-#include "testappmnguiAppUi.h"
-#include "testappmnguiDocument.h"
+#include "testappmnguiappui.h"
+#include "testappmnguidocument.h"
 
 // Standard Symbian OS construction sequence
 CtestappmnguiDocument* CtestappmnguiDocument::NewL(CEikApplication& aApp)
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.mmp
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -35,7 +35,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tappmgrprovider.cpp
-SOURCE          tappmgrproviderBlocks.cpp
+SOURCE          tappmgrproviderblocks.cpp
 SOURCE          testappobserver.cpp
 
 USERINCLUDE     ../inc
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/inc/testappobserver.h
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/inc/testappobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/inc/testappobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrprovider.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrprovider.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrprovider.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tappmgrprovider.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include "tappmgrprovider.h"
 #include "appmanagerservice.h"
 #include "appmanagercommon.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.mmp
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -33,7 +33,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tappmgrtest.cpp
-SOURCE          tappmgr_testBlocks.cpp
+SOURCE          tappmgr_testblocks.cpp
 SOURCE          testappobserver.cpp
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgr_testblocks.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgr_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgr_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include"appmanagertest.h"
 #include "tappmgrtest.h"
 #include "appmanagerservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgrtest.cpp
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgrtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgrtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include "appmanagertest.h"
 #include "tappmgrtest.h"
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/calendarservice/src/addentry.cpp
--- a/serviceproviders/sapi_calendar/calendarservice/src/addentry.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/calendarservice/src/addentry.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 #include <calinstance.h>
 #include <calentryview.h>
 #include <calinstanceview.h>
-#include <caleninterimutils2.h>
+#include <CalenInterimUtils2.h>
 #include <calrrule.h>
 #include <calalarm.h>
 #include <caluser.h>
@@ -525,14 +525,38 @@
 					User::Leave( KErrNotSupported );	
 				}
 		    
-		    TDateTime stTime;
-	    	stTime = aEntry->StartTimeL().TimeUtcL().DateTime();
-		    alTime.MinutesFrom( stTime, minutes );// calculate the offset between alarm time and start time
-		    CCalAlarm* alarm = CCalAlarm::NewL();
-		    CleanupStack::PushL( alarm );
-		    alarm->SetTimeOffset(-minutes.Int());
-			aEntry->SetAlarmL(alarm); // set the alarm for the entry
-		    CleanupStack::PopAndDestroy( alarm );
+		    if( aEntry->EntryTypeL() != CCalEntry::ETodo )
+		        {
+		        TDateTime stTime;
+	    	    stTime = aEntry->StartTimeL().TimeUtcL().DateTime();
+		        alTime.MinutesFrom( stTime, minutes );// calculate the offset between alarm time and start time
+		        CCalAlarm* alarm = CCalAlarm::NewL();
+		        CleanupStack::PushL( alarm );
+		        alarm->SetTimeOffset(-minutes.Int());
+			    aEntry->SetAlarmL(alarm); // set the alarm for the entry
+		        CleanupStack::PopAndDestroy( alarm );
+		        }
+		    else
+		        {
+                TTime endTime;
+                endTime = aEntry->EndTimeL().TimeUtcL();
+                if ( endTime != Time::NullTTime() )
+                    {
+                    alTime.MinutesFrom( endTime, minutes );// calculate the offset between alarm time and start time
+                    if(minutes.Int() < 0 )
+                        {
+                        CCalAlarm* alarm = CCalAlarm::NewL();
+                        CleanupStack::PushL( alarm );
+                        alarm->SetTimeOffset(-minutes.Int());
+                        aEntry->SetAlarmL(alarm); // set the alarm for the entry
+                        CleanupStack::PopAndDestroy( alarm );
+                        }
+                    else
+                        {
+                        User::Leave( KErrNotSupported );
+                        }
+                    }
+ 		        }
 		    }	
 		}
 			
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/calendarservice/src/calendarexport.cpp
--- a/serviceproviders/sapi_calendar/calendarservice/src/calendarexport.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarexport.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -29,7 +29,7 @@
 #include "calendarheader.h"
 #include "calendarconstants.h"
 #include "asyncreqobserver.h"
-#include "CalendarExport.h"
+#include "calendarexport.h"
 
 
 void CleanupCCalEntryArray(TAny* aPointer);
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/calendarservice/src/calendarheader.cpp
--- a/serviceproviders/sapi_calendar/calendarservice/src/calendarheader.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarheader.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <calentryview.h>
 #include <calinstanceview.h>
 #include <calprogresscallback.h>
-#include <caleninterimutils2.h>
+#include <CalenInterimUtils2.h>
 
 
 #include "calendarheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/calendarservice/src/calendarnotify.cpp
--- a/serviceproviders/sapi_calendar/calendarservice/src/calendarnotify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarnotify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 #include <calsession.h>
 
 
-#include "Calendarheader.h"
-#include "Calendarnotify.h"
+#include "calendarheader.h"
+#include "calendarnotify.h"
 #include "asyncreqobserver.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/calendarservice/src/calendarservice.cpp
--- a/serviceproviders/sapi_calendar/calendarservice/src/calendarservice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarservice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -28,7 +28,7 @@
 #include "calendarconstants.h"
 #include "entryattributes.h"
 #include "calendarservice.h"
-#include "Calendarnotify.h"
+#include "calendarnotify.h"
 #include "calendardeleteentry.h"
 #include "calendarimport.h"
 #include "calendarexport.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/data/2000CFB4.rss
--- a/serviceproviders/sapi_calendar/data/2000CFB4.rss	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/data/2000CFB4.rss	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include <Eikon.rh>
-#include "ecom/RegistryInfoV2.rh" 
-#include <LiwCommon.hrh>
+#include <eikon.rh>
+#include "ecom/registryinfov2.rh" 
+#include <liwcommon.hrh>
 
 RESOURCE REGISTRY_INFO theInfo
     {
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/inc/calendarcallback.h
--- a/serviceproviders/sapi_calendar/inc/calendarcallback.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/inc/calendarcallback.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,9 +19,9 @@
 #ifndef __CALENDARCALLBACK_H
 #define __CALENDARCALLBACK_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include <calchangecallback.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/inc/calendarinterface.h
--- a/serviceproviders/sapi_calendar/inc/calendarinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/inc/calendarinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,9 +19,9 @@
 #ifndef __CALENDARINTERFACE_H
 #define __CALENDARINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include <calrrule.h>
 #include <calalarm.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/inc/calendariterableimpl.h
--- a/serviceproviders/sapi_calendar/inc/calendariterableimpl.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/inc/calendariterableimpl.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,9 +19,9 @@
 #ifndef __CALENDARITERABLEIMPL_H
 #define __CALENDARITERABLEIMPL_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include <calentry.h>
 #include <calinstance.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/inc/calendarservicehandler.h
--- a/serviceproviders/sapi_calendar/inc/calendarservicehandler.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/inc/calendarservicehandler.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 #ifndef __CALENDARSERVICEHANDLER_H
 #define __CALENDARSERVICEHANDLER_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
 
 /**
 * Provides implementation to CLiwServiceIfBase interface.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/src/calendarservicehandler.cpp
--- a/serviceproviders/sapi_calendar/src/calendarservicehandler.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/src/calendarservicehandler.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <ecom/ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 
 #include "calendarinterface.h"
 #include "calendarservicehandler.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/inc/teststartconsolealarmserver2.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/inc/teststartconsolealarmserver2.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/inc/teststartconsolealarmserver2.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,13 +21,13 @@
 
 #include <calalarm.h>
 #include <caluser.h>
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid );
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,8 +23,8 @@
 //#include <msvstd.h>
 //#include <msvapi.h>
 //#include <msvids.h>
-#include <LiwCommon.h>
-#include <Stiftestinterface.h>
+#include <liwcommon.h>
+#include <StifTestInterface.h>
 
 #include "tcalendaraddtest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,10 +22,10 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 #include "tcalendaraddtest.h"
 #include "calendarheader.h"
 #include "calendarconstants.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 #include "tcalendaraddtest.h"
 #include "calendarheader.h"
 #include "calendarconstants.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/calendarinterface.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/calendarinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/calendarinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #ifndef __CALENDARINTERFACE_H
 #define __CALENDARINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include <calrrule.h>
 #include <calalarm.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/notify.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/notify.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/notify.h	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 #include <e32base.h>
 //#include <SendUiConsts.h>
-#include <BADESCA.H>
-#include<LiwCommon.h>
+#include <badesca.h>
+#include<liwcommon.h>
 #include <f32file.h>
 
 class CLiwServiceHandler;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/notify.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/notify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/notify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 
 
 #include "calendarinterface.h"
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 
 #include"notify.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarchangenotifytest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,11 +22,11 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include <badesca.h>
-#include<LiwServiceHandler.h>
-#include<LiwCommon.h>    
+#include<liwservicehandler.h>
+#include<liwcommon.h>    
 
 
 #include "tcalendarchangenotifytest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/delete.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/delete.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/delete.h	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 #include <e32base.h>
-#include <BADESCA.H>
-#include<LiwCommon.h>
+#include <badesca.h>
+#include<liwcommon.h>
 #include <f32file.h>
 
 class CLiwServiceHandler;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteguid.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteguid.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteguid.h	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 #include <e32base.h>
-#include <BADESCA.H>
-#include<LiwCommon.h>
+#include <badesca.h>
+#include<liwcommon.h>
 #include <f32file.h>
 
 class CLiwServiceHandler;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteluid.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteluid.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteluid.h	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 #include <e32base.h>
-#include <BADESCA.H>
-#include<LiwCommon.h>
+#include <badesca.h>
+#include<liwcommon.h>
 #include <f32file.h>
 
 class CLiwServiceHandler;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/teststartconsolealarmserver2.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/teststartconsolealarmserver2.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/teststartconsolealarmserver2.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,13 +21,13 @@
 
 #include <calalarm.h>
 #include <caluser.h>
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid );
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 #include "tcalendardeletetest.h"
 #include "delete.h"
 #include "calendarheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 #include "tcalendardeletetest.h"
 #include "deleteguid.h"
 #include "calendarheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 #include "tcalendardeletetest.h"
 #include "deleteluid.h"
 #include "calendarheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcalendardeletetest.h"
 //#include <SAPI_TEST\testprg.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <msvids.h> 
 //#include <SendUiConsts.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 //#include <calendarinterface.h>
 
 #include "delete.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/inc/teststartconsolealarmserver2.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/inc/teststartconsolealarmserver2.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/inc/teststartconsolealarmserver2.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,13 +21,13 @@
 
 #include <calalarm.h>
 #include <caluser.h>
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid );
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarexporttest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,11 +22,11 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include <badesca.h>
 
-#include<LiwServiceHandler.h>
+#include<liwservicehandler.h>
 
 #include "tcalendarexporttest.h"
 #include "teststartconsolealarmserver2.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertest.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertestobserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertestobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertestobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/txmlconvertor.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/txmlconvertor.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/txmlconvertor.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest_testblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendargetlisttest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,11 +22,11 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
-
-
-#include <BADESCA.H>
-#include<LiwServiceHandler.h>
+#include <StifTestInterface.h>
+
+
+#include <badesca.h>
+#include<liwservicehandler.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarimporttest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,12 +22,12 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 
 #include <badesca.h>
 //#include "teststartconsolealarmserver3.h"
-#include<LiwServiceHandler.h>
+#include<liwservicehandler.h>
 
 
 #include "tcalendarimporttest.h"
@@ -166,7 +166,7 @@
     }
 
    
-#include<LiwCommon.h>    
+#include<liwcommon.h>    
 
 class CTestAsync;
 	
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/inc/teststartconsolealarmserver2.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/inc/teststartconsolealarmserver2.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/inc/teststartconsolealarmserver2.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,13 +21,13 @@
 
 #include <calalarm.h>
 #include <caluser.h>
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid );
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 //#include <msvapi.h>
 //#include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarupdatetest.h"
 #include "teststartconsolealarmserver2.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,10 +22,10 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 
 #include "tcalendarupdatetest.h"
 #include "calendarheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendaraddtest.h"
 //#include <SAPI_TEST\testprg.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32base.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarchangenotifytest.h"
 //#include <SAPI_TEST\testprg.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "calendarheader.h"
 #include "calendarservice.h"
 #include "entryattributes.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/caldeltestcases.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/caldeltestcases.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/caldeltestcases.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -33,7 +33,7 @@
 #include "calendarheader.h"    
 #include "calendarservice.h"
 #include "entryattributes.h"    
-#include<ASCliClientUtils.h>
+#include<ascliclientutils.h>
 
 #include "teststartconsolealarmserver.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendardeletetest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendardeletetest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/calexptestcases.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/calexptestcases.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/calexptestcases.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -32,7 +32,7 @@
 #include "calendarservice.h"
 
     
-#include<ASCliClientUtils.h>
+#include<ascliclientutils.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarexporttest.h"
 //#include "teststartconsolealarmserver.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarexporttest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendargetlisttest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <f32file.h> //for RFile and Rfs
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "calendarheader.h"
 #include "calendarservice.h"
 #include <calentry.h>//for CCalEntry
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/calimptestcases.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/calimptestcases.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/calimptestcases.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -29,7 +29,7 @@
 #include "calimptestcases.h"
 #include "teststartconsolealarmserver.h"    
     
-#include<ASCliClientUtils.h>
+#include<ascliclientutils.h>
 
 
 _LIT(KCalName              ,"c:Calendar");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarimporttest.h"
 #if __WINS__
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcalendarimporttest.h"
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "tcalendarupdatetest.h"
 //#include <SAPI_TEST\testprg.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -56,7 +56,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_providertest.cpp
-SOURCE          tcal_providertestBlocks.cpp
+SOURCE          tcal_providertestblocks.cpp
 SOURCE          notify.cpp
 
 //RESOURCE        resource_file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -18,9 +18,9 @@
 #ifndef __CALENDARINTERFACE_H
 #define __CALENDARINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include <calrrule.h>
 #include <calalarm.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/messaginginterface.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/messaginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/messaginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #ifndef __MESSAGINGINTERFACE_H
 #define __MESSAGINGINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include "messageheader.h" 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/notify.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/notify.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/notify.h	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 #include <e32base.h>
 //#include <SendUiConsts.h>
-#include <BADESCA.H>
-#include<LiwCommon.h>
+#include <badesca.h>
+#include<liwcommon.h>
 #include <f32file.h>
 
 class CLiwServiceHandler;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/tcal_providertest.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/tcal_providertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/tcal_providertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,12 +26,12 @@
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
 
-#include <LiwCommon.h>
-#include <LiwVariant.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwvariant.h>
+#include <liwservicehandler.h>
 #include "calendarheader.h"
 #include "calendarconstants.h"
-#include <BADESCA.H>
+#include <badesca.h>
 // CONSTANTS
 //const ?type ?constant_var = ?constant;
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/notify.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/notify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/notify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 
 
 #include "calendarinterface.h"
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 #include "tcal_providertest.h"
 #include"notify.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertest.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_providertest.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,14 +21,14 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_providertest.h"
-#include <LiwCommon.h>
-#include <LiwVariant.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwvariant.h>
+#include <liwservicehandler.h>
 #include "calendarheader.h"
 #include "calendarconstants.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "notify.h"
 //#include <SendUiConsts.h>
 #include "messaginginterface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -54,7 +54,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_add.cpp
-SOURCE          tcal_addBlocks.cpp
+SOURCE          tcal_addblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_add.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_add.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_add.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_add.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_addblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_addblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_addblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_add.h"
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -54,7 +54,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_changenotify.cpp
-SOURCE          tcal_changenotifyBlocks.cpp
+SOURCE          tcal_changenotifyblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotify.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_changenotify.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotifyblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotifyblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotifyblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_changenotify.h"
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -56,7 +56,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_delete.cpp
-SOURCE          tcal_deleteBlocks.cpp
+SOURCE          tcal_deleteblocks.cpp
 SOURCE          cal_delete.cpp
 
 //RESOURCE        resource_file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -33,7 +33,7 @@
 #include "calendarheader.h"
 #include "calendarservice.h"
 #include "entryattributes.h"
-#include<ASCliClientUtils.h>
+#include<ascliclientutils.h>
 
 #include "teststartconsolealarmserver.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_delete.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_delete.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_delete.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_delete.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_deleteblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_deleteblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_deleteblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_delete.h"
 #include "cal_delete.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -55,7 +55,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_export.cpp
-SOURCE          tcal_exportBlocks.cpp
+SOURCE          tcal_exportblocks.cpp
 SOURCE          exportestcases.cpp
 
 //RESOURCE        resource_file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/exportestcases.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/exportestcases.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/exportestcases.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -32,7 +32,7 @@
 #include "calendarservice.h"
 
     
-#include<ASCliClientUtils.h>
+#include<ascliclientutils.h>
 
 _LIT(KCalName                 ,"c:Calendar");
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_export.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_export.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_export.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_export.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_exportblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_exportblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_exportblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_export.h"
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -56,7 +56,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_getlist.cpp
-SOURCE          tcal_getlistBlocks.cpp
+SOURCE          tcal_getlistblocks.cpp
 SOURCE          calgetlisttestcases.cpp
 
 //RESOURCE        resource_file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlist.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_getlist.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 #include <e32std.h>
 #include <f32file.h> //for RFile and Rfs
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_getlist.h"
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -55,7 +55,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_import.cpp
-SOURCE          tcal_importBlocks.cpp
+SOURCE          tcal_importblocks.cpp
 SOURCE          importestcases.cpp
 
 //RESOURCE        resource_file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -29,7 +29,7 @@
 #include "importestcases.h"
 #include "teststartconsolealarmserver.h"    
     
-#include<ASCliClientUtils.h>
+#include<ascliclientutils.h>
 
 
 _LIT(KCalName              ,"c:Calendar");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_import.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_import.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_import.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_import.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_importblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_importblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_importblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_import.h"
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -55,7 +55,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcal_update.cpp
-SOURCE          tcal_updateBlocks.cpp
+SOURCE          tcal_updateblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/teststartconsolealarmserver.h
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/teststartconsolealarmserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/teststartconsolealarmserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,7 +26,7 @@
 
 #include "calendarconstants.h"
 #include "calendarheader.h"
-#include "EntryAttributes.h"
+#include "entryattributes.h"
 #include "calendarservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_update.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_update.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_update.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_update.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_updateblocks.cpp
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_updateblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_updateblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcal_update.h"
 #include "calendarheader.h"
 #include "calendarservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/inc/addcontactobserver.h
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/addcontactobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/addcontactobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 
 
 #include <s32file.h> 
-#include <mvpbkcontactstoreobserver.h>    
-#include <mvpbkcontactobserver.h>    
+#include <MVPbkContactStoreObserver.h>    
+#include <MVPbkContactObserver.h>    
 #include <MVPbkSingleContactOperationObserver.h>
 #include <MVPbkStoreContact.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/inc/contactservice.h
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/contactservice.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/contactservice.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,13 +21,13 @@
 
 //System includes
 #include <s32file.h> // Used for RFileReadStream and RFileWriteStream
-#include <mvpbkcontactstoreListobserver.h>    //base class for vCardEng
-#include <mvpbkcontactobserver.h>    //base class for vCardEng
-#include <mvpbksinglecontactoperationObserver.h>//base class
-#include <mvpbkcontactcopyobserver.h>    //base class for vCardEng
+#include <MVPbkContactStoreListObserver.h>    //base class for vCardEng
+#include <MVPbkContactObserver.h>    //base class for vCardEng
+#include <MVPbkSingleContactOperationObserver.h>//base class
+#include <MVPbkContactCopyObserver.h>    //base class for vCardEng
 #include <CVPbkFieldTypeRefsList.h>		//Used to specify search fields
 #include <CVPbkContactLinkArray.h>
-#include <vpbkcontactstoreuris.h>
+#include <VPbkContactStoreUris.h>
 
 //User Includes
 #include "contactcallback.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/inc/deletecontactobserver.h
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/deletecontactobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/deletecontactobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 
 #include <s32file.h> // Used for RFileReadStream and RFileWriteStream
 
-#include <mvpbkcontactobserver.h>    //base class for vCardExEng
-#include <mvpbkbatchoperationobserver.h>
-#include <mvpbkcontactstoreobserver.h>
-#include <cvpbkcontactlinkarray.h>
+#include <MVPbkContactObserver.h>    //base class for vCardExEng
+#include <MVPbkBatchOperationObserver.h>
+#include <MVPbkContactStoreObserver.h>
+#include <CVPbkContactLinkArray.h>
 
 #include "contactservice.h"
 #include "cancelasyncrquest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/inc/exportstorelistobserver.h
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/exportstorelistobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/exportstorelistobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 
 
 #include <s32file.h> // Used for RFileWriteStream 
-#include <mvpbkcontactstoreListobserver.h>    //base class for vCardEng
-#include <mvpbkcontactobserver.h>    //base class for vCardEng
-#include <mvpbksinglecontactoperationObserver.h> //base class for vCardEng
+#include <MVPbkContactStoreListObserver.h>    //base class for vCardEng
+#include <MVPbkContactObserver.h>    //base class for vCardEng
+#include <MVPbkSingleContactOperationObserver.h> //base class for vCardEng
 #include <CVPbkVCardEng.h>
 #include <MVPbkContactStore.h>
 #include "contactcallback.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/inc/importstorelistobserver.h
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/importstorelistobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/importstorelistobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #define C_IMPORTSTORELISTOBSERVER_H
 
 #include <s32file.h> // Used for RFileReadStream 
-#include <mvpbkcontactstoreListobserver.h>    //base class for vCardEng
-#include <mvpbkcontactobserver.h>    //base class for vCardEng
-#include <mvpbkcontactcopyobserver.h>    //base class for vCardEng
+#include <MVPbkContactStoreListObserver.h>    //base class for vCardEng
+#include <MVPbkContactObserver.h>    //base class for vCardEng
+#include <MVPbkContactCopyObserver.h>    //base class for vCardEng
 #include <CVPbkVCardEng.h>
 #include <MVPbkContactStore.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/inc/organisegroupsobserver.h
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/organisegroupsobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/organisegroupsobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 
 
 #include <s32file.h> // Used for RFileReadStream and RFileWriteStream
-#include <mvpbkcontactobserver.h>    //base class for vCardExEng
-#include <mvpbkcontactstoreobserver.h>    //base class for vCardExEng
-#include <mvpbksinglecontactoperationobserver.h>
-#include <cvpbkcontactlinkarray.h>
+#include <MVPbkContactObserver.h>    //base class for vCardExEng
+#include <MVPbkContactStoreObserver.h>    //base class for vCardExEng
+#include <MVPbkSingleContactOperationObserver.h>
+#include <CVPbkContactLinkArray.h>
 #include "contactservice.h"
 
 class CVPbkContactManager;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/inc/storelistobserver.h
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/storelistobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/storelistobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #define C_STORELISTOBSERVER_H
 
 
-#include <mvpbkcontactstoreListobserver.h>    //base class for vCardEng
+#include <MVPbkContactStoreListObserver.h>    //base class for vCardEng
 #include <CVPbkVCardEng.h>
 #include <MVPbkContactStore.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/addcontactobserver.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/addcontactobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/addcontactobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,10 +22,10 @@
 
 //System include 
 #include "contactservice.h"// for iContactService
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
+#include <MVPbkContactStore.h>// for iContactStore
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
 #include <MVPbkContactGroup.h>
 #include <MVPbkContactFieldTextData.h>
 #include <MVPbkContactFieldData.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/contactiter.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactiter.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactiter.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,11 +23,11 @@
 #include "getliststorelistobserver.h"
 #include <CVPbkContactStoreUriArray.h>
 #include <CVPbkContactManager.h>
-#include <mvpbkcontactstorelist.h>
+#include <MVPbkContactStoreList.h>
 #include <MVPbkContactOperationBase.h>
 #include <TVPbkContactStoreUriPtr.h>
 #include <MVPbkContactLink.h>
-#include <mvpbkcontactstoreproperties.h>
+#include <MVPbkContactStoreProperties.h>
 
 
 //Initialize the class variable with the result of ReadContactL
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/contactservice.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactservice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactservice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,25 +18,25 @@
 
 //System includes
 
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
-#include <mvpbkstorecontact.h>		// used in many function to get the store contact
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
+#include <MVPbkStoreContact.h>		// used in many function to get the store contact
 #include <MVPbkContactGroup.h>
 #include <badesca.h>
-#include <mvpbkcontactstoreproperties.h>
-#include <tvpbkcontactstoreuriptr.h>
+#include <MVPbkContactStoreProperties.h>
+#include <TVPbkContactStoreUriPtr.h>
 #include <MVPbkContactStore.h>
 
 //User includes.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/deletecontactobserver.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/deletecontactobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/deletecontactobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 #include "contactcallback.h"
 
 //System Includes
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <mvpbkcontactstoreproperties.h>//for getting store uri in StoreReady()
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <MVPbkContactStoreProperties.h>//for getting store uri in StoreReady()
 
 //-------------------------------------------------------------------------------------
 // Static method to create instance of delete contact observer.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/exportstorelistobserver.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/exportstorelistobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/exportstorelistobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,20 +19,20 @@
 
 #include "exportstorelistobserver.h"
 
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 
 
 // ---------------------------------------------------------------------------
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/getliststorelistobserver.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/getliststorelistobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/getliststorelistobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,9 +23,9 @@
 #include "contactiter.h"
 #include <MVPbkContactViewBase.h>
 #include <MVPbkContactViewFiltering.h>
-#include <cvpbkcontactviewdefinition.h>
+#include <CVPbkContactViewDefinition.h>
 #include <MVPbkContactLink.h>
-#include <mvpbkcontactstoreproperties.h>
+#include <MVPbkContactStoreProperties.h>
 #include <MVPbkContactOperationBase.h>
 #include "contactviewobserver.h"
 #include "getliststorelistobserver.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/importstorelistobserver.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/importstorelistobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/importstorelistobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,20 +20,20 @@
 
 #include "importstorelistobserver.h"
 
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/contactservice/src/organisegroupsobserver.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/organisegroupsobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/organisegroupsobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,11 +21,11 @@
 #include "contactcallback.h"
 
 //System include
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
 #include <MVPbkContactGroup.h>
 #include <CVPbkContactLinkArray.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss
--- a/serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss	Fri Dec 04 14:09:26 2009 +0000
@@ -15,10 +15,10 @@
 *
 */
 
-#include <Eikon.rh>
-#include <LiwCommon.hrh>
+#include <eikon.rh>
+#include <liwcommon.hrh>
 
-#include "ecom/RegistryInfoV2.rh"
+#include "ecom/registryinfov2.rh"
 
 RESOURCE REGISTRY_INFO theInfo
     {
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/inc/contactinterface.h
--- a/serviceproviders/sapi_contacts_vpbk/inc/contactinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/inc/contactinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #define C_CCONTACTINTERFACE_H
 
 //System includes
-#include <LiwVariant.h>
+#include <liwvariant.h>
 
 // User Includes
 #include "contactinterface.hrh"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/inc/contactiterator.h
--- a/serviceproviders/sapi_contacts_vpbk/inc/contactiterator.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/inc/contactiterator.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,8 +20,8 @@
 #define C_CCONTACTITERATOR_H
 
 //System includes
-#include <LiwServiceIfBase.h>
-#include <LiwCommon.h>
+#include <liwserviceifbase.h>
+#include <liwcommon.h>
 
 //User include
 #include "contactiter.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp
--- a/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,9 +15,9 @@
 *
 */
 
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
-#include <LiwCommon.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
+#include <liwcommon.h>
 
 #include <CVPbkContactLinkArray.h>
 #include <CVPbkContactStoreUriArray.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/src/contactinterfacecallback.cpp
--- a/serviceproviders/sapi_contacts_vpbk/src/contactinterfacecallback.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/src/contactinterfacecallback.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 
-#include <LiwCommon.h>
-#include <LiwGenericParam.h>
+#include <liwcommon.h>
+#include <liwgenericparam.h>
 
 // User Includes
 #include "contactinterfacecallback.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/src/contactprovider.cpp
--- a/serviceproviders/sapi_contacts_vpbk/src/contactprovider.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/src/contactprovider.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <ecom/ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 #include "contactprovider.h"
 #include "contactinterface.h"
 #include "../../inc/serviceerrno.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -35,8 +35,8 @@
 DEFFILE         tcontactprovidertest.def
 
 SOURCEPATH      ../src
-SOURCE          Tcomplugin.cpp
-SOURCE          TcompluginBlocks.cpp
+SOURCE          tcomplugin.cpp
+SOURCE          tcompluginblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/inc/tcomplugin.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/inc/tcomplugin.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/inc/tcomplugin.h	Fri Dec 04 14:09:26 2009 +0000
@@ -28,9 +28,9 @@
 
 #include "serviceerrno.h"
 
-#include <LiwCommon.h>
-#include <LiwBufferExtension.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
+#include <liwservicehandler.h>
 
 #include <MVPbkContactStoreListObserver.h>
 #include <MVPbkContactObserver.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcomplugin.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcomplugin.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcomplugin.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "Tcomplugin.h"
+#include <StifTestInterface.h>
+#include "tcomplugin.h"
 #include <CVPbkContactStoreUriArray.h>
 #include <TVPbkContactStoreUriPtr.h>
 #include <CVPbkContactManager.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include <VPbkEng.rsg>
 #include <e32def.h>
@@ -43,7 +43,7 @@
 #include <MVPbkContactFieldTextData.h>
 #include<f32file.h>
 
-#include "Tcomplugin.h"
+#include "tcomplugin.h"
 
 _LIT(LogFileName , "C:\\Notifications.txt") ;
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -35,8 +35,8 @@
 DEFFILE         tcontactprovidertest_sync.def
 
 SOURCEPATH      ../src
-SOURCE          Tcomplugin.cpp
-SOURCE          TcompluginBlocks.cpp
+SOURCE          tcomplugin.cpp
+SOURCE          tcompluginblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/inc/tcomplugin.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/inc/tcomplugin.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/inc/tcomplugin.h	Fri Dec 04 14:09:26 2009 +0000
@@ -28,9 +28,9 @@
 
 #include "serviceerrno.h"
 
-#include <LiwCommon.h>
-#include <LiwBufferExtension.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
+#include <liwservicehandler.h>
 #include <MVPbkContactStoreListObserver.h>
 #include <MVPbkContactObserver.h>
 #include <MVPbkContactFindObserver.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcomplugin.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcomplugin.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcomplugin.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "Tcomplugin.h"
+#include <StifTestInterface.h>
+#include "tcomplugin.h"
 #include <CVPbkContactStoreUriArray.h>
 #include <TVPbkContactStoreUriPtr.h>
 #include <CVPbkContactManager.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcompluginblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcompluginblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcompluginblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <VPbkEng.rsg>
 
 
@@ -42,7 +42,7 @@
 #include<f32file.h>
 
 
-#include "Tcomplugin.h"
+#include "tcomplugin.h"
 _LIT(LogFileName , "C:\\Notifications.txt") ;
 
 _LIT(KError,"Error code is");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/inc/tcontacts_async.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/inc/tcontacts_async.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/inc/tcontacts_async.h	Fri Dec 04 14:09:26 2009 +0000
@@ -32,8 +32,8 @@
 #include <MVPbkContactFindObserver.h>
 #include <MVPbkSingleContactOperationObserver.h>
 #include <MVPbkBatchOperationObserver.h>
-#include <S32MEM.H>
-#include <S32FILE.H>
+#include <s32mem.h>
+#include <s32file.h>
 
 #include "contactcallback.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,15 +19,15 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <COEMAIN.H>
+#include <StifTestInterface.h>
+#include <coemain.h>
 
 #include <CVPbkContactStoreUriArray.h>
 #include <CVPbkContactManager.h>
 #include <MVPbkContactStoreList.h>
 #include <MVPbkContactStore.h>
 #include <TVPbkContactStoreUriPtr.h>
-#include <CVpbkVcardeng.h>
+#include <CVPbkVCardEng.h>
 
 #include "contactservice.h"
 #include "tcontacts_async.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <VPbkEng.rsg>
 
 #include <MVPbkContactFieldTextData.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim_blocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim_blocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim_blocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include <f32file.h>
 #include <e32des16.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/inc/tcontacts_sync.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/inc/tcontacts_sync.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/inc/tcontacts_sync.h	Fri Dec 04 14:09:26 2009 +0000
@@ -32,8 +32,8 @@
 #include <MVPbkContactFindObserver.h>
 #include <MVPbkSingleContactOperationObserver.h>
 #include <MVPbkBatchOperationObserver.h>
-#include <S32MEM.H>
-#include <S32FILE.H>
+#include <s32mem.h>
+#include <s32file.h>
 
 #include "contactcallback.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,15 +19,15 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <COEMAIN.H>
+#include <StifTestInterface.h>
+#include <coemain.h>
 
 #include <CVPbkContactStoreUriArray.h>
 #include <CVPbkContactManager.h>
 #include <MVPbkContactStoreList.h>
 #include <MVPbkContactStore.h>
 #include <TVPbkContactStoreUriPtr.h>
-#include <CVpbkVcardeng.h>
+#include <CVPbkVCardEng.h>
 
 #include "contactservice.h"
 #include "tcontacts_sync.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <VPbkEng.rsg>
 
 #include <MVPbkContactFieldTextData.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -28,9 +28,9 @@
 #include <f32file.h>
 #include <TestclassAssert.h>
 
-#include <LiwCommon.h>
-#include <LiwBufferExtension.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
+#include <liwservicehandler.h>
 
 #include <e32base.h>	// CBase
 #include <e32std.h>	 // TBuf
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertest.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 
 #include "tcontactsgetidsprovidertest.h"	// Ctcontactsgetidsprovidertest
 #include "tcontactsgetidsprovidertest.hrh"
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <SettingServerClient.h>
 //  Member Functions
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,8 +23,8 @@
 #include "tcontactsgetidsprovidertest.hrh"
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 PRJ_TESTEXPORTS
 ../conf/tcontactsprovider_sim.cfg  /epoc32/WINSCW/C/TestFramework/tcontactsprovider_sim.cfg
 //../data/import.vcf	/epoc32/WINSCW/C/data/Import.vcf
-../data/c/Import1.vcf	/epoc32/WINSCW/C/data/Import1.vcf
+../data/c/import1.vcf	/epoc32/WINSCW/C/data/Import1.vcf
 
 PRJ_EXPORTS
 //All files under this section are been moved to PRJ_TESTEXPORTS
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/inc/tcontactsprovider_sim.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/inc/tcontactsprovider_sim.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/inc/tcontactsprovider_sim.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,9 +25,9 @@
 #include <f32file.h>
 
 
-#include <LiwCommon.h>
-#include <LiwBufferExtension.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
+#include <liwservicehandler.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,14 +24,14 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include <f32file.h>
 #include <e32des16.h>
 #include <e32base.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "serviceerrno.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk_observer.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk_observer.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk_observer.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/txmlconvertor.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/txmlconvertor.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/txmlconvertor.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 #include "tprovidertest_vpbk.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_testblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 
 #include "tprovidertest_vpbk.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -18,13 +18,13 @@
 
 
 
-#include "../tContact_add/group/bld.inf"
-#include "../tContact_delete/group/bld.inf"
-#include "../tContact_edit/group/bld.inf"
-#include "../tContact_import/group/bld.inf"
-#include "../tContact_export/group/bld.inf"
-#include "../tContact_getlist/group/bld.inf"
-#include "../tContact_organise/group/bld.inf"
+#include "../tcontact_add/group/bld.inf"
+#include "../tcontact_delete/group/bld.inf"
+#include "../tcontact_edit/group/bld.inf"
+#include "../tcontact_import/group/bld.inf"
+#include "../tcontact_export/group/bld.inf"
+#include "../tcontact_getlist/group/bld.inf"
+#include "../tcontact_organise/group/bld.inf"
 #include "../tcontact_getIds/group/bld.inf"
 
 //  End of File
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -39,7 +39,7 @@
 */
 
 PRJ_TESTMMPFILES
-tContact_add.mmp
+tcontact_add.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -50,11 +50,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         tContact_add.def
+DEFFILE         tcontact_add.def
 
 SOURCEPATH      ../src
-SOURCE          tContact_add.cpp
-SOURCE          tContact_addBlocks.cpp
+SOURCE          tcontact_add.cpp
+SOURCE          tcontact_addblocks.cpp
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/inc/tcontact_add.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/inc/tcontact_add.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/inc/tcontact_add.h	Fri Dec 04 14:09:26 2009 +0000
@@ -24,23 +24,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
  #include<cntitem.h> 
  #include<cntdb.h>
@@ -51,7 +51,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_add.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_add.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_add.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "tContact_add.h"
+#include <StifTestInterface.h>
+#include "tcontact_add.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "tContact_add.h"
+#include <StifTestInterface.h>
+#include "tcontact_add.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -39,7 +39,7 @@
 */
 
 PRJ_TESTMMPFILES
-tContact_delete.mmp
+tcontact_delete.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -50,11 +50,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         tContact_delete.def
+DEFFILE         tcontact_delete.def
 
 SOURCEPATH      ../src
-SOURCE          tContact_delete.cpp
-SOURCE          tContact_deleteBlocks.cpp
+SOURCE          tcontact_delete.cpp
+SOURCE          tcontact_deleteblocks.cpp
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/inc/tcontact_delete.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/inc/tcontact_delete.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/inc/tcontact_delete.h	Fri Dec 04 14:09:26 2009 +0000
@@ -24,23 +24,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
  #include<cntitem.h> 
  #include<cntdb.h>
@@ -51,7 +51,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_delete.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_delete.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_delete.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "tContact_delete.h"
+#include <StifTestInterface.h>
+#include "tcontact_delete.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "tContact_delete.h"
+#include <StifTestInterface.h>
+#include "tcontact_delete.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -39,7 +39,7 @@
 */
 
 PRJ_TESTMMPFILES
-tContact_edit.mmp
+tcontact_edit.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -50,11 +50,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         tContact_edit.def
+DEFFILE         tcontact_edit.def
 
 SOURCEPATH      ../src
-SOURCE          tContact_edit.cpp
-SOURCE          tContact_editBlocks.cpp
+SOURCE          tcontact_edit.cpp
+SOURCE          tcontact_editblocks.cpp
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/inc/tcontact_edit.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/inc/tcontact_edit.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/inc/tcontact_edit.h	Fri Dec 04 14:09:26 2009 +0000
@@ -24,23 +24,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
 #include<cntitem.h> 
 #include<cntdb.h>
@@ -51,7 +51,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_edit.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_edit.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_edit.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "tContact_edit.h"
+#include <StifTestInterface.h>
+#include "tcontact_edit.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_editblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_editblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_editblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "tContact_edit.h"
+#include <StifTestInterface.h>
+#include "tcontact_edit.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -39,7 +39,7 @@
 */
 
 PRJ_TESTMMPFILES
-tContact_export.mmp
+tcontact_export.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -49,11 +49,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         tContact_export.def
+DEFFILE         tcontact_export.def
 
 SOURCEPATH      ../src
-SOURCE          tContact_export.cpp
-SOURCE          tContact_exportBlocks.cpp
+SOURCE          tcontact_export.cpp
+SOURCE          tcontact_exportblocks.cpp
 
 EPOCALLOWDLLDATA
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/inc/tcontact_export.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/inc/tcontact_export.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/inc/tcontact_export.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,23 +25,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
  #include<cntitem.h> 
  #include<cntdb.h>
@@ -52,7 +52,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
  
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_export.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_export.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_export.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "tContact_export.h"
+#include <StifTestInterface.h>
+#include "tcontact_export.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "tContact_export.h"
+#include <StifTestInterface.h>
+#include "tcontact_export.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/group/tcontact_getIds.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/group/tcontact_getIds.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/group/tcontact_getIds.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -54,7 +54,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tcontact_getIds.cpp
-SOURCE          tContact_getIdsBlocks.cpp
+SOURCE          tcontact_getIdsblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,23 +25,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
  #include<cntitem.h> 
  #include<cntdb.h>
@@ -51,7 +51,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIds.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIds.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIds.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcontact_getIds.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tcontact_getIds.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -39,7 +39,7 @@
 */
 
 PRJ_TESTMMPFILES
-tContact_getlist.mmp
+tcontact_getlist.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -50,11 +50,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         tContact_getlist.def
+DEFFILE         tcontact_getlist.def
 
 SOURCEPATH      ../src
-SOURCE          tContact_getlist.cpp
-SOURCE          tContact_getlistBlocks.cpp
+SOURCE          tcontact_getlist.cpp
+SOURCE          tcontact_getlistblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/inc/tcontact_getlist.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/inc/tcontact_getlist.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/inc/tcontact_getlist.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,23 +25,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
  #include<cntitem.h> 
  #include<cntdb.h>
@@ -51,7 +51,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlist.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "tContact_getlist.h"
+#include <StifTestInterface.h>
+#include "tcontact_getlist.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "tContact_getlist.h"
+#include <StifTestInterface.h>
+#include "tcontact_getlist.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -39,7 +39,7 @@
 */
 
 PRJ_TESTMMPFILES
-tContact_import.mmp
+tcontact_import.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -50,11 +50,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         tContact_import.def
+DEFFILE         tcontact_import.def
 
 SOURCEPATH      ../src
-SOURCE          tContact_import.cpp
-SOURCE          tContact_importBlocks.cpp
+SOURCE          tcontact_import.cpp
+SOURCE          tcontact_importblocks.cpp
 
 EPOCALLOWDLLDATA
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/inc/tcontact_import.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/inc/tcontact_import.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/inc/tcontact_import.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,23 +25,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
  #include<cntitem.h> 
  #include<cntdb.h>
@@ -52,7 +52,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
  
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_import.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_import.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_import.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "tContact_import.h"
+#include <StifTestInterface.h>
+#include "tcontact_import.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_importblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_importblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_importblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "tContact_import.h"
+#include <StifTestInterface.h>
+#include "tcontact_import.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -39,7 +39,7 @@
 */
 
 PRJ_TESTMMPFILES
-tContact_organise.mmp
+tcontact_organise.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.mmp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -50,11 +50,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         tContact_organise.def
+DEFFILE         tcontact_organise.def
 
 SOURCEPATH      ../src
-SOURCE          tContact_organise.cpp
-SOURCE          tContact_organiseBlocks.cpp
+SOURCE          tcontact_organise.cpp
+SOURCE          tcontact_organiseblocks.cpp
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/inc/tcontact_organise.h
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/inc/tcontact_organise.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/inc/tcontact_organise.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,23 +25,23 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <stringloader.h>//for StringLoaderLC
+#include <StringLoader.h>//for StringLoaderLC
 #include <barsread.h>//resource reader
 #include <aknnotewrappers.h>//for note
-#include <cvpbkvcardeng.h>//for the vcard engin
-#include <cvpbkcontactmanager.h>// for iContactManager
-#include <mvpbkcontactstore.h>// for iContactStore
-#include <tvpbkcontactstoreuriPtr.h>//used in SetupL
-#include <mvpbkcontactstorelist.h>//used in SetupL to get contact stores
-#include <mvpbkstorecontactfield.h>//used in AddFieldToContactL
-#include <mvpbkstorecontact.h>// used in many function to get the store contact
-#include <mvpbkcontactfieldtextdata.h>//for the field text data
-#include <tvpbkfieldtypemapping.h>//used in CreateFieldTypeL()
-#include <mvpbkfieldtype.h>//return type of CreateFieldTypeL()
-#include <mvpbkcontactoperationbase.h>//for observer
-#include <mvpbkcontactfielddatetimedata.h>//Used in AddDateFieldToContactL
-#include <mvpbkcontactlink.h>//for param in ContactsSaved()
-#include <cvpbkcontactstoreuriarray.h>//used in SetupL
+#include <CVPbkVCardEng.h>//for the vcard engin
+#include <CVPbkContactManager.h>// for iContactManager
+#include <MVPbkContactStore.h>// for iContactStore
+#include <TVPbkContactStoreUriPtr.h>//used in SetupL
+#include <MVPbkContactStoreList.h>//used in SetupL to get contact stores
+#include <MVPbkStoreContactField.h>//used in AddFieldToContactL
+#include <MVPbkStoreContact.h>// used in many function to get the store contact
+#include <MVPbkContactFieldTextData.h>//for the field text data
+#include <TVPbkFieldTypeMapping.h>//used in CreateFieldTypeL()
+#include <MVPbkFieldType.h>//return type of CreateFieldTypeL()
+#include <MVPbkContactOperationBase.h>//for observer
+#include <MVPbkContactFieldDateTimeData.h>//Used in AddDateFieldToContactL
+#include <MVPbkContactLink.h>//for param in ContactsSaved()
+#include <CVPbkContactStoreUriArray.h>//used in SetupL
 #include "contactservice.h"
  #include<cntitem.h> 
  #include<cntdb.h>
@@ -52,7 +52,7 @@
 #include  "contactiter.h"
 #include  "contactcallback.h"
 #include <MVPbkStoreContact.h>
-#include <MVpbkFieldType.h>
+#include <MVPbkFieldType.h>
 #include <VPbkEng.rsg>
 #include <MVPbkStoreContact.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organise.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organise.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organise.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "tContact_organise.h"
+#include <StifTestInterface.h>
+#include "tcontact_organise.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organiseblocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organiseblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organiseblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "tContact_organise.h"
+#include <StifTestInterface.h>
+#include "tcontact_organise.h"
 
 
  TInt handleiter_cnt;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/landmarksservice/inc/clandmarkfilter.h
--- a/serviceproviders/sapi_landmarks/landmarksservice/inc/clandmarkfilter.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/landmarksservice/inc/clandmarkfilter.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <epos_cposlmcategorymanager.h>
+#include <EPos_CPosLmCategoryManager.h>
 
 //FORWARD DECLARARTION
 class CPosLmSearchCriteria;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetcategories.cpp
--- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetcategories.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetcategories.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 
-#include <epos_cposlmoperation.h>
-#include <epos_cposlandmarksearch.h>
+#include <EPos_CPosLmOperation.h>
+#include <EPos_CPosLandmarkSearch.h>
 #include "clandmarkcmdgetcategories.h"
 #include "mlandmarkobserver.h"
 #include "clandmarkmanagehandlers.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetlandmarks.cpp
--- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetlandmarks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetlandmarks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 
-#include <epos_cposlmoperation.h>
-#include <epos_cposlandmarksearch.h>
+#include <EPos_CPosLmOperation.h>
+#include <EPos_CPosLandmarkSearch.h>
 #include "clandmarkcmdgetlandmarks.h"
 #include "mlandmarkobserver.h"
 #include "clandmarkmanagehandlers.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkfilter.cpp
--- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkfilter.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkfilter.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 
-#include <epos_cposlandmarksearch.h>
-#include <epos_cposlmcatnamecriteria.h>
-#include <epos_cposlmtextcriteria.h>
-#include <epos_cposlandmark.h>
+#include <EPos_CPosLandmarkSearch.h>
+#include <EPos_CPosLmCatNameCriteria.h>
+#include <EPos_CPosLmTextCriteria.h>
+#include <EPos_CPosLandmark.h>
 #include "clandmarkfilter.h"
 
 _LIT(KGetAll,"*");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkmanagehandlers.cpp
--- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkmanagehandlers.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkmanagehandlers.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlmcategorymanager.h>
-#include <epos_cposlandmarksearch.h>
-#include <epos_TposLmDatabaseSettings.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLmCategoryManager.h>
+#include <EPos_CPosLandmarkSearch.h>
+#include <EPos_TPosLmDatabaseSettings.h>
 #include "clandmarkmanagehandlers.h"
 
 //class CLandmarkManageHandlers
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/landmarksservice/src/landmarkservice.cpp
--- a/serviceproviders/sapi_landmarks/landmarksservice/src/landmarkservice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/landmarksservice/src/landmarkservice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,14 +16,14 @@
 */
 
 
-#include <epos_hposlmdatabaseinfo.h>
-#include <epos_cposlmdatabasemanager.h>
-#include <epos_cposlandmarkparser.h>
-#include <epos_cposlandmarkencoder.h>
-#include <epos_cposlmitemiterator.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlandmarksearch.h>
-#include <epos_cposlmcategorymanager.h>
+#include <EPos_HPosLmDatabaseInfo.h>
+#include <EPos_CPosLmDatabaseManager.h>
+#include <EPos_CPosLandmarkParser.h>
+#include <EPos_CPosLandmarkEncoder.h>
+#include <EPos_CPosLmItemIterator.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLandmarkSearch.h>
+#include <EPos_CPosLmCategoryManager.h>
 #include "landmarkservice.h"
 #include "clandmarkcmdgetcategories.h"
 #include "clandmarkcmdgetlandmarks.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/src/clandmarkcategoryiterable.cpp
--- a/serviceproviders/sapi_landmarks/src/clandmarkcategoryiterable.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/src/clandmarkcategoryiterable.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 
-#include <epos_cposlandmarkcategory.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlmcategorymanager.h>
-#include <epos_cposlmitemiterator.h>
+#include <EPos_CPosLandmarkCategory.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLmCategoryManager.h>
+#include <EPos_CPosLmItemIterator.h>
 #include "clandmarkcategoryiterable.h"
 #include "landmarkliwparams.hrh"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/src/clandmarkdatabaseiterable.cpp
--- a/serviceproviders/sapi_landmarks/src/clandmarkdatabaseiterable.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/src/clandmarkdatabaseiterable.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 #include <liwgenericparam.h>
-#include <epos_cposlmdatabasemanager.h>
+#include <EPos_CPosLmDatabaseManager.h>
 #include "clandmarkdatabaseiterable.h"
 #include "landmarkliwparams.hrh"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/src/clandmarkiterable.cpp
--- a/serviceproviders/sapi_landmarks/src/clandmarkiterable.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/src/clandmarkiterable.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 
 
 #include <e32math.h>
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlmitemiterator.h>
+#include <EPos_CPosLandmark.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLmItemIterator.h>
 #include <lbsposition.h>
 #include "clandmarkiterable.h"
 #include "landmarkliwparams.hrh"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/src/landmarkinterface.cpp
--- a/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,17 +18,17 @@
 //INCLUDES
 #include <e32math.h>
 #include <liwcommon.h>
-#include <epos_cposlandmarkparser.h>
-#include <epos_cposlandmarkencoder.h>
-#include <epos_cposlandmarksearch.h>
-#include <epos_cposlmcompositecriteria.h>
-#include <epos_cposlmnearestcriteria.h>
-#include <epos_cposlmtextcriteria.h>
-#include <epos_cposlmareacriteria.h>
-#include <epos_cposlmcategorycriteria.h>
-#include <epos_cposlmcatnamecriteria.h>
-#include <epos_cposlmdatabasemanager.h>
-#include <epos_tposlmdatabasesettings.h>
+#include <EPos_CPosLandmarkParser.h>
+#include <EPos_CPosLandmarkEncoder.h>
+#include <EPos_CPosLandmarkSearch.h>
+#include <EPos_CPosLmCompositeCriteria.h>
+#include <EPos_CPosLmNearestCriteria.h>
+#include <EPos_CPosLmTextCriteria.h>
+#include <EPos_CPosLmAreaCriteria.h>
+#include <EPos_CPosLmCategoryCriteria.h>
+#include <EPos_CPosLmCatNameCriteria.h>
+#include <EPos_CPosLmDatabaseManager.h>
+#include <EPos_TPosLmDatabaseSettings.h>
 #include <utf.h>
 #include "landmarkliwparams.hrh"
 #include "landmarkinterface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -23,6 +23,6 @@
 ../conf/tlandmarkprovider.cfg	/epoc32/WINSCW/C/TestFramework/tlandmarkprovider.cfg
 PRJ_TESTMMPFILES
 
-TLandmarkProvider.mmp
+tlandmarkprovider.mmp
 
 //  End of File
\ No newline at end of file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.mmp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -32,11 +32,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         TLandmarkProvider.def
+DEFFILE         tlandmarkprovider.def
 
 SOURCEPATH      ../src
-SOURCE          TLandmarkProvider.cpp
-SOURCE          TLandmarkProviderBlocks.cpp
+SOURCE          tlandmarkprovider.cpp
+SOURCE          tlandmarkproviderblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkprovider.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkprovider.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkprovider.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,13 +18,13 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <liwcommon.h>
 #include <liwservicehandler.h>
-#include <epos_landmarks.h>
+#include <EPos_Landmarks.h>
 #include <EPos_HPosLmDatabaseInfo.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include "TLandmarkProvider.h"
+#include "tlandmarkprovider.h"
 #include "landmarkliwparams.hrh"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkproviderblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkproviderblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkproviderblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,18 +23,18 @@
 #include <f32file.h>
 #include <StifParser.h>
 #include <e32std.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <liwgenericparam.h>
 #include <liwservicehandler.h>
 #include <liwvariant.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkencoder.h>
-#include <epos_cposlmcategorymanager.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLandmark.h>
+#include <EPos_CPosLandmarkEncoder.h>
+#include <EPos_CPosLmCategoryManager.h>
 #include <EPos_HPosLmDatabaseInfo.h>
 #include <EPos_CPosLmDatabaseManager.h>
 #include <lbsposition.h> 
-#include "TLandmarkProvider.h"
+#include "tlandmarkprovider.h"
 #include "landmarkliwparams.hrh"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytestblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,14 +20,14 @@
 #include <f32file.h>
 #include <StifParser.h>
 #include <e32std.h>
-#include <Stiftestinterface.h>
-#include <LiwGenericParam.h>
-#include <LiwServiceHandler.h>
-#include <epos_cposlandmarkdatabase.h> 
+#include <StifTestInterface.h>
+#include <liwgenericparam.h>
+#include <liwservicehandler.h>
+#include <EPos_CPosLandmarkDatabase.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include <epos_cposlandmark.h> 
-#include <epos_cposlandmarkencoder.h> 
-#include <epos_cposlmcategorymanager.h> 
+#include <EPos_CPosLandmark.h> 
+#include <EPos_CPosLandmarkEncoder.h> 
+#include <EPos_CPosLmCategoryManager.h> 
 #include "tlmprovidercategorytests.h"
 #include "landmarkliwparams.hrh"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytests.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,12 +19,12 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <epos_landmarks.h>
+#include <StifTestInterface.h>
+#include <EPos_Landmarks.h>
 #include <EPos_HPosLmDatabaseInfo.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include <LiwCommon.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwservicehandler.h>
 #include "tlmprovidercategorytests.h"
 #include "landmarkliwparams.hrh"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtestblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,15 +19,15 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <liwcommon.h>
 #include <liwservicehandler.h>
 #include <EPos_HPosLmDatabaseInfo.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_landmarks.h>
-#include <epos_cposlandmark.h>
-#include <LiwCommon.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_Landmarks.h>
+#include <EPos_CPosLandmark.h>
+#include <liwcommon.h>
 #include "tlmproviderdbtests.h"
 #include "landmarkliwparams.hrh"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtests.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,12 +19,12 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <epos_landmarks.h>
+#include <StifTestInterface.h>
+#include <EPos_Landmarks.h>
 #include <EPos_HPosLmDatabaseInfo.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include <LiwCommon.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwservicehandler.h>
 #include "tlmproviderdbtests.h"
 #include "landmarkliwparams.hrh"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.mmp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -37,7 +37,7 @@
 
 SOURCEPATH      ../src
 SOURCE          clmcategoriestest.cpp
-SOURCE          clmcategoriestestBlocks.cpp
+SOURCE          clmcategoriestestblocks.cpp
 
 
 USERINCLUDE     ../inc 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clandmarkfilter.h
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clandmarkfilter.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clandmarkfilter.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <epos_cposlmcategorymanager.h>
+#include <EPos_CPosLmCategoryManager.h>
 
 //FORWARD DECLARARTION
 class CPosLmSearchCriteria;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clmcategoriestest.h
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clmcategoriestest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clmcategoriestest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -27,11 +27,11 @@
 #include <StifTestModule.h>
 #include <EPos_HPosLmDatabaseInfo.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include <epos_landmarks.h>
+#include <EPos_Landmarks.h>
 #include <EPos_CPosLandmarkCategory.h> 
 #include <EPos_CPosLmCatNameCriteria.h> 
-#include <epos_cposlmcategorymanager.h> 
-#include <epos_cposlandmarkdatabase.h> 
+#include <EPos_CPosLmCategoryManager.h> 
+#include <EPos_CPosLandmarkDatabase.h> 
 #include "landmarkservice.h"
 #include "mlandmarkobserver.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestest.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,10 +19,10 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "Clmcategoriestest.h"
-#include <epos_cposlandmarkdatabase.h> 
-#include <epos_cposlmcategorymanager.h> 
+#include <StifTestInterface.h>
+#include "clmcategoriestest.h"
+#include <EPos_CPosLandmarkDatabase.h> 
+#include <EPos_CPosLmCategoryManager.h> 
 
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestestblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,13 +21,13 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <EPos_CPosLmTextCriteria.h>
 #include <lbsposition.h> 
-#include <epos_cposlmitemiterator.h> 
-#include <epos_cposlmcategorymanager.h> 
-#include <epos_cposlandmarkdatabase.h> 
-#include "Clmcategoriestest.h"
+#include <EPos_CPosLmItemIterator.h> 
+#include <EPos_CPosLmCategoryManager.h> 
+#include <EPos_CPosLandmarkDatabase.h> 
+#include "clmcategoriestest.h"
 #include "landmarkservice.h"
 #include "clandmarkfilter.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf	Fri Dec 04 14:09:26 2009 +0000
@@ -22,9 +22,9 @@
 WINSCW ARMV5
 
 PRJ_TESTEXPORTS
-../conf/Tlmdatabasetests.cfg	/epoc32/WINSCW/C/TestFramework/Tlmdatabasetests.cfg
+../conf/tlmdatabasetests.cfg	/epoc32/WINSCW/C/TestFramework/tlmdatabasetests.cfg
 
 PRJ_TESTMMPFILES
-Tlmdatabasetests.mmp
+tlmdatabasetests.mmp
 
 //  End of File
\ No newline at end of file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/inc/tlmdatabasestest.h
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/inc/tlmdatabasestest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/inc/tlmdatabasestest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -27,7 +27,7 @@
 #include <StifTestModule.h>
 #include <EPos_HPosLmDatabaseInfo.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include <epos_landmarks.h>
+#include <EPos_Landmarks.h>
 
 // MACROS
 // Logging path
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmdatabasestest.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmdatabasestest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmdatabasestest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "TLmDatabasesTest.h"
+#include <StifTestInterface.h>
+#include "tlmdatabasestest.h"
 
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmtestblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "TLmDatabasesTest.h"
+#include <StifTestInterface.h>
+#include "tlmdatabasestest.h"
 #include "landmarkservice.h"
 
 // CONSTANTS  
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.mmp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -36,7 +36,7 @@
 
 SOURCEPATH      ../src
 SOURCE          clmlandmarkstest.cpp
-SOURCE          clmlandmarkstestBlocks.cpp
+SOURCE          clmlandmarkstestblocks.cpp
 SOURCE          clandmarkasynctests.cpp
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkasynctests.h
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkasynctests.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkasynctests.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 
 #include <e32base.h>
 #include "mlandmarkobserver.h"
-#include "Clmlandmarkstest.h"
+#include "clmlandmarkstest.h"
 
 class CLandmarkService;
 class CPosLmItemIterator;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkfilter.h
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkfilter.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkfilter.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <epos_cposlmcategorymanager.h>
+#include <EPos_CPosLmCategoryManager.h>
 
 //FORWARD DECLARARTION
 class CPosLmSearchCriteria;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clmlandmarkstest.h
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clmlandmarkstest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clmlandmarkstest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -27,10 +27,10 @@
 #include <StifTestModule.h>
 #include <EPos_HPosLmDatabaseInfo.h> 
 #include <EPos_CPosLmDatabaseManager.h> 
-#include <epos_landmarks.h>
+#include <EPos_Landmarks.h>
 #include <EPos_CPosLandmarkCategory.h> 
 #include <EPos_CPosLmSearchCriteria.h>
-#include <epos_cposlandmarkdatabase.h> 
+#include <EPos_CPosLandmarkDatabase.h> 
 #include "mlandmarkobserver.h"
 #include "landmarkservice.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clandmarkasynctests.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clandmarkasynctests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clandmarkasynctests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,15 +15,15 @@
 *
 */
 
-#include <epos_cposlandmarkparser.h> 
-#include <epos_cposlandmarkencoder.h> 
+#include <EPos_CPosLandmarkParser.h> 
+#include <EPos_CPosLandmarkEncoder.h> 
 #include <lbsposition.h> 
 #include <EPos_CPosLmTextCriteria.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlmitemiterator.h> 
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLmItemIterator.h> 
 #include "clandmarkfilter.h"
 #include "landmarkservice.h"
-#include "CLandmarkAsyncTests.h"
+#include "clandmarkasynctests.h"
 
 _LIT(KLmName1, "lm1");
 _LIT(KLmName2, "lm2");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstest.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,9 +19,9 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "Clmlandmarkstest.h"
-#include <epos_cposlandmarkdatabase.h> 
+#include <StifTestInterface.h>
+#include "clmlandmarkstest.h"
+#include <EPos_CPosLandmarkDatabase.h> 
 
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstestblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,19 +21,19 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <epos_cposlandmarkparser.h> 
-#include <epos_cposlandmarkencoder.h>
+#include <StifTestInterface.h>
+#include <EPos_CPosLandmarkParser.h> 
+#include <EPos_CPosLandmarkEncoder.h>
 #include <lbsposition.h> 
 #include <EPos_CPosLmTextCriteria.h>
 #include <f32file.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlmitemiterator.h> 
-#include <epos_cposlandmark.h> 
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLmItemIterator.h> 
+#include <EPos_CPosLandmark.h> 
 #include "clandmarkfilter.h"
-#include "CLandmarkAsyncTests.h"
+#include "clandmarkasynctests.h"
 #include "landmarkservice.h"
-#include "Clmlandmarkstest.h"
+#include "clmlandmarkstest.h"
 
 _LIT(KLmName1, "lm1");
 _LIT(KLmName2, "lm2");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.mmp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -48,7 +48,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tlandmark_provider.cpp
-SOURCE          tlandmark_providerBlocks.cpp
+SOURCE          tlandmark_providerblocks.cpp
 SOURCE          tgetlist.cpp
 
 //RESOURCE        resource_file
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/inc/getlist.h
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/inc/getlist.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/inc/getlist.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 #include <liwcommon.h>
 #include <e32base.h>
 #include <f32file.h>
-#include <BADESCA.H>
+#include <badesca.h>
 
 class CLiwServiceHandler;
 class CLiwGenericParamList;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,17 +18,17 @@
 
 
 #include <e32std.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
 #include <StifLogger.h>
 #include "getlist.h"
-#include<LiwCommon.h>
-#include<LiwVariant.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
 #include "landmarkliwparams.hrh"
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkencoder.h>
-#include <epos_cposlmcategorymanager.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLandmark.h>
+#include <EPos_CPosLandmarkEncoder.h>
+#include <EPos_CPosLmCategoryManager.h>
 #include "tlandmark_provider.h"
 #include <EPos_HPosLmDatabaseInfo.h>
 #include <EPos_CPosLmDatabaseManager.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_provider.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_provider.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_provider.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tlandmark_provider.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,14 +23,14 @@
 #include <f32file.h>
 #include <StifParser.h>
 #include <e32std.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <liwgenericparam.h>
 #include <liwservicehandler.h>
 #include <liwvariant.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkencoder.h>
-#include <epos_cposlmcategorymanager.h>
+#include <EPos_CPosLandmarkDatabase.h>
+#include <EPos_CPosLandmark.h>
+#include <EPos_CPosLandmarkEncoder.h>
+#include <EPos_CPosLmCategoryManager.h>
 #include <EPos_HPosLmDatabaseInfo.h>
 #include <EPos_CPosLmDatabaseManager.h>
 #include <lbsposition.h> 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.mmp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -51,7 +51,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tproviderlmarktest.cpp
-SOURCE          tproviderlmarktestBlocks.cpp
+SOURCE          tproviderlmarktestblocks.cpp
 SOURCE          tprovidertestobserver.cpp
 SOURCE          txmlconvertor.cpp
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tproviderlmarktest.h
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tproviderlmarktest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tproviderlmarktest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 class CLiwGenericParamList;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tprovidertestobserver.h
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tprovidertestobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tprovidertestobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/txmlconvertor.h
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/txmlconvertor.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/txmlconvertor.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktest.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include "tproviderlmarktest.h"
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktestblocks.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 #include "txmlconvertor.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/data/102833ab.rss
--- a/serviceproviders/sapi_location/data/102833ab.rss	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/data/102833ab.rss	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include <Eikon.rh>
-#include "ecom/RegistryInfoV2.rh" 
-#include <LiwCommon.hrh>
+#include <eikon.rh>
+#include "ecom/registryinfov2.rh" 
+#include <liwcommon.hrh>
 
 RESOURCE REGISTRY_INFO theInfo
     {
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/group/locationprovider.mmp
--- a/serviceproviders/sapi_location/group/locationprovider.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/group/locationprovider.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -37,7 +37,7 @@
 SOURCEPATH      ../src
 
 SOURCE 			locationinterface.cpp
-SOURCE 			locationCallBack.cpp
+SOURCE 			locationcallBack.cpp
 SOURCE          locationservicehandler.cpp
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/inc/locationcb.h
--- a/serviceproviders/sapi_location/inc/locationcb.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/inc/locationcb.h	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #ifndef C_LOCATIONCB_H
 #define C_LOCATIONCB_H
 
-#include <LiwCommon.h> 
+#include <liwcommon.h> 
 #include "locationservice.h"
 
 const TInt KGetLocationCB = 0 ;
@@ -68,7 +68,7 @@
      
      LocationInterfaceCB( MLiwNotifyCallback* aCallBack , 
      					  const CLiwGenericParamList* aInParmList ,	
-     				      TPositionModuleInfo* aModuleInfo,
+     				      //TPositionModuleInfo* aModuleInfo,
      				      TInt32 aTransactionId = 0 ) ;
      				      
     
@@ -88,7 +88,7 @@
 
     static LocationInterfaceCB * NewL( MLiwNotifyCallback* aCallBack , 
     									 const CLiwGenericParamList* aInParmList, 
-    									 TPositionModuleInfo* aModuleInfo ,
+    									 //TPositionModuleInfo* aModuleInfo ,
     									 TInt32 aTransactionId = 0)  ;
 
     /**
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/inc/locationinterface.h
--- a/serviceproviders/sapi_location/inc/locationinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/inc/locationinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,14 +19,13 @@
 #define C_LOCINTERFACE_H
 
 
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include "locationcb.h"
 #include "locationservice.h"
 #include "serviceerrno.h"
 
 
 // CONSTANTS
-const TInt KMaxSupportedFields = 25 ;
 
 
 
@@ -271,7 +270,6 @@
      * Positioning module used for location estimation
      */	            
     	            
-    TInt SetSupportedFields() ;  
 
     /**
      * Internal utility function which gets all location information which module supports
@@ -296,27 +294,13 @@
     
 
     /**
-     * Member variable which holds all the Generic position  information
-     */
-
-    HPositionGenericInfo *iGenericPosInfo ;
-
-    /**
-     * Class member which contains module information which is used for location esitmation
-     */
-    TPositionModuleInfo   iModuleInfo ;
-    /**
      * Class member which is used to obtain updates of Last Known Position
      */
     TPosition iPosition;
-
     /**
-     * Class member which contains all the field ids of all the supported Hposition info fields
-     */ 
-
-    TPositionFieldId iFieldList[KMaxSupportedFields] ;
-
-
+     * Generic position class
+     */
+    HPositionGenericInfo *iGenericPosition;
 
     };
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/inc/locationservicehandler.h
--- a/serviceproviders/sapi_location/inc/locationservicehandler.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/inc/locationservicehandler.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 
 
 #include <liwserviceifbase.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 
 /**
  * InerfaceName ILocation
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/locationservice/inc/locationcoreimp.h
--- a/serviceproviders/sapi_location/locationservice/inc/locationcoreimp.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/locationservice/inc/locationcoreimp.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #define C_LOCATIONCOREIMP_H
 
 #include <lbs.h>
-#include <LbsSatellite.h>
+#include <lbssatellite.h>
 #include "locationservice.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/locationservice/inc/locationservice.h
--- a/serviceproviders/sapi_location/locationservice/inc/locationservice.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/locationservice/inc/locationservice.h	Fri Dec 04 14:09:26 2009 +0000
@@ -40,6 +40,7 @@
 _LIT8(KVerAccuracy,"VerticalAccuracy");
 
 _LIT(KUnknown,"Unknown");
+const TInt KMaxSupportedFields = 25 ;
 
 /**
  * Default Update options
@@ -57,6 +58,7 @@
 const TInt KSMaxAge = 0;
 const TInt KGetLocationReq = 0 ;
 const TInt KTraceReq   = 1 ;
+const TInt errServiceNotReady = 1006;
 
 /**
  * Enums required for mathoperations
@@ -279,6 +281,8 @@
 	      */
 	     
 	     void GetHighAccuracyModuleL(TPositionModuleId* aModId);
+         TInt SetSupportedFields() ; 
+         TInt SetRequestingField();
 
 
 
@@ -319,6 +323,20 @@
 	     * Module indtifier used by location server for getting location information
 	     */
 	    TPositionModuleId iModuleId ; 
+	    /**
+         * Member variable which holds all the Generic position  information
+         */
+
+        HPositionGenericInfo *iGenericPosInfo ;
+        /**
+         * Class member which contains all the field ids of all the supported Hposition info fields
+         */ 
+
+        TPositionFieldId iFieldList[KMaxSupportedFields] ;
+        /**
+        * Class member which contains module information which is used for location esitmation
+        */
+       TPositionModuleInfo   iModuleInfo ;
 
     };
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp
--- a/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -65,7 +65,7 @@
         User :: LeaveIfError((this->iPositioner).Open(aPositionServer)) ; 
         }
 
-    CleanupClosePushL(iPositioner);
+    //CleanupClosePushL(iPositioner);
     //Set the identity of this particular requestor
     User::LeaveIfError( (this->iPositioner).SetRequestor( 
             CRequestor::ERequestorService,
@@ -75,15 +75,15 @@
     this->iPosInfoBase = &(this->iPositionInfo);
     this->iRequestType = aRequestType;
     this->iGenericPosInfo = HPositionGenericInfo :: NewL();
-    CleanupStack :: PushL(this->iGenericPosInfo);
+    //CleanupStack :: PushL(this->iGenericPosInfo);
 
     if(aList)
         {
         User :: LeaveIfError((this->iGenericPosInfo)->SetRequestedFields(aList));
         }
 
-    CleanupStack ::Pop(this->iGenericPosInfo );
-    CleanupStack::Pop(&iPositioner);
+    //CleanupStack ::Pop(this->iGenericPosInfo );
+    //CleanupStack::Pop(&iPositioner);
     }
 /**
  * Function name: NewL , 
@@ -197,7 +197,10 @@
     }
 
     iPositioner.NotifyPositionUpdate( *iGenericPosInfo, iStatus );
-    SetActive() ;
+    if (!IsActive())
+        {
+        SetActive();
+        }
     return KErrNone ;
     }
 
@@ -234,7 +237,10 @@
 					if(!this->IsStatusComplete())
 					{
 						iPositioner.NotifyPositionUpdate( *iGenericPosInfo, iStatus );
-						SetActive();
+						if (!IsActive())
+                            {
+                            SetActive();
+                            }
 					}
 					 	
 				}
@@ -254,7 +260,10 @@
                         {
                         iPositioner.NotifyPositionUpdate( *iGenericPosInfo,
                                 iStatus);
-                        SetActive();
+                        if (!IsActive())
+                            {
+                            SetActive();
+                            }
                         }
 
                     }
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/locationservice/src/locationservice.cpp
--- a/serviceproviders/sapi_location/locationservice/src/locationservice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/locationservice/src/locationservice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -31,6 +31,7 @@
  
  
 EXPORT_C CLocationService :: CLocationService()
+						  :iGenericPosInfo(NULL)
     {
 	//No Implementation Required Here
     }
@@ -60,6 +61,7 @@
         }
     iPosServer.Close();
     iRegTable.Close();
+    delete iGenericPosInfo;
 
     }
  
@@ -89,12 +91,18 @@
 void CLocationService::ConstructL()
     {
     User :: LeaveIfError(iPosServer.Connect());
-    CleanupClosePushL(iPosServer);
+    //CleanupClosePushL(iPosServer);
+    iGenericPosInfo = HPositionGenericInfo::NewL() ;
+
+    if ( !iGenericPosInfo )
+        {
+        User::Leave( KErrNoMemory ) ;
+        }
     
     //Get the module id of the default module available
-    User :: LeaveIfError(iPosServer.GetDefaultModuleId(iModuleId));
+    //User :: LeaveIfError(iPosServer.GetDefaultModuleId(iModuleId));
 
-    CleanupStack::Pop(&iPosServer);
+    //CleanupStack::Pop(&iPosServer);
     }
 
 /**
@@ -111,7 +119,7 @@
     //Flags used for indicating if a particular module is found
     TInt termInternalFlag = 0;   
     TInt termFlag = 0 ,assisFlag = 0 ,networkFlag = 0,unknownFlag = 0;
-    TInt err;
+    //TInt err;
     
     User::LeaveIfError(iPosServer.GetNumModules(numOfModules));
         
@@ -171,26 +179,43 @@
  */
 
 EXPORT_C void  CLocationService :: GetLocationL( TPositionInfoBase* aInfoBase ,
-        const TPositionUpdateOptions* aUpdateOpts,TBool aEnableHighAcc )
+                                                 const TPositionUpdateOptions* aUpdateOpts,
+                                                 TBool aEnableHighAcc )
     {
+    //Check if atleast one of the module is enabled
+    TInt modError = iPosServer.GetDefaultModuleId(iModuleId);
+    if (modError)
+        {
+        User::Leave(errServiceNotReady);
+        }
     // Open subsession to the position server
     TPositionModuleId ModuleId;
-    TInt error;
+    //TInt error;
     if(aEnableHighAcc)
         {
         GetHighAccuracyModuleL(&ModuleId);
        
         User::LeaveIfError(iPositioner.Open(iPosServer,ModuleId));
         
+        iModuleId = ModuleId;
         }
     else
         {
         User::LeaveIfError(iPositioner.Open(iPosServer));
+        User::LeaveIfError(iPosServer.GetDefaultModuleId(iModuleId));
         }
 
     
-    CleanupClosePushL(iPositioner);
-
+    //CleanupClosePushL(iPositioner);
+    TInt errorInprocessing = KErrNone;
+    errorInprocessing = SetRequestingField();
+    if(errorInprocessing)
+        {
+        iPositioner.Close();
+        User::Leave(errorInprocessing);
+        }
+   // (static_cast<HPositionGenericInfo*>(aInfoBase))->ClearRequestedFields() ;
+    (static_cast<HPositionGenericInfo*>(aInfoBase))->SetRequestedFields(iFieldList) ;
     //setting identity for this requestor
     User::LeaveIfError( iPositioner.SetRequestor( CRequestor::ERequestorService,
             CRequestor::EFormatApplication,
@@ -200,7 +225,14 @@
 
     if(aUpdateOpts)
         {
-        User::LeaveIfError(iPositioner.SetUpdateOptions(*aUpdateOpts));
+        TInt errorInprocessing = iPositioner.SetUpdateOptions(*aUpdateOpts);
+        
+        if(errorInprocessing)
+           {
+           iPositioner.Close();
+           User::Leave(errorInprocessing);
+           }
+        
         }
 
     else
@@ -227,7 +259,8 @@
 
     iPositioner.NotifyPositionUpdate( *aInfoBase, status );
     User :: WaitForRequest(status) ;
-    CleanupStack::PopAndDestroy(&iPositioner);
+    //CleanupStack::PopAndDestroy(&iPositioner);
+    iPositioner.Close();
     
     User::LeaveIfError(status.Int());
     }
@@ -237,7 +270,8 @@
  * positioning moulde, currently this methods only supports info of default module indentifier
  */
 
- EXPORT_C TInt CLocationService :: GetModuleInfo( TPositionModuleInfoBase& aModuleInfo )   const
+EXPORT_C TInt CLocationService :: GetModuleInfo( 
+        TPositionModuleInfoBase& aModuleInfo ) const
     {
     return  iPosServer.GetModuleInfoById(iModuleId , aModuleInfo) ;
 
@@ -252,27 +286,35 @@
  */
 EXPORT_C void CLocationService :: GetLocationL( MLocationCallBack* aCallBackObj ,
         TInt aLocationInfoCategory,
-        TPositionFieldIdList aFieldList ,
+        TPositionFieldIdList/* aFieldList*/ ,
         const TPositionUpdateOptions* aUpateOptions,
         TBool aEnableHighAcc 
 )
     {  
+    TInt modError = iPosServer.GetDefaultModuleId(iModuleId);
+    if (modError)
+        {
+        User::Leave(errServiceNotReady);
+        }
     TPositionModuleId ModuleId;
     if(aEnableHighAcc)
         {
         GetHighAccuracyModuleL(&ModuleId);
+        iModuleId = ModuleId;
         
         }
     else
         {
         //Indicates that when opening the subsession ,moudleId need not be specified
         ModuleId.iUid = 0;       
+        User::LeaveIfError(iPosServer.GetDefaultModuleId(iModuleId));
         }
 
     TInt err = KErrGeneral;
+    User::LeaveIfError(SetSupportedFields());
 
     CGetLoc* activeGetLoc = CGetLoc :: NewL(iPosServer ,
-            aFieldList ,
+            iFieldList ,
             KGetLocationRequest,
             aLocationInfoCategory,
             ModuleId) ;
@@ -300,10 +342,15 @@
 
 EXPORT_C void CLocationService :: TraceL( MLocationCallBack* aCallBackObj ,
         TInt aLocationInfoCategory,
-        TPositionFieldIdList aFiledList ,
+        TPositionFieldIdList/* aFiledList*/ ,
         const TPositionUpdateOptions* aUpateOptions,
         TBool aEnableHighAcc )
     {
+    TInt modError = iPosServer.GetDefaultModuleId(iModuleId);
+    if (modError)
+        {
+        User::Leave(errServiceNotReady);
+        }
     TPositionModuleId ModuleId;
     if(aEnableHighAcc)
         {
@@ -312,15 +359,17 @@
             {
             User::Leave(KErrGeneral);
             }
+        iModuleId = ModuleId;
         }
     else
         {
         //Indicates that when opening the subsession ,moudleId need not be specified
         ModuleId.iUid = 0;          
+        User::LeaveIfError(iPosServer.GetDefaultModuleId(iModuleId));
         }
     
     CGetLoc* activeTrace = CGetLoc :: NewL(iPosServer ,
-            aFiledList ,
+            iFieldList ,
             KTraceRequest,
             aLocationInfoCategory,
             ModuleId) ;
@@ -501,3 +550,127 @@
 
     return KErrNotFound;
     }
+TInt CLocationService :: SetSupportedFields()
+    {
+    
+    TUint fieldIter = 0 ;
+    //get positioning module information
+    TInt infoerr = GetModuleInfo(iModuleInfo);
+    if (infoerr)
+        {
+        return infoerr;
+        }
+
+    TPositionModuleInfo :: TCapabilities  currCapability  = iModuleInfo.Capabilities() ;
+
+    if(currCapability & TPositionModuleInfo :: ECapabilitySpeed) //set horizontal,vertical speeds along with errros 
+        {   
+        iFieldList[fieldIter++] = EPositionFieldHorizontalSpeed ;
+        
+        iFieldList[fieldIter++] = EPositionFieldHorizontalSpeedError ;
+        iFieldList[fieldIter++] = EPositionFieldVerticalSpeed ;
+        iFieldList[fieldIter++] = EPositionFieldVerticalSpeedError ;
+        }
+
+    if(currCapability & TPositionModuleInfo :: ECapabilitySatellite) //Set satellite info fields if positioning module supports
+        {                                                               //
+        
+        iFieldList[fieldIter++] = EPositionFieldSatelliteNumInView ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteNumUsed ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteTime ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteHorizontalDoP ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteVerticalDoP ;
+        
+        }
+
+    if(currCapability & TPositionModuleInfo :: ECapabilityDirection) //Set Direction info fields if positioning module supports
+        {
+        
+        iFieldList[fieldIter++] = EPositionFieldTrueCourse ;
+        iFieldList[fieldIter++] = EPositionFieldTrueCourseError ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticCourse ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticCourseError ;
+        
+        }
+    
+
+    if(currCapability & TPositionModuleInfo :: ECapabilityCompass) //Set NMEA fields if positioning module supports 
+        {
+            
+        iFieldList[fieldIter++] = EPositionFieldHeading ;
+        iFieldList[fieldIter++] = EPositionFieldHeadingError ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticHeading ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticHeadingError ;
+        
+        }
+    
+    
+   iFieldList[fieldIter] = EPositionFieldNone  ;   //Field Termination 
+   iGenericPosInfo->ClearRequestedFields() ;
+   iGenericPosInfo->SetRequestedFields(iFieldList) ;
+  
+  
+   return KErrNone ;
+   }
+TInt CLocationService :: SetRequestingField()
+    {
+    
+    TUint fieldIter = 0 ;
+    //get positioning module information
+    TInt infoerr = GetModuleInfo(iModuleInfo);
+    if (infoerr)
+        {
+        return infoerr;
+        }
+
+    TPositionModuleInfo :: TCapabilities  currCapability  = iModuleInfo.Capabilities() ;
+
+    if(currCapability & TPositionModuleInfo :: ECapabilitySpeed) //set horizontal,vertical speeds along with errros 
+        {   
+        iFieldList[fieldIter++] = EPositionFieldHorizontalSpeed ;
+        
+        iFieldList[fieldIter++] = EPositionFieldHorizontalSpeedError ;
+        iFieldList[fieldIter++] = EPositionFieldVerticalSpeed ;
+        iFieldList[fieldIter++] = EPositionFieldVerticalSpeedError ;
+        }
+
+    if(currCapability & TPositionModuleInfo :: ECapabilitySatellite) //Set satellite info fields if positioning module supports
+        {                                                               //
+        
+        iFieldList[fieldIter++] = EPositionFieldSatelliteNumInView ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteNumUsed ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteTime ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteHorizontalDoP ;
+        iFieldList[fieldIter++] = EPositionFieldSatelliteVerticalDoP ;
+        
+        }
+
+    if(currCapability & TPositionModuleInfo :: ECapabilityDirection) //Set Direction info fields if positioning module supports
+        {
+        
+        iFieldList[fieldIter++] = EPositionFieldTrueCourse ;
+        iFieldList[fieldIter++] = EPositionFieldTrueCourseError ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticCourse ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticCourseError ;
+        
+        }
+    
+
+    if(currCapability & TPositionModuleInfo :: ECapabilityCompass) //Set NMEA fields if positioning module supports 
+        {
+            
+        iFieldList[fieldIter++] = EPositionFieldHeading ;
+        iFieldList[fieldIter++] = EPositionFieldHeadingError ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticHeading ;
+        iFieldList[fieldIter++] = EPositionFieldMagneticHeadingError ;
+        
+        }
+    
+    
+   iFieldList[fieldIter] = EPositionFieldNone  ;   //Field Termination 
+   
+  
+  
+   return KErrNone ;
+   }
+
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/src/locationcallBack.cpp
--- a/serviceproviders/sapi_location/src/locationcallBack.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/src/locationcallBack.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 */
 
 #include <liwserviceifbase.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include "locationinterface.h"
 #include "locationservice.h"
 #include "locationcb.h"
@@ -43,11 +43,11 @@
  
 LocationInterfaceCB :: LocationInterfaceCB( MLiwNotifyCallback* aCallBack ,
 										const CLiwGenericParamList* aInParmList ,	
-     				      				TPositionModuleInfo* aPositionModuleInfo ,
+     				      				//TPositionModuleInfo* aPositionModuleInfo ,
      				      				TInt32 aTransactionId ) : iCallBack(aCallBack), 
      				      										 iTransactionId(aTransactionId)
     {
-    iModuleInfo = aPositionModuleInfo	;
+    //iModuleInfo = aPositionModuleInfo	;
     
     //Extract the location info category from inputparamlist
     TInt index = 0;
@@ -85,11 +85,11 @@
  
 LocationInterfaceCB *LocationInterfaceCB :: NewL(MLiwNotifyCallback* aCallBack  ,
 												const CLiwGenericParamList* aInParmList ,  
-												TPositionModuleInfo* aPositionModuleInfo,
+												//TPositionModuleInfo* aPositionModuleInfo,
 												TInt32 aTransactionid  ) 
     {
     LocationInterfaceCB *self = new(ELeave) LocationInterfaceCB(aCallBack , aInParmList ,
-    															aPositionModuleInfo, aTransactionid) ;
+    															/*aPositionModuleInfo,*/ aTransactionid) ;
     CleanupStack::PushL(self);
 
     //Store the outparam and in param list
@@ -194,12 +194,11 @@
         result->InsertL(KVerAccuracy, TLiwVariant((TReal)Val1)) ;
         }
     
-    TPositionModuleInfo :: TCapabilities  currCapability  = iModuleInfo->Capabilities() ;
+    //TPositionModuleInfo :: TCapabilities  currCapability  = iModuleInfo->Capabilities() ;
     
     if ( iLocinfoCategory == EGenericInfo )
 	    {
-	    if(currCapability & TPositionModuleInfo :: ECapabilitySpeed) //Populate output param with speed info
-        {
+	   
         TReal32 speedinfo = 0 ;
 
         if(!aGenericInfo->GetValue(EPositionFieldHorizontalSpeed , speedinfo) ) //Extract speed 
@@ -215,11 +214,8 @@
 
 
 
-        }   //End of EcapabilitySpeed 
 
 
-	    if(currCapability & TPositionModuleInfo :: ECapabilitySatellite) //Extract satellitinfo if any and append it
-	        {																//as part of out parm list
 	        TInt8 satinfo  = 0;
 
 	        if(!aGenericInfo->GetValue(EPositionFieldSatelliteNumInView , satinfo))
@@ -232,10 +228,8 @@
 		        }
 
 
-	        }
+	                                                                   
 
-	    if(currCapability & TPositionModuleInfo :: ECapabilityDirection) //Extract direction info if any and append it 
-	        {                                                               // as part of out parm list
 	        TReal32 direcinfo = 0;
 
 	        if(!aGenericInfo->GetValue(EPositionFieldTrueCourse , direcinfo) )
@@ -264,17 +258,13 @@
 	            	
 	            }
 
-	        }
-
-
-	    if(currCapability & TPositionModuleInfo :: ECapabilityCompass) //Extract compass info if any and append it 
-	        {                                                               // as part of out parm list
+	       
 	        TReal32 compassinfo ;
 
 	        if(!aGenericInfo->GetValue(EPositionFieldHeading , compassinfo) )
 	            {
 	            result->InsertL(KPositionFieldHeading,TLiwVariant((TReal)compassinfo));
-	            ;
+           
 	            }
 
 
@@ -300,7 +290,6 @@
 
 
 
-	        }
 
 	    /*if( currCapability & TPositionModuleInfo :: ECapabilityNmea ) //Extract Nmea info if any and append it 	
 	        {                                                             //as part of out param list  
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/src/locationinterface.cpp
--- a/serviceproviders/sapi_location/src/locationinterface.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/src/locationinterface.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 #include <e32base.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include <lbs.h>
-#include <LbsRequestor.h>
+#include <lbsrequestor.h>
 
 #include <lbscommon.h>
 #include <lbssatellite.h>
@@ -51,7 +51,7 @@
  	 	 delete iHandleCB[iter] ;
  	 	}
  	 iHandleCB.Close();
-	 delete iGenericPosInfo ;
+	 delete iGenericPosition ;
  
  	
     }
@@ -66,16 +66,16 @@
     }
 void CLocationInterface::ConstructL()
     {
-    iGenericPosInfo = HPositionGenericInfo::NewL() ;
+    iGenericPosition = HPositionGenericInfo::NewL() ;
 
-    if ( !iGenericPosInfo )
+    if ( !iGenericPosition )
         {
         User::Leave( KErrNoMemory ) ;
         }
 
     iLocationService = CLocationService::NewL() ;
-    User::LeaveIfError( iLocationService->GetModuleInfo( iModuleInfo ) );
-    User::LeaveIfError( this->SetSupportedFields() );
+    //User::LeaveIfError( iLocationService->GetModuleInfo( iModuleInfo ) );
+    //User::LeaveIfError( this->SetSupportedFields() );
     }
 
 
@@ -148,6 +148,11 @@
 				sapiErr = SErrMissingArgument;
 				break;
 			}
+		case SErrServiceNotReady:
+		    {
+                sapiErr = SErrServiceNotReady;
+		        break;
+			}
 		default:
 			{
 				sapiErr = SErrGeneralError;
@@ -245,7 +250,7 @@
         User::LeaveIfError(iLocationService->GetLastKnownLoc(iPosition)) ;            
         TUint category1 = EBasicInfo;
 
-        iGenericPosInfo->SetPosition(iPosition);
+        iGenericPosition->SetPosition(iPosition);
         GetLocationInfo(aOutParamList, category1) ;
 
         }
@@ -434,13 +439,13 @@
                 }
             LocationInterfaceCB* callback =
             LocationInterfaceCB::NewL(aCallback,
-                    &aInParamList, &iModuleInfo, transid) ;
+                    &aInParamList, /*&iModuleInfo,*/ transid) ;
 
             CleanupStack :: PushL(callback) ;                   
             callback->SetRequestType(KGetLocationCB) ;
             
             iLocationService->GetLocationL(callback ,category,
-                    iFieldList,updateoptions,enableHighAcc) ;	                    
+                    NULL,updateoptions,enableHighAcc) ;	                    
             //Store the allocatioed address 
             iHandleCB.Append(callback);
             //Append Transcationid to out list
@@ -581,7 +586,7 @@
                     }
                 }
 
-            iLocationService->GetLocationL(iGenericPosInfo,
+            iLocationService->GetLocationL(iGenericPosition,
                     updateOptions,enableHighAcc) ;
             GetLocationInfo(aOutParamList,category) ; 
             
@@ -782,12 +787,12 @@
 
         LocationInterfaceCB* callback =
         LocationInterfaceCB::NewL(aCallback,
-                &aOutParamList, &iModuleInfo, transid) ;
+                &aOutParamList,/* &iModuleInfo,*/ transid) ;
         CleanupStack :: PushL(callback) ;
         callback->SetRequestType(KTraceCB) ;
 
 
-        iLocationService->TraceL( callback, catergory,iFieldList, 
+        iLocationService->TraceL( callback, catergory,NULL, 
                 updateOption,enableHighAcc );
         iHandleCB.Append(callback);
         aOutParamList.AppendL(TLiwGenericParam(KTransactionId,
@@ -1272,71 +1277,6 @@
  * positioning module used
  */ 
 
-TInt CLocationInterface :: SetSupportedFields()
-    {
-	//Extract all the information Accuracy, timestamp, satellite and course info and append 
-	// to out parmlist
-
-	
-	
-	TUint fieldIter = 0 ;
-
-	TPositionModuleInfo :: TCapabilities  currCapability  = iModuleInfo.Capabilities() ;
-
-	if(currCapability & TPositionModuleInfo :: ECapabilitySpeed) //set horizontal,vertical speeds along with errros 
-        {   
-        iFieldList[fieldIter++] = EPositionFieldHorizontalSpeed ;
-        iFieldList[fieldIter++] = EPositionFieldHorizontalSpeedError ;
-        iFieldList[fieldIter++] = EPositionFieldVerticalSpeed ;
-        iFieldList[fieldIter++] = EPositionFieldVerticalSpeedError ;
-        }
-
-	if(currCapability & TPositionModuleInfo :: ECapabilitySatellite) //Set satellite info fields if positioning module supports
-	    {                                                               //
-		
-		iFieldList[fieldIter++] = EPositionFieldSatelliteNumInView ;
-		iFieldList[fieldIter++] = EPositionFieldSatelliteNumUsed ;
-        iFieldList[fieldIter++] = EPositionFieldSatelliteTime ;
-        iFieldList[fieldIter++] = EPositionFieldSatelliteHorizontalDoP ;
-        iFieldList[fieldIter++] = EPositionFieldSatelliteVerticalDoP ;
-        
-	    }
-
-	if(currCapability & TPositionModuleInfo :: ECapabilityDirection) //Set Direction info fields if positioning module supports
-    	{
-		
-		iFieldList[fieldIter++] = EPositionFieldTrueCourse ;
-		iFieldList[fieldIter++] = EPositionFieldTrueCourseError ;
-		iFieldList[fieldIter++] = EPositionFieldMagneticCourse ;
-		iFieldList[fieldIter++] = EPositionFieldMagneticCourseError ;
-		
-    	}
-    
-
-	if(currCapability & TPositionModuleInfo :: ECapabilityCompass) //Set NMEA fields if positioning module supports 
-    	{
-			
-		iFieldList[fieldIter++] = EPositionFieldHeading ;
-		iFieldList[fieldIter++] = EPositionFieldHeadingError ;
-		iFieldList[fieldIter++] = EPositionFieldMagneticHeading ;
-		iFieldList[fieldIter++] = EPositionFieldMagneticHeadingError ;
-		
-    	}
-	
-	/*if(currCapability & TPositionModuleInfo :: ECapabilityNmea)
-    	{
-		
-		iFieldList[fieldIter++] = EPositionFieldNMEASentences ;
-		iFieldList[fieldIter++] = EPositionFieldNMEASentencesStart ;
-		
-    	}*/
-	iFieldList[fieldIter] = EPositionFieldNone  ;   //Field Termination 
-   iGenericPosInfo->ClearRequestedFields() ;
-   iGenericPosInfo->SetRequestedFields(iFieldList) ;
-  
-  
-  return KErrNone ;
-    }
 
 /**
  * CLocationInterface :: GetLocationInfo an internal utility funtionin, gets all the location information 
@@ -1347,7 +1287,7 @@
 void CLocationInterface :: GetLocationInfo( CLiwGenericParamList& aOutParamList,TInt aPosInfoCategory)
     {
     TPosition pos ;
-    iGenericPosInfo->GetPosition(pos) ; //Now populate outparam list with latitude, longitude and altitude data
+    iGenericPosition->GetPosition(pos) ; //Now populate outparam list with latitude, longitude and altitude data
 
     CLiwDefaultMap *Result = CLiwDefaultMap::NewL() ; 
     
@@ -1382,22 +1322,21 @@
     TLiwVariant MapVariant(Result) ;
      
    
-     TPositionModuleInfo :: TCapabilities  currCapability  = iModuleInfo.Capabilities() ;
+     //TPositionModuleInfo :: TCapabilities  currCapability  = iModuleInfo.Capabilities() ;
 
 	 if ( aPosInfoCategory == EGenericPositionInfo )
 	     {
-	     if(currCapability & TPositionModuleInfo :: ECapabilitySpeed) //Populate output param with speed info
-		    {
+	     
 		    TReal32 speedinfo = 0 ;
 
-		    if(!iGenericPosInfo->GetValue(EPositionFieldHorizontalSpeed , speedinfo))  //Extract speed 
+        if(!iGenericPosition->GetValue(EPositionFieldHorizontalSpeed , speedinfo))  //Extract speed 
 		    	{
 		    	 Result->InsertL(KPositionFieldHorizontalSpeed ,TLiwVariant((TReal) speedinfo)) ;
 		    	}
 
 
 
-		    if(!iGenericPosInfo->GetValue(EPositionFieldHorizontalSpeedError , speedinfo) )
+        if(!iGenericPosition->GetValue(EPositionFieldHorizontalSpeedError , speedinfo) )
 		        {
 		        Result->InsertL(KPositionFieldHorizontalSpeedError ,TLiwVariant((TReal) speedinfo)) ;
 		        }
@@ -1414,104 +1353,80 @@
 		        }*/
 
 
-		    }   //End of EcapabilitySpeed 
 
 
-		 if(currCapability & TPositionModuleInfo :: ECapabilitySatellite) //Extract satellitinfo if any and append it
-		    {																//as part of out parm list
-		    TInt8 satinfo  = 0;
+        TInt8 satinfo  = 0;
 
-		    if(!iGenericPosInfo->GetValue(EPositionFieldSatelliteNumInView , satinfo))
-		        {
-		        Result->InsertL(KPositionFieldSatelliteNumInView ,TLiwVariant((TReal) satinfo)) ;
-		        }
-			if(!iGenericPosInfo->GetValue(EPositionFieldSatelliteNumUsed , satinfo))
-		        {
-		        Result->InsertL(KPositionFieldSatelliteNumUsed ,TLiwVariant((TReal) satinfo)) ;
-		        }
-		    } //End of ECapabilitySatellite
+        if(!iGenericPosition->GetValue(EPositionFieldSatelliteNumInView , satinfo))
+            {
+            Result->InsertL(KPositionFieldSatelliteNumInView ,TLiwVariant((TReal) satinfo)) ;
+            }
+        if(!iGenericPosition->GetValue(EPositionFieldSatelliteNumUsed , satinfo))
+            {
+            Result->InsertL(KPositionFieldSatelliteNumUsed ,TLiwVariant((TReal) satinfo)) ;
+            }
+		   
 
-		 if(currCapability & TPositionModuleInfo :: ECapabilityDirection) //Extract direction info if any and append it 
-		 {                                                               // as part of out parm list
+		 
 		 TReal32 direcinfo = 0;
 
 
-		 if(!iGenericPosInfo->GetValue(EPositionFieldTrueCourse , direcinfo) )
+		 if(!iGenericPosition->GetValue(EPositionFieldTrueCourse , direcinfo) )
 		   {
 		   Result->InsertL(KPositionFieldTrueCourse ,TLiwVariant((TReal) direcinfo)) ;
 		   }
 
 
-		 if(!iGenericPosInfo->GetValue(EPositionFieldTrueCourseError , direcinfo) )
+		 if(!iGenericPosition->GetValue(EPositionFieldTrueCourseError , direcinfo) )
 		   {
 		   Result->InsertL(KPositionFieldTrueCourseError ,TLiwVariant((TReal) direcinfo)) ;
 		   }
 
 
-		 if(!iGenericPosInfo->GetValue(EPositionFieldMagneticCourseError , direcinfo) )
+		 if(!iGenericPosition->GetValue(EPositionFieldMagneticCourseError , direcinfo) )
 		    {
 		    Result->InsertL(KPositionFieldMagneticCourseError ,TLiwVariant((TReal) direcinfo)) ;
 		    }
 
 
-		 if(!iGenericPosInfo->GetValue(EPositionFieldMagneticCourse , direcinfo) )
+		 if(!iGenericPosition->GetValue(EPositionFieldMagneticCourse , direcinfo) )
 		    {
 		    Result->InsertL(KPositionFieldMagneticCourse ,TLiwVariant((TReal) direcinfo)) ;
 		    }
-		 } // End of ECapabilityDirection
+		
 
 
-		if(currCapability & TPositionModuleInfo :: ECapabilityCompass) //Extract compass info if any and append it 
-	    	{                                                               // as part of out parm list
-	    	TReal32 compassinfo ;
+		
+        TReal32 compassinfo ;
 
-	    	
-	    	if(!iGenericPosInfo->GetValue(EPositionFieldHeading , compassinfo) )
-	        	{
-	        	Result->InsertL(KPositionFieldHeading ,TLiwVariant((TReal) compassinfo)) ;	
-	        	}
+        
+        if(!iGenericPosition->GetValue(EPositionFieldHeading , compassinfo) )
+            {
+            Result->InsertL(KPositionFieldHeading ,TLiwVariant((TReal) compassinfo)) ;	
+            }
 
 
-	    	if(!iGenericPosInfo->GetValue(EPositionFieldHeadingError , compassinfo) )
-	        	{
-	        	Result->InsertL(KPositionFieldHeadingError ,TLiwVariant((TReal) compassinfo)) ;
-	        	}
+        if(!iGenericPosition->GetValue(EPositionFieldHeadingError , compassinfo) )
+            {
+            Result->InsertL(KPositionFieldHeadingError ,TLiwVariant((TReal) compassinfo)) ;
+            }
 
 
-	    	if(!iGenericPosInfo->GetValue(EPositionFieldMagneticHeading , compassinfo) )
-	        	{
-	        	Result->InsertL(KPositionFieldMagneticHeading ,TLiwVariant((TReal) compassinfo)) ;
-	        	}
+        if(!iGenericPosition->GetValue(EPositionFieldMagneticHeading , compassinfo) )
+            {
+            Result->InsertL(KPositionFieldMagneticHeading ,TLiwVariant((TReal) compassinfo)) ;
+            }
 
 
 
-	    	if(!iGenericPosInfo->GetValue(EPositionFieldMagneticHeadingError , compassinfo) )
-	            {
-	            Result->InsertL(KPositionFieldMagneticHeadingError ,TLiwVariant((TReal) compassinfo)) ;
-
-	            } 
-
+        if(!iGenericPosition->GetValue(EPositionFieldMagneticHeadingError , compassinfo) )
+            {
+            Result->InsertL(KPositionFieldMagneticHeadingError ,TLiwVariant((TReal) compassinfo)) ;
 
-	    	} //End of  ECapabilityCompass
-
-		/*if( currCapability & TPositionModuleInfo :: ECapabilityNmea ) //Extract Nmea info if any and append it 	
-		    {                                                             //as part of out param list  
-		    TUint8 numSentences ;
-
-		    if(!iGenericPosInfo->GetValue(EPositionFieldNMEASentences , numSentences) )
-		        {
-		        Result->InsertL(KPositionFieldNMEASentences ,TLiwVariant((TReal) numSentences)) ;
+            } 
 		        }
 
 
-		    TBuf8 <20> nmeaSentences ;
-		    if(!iGenericPosInfo->GetValue(EPositionFieldNMEASentencesStart , nmeaSentences) )
-		        {
-		        Result->InsertL(KPositionFieldNMEASentencesStart ,TLiwVariant( numSentences)) ;
-		        }
-		    }*/ //End of ECapabilityNmea
-
-	     }
     aOutParamList.AppendL(TLiwGenericParam ( KLocationMap, TLiwVariant(Result))) ;
     Result->DecRef();
     CleanupStack :: Pop(Result) ;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/src/locationservicehandler.cpp
--- a/serviceproviders/sapi_location/src/locationservicehandler.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/src/locationservicehandler.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,8 +18,8 @@
 
 
 #include <liwserviceifbase.h>
-#include <LiwCommon.h>
-#include <ecom/ImplementationProxy.h>
+#include <liwcommon.h>
+#include <ecom/implementationproxy.h>
 #include "locationservicehandler.h"
 #include "locationcb.h"
 #include "locationinterface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.mmp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -32,11 +32,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         Tcomplugin.def
+DEFFILE         tcomplugin.def
 
 SOURCEPATH      ../src
-SOURCE          Tcomplugin.cpp
-SOURCE          TcompluginBlocks.cpp
+SOURCE          tcomplugin.cpp
+SOURCE          tcompluginblocks.cpp
 SOURCE			ttrace.cpp
 SOURCE 			tgetlocationasync.cpp
 SOURCE			tservicefailedtest.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
  
  
  #include "tcomplugin.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcomplugin.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcomplugin.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcomplugin.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "Tcomplugin.h"
+#include <StifTestInterface.h>
+#include "tcomplugin.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,13 +21,13 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <lbs.h>
 
-#include "Tcomplugin.h"
+#include "tcomplugin.h"
 
 using namespace LIW;
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
  
  
  #include "tcomplugin.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,10 +22,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 
 #include "tcomplugin.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include "tcomplugin.h"
 
 using namespace LIW;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 
 #include "tcomplugin.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocstraytest.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocstraytest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocstraytest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tcomplugin.h" 
  
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tcomplugin.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <liwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <lbs.h>
 
 #include "tcomplugin.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,10 +20,10 @@
  */
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <liwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tcomplugin.h"
  
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttrace.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttrace.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttrace.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tcomplugin.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
  
  
  #include "tcomplugin.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tcomplugin.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsRequestor.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <lbsrequestor.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tcomplugin.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtest.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 
 #include "tlocmanualtest.h"
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtestblocks.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <AiwCommon.h>
 #include <lbs.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.mmp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -31,11 +31,11 @@
 #endif
 
 //TARGETPATH      ?target_path
-DEFFILE         TLocTest.def
+DEFFILE         tloctest.def
 
 SOURCEPATH      ../src
-SOURCE          TLocTest.cpp
-SOURCE          TLocTestBlocks.cpp
+SOURCE          tloctest.cpp
+SOURCE          tloctestblocks.cpp
 SOURCE			tfunctionthread.cpp
 SOURCE 			tstraysignaltest.cpp
 SOURCE 			tstraygetlocationtest.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/loccancel.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/loccancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/loccancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -12,12 +12,12 @@
 * Contributors:
 *
 * Description:   contains test case implementation for CancelOngoingService location-SAPI
-*  V	ersion     : %version: 5 % << Don't touch! Updated by Synergy at check-out.
+*  V	ersion     : %version: 6 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
 
-#include "TLocTest.h"
+#include "tloctest.h"
 #include "locationservice.h"
 #include <f32file.h>
 #include <e32const.h>
@@ -30,12 +30,12 @@
 _LIT(KRequestor,"testapp");
 
 // INCLUDE FILES
-#include "TLocTest.h"
+#include "tloctest.h"
 
 #include <e32svr.h>
 #include <StifParser.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 //#include <S60LocCoreImpl.h>
 #include <AiwCommon.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 class CGetLoc ; //Forward declaration
-#include "TLocTest.h"
+#include "tloctest.h"
 #include "locationservice.h"
 #include <f32file.h>
 #include <e32const.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctest.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,8 +20,8 @@
 
 // INCLUDE FILES
 
-#include "TLocTest.h"
-#include <Stiftestinterface.h>
+#include "tloctest.h"
+#include <StifTestInterface.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,11 +19,11 @@
 
 
 // INCLUDE FILES
-#include "TLocTest.h"
+#include "tloctest.h"
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <AiwCommon.h>
 #include <lbs.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.mmp
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -32,7 +32,7 @@
 
 
 //TARGETPATH      ?target_path
-DEFFILE         SAPILocTest.def
+DEFFILE         sapiloctest.def
 
 SOURCEPATH      ../src
 SOURCE          sapiloctest.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctest.cpp
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "SAPILocTest.h"
+#include <StifTestInterface.h>
+#include "sapiloctest.h"
 //#include <SAPI_TEST\testprg.h>
 #include "locationservice.h"
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "SAPILocTest.h"
+#include <StifTestInterface.h>
+#include "sapiloctest.h"
 #include <f32file.h>
-#include <LbsPosition.h>
-#include <LbsPositionInfo.h> 
-#include <LbsCommon.h>
+#include <lbsposition.h>
+#include <lbspositioninfo.h> 
+#include <lbscommon.h>
 
 
 _LIT(LogFileName , "C:\\tsapiloctest.txt") ;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.mmp
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -35,7 +35,7 @@
 
 SOURCEPATH      ../src
 SOURCE          sapiloctotest.cpp
-SOURCE          sapiloctotestBlocks.cpp
+SOURCE          sapiloctotestblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotest.cpp
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "sapiloctotest.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotestblocks.cpp
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "sapiloctotest.h"
 #include <f32file.h>
-#include <LbsPosition.h>
+#include <lbsposition.h>
 
 
 _LIT(LogFileName , "C:\\Notifications.txt") ;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/data/2000CFBC.rss
--- a/serviceproviders/sapi_logging/data/2000CFBC.rss	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/data/2000CFBC.rss	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include <Eikon.rh>
-#include "ecom/RegistryInfoV2.rh" 
-#include <LiwCommon.hrh>
+#include <eikon.rh>
+#include "ecom/registryinfov2.rh" 
+#include <liwcommon.hrh>
 
 RESOURCE REGISTRY_INFO theInfo
     {
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/inc/logginginterface.h
--- a/serviceproviders/sapi_logging/inc/logginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/inc/logginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #ifndef C_LOGINTERFACE_H
 #define C_LOGINTERFACE_H
 
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include "serviceerrno.h"
 
 /**
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/inc/loggingservicehandler.h
--- a/serviceproviders/sapi_logging/inc/loggingservicehandler.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/inc/loggingservicehandler.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 
 
 #include <liwserviceifbase.h>
-#include <liwCommon.h>
+#include <liwcommon.h>
 
 /**
 * InterfaceName ILogging
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/loggingservice/inc/loggingevent.h
--- a/serviceproviders/sapi_logging/loggingservice/inc/loggingevent.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/loggingservice/inc/loggingevent.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #define SAPIEVENT_H
 
 #include <logwrap.h>
-#include <CNTDEF.H>
+#include <cntdef.h>
 
 /**
 * CLogsEvent:this is a wrapper class for the symbian CLogEvent class.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/src/loggingcallback.cpp
--- a/serviceproviders/sapi_logging/src/loggingcallback.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/src/loggingcallback.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 */
 
 #include <liwserviceifbase.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include <logwrap.h>
-#include <LOGCLIENTCHANGEOBSERVER.H>
+#include <logclientchangeobserver.h>
 
 #include "logiter.h"
 #include "logginginterface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/src/loggingservicehandler.cpp
--- a/serviceproviders/sapi_logging/src/loggingservicehandler.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/src/loggingservicehandler.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 */
 
 #include <liwserviceifbase.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include <logwrap.h>
-#include <ecom/ImplementationProxy.h>
-#include "LOGCLIENTCHANGEOBSERVER.H"
+#include <ecom/implementationproxy.h>
+#include "logclientchangeobserver.h"
 #include "logiter.h"
 #include "loggingservicehandler.h"
 #include "logginginterface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -55,14 +55,14 @@
 
 SOURCEPATH      ../src
 SOURCE          tprovidertest.cpp
-SOURCE          tprovidertestBlocks.cpp
+SOURCE          tprovidertestblocks.cpp
 SOURCE          taddtest1.cpp
 SOURCE          tlogresults.cpp
 SOURCE          teventdetails.cpp
-SOURCE          taddgenericL.cpp
+SOURCE          taddgenericl.cpp
 SOURCE          tprovidercallback.cpp
 SOURCE 			tdeletetest.cpp
-SOURCE          tgetlistgenericL.cpp
+SOURCE          tgetlistgenericl.cpp
 SOURCE          tfilterdetails.cpp
 SOURCE			tgetlistgenericpos.cpp
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/inc/tprovidertest.h
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/inc/tprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/inc/tprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,8 +26,8 @@
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericl.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericl.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericl.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tconstants.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericpos.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericpos.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericpos.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tconstants.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddtest1.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddtest1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddtest1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 
 #include "tconstants.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletegenericpos.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletegenericpos.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletegenericpos.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 
 #include "tconstants.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletetest.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 
 #include "tconstants.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericl.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericl.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericl.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tconstants.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericpos.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericpos.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericpos.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tconstants.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tlogresults.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tlogresults.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tlogresults.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <e32std.h>
 #include "tprovidertest.h"
 #include "tconstants.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,11 +18,11 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tprovidertest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertest.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tprovidertest.h"
 #include "teventdetails.h"
 #include "tfilterdetails.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertestblocks.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tprovidertest.h"
 #include "teventdetails.h"
 #include "tfilterdetails.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -56,7 +56,7 @@
 SOURCEPATH      ../src
 SOURCE          tlogging.cpp
 
-SOURCE          tloggingBlocks.cpp
+SOURCE          tloggingblocks.cpp
 SOURCE 			taddtest.cpp
 SOURCE 			taddtest1.cpp
 SOURCE 			taddtest2.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/inc/loggingevent.h
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/inc/loggingevent.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/inc/loggingevent.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #define SAPIEVENT_H
 
 #include <logwrap.h>
-#include <CNTDEF.H>
+#include <cntdef.h>
 
 /**
 * CLogsEvent:this is a wrapper class for the symbian CLogEvent class.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest1.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest2.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest3.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest3.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest3.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest4.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest4.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest4.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest1.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest2.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest3.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest3.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest3.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest4.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest4.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest4.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest5.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest5.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest5.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest6.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest6.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest6.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest2.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent2.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent3.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent3.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent3.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetlist1.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetlist1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetlist1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist2.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist3.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist3.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist3.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist4.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist4.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist4.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogcallback.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogcallback.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogcallback.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogging.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogging.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogging.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertest.h
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertestobserver.h
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertestobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertestobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/txmlconvertor.h
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/txmlconvertor.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/txmlconvertor.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest_testblocks.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp
--- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -58,7 +58,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tloggingservicetest.cpp
-SOURCE          tloggingservicetestBlocks.cpp
+SOURCE          tloggingservicetestblocks.cpp
 SOURCE          taddeventsync.cpp
 SOURCE          taddeventasync.cpp
 SOURCE          tgetlist.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/inc/loggingevent.h
--- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/inc/loggingevent.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/inc/loggingevent.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #define SAPIEVENT_H
 
 #include <logwrap.h>
-#include <CNTDEF.H>
+#include <cntdef.h>
 
 /**
 * CLogsEvent:this is a wrapper class for the symbian CLogEvent class.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetest.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tloggingservicetest.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetestblocks.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tloggingservicetest.h"
 
 #include <logcli.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -55,7 +55,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tlogprovidertest.cpp
-SOURCE          tlogprovidertestBlocks.cpp
+SOURCE          tlogprovidertestblocks.cpp
 SOURCE          taddtest.cpp
 SOURCE          tcallback.cpp
 SOURCE          teventdetails.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/inc/tlogprovidertest.h
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/inc/tlogprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/inc/tlogprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,8 +25,8 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <logcli.h>
 #include <logwrap.h>
 #include "tlogprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,11 +18,11 @@
 #include <e32svr.h>
 #include <e32std.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <logcli.h>
 #include <logwrap.h>
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 
 #include "tlogprovidertest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <logcli.h>
 #include <logwrap.h>
 #include "tlogprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <logcli.h>
 #include <logwrap.h>
 #include "tlogprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/terror.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/terror.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/terror.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <logcli.h>
 #include <logwrap.h>
 #include "tlogprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <logcli.h>
 #include <logwrap.h>
 #include "tlogprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertest.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tlogprovidertest.h"
 //#include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tlogprovidertest.h"
 #include "teventdetails.h"
 #include "tfilterdetails.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <LiwServiceHandler.h>
-#include <LiwCommon.h>
+#include <liwservicehandler.h>
+#include <liwcommon.h>
 #include <logcli.h>
 #include <logwrap.h>
 #include "tlogprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/inc/mgitemslist.h
--- a/serviceproviders/sapi_mediamanagement/inc/mgitemslist.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/inc/mgitemslist.h	Fri Dec 04 14:09:26 2009 +0000
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CMGITEMSLIST_H
 #define __CMGITEMSLIST_H
 
@@ -25,6 +24,8 @@
 class MCLFItemListModel;
 class MgMediaItemFactory;
 class CMgMediaItem;
+class CClfOperationObserver;
+
 /**
  *  This class implements the abstract methods of CLiwIterable   
  *  class so that the user may iterate over the result 
@@ -42,7 +43,7 @@
      * @param aCmdId specifies whether the SAPI is GetFiles or GetFilesInfo
      * @return A pointer of type CMgItemsList
      */
-     static CMgItemsList* NewL( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId );
+     static CMgItemsList* NewL( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId );
     
     /**
     * Destructor.
@@ -74,7 +75,7 @@
      * @param  aCmdId specifies whether the SAPI is GetFiles or GetFilesInfo
      */
     
-    CMgItemsList( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId );
+    CMgItemsList( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId );
     
 private: // data
 
@@ -82,6 +83,9 @@
     * A pointer to MCLFItemListModel class
     */
     MCLFItemListModel* iItemListModel;
+    
+    CClfOperationObserver* iOperationObserver;
+        
     /**
     * Indicates whether GetFiles or GetFilesInfo SAPI is being processed
     */
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/inc/mgserviceobserver.h
--- a/serviceproviders/sapi_mediamanagement/inc/mgserviceobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/inc/mgserviceobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -24,6 +24,7 @@
 
 class CLiwGenericParamList;
 class MCLFItemListModel;
+class CClfOperationObserver;
 
 
 
@@ -70,6 +71,7 @@
         */
         virtual void MgNotifyL(TUint  aTransactionID, 
                                MCLFItemListModel* aListModel,
+                               CClfOperationObserver* aOperationObserver,
         					   TMgOperationEvent& aOperationEvent , 
                                const TInt& aError );
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #define __MGCLFOPERATIONOBSERVER_H
 
 
-#include <mclfoperationobserver.h>
+#include <MCLFOperationObserver.h>
 #include <e32base.h>
 
 class MCLFItemListModel;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgimageresolution.h
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgimageresolution.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgimageresolution.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #define MGIMAGERESOLUTION_H_
 
 #include<e32base.h>
-#include<ImageConversion.h>
+#include<imageconversion.h>
 #include<icl/imagedata.h>
 #include<f32file.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgmediacontainer.h
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgmediacontainer.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgmediacontainer.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,8 +20,8 @@
 #define MGMEDIACONTAINER_H_
 
 
-#include<COECNTRL.H>
-#include<W32STD.H>
+#include<coecntrl.h>
+#include<w32std.h>
 #include<e32std.h>
 #include<e32base.h>
 // CLASS DECLARATION
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,6 +22,7 @@
 
 
 class MCLFItemListModel;
+class CClfOperationObserver;
 
 // CLASS DECLARATION
 /**
@@ -49,6 +50,7 @@
         */
         virtual void MgNotifyL(TUint  aTransactionID, 
                                MCLFItemListModel*  aListModel,
+                               CClfOperationObserver* aOperationObserver,
         					   TMgOperationEvent& aOperationEvent,
                                const TInt& aError ) = 0;
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 #ifndef __CMGPOSTFILTER_H
 #define __CMGPOSTFILTER_H
 
-#include <mclfpostfilter.h>
+#include <MCLFPostFilter.h>
 #include <e32base.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 #ifndef __CMGSERVICE_H
 #define __CMGSERVICE_H
 #include <e32base.h>
-#include <clfcontentlisting.hrh>
+#include <CLFContentListing.hrh>
 
 #include "mgservice.hrh"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgvideoresolution.h
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgvideoresolution.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgvideoresolution.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #define MGVIDEORESOLUTION_H_
 
 
-#include <VideoPlayer.h>
+#include <videoplayer.h>
 
 #include<e32std.h>
 #include<e32base.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgclfoperationobserver.cpp
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgclfoperationobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgclfoperationobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 
-#include <mclfitemlistmodel.h>
-#include <mclfsortingstyle.h>
+#include <MCLFItemListModel.h>
+#include <MCLFSortingStyle.h>
 
 #include "mgclfoperationobserver.h"
 #include "mgservice.h"
@@ -58,23 +58,23 @@
     		iMGService->Clear();
     	}
 
-    	if( NULL !=  iServiceObserver ) //Asynchronous
+    	if( NULL !=  iServiceObserver && (mgEvent == ECLFRefreshComplete)) //Asynchronous
     	{
          
-         iServiceObserver->MgNotifyL( iTransactionID,iListModel, mgEvent, aError );
+		iServiceObserver->MgNotifyL( iTransactionID,iListModel,this,mgEvent, aError );
         
          // calling request complete on asyncrequestmanager
          iAsyncRequestManager->RequestComplete( iTransactionID );
          
-         //Ownership of the List model is transfered to the Iterator class
+		//Ownership of the List model and the observer are transferred to the Iterator class
          iListModel = NULL;
          //In future at the time of supporting back to back call
 		//call delete this	
          iServiceObserver = NULL;
   	     iMGService = NULL;
   	     
-  	     delete this;
-  	     
+		//delete this;
+	     
     	}
     	
 	}
@@ -118,7 +118,7 @@
 			iListModel = NULL;
 			}
 	
-   	iServiceObserver->MgNotifyL(iTransactionID, NULL , mgEvent, KErrNone );
+   	iServiceObserver->MgNotifyL(iTransactionID, NULL, NULL, mgEvent, KErrNone );
    	iMGService = NULL;
     iTransactionID = 0;	
     //In future at the time of supporting back to back call
@@ -136,16 +136,7 @@
 CClfOperationObserver::~CClfOperationObserver()
                        
     {
-       
-        // If this observer is waiting for response
-        // then cancel the request
-        if( iListModel )
-    	    {
-			/*iListModel->CancelRefresh();
-			delete iListModel;
-			iListModel = NULL;*/
-			CancelL();
-			}
+        iListModel = NULL;
         if(iAsyncRequestManager)
             {
             iAsyncRequestManager = NULL;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include "mgpostfilter.h"
 
 const TInt32 KLargestSigned32 = 0x7fffffff;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgservice.cpp
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgservice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgservice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,10 +18,10 @@
 
 
 
-#include <mclfitemlistmodel.h>
-#include <mclfcontentlistingengine.h>
-#include <contentlistingfactory.h>
-#include <mclfsortingstyle.h>
+#include <MCLFItemListModel.h>
+#include <MCLFContentListingEngine.h>
+#include <ContentListingFactory.h>
+#include <MCLFSortingStyle.h>
 
 
 #include "mgservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbnailgeneration.cpp
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbnailgeneration.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbnailgeneration.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #include<e32cmn.h>
 
 #include<f32file.h>
-#include<APGCLI.H>
-#include<APMREC.H> // For TDataRecognitionResult
-#include<APMSTD.H> 
+#include<apgcli.h>
+#include<apmrec.h> // For TDataRecognitionResult
+#include<apmstd.h> 
 #include<thumbnailmanager.h>
 #include"mgthumbnailgeneration.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbobserver.cpp
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,8 +18,8 @@
 
 #include<e32std.h>
 
-#include<ThumbnailData.h>
-#include<FBS.H>
+#include<thumbnaildata.h>
+#include<fbs.h>
 #include"mgthumbobserver.h"
 #include"mgthumbnailobserver.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgitemslist.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgitemslist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgitemslist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,12 +16,13 @@
 */
 
 
-#include <mclfitem.h>
-#include <mclfitemlistmodel.h>
+#include <MCLFItem.h>
+#include <MCLFItemListModel.h>
 
 #include "mgitemslist.h"
 #include "mgmediaitemfactory.h"
 #include "mgmediaitem.h"
+#include "mgclfoperationobserver.h"
 
 
 _LIT8( KMgFileNameAndPath, "FileNameAndPath" );
@@ -34,8 +35,9 @@
 // ---------------------------------------------------------------------------
 //
 
-CMgItemsList::CMgItemsList( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId )
+CMgItemsList::CMgItemsList( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId )
             : iItemListModel(aItemListModel),
+              iOperationObserver(aOperationObserver),
             	iCmdId(aCmdId),
               iCount(iItemListModel->ItemCount()),
               iCurrent(KStartItemIndex),
@@ -49,9 +51,9 @@
 // ---------------------------------------------------------------------------
 //
 
-CMgItemsList* CMgItemsList::NewL( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId )
+CMgItemsList* CMgItemsList::NewL( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId )
     {
-    return new( ELeave ) CMgItemsList( aItemListModel, aCmdId );
+    return new( ELeave ) CMgItemsList( aItemListModel, aOperationObserver, aCmdId );
     }
 
 
@@ -63,11 +65,23 @@
 CMgItemsList::~CMgItemsList()
     {
 
-	delete iItemListModel;
-
-  	delete iMediaItem;
-
-	}
+    if(iItemListModel)
+        {
+            iItemListModel->CancelRefresh();
+            delete iItemListModel;
+            iItemListModel = NULL;
+        }
+    if(iOperationObserver)
+        {
+            delete iOperationObserver;
+            iOperationObserver = NULL;
+        }
+    if(iMediaItem)
+        {
+            delete iMediaItem;
+            iMediaItem = NULL;
+        }
+    }
 // ---------------------------------------------------------------------------
 // CMgItemsList::Reset
 // Resets the iterator to point to the beginning of list
@@ -89,8 +103,8 @@
     {
 
     iCurrent++;
-
-    if( iCurrent<iCount )
+    
+    if( iCurrent< iCount )
         {
 
         const MCLFItem& item = iItemListModel->Item( iCurrent );
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mglinkfile.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mglinkfile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mglinkfile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <e32base.h>
 #include <liwvariant.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgmediafile.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgmediafile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgmediafile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <liwvariant.h>
 
 #include "mgmediafile.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgmediaitem.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgmediaitem.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgmediaitem.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <pathinfo.h>
 #include <liwvariant.h>
 #include "mgmresolution.h"
@@ -100,13 +100,18 @@
     if ( mediaType == ECLFMediaTypeImage )
         {
         TSize imageRes( 0,0 );
-        MResolution* mediaResObj = MediaResolutionFactory::CreateMediaResolutionobjL( mediaImage,fullName );
-        CleanupStack::PushL( mediaResObj );
-        mediaResObj->GetresolutionL( imageRes );        
-        aOutputMap->InsertL( KXPixels,(TInt32)imageRes.iWidth );
-        aOutputMap->InsertL( KYPixels,(TInt32)imageRes.iHeight );
-        CleanupStack::Pop( mediaResObj );
-        delete mediaResObj;
+        MResolution* mediaResObj=NULL;
+        TInt err =KErrNone;
+        TRAP(err,mediaResObj = MediaResolutionFactory::CreateMediaResolutionobjL( mediaImage,fullName ));
+        
+        if(err == KErrNone){
+            CleanupStack::PushL( mediaResObj );
+            mediaResObj->GetresolutionL( imageRes );        
+            aOutputMap->InsertL( KXPixels,(TInt32)imageRes.iWidth );
+            aOutputMap->InsertL( KYPixels,(TInt32)imageRes.iHeight );
+            CleanupStack::Pop( mediaResObj );
+            delete mediaResObj;
+            }
         }         
     }
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgmediaitemfactory.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgmediaitemfactory.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgmediaitemfactory.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 #include <e32base.h>
-#include <mclfitem.h>
+#include <MCLFItem.h>
  
 #include "mgmediaitemfactory.h"
 #include "mglinkfile.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgmusicfile.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgmusicfile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgmusicfile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <liwgenericparam.h> 
 
 #include "mgmusicfile.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgserviceobserver.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgserviceobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgserviceobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,12 +16,14 @@
 */
 
 #include <liwcommon.h>
-#include <mclfitemlistmodel.h>
+#include <MCLFItemListModel.h>
 
 #include "mgserviceobserver.h"
 #include "mgitemslist.h"
 #include "mginterface.h"
 #include "serviceerrno.h"
+#include "mgclfoperationobserver.h"
+
 //using namespace LIW;
 //Output Keys/arguments
 _LIT8(KResponse,"ReturnValue");
@@ -52,6 +54,7 @@
 // -----------------------------------------------------------------------------
 void CMgServiceObserver :: MgNotifyL( TUint  aTransactionID,
                                       MCLFItemListModel* aListModel,
+                                      CClfOperationObserver* aOperationObserver,
                                       TMgOperationEvent& aOperationEvent,
                                       const TInt& aError  )
 
@@ -98,17 +101,21 @@
 	 	// it will become the owner of iListModel,Ownership of
 	 	// Iterator is transfered to consumer
 
-	 	CMgItemsList *iterator = CMgItemsList::NewL( aListModel, iCmdId );
+	 	CMgItemsList *iterator = CMgItemsList::NewL( aListModel, aOperationObserver, iCmdId );
  	    CleanupStack::PushL( iterator );
 	 	response.Set( iterator );
 		iOutput->AppendL( TLiwGenericParam ( KResponse, response ) );
  		CleanupStack::Pop( iterator );
-        iterator->DecRef();
+        // iterator->DecRef();   //This code is commented because the when the iterator is passed to user by using 
+                                 //AsIterable() call refCount is not getting increased. As the iterator control is 
+ 		                         //with the user we dont need to decrement the ref count here.
         }
    	else
    	    {
 		delete aListModel;
+		delete aOperationObserver;
 		aListModel = NULL;
+		aOperationObserver = NULL;
 	 	}
 
     if( NULL != iCallBack )
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgservicethumbnailobserver.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgservicethumbnailobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgservicethumbnailobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,7 +15,7 @@
 *  *
 */
 
-#include<Liwcommon.h>
+#include<liwcommon.h>
 #include "serviceerrno.h"
 #include "mgservicethumbnailobserver.h"
 #include"mginterface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/src/mgvideofile.cpp
--- a/serviceproviders/sapi_mediamanagement/src/mgvideofile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/src/mgvideofile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <e32base.h>
 #include <liwvariant.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/conf/tmediamgmtprovidertest.cfg
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/conf/tmediamgmtprovidertest.cfg	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/conf/tmediamgmtprovidertest.cfg	Fri Dec 04 14:09:26 2009 +0000
@@ -52,7 +52,7 @@
 foobar InterfaceClass GetList FileInfo Video NULL NULL NULL FileName Ascending 0 0
 delete foobar
 [Endtest]
-
+/*
 [Test]
 title  MG_GetFilesInfo_Video_NULL_NULL_NULL_FileName_Ascending_0
 create tmediamgmtprovidertest foobar
@@ -66,7 +66,7 @@
 foobar InterfaceClass GetList FileInfo StreamingURL FileDate 20070220: 20070323: NULL Ascending 0 0
 delete foobar
 [Endtest]
-
+*/
 [Test]
 title  MG_GetFilesInfo_Music_Artist_NULL_NULL_Artist_Ascending_-1
 create tmediamgmtprovidertest foobar
@@ -215,7 +215,7 @@
 foobar InterfaceClass GetList FileInfo Video FileDate 20070221: NULL FileSize Descending 0 0
 delete foobar
 [Endtest]
-
+/*
 [Test]
 title  MG_GetFilesInfo_StreamingURL_FileSize_NULL_2000_NULL_Ascending_0
 create tmediamgmtprovidertest foobar
@@ -236,7 +236,7 @@
 foobar InterfaceClass GetList FileInfo StreamingURL FileNameAndPath C:\Data\Dlink.ram NULL NULL Ascending 0 0
 delete foobar
 [Endtest]
-
+*/
 [Test]
 title  MG_GetFilesInfo_Image_FileSize_0_1100000_FileName_Ascending_0
 create tmediamgmtprovidertest foobar
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmt.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmt.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmt.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "mediamgmt.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmtblocks.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmtblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmtblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
 #include "mediamgmt.h"
 
 using namespace LIW;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/conf/tmediamgmttest.cfg
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/conf/tmediamgmttest.cfg	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/conf/tmediamgmttest.cfg	Fri Dec 04 14:09:26 2009 +0000
@@ -36,7 +36,7 @@
 foobar GetFilesInfo Video NULL NULL NULL FileName 0
 delete foobar
 [Endtest]
-
+/*
 [Test]
 title  MG_GetFilesInfo_Video_NULL_NULL_NULL_FileName_0
 create tmediamgmttest foobar
@@ -50,7 +50,7 @@
 foobar GetFilesInfo StreamingURL FileDate 20070220: 20070323: NULL 0
 delete foobar
 [Endtest]
-
+*/
 [Test]
 title  MG_GetFilesInfo_Music_Artist_NULL_NULL_Artist_0
 create tmediamgmttest foobar
@@ -200,7 +200,7 @@
 foobar GetFilesInfo Video FileDate 20070221: NULL FileSize 1
 delete foobar
 [Endtest]
-
+/*
 [Test]
 title  MG_GetFilesInfo_StreamingURL_FileSize_NULL_2000_NULL_0
 create tmediamgmttest foobar
@@ -220,6 +220,7 @@
 foobar GetFilesInfo StreamingURL FileNameAndPath C:\Data\Dlink.ram NULL NULL 0
 delete foobar
 [Endtest]
+*/
 [Test]
 title  MG_GetFilesInfo_Image_FileSize_0_1100000_FileName_0
 create tmediamgmttest foobar
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/inc/mediamgmt.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/inc/mediamgmt.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/inc/mediamgmt.h	Fri Dec 04 14:09:26 2009 +0000
@@ -204,6 +204,7 @@
 	TInt HandleNotifyL(TInt aCmdId,TInt aEventId,CLiwGenericParamList& aEventParamList,const CLiwGenericParamList& aInParamList);
      virtual void MgNotifyL(TUint  aTransactionID, 
                                MCLFItemListModel*  aListModel,
+                               CClfOperationObserver* aOperationObserver,
         					   TMgOperationEvent& aOperationEvent,
                                const TInt& aError );
 };
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmt.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmt.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmt.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "mediamgmt.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include  <utf.h>
-#include "MediaMgmt.h"
+#include "mediamgmt.h"
 #include "mgitemslist.h"
 using namespace LIW;
 
@@ -209,6 +209,7 @@
 
  void Callback::MgNotifyL(TUint /*aTransactionID*/,
                                MCLFItemListModel*  aListModel,
+                               CClfOperationObserver* aOperationObserver,
         					   TMgOperationEvent& aOperationEvent,
                                const TInt& aError )
 
@@ -247,6 +248,8 @@
    	    {
 		delete aListModel;
 		aListModel = NULL;
+		delete aOperationObserver;
+		aOperationObserver = NULL;
 	 	}
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgitemslist.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgitemslist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgitemslist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 
 
-#include <mclfitem.h>
-#include <mclfitemlistmodel.h>
+#include <MCLFItem.h>
+#include <MCLFItemListModel.h>
 
 #include "mgitemslist.h"
 #include "mgmediaitemfactory.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mglinkfile.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mglinkfile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mglinkfile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <e32base.h>
 #include <liwvariant.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediafile.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediafile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediafile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <liwvariant.h>
 
 #include "mgmediafile.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitem.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitem.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitem.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <mCLFitem.h>
+#include <MCLFItem.h>
 #include <pathinfo.h>
 #include <liwvariant.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitemfactory.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitemfactory.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitemfactory.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 #include <e32base.h>
-#include <mclfitem.h>
+#include <MCLFItem.h>
  
 #include "mgmediaitemfactory.h"
 #include "mglinkfile.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmusicfile.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmusicfile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmusicfile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <mCLFitem.h>
+#include <MCLFItem.h>
 
 #include <liwgenericparam.h> 
 #include "mgmusicfile.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgvideofile.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgvideofile.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgvideofile.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <mclfitem.h>
+#include <MCLFItem.h>
 #include <e32base.h>
 #include <liwvariant.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/imageresolution.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/imageresolution.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/imageresolution.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #define MGIMAGERESOLUTION_H_
 
 #include<e32base.h>
-#include<ImageConversion.h>
+#include<imageconversion.h>
 #include<icl/imagedata.h>
 #include<f32file.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/ttestmediathumbobserver.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/ttestmediathumbobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/ttestmediathumbobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumb_testblocks.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumb_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumb_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <f32file.h>
 #include <e32des16.h>
 #include <e32base.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumbnailtest.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumbnailtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumbnailtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tmediathumbnailtest.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tmediaprovidertest.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tmediaprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tmediaprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tprovidertestobserver.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tprovidertestobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tprovidertestobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/txmlconvertor.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/txmlconvertor.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/txmlconvertor.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 #include "tmediaprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest_testblocks.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 
 #include "tmediaprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaobserver.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -18,9 +18,9 @@
 #ifndef _TMEDIAPROVIDERTESTING_H__
 #define _TMEDIAPROVIDERTESTING_H__
 
-#include <LiwCommon.h>
-#include <LiwBufferExtension.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
+#include <liwservicehandler.h>
 #include <e32base.h>
 extern TInt count;
 class CMediaObserver : public CBase , public MLiwNotifyCallback
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaprovidertesting.h
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaprovidertesting.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaprovidertesting.h	Fri Dec 04 14:09:26 2009 +0000
@@ -26,9 +26,9 @@
 #include <StifTestModule.h>
 #include <TestclassAssert.h>
 
-#include <LiwCommon.h>
-#include <LiwBufferExtension.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
+#include <liwservicehandler.h>
 
 // CONSTANTS
 //const ?type ?constant_var = ?constant;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
 #include<e32cmn.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertesting.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertesting.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertesting.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tmediaprovidertesting.h"
 #include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
 #include<f32file.h>
 #include "tmediaprovidertesting.h"
 #include "tmediaprovidertesting.hrh"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
 
 #include "tmediaprovidertesting.h"
 #include "tmediaprovidertesting.hrh"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/data/102833AF.rss
--- a/serviceproviders/sapi_messaging/data/102833AF.rss	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/data/102833AF.rss	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 
-#include <Eikon.rh>
-#include "ecom/RegistryInfoV2.rh" 
-#include <LiwCommon.hrh>
+#include <eikon.rh>
+#include "ecom/registryinfov2.rh" 
+#include <liwcommon.hrh>
 
 RESOURCE REGISTRY_INFO theInfo
     {
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/inc/messaginginterface.h
--- a/serviceproviders/sapi_messaging/inc/messaginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/inc/messaginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,9 +19,9 @@
 #ifndef __MESSAGINGINTERFACE_H
 #define __MESSAGINGINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include "messageheader.h" 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/inc/messagingservicehandler.h
--- a/serviceproviders/sapi_messaging/inc/messagingservicehandler.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/inc/messagingservicehandler.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 #ifndef __MESSAGINGSERVICEHANDLER_H
 #define __MESSAGINGSERVICEHANDLER_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
 
 /**
 * Provides implementation to CLiwServiceIfBase interface.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/messagingservice/src/accessfolder.cpp
--- a/serviceproviders/sapi_messaging/messagingservice/src/accessfolder.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/messagingservice/src/accessfolder.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,8 +20,8 @@
 #include <e32base.h>
 #include <badesca.h>
 #include <msvapi.h>
-#include <MsvUids.h>
-#include <senduiconsts.h>
+#include <msvuids.h>
+#include <SendUiConsts.h>
 
 #include "messageheader.h"
 #include "accessfolder.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/messagingservice/src/changestatus.cpp
--- a/serviceproviders/sapi_messaging/messagingservice/src/changestatus.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/messagingservice/src/changestatus.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include <miuthdr.h>
 
 #include "messageheader.h"
-#include "ChangeStatus.h"
+#include "changestatus.h"
 
 // ---------------------------------------------------------------------------
 // two-phased constructor
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/messagingservice/src/messagedetail.cpp
--- a/serviceproviders/sapi_messaging/messagingservice/src/messagedetail.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/messagingservice/src/messagedetail.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,14 +21,14 @@
 #include <badesca.h>
 #include <msvapi.h>
 
-#include <CMsvAttachment.h>
-#include <MMsvAttachmentManager.h>
+#include <cmsvattachment.h>
+#include <mmsvattachmentmanager.h>
 #include <txtrich.h>
-#include <MsvUids.h>
-#include <MTCLREG.H>
+#include <msvuids.h>
+#include <mtclreg.h>
 #include <smsclnt.h>
 #include <smuthdr.h>
-#include <senduiconsts.h>
+#include <SendUiConsts.h>
 #include <cmsvrecipientlist.h>
 #include <mmsclient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/messagingservice/src/messageheader.cpp
--- a/serviceproviders/sapi_messaging/messagingservice/src/messageheader.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/messagingservice/src/messageheader.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,8 +16,8 @@
 */
 
 
-#include <CMsvAttachment.h>
-#include <senduiconsts.h>
+#include <cmsvattachment.h>
+#include <SendUiConsts.h>
 
 #include "messageheader.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/messagingservice/src/messagingservice.cpp
--- a/serviceproviders/sapi_messaging/messagingservice/src/messagingservice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/messagingservice/src/messagingservice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include <msvstd.h>
 #include <msvapi.h>
 #include <msvids.h>
-#include <senduiconsts.h>
+#include <SendUiConsts.h>
 
 #include "messageheader.h"
 #include "messagingservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp
--- a/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,17 +17,17 @@
 
 
 #include <e32base.h>
-#include <senduiconsts.h>
+#include <SendUiConsts.h>
 #include <mmsconst.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include <aknenv.h>
-#include <MTCLREG.H>
-#include <UTF.H>
+#include <mtclreg.h>
+#include <utf.h>
 #include <mturutils.h>      
 #include <aknenv.h>
-#include <APGCLI.H>
+#include <apgcli.h>
 #include <smsclnt.h>
-#include <TXTRICH.H>
+#include <txtrich.h>
 #include <smuthdr.h>
 #include <smscmds.h>
 #include <mtmuibas.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/src/messagingservicehandler.cpp
--- a/serviceproviders/sapi_messaging/src/messagingservicehandler.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/src/messagingservicehandler.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include <ecom/ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 
 #include "messaginginterface.h"
 #include "messagingservicehandler.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.mmp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -38,7 +38,7 @@
 
 SOURCEPATH      ../src
 SOURCE          messagenotificationtest.cpp
-SOURCE          messagenotificationtestBlocks.cpp
+SOURCE          messagenotificationtestblocks.cpp
 SOURCE			notify.cpp
 
 USERINCLUDE     ../inc 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/messaginginterface.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/messaginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/messaginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #ifndef __MESSAGINGINTERFACE_H
 #define __MESSAGINGINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include "messageheader.h" 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/notify.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/notify.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/notify.h	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 #include <e32base.h>
 ////#include <senduiconsts.h>
-#include <BADESCA.H>
-#include<LiwCommon.h>
+#include <badesca.h>
+#include<liwcommon.h>
 #include <f32file.h>
 
 class CLiwServiceHandler;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtest.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "messagenotificationtest.h"
 //#include <SAPI_TEST\testprg.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtestblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <msvids.h> 
 ////#include <senduiconsts.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include "messaginginterface.h"
 
 #include "notify.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 
 
 #include "messaginginterface.h"
-#include<LiwCommon.h>
-#include<LiwVariant.h>
-#include<LiwServiceHandler.h>
+#include<liwcommon.h>
+#include<liwvariant.h>
+#include<liwservicehandler.h>
 
 #include"notify.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/inc/messagingservicehandler.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/inc/messagingservicehandler.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/inc/messagingservicehandler.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,8 +20,8 @@
 #ifndef __MESSAGINGSERVICEHANDLER_H
 #define __MESSAGINGSERVICEHANDLER_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
 
 /**
 * Provides implementation to CLiwServiceIfBase interface.
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustest.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tchangestatustest.h"
 //#include <SAPI_TEST\testprg.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustestblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,11 +21,11 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <msvids.h> 
 ////#include <senduiconsts.h>
-#include <LiwCommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include "messagingservicehandler.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/inc/messaginginterface.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/inc/messaginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/inc/messaginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #ifndef __MESSAGINGINTERFACE_H
 #define __MESSAGINGINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include "messageheader.h" 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetest.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "TDeleteMessageTest.h"
+#include <StifTestInterface.h>
+#include "tdeletemessagetest.h"
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetestblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,14 +21,14 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <msvids.h> 
 ////#include <senduiconsts.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include "messaginginterface.h"
-#include<LiwServiceHandler.h>
+#include<liwservicehandler.h>
 
-#include "TDeleteMessageTest.h"
+#include "tdeletemessagetest.h"
 
 // -----------------------------------------------------------------------------
 // CTDeleteMessageTest::Delete
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/inc/messaginginterface.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/inc/messaginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/inc/messaginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #ifndef __MESSAGINGINTERFACE_H
 #define __MESSAGINGINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include "messageheader.h" 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/get_headerblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/get_headerblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/get_headerblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "getheader.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/getheader.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/getheader.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/getheader.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "getheader.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist1.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,11 +19,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 #ifdef MAIN
 #define getheader_test1 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist2.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,11 +20,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 #ifdef MAIN
 #define getheader_test2 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist3.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist3.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist3.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,11 +20,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 #ifdef MAIN
 #define getheader_test3 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist4.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist4.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist4.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,11 +20,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 #ifdef MAIN
 #define getheader_test4 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist5.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist5.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist5.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,11 +20,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 #ifdef MAIN
 #define getheader_test5 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist6.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist6.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist6.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,11 +20,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 #ifdef MAIN
 #define getheader_test6 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist7.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist7.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist7.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,11 +20,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 #ifdef MAIN
 #define getheader_test7 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/inc/messaginginterface.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/inc/messaginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/inc/messaginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #ifndef __MESSAGINGINTERFACE_H
 #define __MESSAGINGINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include "messageheader.h" 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,16 +21,16 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "getheader.h"
 
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include <f32file.h>
-#include<LiwServiceHandler.h>
-#include<MSVSTD.H>
+#include<liwservicehandler.h>
+#include<msvstd.h>
 #include "messageheader.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/getheader.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/getheader.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/getheader.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "getheader.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertest.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 //#include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertestobserver.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertestobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertestobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 
 
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/txmlconvertor.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/txmlconvertor.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/txmlconvertor.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest_testblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 
 #include "tprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/inc/messaginginterface.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/inc/messaginginterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/inc/messaginginterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #ifndef __MESSAGINGINTERFACE_H
 #define __MESSAGINGINTERFACE_H
 
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
 
 #include "messageheader.h" 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/send_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/send_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/send_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "sendmessage.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/sendmessage.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/sendmessage.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/sendmessage.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "sendmessage.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/tsendmessage1.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/tsendmessage1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/tsendmessage1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,11 +22,11 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messaginginterface.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "sendmessage.h"
 #include <f32file.h>
 #include "messageheader.h"
-#include<LiwServiceHandler.h>
+#include<liwservicehandler.h>
 #ifdef MAIN
 #define sendmessage_test1 main
 #endif
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/inc/tmsgget_async.h
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/inc/tmsgget_async.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/inc/tmsgget_async.h	Fri Dec 04 14:09:26 2009 +0000
@@ -24,8 +24,8 @@
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
 #include <TestclassAssert.h>
-#include <LiwCommon.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwservicehandler.h>
 
 // CONSTANTS
 //const ?type ?constant_var = ?constant;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_async.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_async.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_async.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tmsgget_async.h"
 #include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tmsgget_async.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.mmp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -32,7 +32,7 @@
 
 SOURCEPATH      ../src
 SOURCE          messagenotificationtest.cpp
-SOURCE          messagenotificationtestBlocks.cpp
+SOURCE          messagenotificationtestblocks.cpp
 SOURCE          reqnotification.cpp
 //SOURCE			tfunctionthread.cpp
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtest.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <SAPI_TEST\testprg.h>
 #include"messagenotify.h"
 #include "messagenotificationtest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtestblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 #include <msvids.h> 
 #include"messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 
 #include <f32file.h>
 #include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustest.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -24,7 +24,7 @@
 #include <msvapi.h>
 #include <msvids.h>
 
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <SAPI_TEST\testprg.h>
 #include "messageheader.h"
 #include "messagingservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustestblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <msvstd.h>
 #include <msvapi.h>
 #include <msvids.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetest.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,11 +19,11 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <SAPI_TEST\testprg.h>
 //#include <sendmessage.h>
 //#include<messagenotify.h>
-#include "TDeleteMessageTest.h"
+#include "tdeletemessagetest.h"
 //#include <SAPI_TEST\testprg.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetestblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,13 +22,13 @@
 #include <e32svr.h>
 #include <StifParser.h>
 //#include <SAPI_TEST\testprg.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <msvids.h> 
 #include <msvapi.h> 
 #include "messageheader.h"
 #include "messagingservice.h"
 ////#include <senduiconsts.h>
-#include "TDeleteMessageTest.h"
+#include "tdeletemessagetest.h"
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/get_headerblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/get_headerblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/get_headerblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "getheader.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/getheader.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/getheader.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/getheader.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "getheader.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms1.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
 #include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms2.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
 #include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms3.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms3.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms3.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
 //#include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms1.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms1.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms1.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
 #include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms2.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms2.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms2.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
 #include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms3.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms3.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms3.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
 #include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms4.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms4.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms4.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include <e32base.h>
 ////#include <senduiconsts.h>
 #include "messagingservice.h"
-#include <BADESCA.H>
+#include <badesca.h>
 #include "getheader.h"
 #include <f32file.h>
 //#include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/send_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/send_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/send_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "sendmessage.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "sendmessage.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage10.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage10.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage10.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 #include "messagingservice.h"
 #include "sendmessage.h"
-#include<CMsvAttachment.h>
+#include<cmsvattachment.h>
 
 #ifdef MAIN
 #define sendmessage_test10 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage4.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage4.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage4.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 
 #include<e32base.h>
 #include <msvapi.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 
 #include "messagingservice.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage5.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage5.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage5.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,7 +22,7 @@
 #include<e32base.h>
 
 #include "messagingservice.h"
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "sendmessage.h"
 
 #ifdef MAIN
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage7.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage7.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage7.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 #include "messagingservice.h"
 #include "sendmessage.h"
-#include<CMsvAttachment.h>
+#include<cmsvattachment.h>
 
 #ifdef MAIN
 #define sendmessage_test7 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage8.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage8.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage8.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 #include "messagingservice.h"
 #include "sendmessage.h"
-#include<CMsvAttachment.h>
+#include<cmsvattachment.h>
 
 #ifdef MAIN
 #define sendmessage_test8 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage9.cpp
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage9.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage9.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 #include "messagingservice.h"
 #include "sendmessage.h"
-#include<CMsvAttachment.h>
+#include<cmsvattachment.h>
 
 #ifdef MAIN
 #define sendmessage_test9 main
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.mmp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -45,7 +45,7 @@
 
 SOURCEPATH      ../src
 SOURCE          async_send_message.cpp
-SOURCE          async_send_messageBlocks.cpp
+SOURCE          async_send_messageblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/inc/async.h
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/inc/async.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/inc/async.h	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_message.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_message.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_message.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "async_send_message.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "async_send_message.h"
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 #include "async.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.mmp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -44,7 +44,7 @@
 
 SOURCEPATH      ../src
 SOURCE          change_status_message.cpp
-SOURCE          change_status_messageBlocks.cpp
+SOURCE          change_status_messageblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_message.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_message.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_message.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "change_status_message.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -23,10 +23,10 @@
 #include <e32cons.h>
 #include <e32base.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "change_status_message.h"
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.mmp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -43,7 +43,7 @@
 
 SOURCEPATH      ../src
 SOURCE          delete_message.cpp
-SOURCE          delete_messageBlocks.cpp
+SOURCE          delete_messageblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_message.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_message.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_message.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "delete_message.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "delete_message.h"
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.mmp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -43,7 +43,7 @@
 
 SOURCEPATH      ../src
 SOURCE          get_header_message.cpp
-SOURCE          get_header_messageBlocks.cpp
+SOURCE          get_header_messageblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_message.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_message.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_message.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "get_header_message.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,9 +22,9 @@
 #include <e32base.h>
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 #include "get_header_message.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/inc/async.h
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/inc/async.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/inc/async.h	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_async.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_async.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_async.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "get_message_async.h"
 #include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_asyncBlocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_asyncBlocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_asyncBlocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 #include <e32svr.h>
 #include <e32base.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <CMsvAttachment.h>
+#include <StifTestInterface.h>
+#include <cmsvattachment.h>
 #include "get_message_async.h"
 #include "messagingservice.h"
 #include "messageheader.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.mmp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -46,7 +46,7 @@
 
 SOURCEPATH      ../src
 SOURCE          register_message.cpp
-SOURCE          register_messageBlocks.cpp
+SOURCE          register_messageblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/inc/async.h
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/inc/async.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/inc/async.h	Fri Dec 04 14:09:26 2009 +0000
@@ -17,9 +17,9 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_message.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_message.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_message.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "register_message.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "register_message.h"
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 #include "async.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.mmp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -50,7 +50,7 @@
 
 SOURCEPATH      ../src
 SOURCE          send_message.cpp
-SOURCE          send_messageBlocks.cpp
+SOURCE          send_messageblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_message.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_message.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_message.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "send_message.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_messageblocks.cpp
--- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_messageblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_messageblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -22,9 +22,9 @@
 #include <e32base.h>
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 //#include <senduiconsts.h>
-#include <CMsvAttachment.h>
+#include <cmsvattachment.h>
 #include "messagingservice.h"
 #include "messageheader.h"
 #include "send_message.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/data/2000CFB6.rss
--- a/serviceproviders/sapi_sensor/data/2000CFB6.rss	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/data/2000CFB6.rss	Fri Dec 04 14:09:26 2009 +0000
@@ -15,10 +15,10 @@
 *
 */
 
-#include <Eikon.rh>
-#include <LiwCommon.hrh>
+#include <eikon.rh>
+#include <liwcommon.hrh>
 
-#include "ecom/RegistryInfoV2.rh"
+#include "ecom/registryinfov2.rh"
 
 RESOURCE REGISTRY_INFO theInfo
     {
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/inc/sensorcallback.h
--- a/serviceproviders/sapi_sensor/inc/sensorcallback.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/inc/sensorcallback.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,8 +20,8 @@
 #define CSENSORCALLBACK_H
 
 
-#include <Liwserviceifbase.h>
-#include <LiwCommon.h>
+#include <liwserviceifbase.h>
+#include <liwcommon.h>
 #include <sensrvtypes.h>
 #include <sensrvdatalistener.h>
 #include <sensrvchannelinfo.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/inc/sensorinterface.h
--- a/serviceproviders/sapi_sensor/inc/sensorinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/inc/sensorinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #ifndef C_CSENSORINTERFACE_H
 #define C_CSENSORINTERFACE_H
 
-#include <LiwVariant.h>
+#include <liwvariant.h>
 #include <utf.h>
 
 // User Includes
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/inc/sensorservicehandler.h
--- a/serviceproviders/sapi_sensor/inc/sensorservicehandler.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/inc/sensorservicehandler.h	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 #ifndef C_CSENSORSERVICEHANDLER_H
 #define C_CSENSORSERVICEHANDLER_H
 
-#include <Liwserviceifbase.h>
+#include <liwserviceifbase.h>
 
 /**
  * CsensorProvider - inherits the CLiwServiceIfBase to Load the sensor
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/src/sensorinterface.cpp
--- a/serviceproviders/sapi_sensor/src/sensorinterface.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/src/sensorinterface.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,9 +16,9 @@
 */
 
 //system include
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
-#include <LiwCommon.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
+#include <liwcommon.h>
 #include <sensrvchannelinfo.h>
 #include <sensrvtypes.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/src/sensorprovider.cpp
--- a/serviceproviders/sapi_sensor/src/sensorprovider.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/src/sensorprovider.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include <ecom/ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 #include "sensorservicehandler.h"
 #include "sensorinterface.h"
 #include "serviceerrno.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/inc/sensrprovidertest.h
--- a/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/inc/sensrprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/inc/sensrprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -31,10 +31,10 @@
 #include <f32file.h>
 #include <StifParser.h>
 #include <e32std.h>
-#include <Stiftestinterface.h>
-#include <Liwgenericparam.h>
-#include <Liwservicehandler.h>
-#include <Liwvariant.h>
+#include <StifTestInterface.h>
+#include <liwgenericparam.h>
+#include <liwservicehandler.h>
+#include <liwvariant.h>
 #include <utf.h>
 
 /*#include "sensorservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/src/sensrprovidertest.cpp
--- a/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/src/sensrprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/src/sensrprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,9 +19,9 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <Liwcommon.h>
-#include <Liwservicehandler.h>
+#include <StifTestInterface.h>
+#include <liwcommon.h>
+#include <liwservicehandler.h>
  
 #include "sensrprovidertest.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetest.cpp
--- a/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 
 #include "sensrservicetest.h"
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetestblocks.cpp
--- a/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <e32base.h>
 //#include <stdio.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertest.h
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertestobserver.h
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertestobserver.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertestobserver.h	Fri Dec 04 14:09:26 2009 +0000
@@ -15,7 +15,7 @@
 *
 */
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 #include  "e32base.h" 
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/txmlconvertor.h
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/txmlconvertor.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/txmlconvertor.h	Fri Dec 04 14:09:26 2009 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <liwgenericparam.h>
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest.cpp
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <gmxmlparser.h>
 #include <gmxmlnode.h>
 #include "tsnsrprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest_testblocks.cpp
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <StifTestInterface.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 
 
 #include "tsnsrprovidertest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/txmlconvertor.cpp
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/txmlconvertor.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/txmlconvertor.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 
-#include <LiwServiceHandler.h>
-#include <Liwbufferextension.h>
+#include <liwservicehandler.h>
+#include <liwbufferextension.h>
 #include <gmxmldocument.h>
 #include <gmxmlelement.h>
 #include <gmxmlcharacterdata.h>
-#include <charconv.H>
+#include <charconv.h>
 #include <gmxmltext.h>
 
 #include "txmlconvertor.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_test.cpp
--- a/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_test.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_test.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsensorservice_test.h"
 #include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_testblocks.cpp
--- a/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_testblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_testblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <e32base.h>
 #include <sensrvchannelinfo.h>
 #include <sensrvchannel.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/data/102833a9.rss
--- a/serviceproviders/sapi_serviceregistry/data/102833a9.rss	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/data/102833a9.rss	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 #include <eikon.rh>
-#include <ecom\registryinfov2.rh>
+#include <ecom/registryinfov2.rh>
 #include <liwcommon.hrh>
 
 // Declares the interface implementation provided: a custom resolver
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/inc/serviceinterface.h
--- a/serviceproviders/sapi_serviceregistry/inc/serviceinterface.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/inc/serviceinterface.h	Fri Dec 04 14:09:26 2009 +0000
@@ -20,9 +20,9 @@
 #define SERVICEINTERFACE_H
 
 #include <liwcommon.h>
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
-#include <LiwServiceHandler.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
+#include <liwservicehandler.h>
 
 
 // CLASS DECLARATION
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/inc/serviceregistryiterator.h
--- a/serviceproviders/sapi_serviceregistry/inc/serviceregistryiterator.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/inc/serviceregistryiterator.h	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 
 #include <liwgenericparam.h> 
 #include <liwcommon.h>
-#include <LiwVariant.h>
+#include <liwvariant.h>
 
 /**
  *  This class implements the abstract methods of CLiwIterable   
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/src/serviceregistryservicehandler.cpp
--- a/serviceproviders/sapi_serviceregistry/src/serviceregistryservicehandler.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/src/serviceregistryservicehandler.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 */
 
 
-#include <ecom\implementationproxy.h>
+#include <ecom/implementationproxy.h>
 #include "serviceregistryservicehandler.h"
 // Including a copy of common constants for this compilation unit
 #include "serviceregistryservice.hrh"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/group/tserviceregistrytest.mmp
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/group/tserviceregistrytest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/group/tserviceregistrytest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -40,7 +40,7 @@
 
 SYSTEMINCLUDE   /epoc32/include 
 SYSTEMINCLUDE   /epoc32/include/internal
-SYSTEMINCLUDE   /epoc32/include/ECom
+SYSTEMINCLUDE   /epoc32/include/ecom
 SYSTEMINCLUDE   /epoc32/include/applications
 SYSTEMINCLUDE   /epoc32/include/internal
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/inc/tserviceregistrytest.h
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/inc/tserviceregistrytest.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/inc/tserviceregistrytest.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,9 +25,9 @@
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
 
-#include <LiwCommon.h>
-#include <LiwBufferExtension.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwbufferextension.h>
+#include <liwservicehandler.h>
 
 // CONSTANTS
 //const ?type ?constant_var = ?constant;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytest.cpp
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tserviceregistrytest.h"
 #include <SettingServerClient.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <hal.h>
 
 #include "tserviceregistrytest.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp
--- a/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #include <e32math.h>
 #include <liwcommon.h>
 #include <liwgenericparam.h> 
-#include <NumberConversion.h>
+#include <numberconversion.h>
 #include <PtiEngine.h>
 
 #include "errormsgs.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #ifndef __SYSINFO_H__
 #define __SYSINFO_H__
 
-#include <BADESCA.H>
+#include <badesca.h>
 #include <f32file.h>
 #include <AccPolGenericIDArray.h>
 #include <etelmm.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,22 +18,22 @@
 
 #include <centralrepository.h>
 #include <btserversdkcrkeys.h>
-#include <SettingsInternalCRKeys.h>
-#include <HWRMVibraSDKCRKeys.h>
-#include <HWRMLightDomainCRKeys.h>
+#include <settingsinternalcrkeys.h>
+#include <hwrmvibrasdkcrkeys.h>
+#include <hwrmlightdomaincrkeys.h>
 #include <AknFepInternalCRKeys.h>
-#include <SysUtilDomainCRKeys.h>
+#include <sysutildomaincrkeys.h>
 
 #include <UikonInternalPSKeys.h>
 #include <NetworkHandlingDomainPSKeys.h>
-#include <HWRMDomainPSKeys.h>
+#include <hwrmdomainpskeys.h>
 #include <hwrmpowerstatesdkpskeys.h>
-#include <IR_SOCK.H>
+#include <ir_sock.h>
 
 #include "activerequests.h"
 #include "sysinfoservice.h"
 #include "entitykeys.h"
-#include "SysInfoUtils.h"
+#include "sysinfoutils.h"
 
 using namespace SysInfo;
 _LIT(KDriveSeperator,":\\");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/sysinfoservice/src/deviceinfo.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/deviceinfo.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/deviceinfo.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,10 +16,10 @@
 */
 
 #include <hal.h>
-#include <SysUtil.h>
+#include <sysutil.h>
 
 #include "sysinfoservice.h"
-#include "SysInfoUtils.h"
+#include "sysinfoutils.h"
 #include "entitykeys.h"
 #include "deviceinfo.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,10 +20,10 @@
 #include <AccessoryServer.h>
 #include <PtiEngine.h>
 #include <centralrepository.h>
-#include <SysUtilDomainCRKeys.h>
+#include <sysutildomaincrkeys.h>
 
 #include "sysinfo.h"
-#include "SysInfoUtils.h"
+#include "sysinfoutils.h"
 
 // --------------------------------------------------------------------
 // CSysData::CSysData()
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -16,27 +16,27 @@
 */
 
 
-#include <W32STD.H>
+#include <w32std.h>
 #include <hal.h>
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include <bldvariant.hrh>
 #include <PtiEngine.h>
 #include <driveinfo.h>
 
 
 #include <centralrepository.h>
-#include <HWRMVibraSDKCRKeys.h>
-#include <SettingsInternalCRKeys.h>
-#include <HWRMLightDomainCRKeys.h>
+#include <hwrmvibrasdkcrkeys.h>
+#include <settingsinternalcrkeys.h>
+#include <hwrmlightdomaincrkeys.h>
 #include <AknFepInternalCRKeys.h>
-#include <IR_SOCK.H>
+#include <ir_sock.h>
 #include <btserversdkcrkeys.h>
-#include <SysUtilDomainCRKeys.h>
+#include <sysutildomaincrkeys.h>
 
 #include <e32property.h>
-#include <HWRMDomainPSKeys.h>
+#include <hwrmdomainpskeys.h>
 #include <NetworkHandlingDomainPSKeys.h>
-#include <HWRMPowerStateSDKPSKeys.h>
+#include <hwrmpowerstatesdkpskeys.h>
 #include <wlaninternalpskeys.h>
 #include <UikonInternalPSKeys.h>
 #include <btengsettings.h>
@@ -47,7 +47,7 @@
 
 #include "sysinfoservice.h"
 #include "sysinfo.h"
-#include "SysInfoUtils.h"
+#include "sysinfoutils.h"
 #include "entitykeys.h"
 #include "activerequests.h"
 #include "deviceinfo.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoutils.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoutils.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoutils.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,10 +18,10 @@
 
 #include <etel.h>
 #include <etelmm.h>
-#include <MmTsy_names.h>
+#include <mmtsy_names.h>
 #include <centralrepository.h>
 
-#include "SysInfoUtils.h"
+#include "sysinfoutils.h"
 
 // ---------------------------------------------------------------------------
 // RPhoneInstance::Connect
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/sysinfoservice/src/sysnetworkrequest.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysnetworkrequest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysnetworkrequest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,13 +17,13 @@
 
 #include <etel.h>
 #include <etelmm.h>
-#include <MmTsy_names.h>
+#include <mmtsy_names.h>
 
 #include "sysinfoservice.h"
 #include "sysnetworkrequest.h"
 #include "entitykeys.h"
 #include "sysrequest.h"
-#include "SysInfoUtils.h"
+#include "sysinfoutils.h"
 
 // --------------------------------------------------------------------
 // CNetwork::CNetwork()
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/taccessorylist.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/taccessorylist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/taccessorylist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include "tsysinfoprovidergeneraltests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionlist.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionlist.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionlist.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include "tsysinfoprovidergeneraltests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionnotify.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionnotify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionnotify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidergeneraltests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tcriticalmemnoti.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tcriticalmemnoti.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tcriticalmemnoti.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,10 +17,10 @@
 
 
 #include <e32std.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 
 #include "tsysinfoprovidergeneraltests.h"
-#include "Tcriticalmemnoti.h"
+#include "tcriticalmemnoti.h"
 #include "watchtimer.h"
 
 #include "entitykeys.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tmemnotifier.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tmemnotifier.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tmemnotifier.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 #include <e32std.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 
 #include "tsysinfoprovidergeneraltests.h"
 #include "tmemnotifier.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltests.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysinfoprovidergeneraltests.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltestsblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltestsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltestsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,15 +21,15 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include<f32file.h>
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include "tsysinfoprovidergeneraltests.h"
 #include "tuseractivitynotifier.h"
-#include "Tmemnotifier.h"
-#include "Tcriticalmemnoti.h"
+#include "tmemnotifier.h"
+#include "tcriticalmemnoti.h"
 #include "sysinfoservice.h"
 #include "sysinfointerface.h"
 #include"entitykeys.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tuseractivitynotifier.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tuseractivitynotifier.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tuseractivitynotifier.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 #include <e32std.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 
 #include "tsysinfoprovidergeneraltests.h"
 #include "tuseractivitynotifier.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tvibra.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tvibra.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tvibra.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include "sysinfointerface.h"
 #include"entitykeys.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/inc/tsignalstrengthasyn.h
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/inc/tsignalstrengthasyn.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/inc/tsignalstrengthasyn.h	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 #ifndef __CTSIGSTRENGTHASYNC_H__
 #define __CTSIGSTRENGTHASYNC_H__
 
-#include <Liwcommon.h>
+#include <liwcommon.h>
 
 #include "watchtimer.h"
 #include "sysinfoservice.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tcurrentnetworknotify.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tcurrentnetworknotify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tcurrentnetworknotify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidernetworktests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/thomenetworkasync.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/thomenetworkasync.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/thomenetworkasync.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidernetworktests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthasyn.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthasyn.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthasyn.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidernetworktests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthnotify.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthnotify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthnotify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,8 +17,8 @@
 
 
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidernetworktests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktests.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysinfoprovidernetworktests.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktestsblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktestsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktestsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,10 +21,10 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <f32file.h>
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 #include "../../../inc/serviceerrno.h"
 
 #include "tsysinfoprovidernetworktests.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.mmp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -49,7 +49,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tsysinfoprovidertests.cpp
-SOURCE          tsysinfoprovidertestsBlocks.cpp
+SOURCE          tsysinfoprovidertestsblocks.cpp
 SOURCE          tuseractivitynotifier.cpp
 SOURCE	        watchtimer.cpp
 SOURCE          tvibra.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnections.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnections.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnections.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -14,8 +14,8 @@
 * Description: 
 *
 */
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidertests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnectionsreqcancel.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnectionsreqcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnectionsreqcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidertests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertests.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysinfoprovidertests.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <f32file.h>
 #include <hal.h>
 #include <liwcommon.h>
-#include <LiwServiceHandler.h>
-#include <COEMAIN.H> 
+#include <liwservicehandler.h>
+#include <coemain.h> 
 
 #include "tsysinfoprovidertests.h"
 #include "entitykeys.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tuseractivitynotifier.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tuseractivitynotifier.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tuseractivitynotifier.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidertests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 #include"tsysinfoprovidertests.h"
 #include"watchtimer.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 #include"tsysinfoprovidertests.h"
 #include"watchtimer.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include "sysinfointerface.h"
 #include"entitykeys.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.mmp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -49,7 +49,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tsysinfoprovidertests.cpp
-SOURCE          tsysinfoprovidertestsBlocks.cpp
+SOURCE          tsysinfoprovidertestsblocks.cpp
 SOURCE          tuseractivitynotifier.cpp
 SOURCE	        watchtimer.cpp
 SOURCE          tautolocknotifier.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnections.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnections.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnections.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidertests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnectionsreqcancel.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnectionsreqcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnectionsreqcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include"tsysinfoprovidertests.h"
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tautolocknotifier.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tautolocknotifier.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tautolocknotifier.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,10 +18,10 @@
 
 
 #include <e32std.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 
 #include "tsysinfoprovidertests.h"
-#include "Tautolocknotifier.h"
+#include "tautolocknotifier.h"
 #include "watchtimer.h"
 #include "entitykeys.h"
 #include "sysinfoaiwparams.hrh"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotify.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotify.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotify.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include <LiwServiceHandler.h>
+#include <liwcommon.h>
+#include <liwservicehandler.h>
 #include <btengsettings.h>
 
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotifyreqcancel.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotifyreqcancel.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotifyreqcancel.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 #include <btengsettings.h>
 
 #include "sysinfointerface.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertests.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysinfoprovidertests.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,12 +21,12 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <f32file.h>
 #include <hal.h>
 #include <liwcommon.h>
-#include <LiwServiceHandler.h>
-#include <COEMAIN.H> 
+#include <liwservicehandler.h>
+#include <coemain.h> 
 
 #include "tsysinfoprovidertests.h"
 #include "entitykeys.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tuseractivitynotifier.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tuseractivitynotifier.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tuseractivitynotifier.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 #include <e32std.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 #include <StifLogger.h>
 
 #include "tsysinfoprovidertests.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -15,8 +15,8 @@
 *
 */
 
-#include <Liwcommon.h>
-#include<LiwServiceHandler.h>
+#include <liwcommon.h>
+#include<liwservicehandler.h>
 
 #include "sysinfointerface.h"
 #include"entitykeys.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatstrnoti.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatstrnoti.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatstrnoti.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include "TSysBattery.h"
+#include "tsysbattery.h"
 #include "sysinfoservice.h"
 #include "entitykeys.h"
 #include "tbatstrnoti.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatterystrengthasyn.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatterystrengthasyn.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatterystrengthasyn.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include "TSysBattery.h"
+#include "tsysbattery.h"
 #include "sysinfoservice.h"
 #include "entitykeys.h"
 #include "tbatterystrengthasyn.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tchargernoti.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tchargernoti.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tchargernoti.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include "TSysBattery.h"
+#include "tsysbattery.h"
 #include "sysinfoservice.h"
 #include "entitykeys.h"
 #include "tchargernoti.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbattery.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbattery.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbattery.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,8 +19,8 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "TSysBattery.h"
+#include <StifTestInterface.h>
+#include "tsysbattery.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbatterytestblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbatterytestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbatterytestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,16 +20,16 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <f32file.h>
 #include <hal.h>
 
-#include "TSysBattery.h"
+#include "tsysbattery.h"
 #include "sysinfoservice.h"
 #include "entitykeys.h"
-#include "TBatteryStrengthAsyn.h"
-#include "TBatLvlNoti.h"
-#include "TChargerNoti.h"
+#include "tbatterystrengthasyn.h"
+#include "tbatlvlnoti.h"
+#include "tchargernoti.h"
 #include "tbatstrnoti.h"
 
 using namespace SysInfo;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tautolocknotifier.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tautolocknotifier.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tautolocknotifier.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 #include "tsysinfogeneraltests.h"
 #include "sysinfoservice.h"
-#include "Tautolocknotifier.h"
+#include "tautolocknotifier.h"
 #include "entitykeys.h"
 #include "watchtimer.h"
 #include <e32std.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tcriticalmemnoti.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tcriticalmemnoti.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tcriticalmemnoti.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 #include "tsysinfogeneraltests.h"
 #include "sysinfoservice.h"
-#include "Tcriticalmemnoti.h"
+#include "tcriticalmemnoti.h"
 #include "entitykeys.h"
 #include "watchtimer.h"
 #include <e32std.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltests.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysinfogeneraltests.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltestsblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltestsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltestsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,14 +21,14 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include<f32file.h>
 
 #include "tsysinfogeneraltests.h"
 #include "tuseractivitynotifier.h"
-#include "Tcriticalmemnoti.h"
-#include "Tmemnotifier.h"
-#include"Tautolocknotifier.h"
+#include "tcriticalmemnoti.h"
+#include "tmemnotifier.h"
+#include"tautolocknotifier.h"
 #include "sysinfoservice.h"
 #include"entitykeys.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktests.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysinfonetworktests.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktestsblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktestsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktestsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <f32file.h>
 
 #include "tsysinfonetworktests.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.mmp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -55,7 +55,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tsysinfoservicetests.cpp
-SOURCE          tsysinfoservicetestsBlocks.cpp
+SOURCE          tsysinfoservicetestsblocks.cpp
 SOURCE          tsysinfobatteryasync.cpp
 SOURCE          watchtimer.cpp
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tautolocknotifier.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tautolocknotifier.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tautolocknotifier.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -18,7 +18,7 @@
 
 #include "tsysinfoservicetests.h"
 #include "sysinfoservice.h"
-#include "Tautolocknotifier.h"
+#include "tautolocknotifier.h"
 #include "entitykeys.h"
 #include "watchtimer.h"
 #include <e32std.h>
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoinfraredstatus.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoinfraredstatus.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoinfraredstatus.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -20,7 +20,7 @@
 #include "sysinfoservice.h"
 #include"entitykeys.h"
 
-#include <IR_SOCK.H>
+#include <ir_sock.h>
 #include <e32property.h>
 
 using namespace SysInfo;
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetests.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetests.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetests.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysinfoservicetests.h"
 
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,16 +21,16 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include <hal.h>
 #include "tsysinfoservicetests.h"
 #include "tbatterystrengthasyn.h"
 #include "tuseractivitynotifier.h"
-#include "Tautolocknotifier.h"
+#include "tautolocknotifier.h"
 
 #include "sysinfoservice.h"
 #include "entitykeys.h"
-#include <COEMAIN.H> 
+#include <coemain.h> 
 
 using namespace SysInfo;
 _LIT(KROMInstallDir,"\\system\\install\\");
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbattery.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbattery.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbattery.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysbattery.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatteryblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatteryblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatteryblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysbattery.h"
 #include "tsysbatterystrengthasync.h"
 #include "tsysbatterynot.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterynot.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterynot.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterynot.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include "TSysBattery.h"
+#include "tsysbattery.h"
 #include "sysinfoservice.h"
 #include "entitykeys.h"
 #include "tsysbatterynot.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterystrengthasync.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterystrengthasync.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterystrengthasync.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -17,7 +17,7 @@
 
 
 
-#include "TSysBattery.h"
+#include "tsysbattery.h"
 #include "sysinfoservice.h"
 #include "entitykeys.h"
 #include "tsysbatterystrengthasync.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/inc/tsysconnectivity.h
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/inc/tsysconnectivity.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/inc/tsysconnectivity.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <FeatMgr.h>
+#include <featmgr.h>
 #include "sysinfoservice.h"
 #include "sysinfo.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivity.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivity.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivity.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysconnectivity.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivityblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivityblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivityblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 
 
 #include "tsysconnectivity.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdevice.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdevice.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdevice.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysdevice.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdeviceblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdeviceblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdeviceblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysdevice.h"
 #include <sysutil.h>
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplay.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplay.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplay.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysdisplay.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplayblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplayblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplayblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <EscapeUtils.h> 
+#include <StifTestInterface.h>
+#include <escapeutils.h> 
 
 #include "tsysdisplay.h"
 #include "tsysdisplaynot.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/inc/tsysfeatures.h
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/inc/tsysfeatures.h	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/inc/tsysfeatures.h	Fri Dec 04 14:09:26 2009 +0000
@@ -25,7 +25,7 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-#include <FeatMgr.h>
+#include <featmgr.h>
 
 #include "sysinfoservice.h"
 #include "sysinfo.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeatures.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeatures.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeatures.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysfeatures.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeaturesblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeaturesblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeaturesblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysfeatures.h"
 #include "entitykeys.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneral.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneral.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneral.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysgeneral.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneralblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneralblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneralblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysgeneral.h"
-#include <COEMAIN.H> 
+#include <coemain.h> 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.mmp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.mmp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.mmp	Fri Dec 04 14:09:26 2009 +0000
@@ -49,7 +49,7 @@
 
 SOURCEPATH      ../src
 SOURCE          tsysmanualtest.cpp
-SOURCE          tsysmanualtestBlocks.cpp
+SOURCE          tsysmanualtestblocks.cpp
 SOURCE          tasyncaccandvibra.cpp
 SOURCE          tsysbatterynot.cpp
 SOURCE          tmemnot.cpp
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtest.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtest.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtest.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysmanualtest.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtestblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtestblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtestblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysmanualtest.h"
 #include "tmemnot.h"
 #include "tsysbatterynot.h"
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemory.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemory.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemory.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysmemory.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemoryblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemoryblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemoryblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysmemory.h"
 #include "tsysmemorynot.h"
 
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetwork.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetwork.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetwork.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysnetwork.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 4a5bd01d597a -r 0122277b3ed5 serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetworkblocks.cpp
--- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetworkblocks.cpp	Thu Nov 12 16:07:15 2009 +0000
+++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetworkblocks.cpp	Fri Dec 04 14:09:26 2009 +0000
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "tsysnetwork.h"
 
 // EXTERNAL DATA STRUCTURES