--- a/deviceupdatesui/cpqtsp/inc/CWPBioControl.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/cpqtsp/inc/CWPBioControl.h	Sun Mar 21 15:34:22 2010 +0530
@@ -22,7 +22,7 @@
 
 // INCLUDES
 #include <e32cmn.h>
-#include <MSVAPI.H>
+#include <msvapi.h>
 #include "CWPBootstrap.h"
 
 class CWPEngine;

--- a/deviceupdatesui/cpqtsp/inc/CpQtSpView.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/cpqtsp/inc/CpQtSpView.h	Sun Mar 21 15:34:22 2010 +0530
@@ -24,7 +24,7 @@
 #include <QGraphicsLinearLayout>
 #include <CWPNameValue.h>
 #include <CWPBioControl.h>
-#include <MSVAPI.H>
+#include <msvapi.h>
 #include <hbscrollarea.h>
 
 class CObserver : public CBase, public MMsvSessionObserver

--- a/deviceupdatesui/cpqtsp/src/CpQtSpView.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/cpqtsp/src/CpQtSpView.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -19,7 +19,7 @@
 #include <hbapplication.h>
 #include <hbtoolbar.h>
 #include <hbaction.h>
-#include <HbMenu.h>
+#include <hbmenu.h>
 #include <HbTextItem>
 #include <HbFontSpec>
 #include <HbMessageBox>
@@ -121,7 +121,7 @@
   if( errSave == KErrNone )
   {
   	//For testing purpose. Will be removed in future.
-    HbMessageBox::launchInformationMessageBox("Message Saved");
+    //HbMessageBox::launchInformationMessageBox("Message Saved");
   }
 }
 

--- a/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierutils.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/devicemanagementnotifierutils.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -15,16 +15,16 @@
 *
 */
 
-#include "devicemanagementnotifierutils.h"
 #include <hbdocumentloader.h>
 #include <hbdialog.h>
 #include <hblabel.h>
 #include <hbmessagebox.h>
-#include <HbAction.h>
-#include <e32Property.h>
-#include "syncmlnotifierparams.h"
+#include <hbaction.h>
+#include <e32property.h>
+#include <qdebug.h>
+#include "SyncMLNotifierParams.h"
 #include "PnpUtilLogger.h"
