# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1259045796 -7200
# Node ID bcef26ca2be3aed14294fdf50c858f7fca79e1b3
# Parent  1ae7a60a544444340238ed000e08133d09253aa5
Revision: 200945
Kit: 200948

diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/group/bld.inf
--- a/languageinterworkingfw/servicehandler/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -38,8 +38,8 @@
 
 #ifndef TOOLS
 
-ServiceHandler.mmp
-LiwResolver.mmp
+servicehandler.mmp
+liwresolver.mmp
 
 #endif
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/group/liwresolver.mmp
--- a/languageinterworkingfw/servicehandler/group/liwresolver.mmp	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/group/liwresolver.mmp	Tue Nov 24 08:56:36 2009 +0200
@@ -36,7 +36,7 @@
 paged
 
 SOURCEPATH      ../src
-SOURCE          LiwResolver.cpp
+SOURCE          liwresolver.cpp
 
 USERINCLUDE     ../inc
 SYSTEMINCLUDE   /epoc32/include/ecom
@@ -44,7 +44,7 @@
 // layer specific include directories
 MW_LAYER_SYSTEMINCLUDE
 
-START RESOURCE  ../data/2000B5D4.RSS
+START RESOURCE  ../data/2000B5D4.rss
 TARGET liwResolver.rsc                                                              
 END
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/group/servicehandler.mmp
--- a/languageinterworkingfw/servicehandler/group/servicehandler.mmp	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/group/servicehandler.mmp	Tue Nov 24 08:56:36 2009 +0200
@@ -35,20 +35,20 @@
 CAPABILITY      CAP_GENERAL_DLL
 
 SOURCEPATH      ../src
-SOURCE          LiwCommon.cpp
-SOURCE          LiwServiceHandler.cpp
-SOURCE          LiwServiceHandlerImpl.cpp
-SOURCE          LiwMenu.cpp
-SOURCE          LiwBinding.cpp
-SOURCE          LiwMenuBinding.cpp
-SOURCE          LiwServiceIfBase.cpp
-SOURCE          LiwServiceIfMenu.cpp
-SOURCE          LiwGenericParam.cpp
-SOURCE          LiwVariant.cpp
-SOURCE          LiwEcomMonitor.cpp
-SOURCE          LiwTlsData.cpp
-SOURCE          LiwXmlHandler.cpp
-SOURCE          LiwServiceData.cpp
+SOURCE          liwcommon.cpp
+SOURCE          liwservicehandler.cpp
+SOURCE          liwservicehandlerimpl.cpp
+SOURCE          liwmenu.cpp
+SOURCE          liwbinding.cpp
+SOURCE          liwmenubinding.cpp
+SOURCE          liwserviceifbase.cpp
+SOURCE          liwserviceifmenu.cpp
+SOURCE          liwgenericparam.cpp
+SOURCE          liwvariant.cpp
+SOURCE          liwecommonitor.cpp
+SOURCE          liwtlsdata.cpp
+SOURCE          liwxmlhandler.cpp
+SOURCE          liwservicedata.cpp
 
 USERINCLUDE     . 
 USERINCLUDE     ../inc
@@ -59,7 +59,7 @@
 
 #include <data_caging_paths.hrh>
 
-START RESOURCE ../data/liwServiceHandler.rss
+START RESOURCE ../data/liwservicehandler.rss
 	HEADER    
 	TARGETPATH   RESOURCE_FILES_DIR  
 END
diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/inc/liwxmlhandler.h
--- a/languageinterworkingfw/servicehandler/inc/liwxmlhandler.h	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/inc/liwxmlhandler.h	Tue Nov 24 08:56:36 2009 +0200
@@ -28,7 +28,7 @@
 
 #include <SenXmlReader.h>
 #include <MSenContentHandlerClient.h>
-#include <xml/ContentHandler.h>
+#include <xml/contenthandler.h>
 #include <e32capability.h>
 
 // CONSTANTS
diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/src/liwecommonitor.cpp
--- a/languageinterworkingfw/servicehandler/src/liwecommonitor.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/src/liwecommonitor.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -24,7 +24,7 @@
 #include "liwcommon.h"
 #include "liwuids.hrh"
 #include "liwserviceifbase.h"
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
 
 // CONSTANTS
 _LIT8(KContentTag, "<CONTENT>");
diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/src/liwservicedata.cpp
--- a/languageinterworkingfw/servicehandler/src/liwservicedata.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/src/liwservicedata.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -23,13 +23,13 @@
 
 
 
-#include "LiwServiceData.h"
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
+#include "liwservicedata.h"
+#include <liwvariant.h>
+#include <liwgenericparam.h>
 
-#include <escapeUtils.h>
+#include <escapeutils.h>
 
-#include <BADESCA.H> 
+#include <badesca.h> 
 
 /**
 * Creates and returns an instance of \c CLiwServiceData
diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/src/liwservicehandlerimpl.cpp
--- a/languageinterworkingfw/servicehandler/src/liwservicehandlerimpl.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/src/liwservicehandlerimpl.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -35,10 +35,10 @@
 #include "liwtlsdata.h"
 #include "data_caging_path_literals.hrh"
 
-#include "LiwXmlHandler.h"
-#include "LiwServiceData.h"
-
-#include <RTSecMgrScriptSession.h>
+#include "liwxmlhandler.h"
+#include "liwservicedata.h"
+
+#include <rtsecmgrscriptsession.h>
 
 // CONSTANTS
 // Max number of empty menu resource slots.
diff -r 1ae7a60a5444 -r bcef26ca2be3 languageinterworkingfw/servicehandler/src/liwxmlhandler.cpp
--- a/languageinterworkingfw/servicehandler/src/liwxmlhandler.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/languageinterworkingfw/servicehandler/src/liwxmlhandler.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -23,13 +23,13 @@
 
 
 
-#include "LiwXmlHandler.h"
+#include "liwxmlhandler.h"
 #include <f32file.h>
 #include "data_caging_path_literals.hrh"
 #include <e32capability.h>
 
-#include "LiwServiceData.h"
-#include <LiwVariant.h>
+#include "liwservicedata.h"
+#include <liwvariant.h>
 
 _LIT8(KMetaDataName, "meta");
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerclient/group/bld.inf
--- a/rtsecuritymanager/rtsecuritymanagerclient/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerclient/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -25,4 +25,4 @@
 ../loc/rtsecmanager.loc        MW_LAYER_LOC_EXPORT_PATH(rtsecmanager.loc)
 
 PRJ_MMPFILES
-RTSecMgrClient.mmp
\ No newline at end of file
+rtsecmgrclient.mmp
\ No newline at end of file
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerclient/group/rtsecmgrclient.mmp
--- a/rtsecuritymanager/rtsecuritymanagerclient/group/rtsecmgrclient.mmp	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerclient/group/rtsecmgrclient.mmp	Tue Nov 24 08:56:36 2009 +0200
@@ -40,10 +40,10 @@
 USERINCLUDE     ../../inc/
 
 SOURCEPATH      ../src/
-SOURCE          RTSecMgrClient.cpp
-SOURCE          RTSecManager.cpp
-SOURCE          RTSecMgrScriptSession.cpp
-SOURCE          RTSecMgrTrustInfo.cpp
+SOURCE          rtsecmgrclient.cpp
+SOURCE          rtsecmanager.cpp
+SOURCE          rtsecmgrscriptsession.cpp
+SOURCE          rtsecmgrtrustinfo.cpp
 
 START RESOURCE ../data/rtsecmanager.rss
 		TARGETPATH      APP_RESOURCE_DIR
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerclient/src/rtsecmgrscriptsession.cpp
--- a/rtsecuritymanager/rtsecuritymanagerclient/src/rtsecmgrscriptsession.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerclient/src/rtsecmgrscriptsession.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -21,7 +21,7 @@
 
 
 #include <aknlistquerydialog.h>
-#include <aknquerydialog.h>
+#include <AknQueryDialog.h>
 #include <aknmessagequerycontrol.h>
 #include <aknmessagequerydialog.h> 
 #include <badesca.h>
@@ -32,7 +32,7 @@
 #include <eikfrlb.h>
 #include <eikfrlbd.h>
 #include <pathinfo.h> 
-#include <stringloader.h>
+#include <StringLoader.h>
 
 #include <rtsecmanager.h>
 #include <rtsecmgrscriptsession.h>
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerserver/group/bld.inf
--- a/rtsecuritymanager/rtsecuritymanagerserver/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerserver/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -25,4 +25,4 @@
 //../data/backup_registration.xml /epoc32/data/z/private/2000F847/backup_registration.xml
 
 PRJ_MMPFILES
-rtsecmgrserver.mmp
+RTSecMgrServer.mmp
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerserver/inc/rtsecmgrpolicyparser.h
--- a/rtsecuritymanager/rtsecuritymanagerserver/inc/rtsecmgrpolicyparser.h	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerserver/inc/rtsecmgrpolicyparser.h	Tue Nov 24 08:56:36 2009 +0200
@@ -24,9 +24,9 @@
 #define C_RTSECMGRPOLICYPARSER_H
 
 #include <e32base.h>
-#include <GMXMLParser.h>
-#include <GMXMLNode.h>
-#include <EscapeUtils.h>
+#include <gmxmlparser.h>
+#include <gmxmlnode.h>
+#include <escapeutils.h>
 #include "rtsecmgrdata.h"
 #include "rtsecmgrcommondef.h"
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerserver/src/rtsecmgrserver.cpp
--- a/rtsecuritymanager/rtsecuritymanagerserver/src/rtsecmgrserver.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerserver/src/rtsecmgrserver.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -24,8 +24,8 @@
 
 #include "rtsecmgrserver.h"
 #include "rtsecmgrsession.h"
-#include "rtsecmgrsubSession.h"
-#include "rtsecmgrcommonDef.h"
+#include "rtsecmgrsubsession.h"
+#include "rtsecmgrcommondef.h"
 #include "rtsecmgrstore.h"
 #include "rtsecmgrpolicymanager.h"
 #include "rtsecmgrscriptmanager.h"
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerutil/group/RTSecMgrUtil.mmp
--- a/rtsecuritymanager/rtsecuritymanagerutil/group/RTSecMgrUtil.mmp	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerutil/group/RTSecMgrUtil.mmp	Tue Nov 24 08:56:36 2009 +0200
@@ -51,11 +51,11 @@
 LIBRARY					flogger.lib
 
 #if defined(ARMCC)
-deffile ../EABI/ 
+deffile ../eabi/ 
 #elif defined(WINSCW)
-deffile ../BWINS/ 
+deffile ../bwins/ 
 #elif defined(WINS)
-deffile ../BWINS/ 
+deffile ../bwins/ 
 #else
 deffile ../bmarm/ 
 #endif
diff -r 1ae7a60a5444 -r bcef26ca2be3 rtsecuritymanager/rtsecuritymanagerutil/src/rtsecmgrscript.cpp
--- a/rtsecuritymanager/rtsecuritymanagerutil/src/rtsecmgrscript.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/rtsecuritymanager/rtsecuritymanagerutil/src/rtsecmgrscript.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -21,7 +21,7 @@
 
 #include <rtsecmgrutility.h>
 #include <rtsecmgrscript.h>
-#include <s32mem.H>
+#include <s32mem.h>
 
 const TReal DEFAULT_VERSION(1.0);
 const TReal VERSION_TWO(2.0);
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_criteria_api/group/bld.inf
--- a/serviceapifw_plat/liw_criteria_api/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_criteria_api/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -29,6 +29,6 @@
 
 PRJ_EXPORTS
 
-../inc/LiwCommon.hrh     MW_LAYER_PLATFORM_EXPORT_PATH(LiwCommon.hrh)
-../inc/LiwCommon.rh     MW_LAYER_PLATFORM_EXPORT_PATH(LiwCommon.rh)
-../inc/LiwCommon.h     MW_LAYER_PLATFORM_EXPORT_PATH(LiwCommon.h)
+../inc/liwcommon.hrh     MW_LAYER_PLATFORM_EXPORT_PATH(liwcommon.hrh)
+../inc/liwcommon.rh     MW_LAYER_PLATFORM_EXPORT_PATH(liwcommon.rh)
+../inc/liwcommon.h     MW_LAYER_PLATFORM_EXPORT_PATH(liwcommon.h)
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_criteria_api/tsrc/group/liwtestcases.mmp
--- a/serviceapifw_plat/liw_criteria_api/tsrc/group/liwtestcases.mmp	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_criteria_api/tsrc/group/liwtestcases.mmp	Tue Nov 24 08:56:36 2009 +0200
@@ -58,7 +58,7 @@
 
 SOURCEPATH      ../src
 SOURCE          liwtestcases.cpp
-SOURCE          liwtestcasesBlocks.cpp 
+SOURCE          liwtestcasesblocks.cpp 
 SOURCE 					liwtestcasesasync.cpp
 
 //RESOURCE        resource_file
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_criteria_api/tsrc/inc/liw_async_testcase.h
--- a/serviceapifw_plat/liw_criteria_api/tsrc/inc/liw_async_testcase.h	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_criteria_api/tsrc/inc/liw_async_testcase.h	Tue Nov 24 08:56:36 2009 +0200
@@ -26,7 +26,7 @@
 // INCLUDES
 #include <liwcommon.h>
 #include <e32base.h>
-#include <LiwGenericParam.h>
+#include <liwgenericparam.h>
 
 // FORWARD DECLARATIONS
 class CLiwServiceHandler;
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_criteria_api/tsrc/inc/liwtestcases.h
--- a/serviceapifw_plat/liw_criteria_api/tsrc/inc/liwtestcases.h	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_criteria_api/tsrc/inc/liwtestcases.h	Tue Nov 24 08:56:36 2009 +0200
@@ -31,16 +31,16 @@
 #include <StifTestModule.h>
 #include <TestclassAssert.h>
 #include <liwservicehandler.h>
-#include <RTSecMgrScriptSession.h>
+#include <rtsecmgrscriptsession.h>
 
 #include <eikapp.h>
 #include <eikdoc.h>
 #include <e32std.h>
 #include <coeccntx.h>
-#include <aknviewappui.h>
+#include <aknViewAppUi.h>
 #include <akntabgrp.h>
 #include <aknnavide.h>
-#include <akntabobserver.h>
+#include <AknTabObserver.h>
 
 #include  "liw_async_testcase.h"
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcases.cpp
--- a/serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcases.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcases.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -23,7 +23,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "liwtestcases.h"
 #include <SettingServerClient.h>
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcasesasync.cpp
--- a/serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcasesasync.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcasesasync.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -22,7 +22,7 @@
 
 
 // INCLUDE FILES
-#include  <aknviewappui.h>
+#include  <aknViewAppUi.h>
 #include  <liwservicehandler.h>
 #include  "liw_async_testcase.h"
 //#include  "liwtestapp.hrh"
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcasesblocks.cpp
--- a/serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcasesblocks.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_criteria_api/tsrc/src/liwtestcasesblocks.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -25,20 +25,20 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "liwtestcases.h"
 
-#include  <aknviewappui.h>
+#include  <aknViewAppUi.h>
 #include  <liwservicehandler.h>
 //#include  "liwTC1.h"
 //#include  "liwtestapp.hrh"
 //#include  <liwtestapp.rsg>
 #include  <s32mem.h> // for read write stream
 
-#include <RTSecManager.h>
-#include <RTSecMgrUtility.h>
-#include <RTSecMgrScriptSession.h>
-#include <RTSecMgrCommonDef.h>
+#include <rtsecmanager.h>
+#include <rtsecmgrutility.h>
+#include <rtsecmgrscriptsession.h>
+#include <rtsecmgrcommondef.h>
 #include "liwtestapplit.h"
 
 #include  "liw_async_testcase.h"
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_generic_parameter_api/group/bld.inf
--- a/serviceapifw_plat/liw_generic_parameter_api/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_generic_parameter_api/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -29,10 +29,10 @@
 
 PRJ_EXPORTS
 
-../inc/LiwGenericParam.h     		MW_LAYER_PLATFORM_EXPORT_PATH(LiwGenericParam.h)
-../inc/LiwVariantType.hrh     	MW_LAYER_PLATFORM_EXPORT_PATH(LiwVariantType.hrh)
-../inc/LiwVariant.h     				MW_LAYER_PLATFORM_EXPORT_PATH(LiwVariant.h)
-../inc/LiwGenericParam.inl     	MW_LAYER_PLATFORM_EXPORT_PATH(LiwGenericParam.inl)
-../inc/LiwGenericParam.hrh     	MW_LAYER_PLATFORM_EXPORT_PATH(LiwGenericParam.hrh)
-../inc/LiwVariant.inl    				MW_LAYER_PLATFORM_EXPORT_PATH(LiwVariant.inl)
-../inc/LiwBufferExtension.h			MW_LAYER_PLATFORM_EXPORT_PATH(LiwBufferExtension.h)
+../inc/liwgenericparam.h     		MW_LAYER_PLATFORM_EXPORT_PATH(liwgenericparam.h)
+../inc/liwvarianttype.hrh     	MW_LAYER_PLATFORM_EXPORT_PATH(liwvarianttype.hrh)
+../inc/liwvariant.h     				MW_LAYER_PLATFORM_EXPORT_PATH(liwvariant.h)
+../inc/liwgenericparam.inl     	MW_LAYER_PLATFORM_EXPORT_PATH(liwgenericparam.inl)
+../inc/liwgenericparam.hrh     	MW_LAYER_PLATFORM_EXPORT_PATH(liwgenericparam.hrh)
+../inc/liwvariant.inl    				MW_LAYER_PLATFORM_EXPORT_PATH(liwvariant.inl)
+../inc/liwbufferextension.h			MW_LAYER_PLATFORM_EXPORT_PATH(liwbufferextension.h)
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_generic_parameter_api/inc/liwbufferextension.h
--- a/serviceapifw_plat/liw_generic_parameter_api/inc/liwbufferextension.h	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_generic_parameter_api/inc/liwbufferextension.h	Tue Nov 24 08:56:36 2009 +0200
@@ -24,7 +24,7 @@
 
 #include <fbs.h>
 
-#include "LiwVariant.h"
+#include "liwvariant.h"
 class CFbsBitmap;
 
 class CLiwBitmapBuffer : public CLiwBuffer
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_generic_parameter_api/inc/liwvarianttype.hrh
--- a/serviceapifw_plat/liw_generic_parameter_api/inc/liwvarianttype.hrh	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_generic_parameter_api/inc/liwvarianttype.hrh	Tue Nov 24 08:56:36 2009 +0200
@@ -21,7 +21,7 @@
 
 
 
-#include "LiwCommon.hrh"
+#include "liwcommon.hrh"
 #ifndef LIW_VARIANT_TYPE_HRH
 #define LIW_VARIANT_TYPE_HRH
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_provider_utility_api/group/bld.inf
--- a/serviceapifw_plat/liw_provider_utility_api/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_provider_utility_api/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -29,4 +29,4 @@
 
 PRJ_EXPORTS
 
-../inc/LiwMenu.h     MW_LAYER_PLATFORM_EXPORT_PATH(LiwMenu.h)
+../inc/liwmenu.h     MW_LAYER_PLATFORM_EXPORT_PATH(liwmenu.h)
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_service_handler_api/group/bld.inf
--- a/serviceapifw_plat/liw_service_handler_api/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_service_handler_api/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -29,4 +29,4 @@
 
 PRJ_EXPORTS
 
-../inc/LiwServiceHandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(LiwServiceHandler.h)
+../inc/liwservicehandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(liwservicehandler.h)
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_service_interface_base_api/group/bld.inf
--- a/serviceapifw_plat/liw_service_interface_base_api/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_service_interface_base_api/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -29,4 +29,4 @@
 
 PRJ_EXPORTS
 
-../inc/LiwServiceIfBase.h     MW_LAYER_PLATFORM_EXPORT_PATH(LiwServiceIfBase.h)
+../inc/liwserviceifbase.h     MW_LAYER_PLATFORM_EXPORT_PATH(liwserviceifbase.h)
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/liw_service_interface_menu_api/group/bld.inf
--- a/serviceapifw_plat/liw_service_interface_menu_api/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/liw_service_interface_menu_api/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -29,4 +29,4 @@
 
 PRJ_EXPORTS
 
-../inc/LiwServiceIfMenu.h     MW_LAYER_PLATFORM_EXPORT_PATH(LiwServiceIfMenu.h)
+../inc/liwserviceifmenu.h     MW_LAYER_PLATFORM_EXPORT_PATH(liwserviceifmenu.h)
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/rtsecuritymanager_client_api/group/bld.inf
--- a/serviceapifw_plat/rtsecuritymanager_client_api/group/bld.inf	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/rtsecuritymanager_client_api/group/bld.inf	Tue Nov 24 08:56:36 2009 +0200
@@ -29,5 +29,5 @@
 PRJ_EXPORTS
 ../inc/rtsecmanager.h     MW_LAYER_PLATFORM_EXPORT_PATH(rtsecmanager.h)
 ../inc/rtsecmgrscriptsession.h     MW_LAYER_PLATFORM_EXPORT_PATH(rtsecmgrscriptsession.h)
-../inc/rtsecmgrtrustinfo.h     MW_LAYER_PLATFORM_EXPORT_PATH(rtsecmgrtrustinfo.h)
+../inc/rtsecmgrtrustInfo.h     MW_LAYER_PLATFORM_EXPORT_PATH(rtsecmgrtrustinfo.h)
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group/ui_tsecuritymanager.mmp
--- a/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group/ui_tsecuritymanager.mmp	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group/ui_tsecuritymanager.mmp	Tue Nov 24 08:56:36 2009 +0200
@@ -57,7 +57,7 @@
 
 SOURCEPATH      ../src
 SOURCE          ui_tsecuritymanager.cpp
-SOURCE          ui_tsecuritymanagerBlocks.cpp
+SOURCE          ui_tsecuritymanagerblocks.cpp
 
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/rtsecuritymanager_client_api/tsrc/inc/ui_tsecuritymanager.h
--- a/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/inc/ui_tsecuritymanager.h	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/inc/ui_tsecuritymanager.h	Tue Nov 24 08:56:36 2009 +0200
@@ -34,7 +34,7 @@
 #include <e32base.h>
 #include <e32std.h>
 #include <f32file.h>
-#include <RTSecMgrScriptSession.h>
+#include <rtsecmgrscriptsession.h>
 #include <rtsecmgrcommondef.h>
 
 // Forward reference
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/rtsecuritymanager_client_api/tsrc/src/ui_tsecuritymanager.cpp
--- a/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/src/ui_tsecuritymanager.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/src/ui_tsecuritymanager.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -24,7 +24,7 @@
 
 
 // INCLUDE FILES
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "ui_tsecuritymanager.h"
 #include <SettingServerClient.h>
 
diff -r 1ae7a60a5444 -r bcef26ca2be3 serviceapifw_plat/rtsecuritymanager_client_api/tsrc/src/ui_tsecuritymanagerblocks.cpp
--- a/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/src/ui_tsecuritymanagerblocks.cpp	Fri Nov 06 13:05:00 2009 +0200
+++ b/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/src/ui_tsecuritymanagerblocks.cpp	Tue Nov 24 08:56:36 2009 +0200
@@ -27,16 +27,16 @@
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
-#include <Stiftestinterface.h>
+#include <StifTestInterface.h>
 #include "ui_tsecuritymanager.h"
 #include<coemain.h>
 
 #include <e32base.h>
 #include <e32std.h>
 #include <f32file.h>
-#include <RTSecManager.h>
-#include <RTSecMgrUtility.h>
-#include <RTSecMgrScriptSession.h>
+#include <rtsecmanager.h>
+#include <rtsecmgrutility.h>
+#include <rtsecmgrscriptsession.h>
 #include <rtsecmgrcommondef.h>
 //#include <rtsecmgrclient.h>
 #include<w32std.h>