--- a/src/hbcore/theme/hbthemelistener_symbian_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemelistener_symbian_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -43,7 +43,7 @@
 /**
  * Constructor
  */
-CThemeListenerPrivate::CThemeListenerPrivate(HbThemeClientPrivate *themeClient)
+CHbThemeListenerPrivate::CHbThemeListenerPrivate(HbThemeClientPrivate *themeClient)
                       : CActive(EPriorityNormal), themeClient(themeClient)
 {
     User::LeaveIfError(themeState.Attach(KServerUid3,KThemeName));
@@ -56,7 +56,7 @@
 /**
  * Destructor
  */
-CThemeListenerPrivate::~CThemeListenerPrivate()
+CHbThemeListenerPrivate::~CHbThemeListenerPrivate()
 {
     Cancel();
     themeState.Close();
@@ -65,10 +65,10 @@
 /**
  * RunL
  */
-void CThemeListenerPrivate::RunL()
+void CHbThemeListenerPrivate::RunL()
 {
 #ifdef THEME_LISTENER_TRACES
-    qDebug() << "CThemeListenerPrivate::RunL: start\n appname"<<HbMemoryUtils::getCleanAppName();
+    qDebug() << "CHbThemeListenerPrivate::RunL: start\n appname"<<HbMemoryUtils::getCleanAppName();
 #endif
     themeState.Subscribe(iStatus);
     SetActive();    
@@ -80,9 +80,9 @@
     QString str((QChar*)name.Ptr(),name.Length());
 #ifdef THEME_LISTENER_TRACES
     if (r==KErrNone) {
-        qDebug() << "CThemeListenerPrivate::RunL: Get() Themename" <<str; 
+        qDebug() << "CHbThemeListenerPrivate::RunL: Get() Themename" <<str; 
     } else {
-        qDebug() << "CThemeListenerPrivate::RunL: Get() Error!!!!!!!!";
+        qDebug() << "CHbThemeListenerPrivate::RunL: Get() Error!!!!!!!!";
     }
 #endif
     themeClient->handleThemeChange(str);
@@ -92,7 +92,7 @@
 /**
  * DoCancel
  */
-void CThemeListenerPrivate::DoCancel()
+void CHbThemeListenerPrivate::DoCancel()
 {
     themeState.Cancel();
 }