-#include <QDebug.h>
+#include "devicemanagementnotifierutils.h"
 
  enum TSyncmlHbNotifierKeys 
 		{

--- a/deviceupdatesui/devicemanagementnotifiersplugin/syncmlnotifierprivate.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/syncmlnotifierprivate.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -17,14 +17,14 @@
 
 
 #include <e32property.h>
-#include "syncmlnotifierprivate.h"
 #include <SyncMLClientDM.h>
 #include <SyncMLClient.h>
 #include <centralrepository.h>
 #include <DevManInternalCRKeys.h>
+#include <centralrepository.h>
 #include "nsmlconstantdefs.h"
-#include "syncmlnotifierparams.h"
-#include <centralrepository.h>
+#include "SyncMLNotifierParams.h"
+#include "syncmlnotifierprivate.h"
 
 
 

--- a/deviceupdatesui/deviceupdates/inc/dmadvancedview.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/dmadvancedview.h	Sun Mar 21 15:34:22 2010 +0530
@@ -30,10 +30,10 @@
 #include <hblabel.h>
 #include <hbdocumentloader.h>
 #include <hblistviewitem.h>
-#include <HbAnchorLayout.h>
+#include <hbanchorlayout.h>
 #include <hbicon.h>
 #include <QStandardItem>
-#include <QTranslator.h>
+#include <qtranslator.h>
 #include <QSortFilterProxyModel>
 #include <QModelIndex>
 #include <wlansdkpskeys.h>
@@ -42,7 +42,7 @@
 #include <centralrepository.h>
 #include <hbglobal.h>
 #include <etelpckt.h>
-#include <Etel3rdparty.h>
+#include <etel3rdparty.h>
 #include <etelmm.h>
 #include <etel.h>
 #include "serversettingsview.h"

--- a/deviceupdatesui/deviceupdates/inc/dmfotaview.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/dmfotaview.h	Sun Mar 21 15:34:22 2010 +0530
@@ -19,7 +19,7 @@
 #define DMFOTAVIEW_H_
 
 
-#include <HbApplication.h>
+#include <hbapplication.h>
 #include <hbwidget.h>
 #include <QGraphicsLinearLayout>
 #include <hbgroupbox.h>

--- a/deviceupdatesui/deviceupdates/inc/dminforetrieval.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/dminforetrieval.h	Sun Mar 21 15:34:22 2010 +0530
@@ -18,17 +18,17 @@
 
 #ifndef DMINFORETRIEVAL_H_
 #define DMINFORETRIEVAL_H_
-#include <QObject.h>
+#include <qobject.h>
 #include <featmgr.h>
 #include <QGraphicsItem>
 #include <e32base.h>
 #include <badesca.h>
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncProfile.h"
+#include "nsmldmsyncappengine.h"
+#include "nsmldmsyncprofile.h"
 //#include "NSmlDMSyncProfileItem.h"
-#include "NSmlDMSyncUtil.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncProfileList.h"
+#include "nsmldmsyncutil.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsyncprofilelist.h"
 #include "nsmldmdbnotifier.h"
 class DmAdvancedView;
 class TNSmlDMProfileItem;

--- a/deviceupdatesui/deviceupdates/inc/nsmldmdbnotifier.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmdbnotifier.h	Sun Mar 21 15:34:22 2010 +0530
@@ -22,7 +22,7 @@
 #include <e32std.h>
 #include <SyncMLObservers.h>
 #include <SyncMLClient.h>
-#include "NSmlDMSyncUtil.h"
+#include "nsmldmsyncutil.h"
 
 // CLASS DECLARATION
 

--- a/deviceupdatesui/deviceupdates/inc/nsmldmdef.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmdef.h	Sun Mar 21 15:34:22 2010 +0530
@@ -20,7 +20,7 @@
 #define NSMLDMDEF_H
 
 #include <e32base.h>
-#include "NSmlDMUIDefines.h"
+#include "nsmldmuidefines.h"
 //#include "NSmlDMSyncUi.hrh"
 
 #define KNSmlMaxURLLength 150

--- a/deviceupdatesui/deviceupdates/inc/nsmldmsyncappengine.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncappengine.h	Sun Mar 21 15:34:22 2010 +0530
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <SyncMLClient.h>
-#include "NSmlDMdef.h"
+#include "nsmldmdef.h"
 
 // FORWARD DECLARATIONS
 class CNSmlDMSyncHandler;

--- a/deviceupdatesui/deviceupdates/inc/nsmldmsynchandler.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsynchandler.h	Sun Mar 21 15:34:22 2010 +0530
@@ -24,9 +24,9 @@
 //#include <AknProgressDialog.h>
 #include <SyncMLObservers.h>
 //#include "NSmlDMProgress.h"
-#include "NSmlDMSyncUtil.h"
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncAppEngine.h"
+#include "nsmldmsyncutil.h"
+#include "nsmldmsyncprofile.h"
+#include "nsmldmsyncappengine.h"
 // FORWARD DECLARATIONS
 class CNSmlDMSyncState;
 class CNSmlDMActiveCaller;

--- a/deviceupdatesui/deviceupdates/inc/nsmldmsyncprofileitem.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprofileitem.h	Sun Mar 21 15:34:22 2010 +0530
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include "NSmlDMdef.h"
+#include "nsmldmdef.h"
 
 /**
 * TNSmlDMSyncProfileItem

--- a/deviceupdatesui/deviceupdates/inc/nsmldmsyncprofilelist.h	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprofilelist.h	Sun Mar 21 15:34:22 2010 +0530
@@ -23,7 +23,7 @@
 //  INCLUDES
 
 #include <e32base.h>
-#include "NSmlDMSyncProfileItem.h"
+#include "nsmldmsyncprofileitem.h"
 
 // FORWARD DECLARATIONS
 class TNSmlDMSyncProfileItem;

--- a/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -17,7 +17,7 @@
 */
 
 #include "dmadvancedview.h"
-#include "ServerSettingsView.h"
+#include "serversettingsview.h"
 
 DmAdvancedView::DmAdvancedView(HbMainWindow *mainWindow, HbView *mainView, QGraphicsItem *parent):HbView(parent),
     bluetooth(":/icons/qgn_prop_sml_bt.svg"),

--- a/deviceupdatesui/deviceupdates/src/dmfotaview.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/dmfotaview.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -18,9 +18,9 @@
 #include <hbmainwindow.h>
 #include <hbpushbutton.h>
 #include <hbaction.h>
-#include <HbDialog.h>
-#include <SysUtil.h>
-#include <HbScrollArea.h>
+#include <hbdialog.h>
+#include <sysutil.h>
+#include <hbscrollarea.h>
 #include <etel.h>
 #include <featmgr.h>
 #include <etelmm.h>
@@ -128,8 +128,7 @@
         {
         val = hbTrId("txt_device_update_dblist_product_release");
         str = QString::fromUtf16(prodrelease.Ptr(), prodrelease.Length());
-        val2 = hbTrId("txt_device_update_dblist_product_release_val_l1").arg(str);       
-        FormatList(val,val2);
+        FormatList(val,str);
         }
     
     //Software version
@@ -169,8 +168,7 @@
                 }
             val = hbTrId("txt_device_update_dblist_software_version");
             str = QString::fromUtf16(swversion.Ptr(), swversion.Length());
