--- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -43,7 +43,7 @@
 {
     DPRINT << ": IN";
 
-    m_cpSettingsWrapper = new CpSettingsWrapper;
+    m_cpSettingsWrapper = new SettingsWrapper;
     m_pSetWrapper = new PSetWrapper; 
     DPRINT << "PSetWrapper created";
     
@@ -160,14 +160,14 @@
     
     if (showCallDurationStatus) {
         m_DataItemShowCallDuration->setContentWidgetData(
-            "text", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+            "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
         m_DataItemShowCallDuration->setContentWidgetData(
-            "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+            "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
     } else {
         m_DataItemShowCallDuration->setContentWidgetData(
-            "text", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+            "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
         m_DataItemShowCallDuration->setContentWidgetData(
-            "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+            "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
     }
 
     DPRINT << ": OUT";
@@ -373,23 +373,23 @@
 
         if (showCallDurationStatus) {
             m_DataItemShowCallDuration->setContentWidgetData(
-                "text", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+                "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
             m_DataItemShowCallDuration->setContentWidgetData(
-                "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+                "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
         } else {
             m_DataItemShowCallDuration->setContentWidgetData(
-                "text", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+                "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
             m_DataItemShowCallDuration->setContentWidgetData(
-                "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+                "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
         }
         emit showGlobalNote(
             m_activeNoteId, 
             emit hbTrId("txt_phone_info_not_allowed"), 
             HbMessageBox::MessageTypeWarning);
     } else {
-        if (showCallDurationText == hbTrId("txt_phone_setlabel_val_yes")) {
+        if (showCallDurationText == hbTrId("txt_phone_setlabel_show_call_duration_val_on")) {
             m_cpSettingsWrapper->setShowCallDuration(true);
-        } else if (showCallDurationText == hbTrId("txt_phone_setlabel_val_no")){
+        } else if (showCallDurationText == hbTrId("txt_phone_setlabel_show_call_duration_val_off")){
             m_cpSettingsWrapper->setShowCallDuration(false);
         } else {
             DPRINT << "nothing done";