diff -r d1c62c765e48 -r cfea66083b62 phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -157,7 +157,7 @@
 {
     //except user cancels
     
-    appendAction("txt_phone_setlabel_all_calls", selectAction, "Cancel");
+    appendAction("txt_phone_title_all_calls", selectAction, "Cancel");
     EXPECT(PSetCallDivertingWrapper, getDefaultNumbers);
     m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData("text", "");
     m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData(
@@ -167,7 +167,7 @@
     QVERIFY(verify());
     
     //except user selects vmb
-    appendAction("txt_phone_setlabel_all_calls", selectItem, "txt_phone_setlabel_voice_mbx");
+    appendAction("txt_phone_title_all_calls", selectItem, "txt_phone_list_to_voice_mailbox");
     EXPECT(PSetCallDivertingWrapper, getDefaultNumbers);
     EXPECT(PSetCallDivertingWrapper, queryVoiceMailBoxNumber).willOnce(invoke(fillNumber)).returns(0);
     EXPECT(SsSettingsWrapper, get);
@@ -195,7 +195,7 @@
     m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData("text", "");
     m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData(
         "checkState", Qt::Checked);
-    appendAction("txt_phone_setlabel_all_calls", selectItem, "0401234567");
+    appendAction("txt_phone_title_all_calls", selectItem, "0401234567");
     EXPECT(PSetCallDivertingWrapper,getDefaultNumbers);
     EXPECT(SsSettingsWrapper,get);
     EXPECT(PSetCallDivertingWrapper,setCallDiverting);
@@ -316,8 +316,8 @@
 void UT_CpDivertPlugin::t_popUpTimerQuery()
 {
     const QString delayLnString("txt_phone_list_ln_seconds");
-        
-    appendAction("txt_phone_setlabel_if_not_answered", selectItem, "txt_phone_list_enter_number_manually");
+    
+    appendAction("txt_phone_title_if_not_answered", selectItem, "txt_phone_list_enter_number_manually");
     appendAction("txt_phone_info_number", insertText, "12345");
     appendAction("txt_phone_info_number", selectAction, "OK");
     appendAction("txt_phone_title_delay", selectItem, delayLnString);