-            val2 = hbTrId("txt_device_update_dblist_software_version_val_l1").arg(str); 
-            FormatList(val,val2);
+            FormatList(val,str);
             }
 
     //Model
@@ -197,8 +195,7 @@
         {
         val = hbTrId("txt_device_update_dblist_model");
         str = QString::fromUtf16(phoneName.Ptr(), phoneName.Length());
-        val2 = hbTrId("txt_device_update_dblist_model_val_l1").arg(str); 
-        FormatList(val,val2);
+        FormatList(val,str);
         }
     }
     phone.Close();
@@ -209,8 +206,7 @@
         {
         val = hbTrId("txt_device_update_dblist_type");
         str = QString::fromUtf16(typedesignator.Ptr(), typedesignator.Length());
-        val2 = hbTrId("txt_device_update_dblist_type_val_l1").arg(str);        
-        FormatList(val,val2);
+        FormatList(val,str);
         }
       
     //Product Code
@@ -237,8 +233,7 @@
              {        
              val = hbTrId("txt_device_update_dblist_product_code");
              str = QString::fromUtf16(productcode.Ptr(), productcode.Length());  
-             val2 = hbTrId("txt_device_update_dblist_product_code_val_l1").arg(str);        
-             FormatList(val,val2);
+             FormatList(val,str);
              }                    
         }
 
@@ -247,8 +242,7 @@
         {
         val = hbTrId("txt_device_update_dblist_imei");
         str = QString::fromUtf16(imei.Ptr(), imei.Length()); 
-        val2 = hbTrId("txt_device_update_dblist_imei_val_l1").arg(str);
-        FormatList(val,val2);
+        FormatList(val,str);
         }
 
     

--- a/deviceupdatesui/deviceupdates/src/dminforetrieval.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/dminforetrieval.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -19,7 +19,7 @@
 #include <cmmanager.h>
 #include <cmconnectionmethod.h>
 #include "dmadvancedview.h"
-#include "NSmlDMSyncPrivateCRKeys.h"
+#include "nsmldmsyncprivatecrkeys.h"
 #include "dminforetrieval.h"
 
 DmInfo::DmInfo(DmAdvancedView* serversview, QGraphicsItem* /*parent*/)

--- a/deviceupdatesui/deviceupdates/src/main.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/main.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -18,7 +18,7 @@
 #include <hbinstance.h>
 #include <dmfotaview.h>
 #include <hbapplication.h>
-#include <QDebug.h>
+#include <qdebug.h>
 #include "nsmldmsyncprivatecrkeys.h"
 
 int main(int argc, char *argv[])

--- a/deviceupdatesui/deviceupdates/src/nsmldmdbnotifier.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/nsmldmdbnotifier.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -17,7 +17,7 @@
 
 
 #include "nsmldmdbnotifier.h"
-#include "nSmldmsyncdebug.h"
+#include "nsmldmsyncdebug.h"
 #include "nsmldmdef.h"
 
 // -----------------------------------------------------------------------------

--- a/deviceupdatesui/deviceupdates/src/nsmldmsyncappengine.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncappengine.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -16,11 +16,11 @@
 */
 
 
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncHandler.h"
 #include <collate.h>
 #include <e32property.h>
+#include "nsmldmsyncappengine.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsynchandler.h"
 #include "nsmldmsyncinternalpskeys.h"
 #include "dminforetrieval.h"
 

--- a/deviceupdatesui/deviceupdates/src/nsmldmsynchandler.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsynchandler.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -26,8 +26,8 @@
 #include <DevManInternalCRKeys.h>
 #include <centralrepository.h>
 #include <featmgr.h>
-#include "NSmlDMSyncHandler.h"
-#include "NSmlDMSyncDebug.h"
+#include "nsmldmsynchandler.h"
+#include "nsmldmsyncdebug.h"
 #include "nsmldmsyncinternalpskeys.h"
 
 // -----------------------------------------------------------------------------

--- a/deviceupdatesui/deviceupdates/src/nsmldmsyncprofile.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncprofile.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -16,11 +16,11 @@
 */
 
 
-#include "NSmlDMSyncProfile.h"
 #include <SyncMLTransportProperties.h>
-#include "NSmlDMdef.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncUtil.h"
+#include "nsmldmsyncprofile.h"
+#include "nsmldmdef.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsyncutil.h"
 
 // ============================ MEMBER FUNCTIONS ==============================
 //

--- a/deviceupdatesui/deviceupdates/src/nsmldmsyncprofileitem.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncprofileitem.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -16,8 +16,8 @@
 */
 
 
-#include "NSmlDMSyncProfileItem.h"
-#include "NSmlDMSyncDebug.h"
+#include "nsmldmsyncprofileitem.h"
+#include "nsmldmsyncdebug.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 

--- a/deviceupdatesui/deviceupdates/src/nsmldmsyncprofilelist.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncprofilelist.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -19,14 +19,12 @@
 #include <SyncMLTransportProperties.h>
 #include <centralrepository.h>
 #include <featmgr.h>
-
-#include "NSmlDMSyncPrivateCRKeys.h"
-
-#include "NSmlDMSyncProfileList.h"
-#include "NSmlDMSyncProfile.h"
-#include "NSmlDMSyncDebug.h"
-#include "NSmlDMSyncAppEngine.h"
-#include "NSmlDMSyncUtil.h"
+#include "nsmldmsyncprivatecrkeys.h"
+#include "nsmldmsyncprofilelist.h"
+#include "nsmldmsyncprofile.h"
+#include "nsmldmsyncdebug.h"
+#include "nsmldmsyncappengine.h"
+#include "nsmldmsyncutil.h"
 
 // ============================ MEMBER FUNCTIONS ==============================
 //

--- a/deviceupdatesui/deviceupdates/src/nsmldmsyncutil.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/nsmldmsyncutil.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -24,13 +24,12 @@
 #include <collate.h>
 #include <StringLoader.h>
 #include <avkon.rsg>
-
 #include <SettingEnforcementInfo.h> // VSettingEnforcementInfo
+#include <featmgr.h>
+#include "nsmldmdef.h"
+#include "nsmldmsyncutil.h"
+#include "nsmldmsyncdebug.h"
 
-#include "NSmlDMdef.h"
-#include "NSmlDMSyncUtil.h"
-#include "NSmlDMSyncDebug.h"
-#include <featmgr.h>
 
 /*****************************************************************************
  * class TUtil

--- a/deviceupdatesui/deviceupdates/src/serversettingsview.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/serversettingsview.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -16,10 +16,10 @@
 */
 
 #include <hblineedit.h>
-#include <HbMessageBox.h>
-#include "ServerSettingsView.h"
+#include <hbmessagebox.h>
+#include "serversettingsview.h"
 #include "dmadvancedview.h"
-#include "settingsdataformcustomItem.h"
+#include "settingsdataformcustomitem.h"
 
 ServerSettingsView::ServerSettingsView(HbMainWindow* mainWindow, DmAdvancedView* serversview, QString& header, QGraphicsItem* parent): HbView(parent), iMainWindow(mainWindow),
  form(NULL),dataformmodel(NULL),serversView(serversview),backbehaviorset(false)

--- a/deviceupdatesui/deviceupdates/src/settingsdataformcustomitem.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/settingsdataformcustomitem.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -20,8 +20,9 @@
 #include <hbdataformmodelitem.h>
 #include <hblineedit.h>
 #include <hbinputeditorinterface.h>
-#include <QGraphicsLinearLayout.h>
+#include <qgraphicslinearlayout.h>
 #include <hblabel.h>
+
 SettingsDataFormCustomItem::SettingsDataFormCustomItem(QGraphicsItem *parent) :
 HbDataFormViewItem(parent)
 {

--- a/deviceupdatesui/deviceupdatesqtsp/src/main.cpp	Fri Mar 19 04:31:04 2010 +0530
+++ b/deviceupdatesui/deviceupdatesqtsp/src/main.cpp	Sun Mar 21 15:34:22 2010 +0530
@@ -16,7 +16,7 @@
 */
 #include <hbinstance.h>
 #include <hbapplication.h>
-#include "DMTelServiceHandler.h"
+#include "DmTelServiceHandler.h"
 
 int main(int argc, char **argv)
 {