diff -r e686773b3f54 -r 0ba2181d7c28 phonebookengines/contactsmodel/tsrc/cntmodel2/T_Packager.cpp
--- a/phonebookengines/contactsmodel/tsrc/cntmodel2/T_Packager.cpp	Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookengines/contactsmodel/tsrc/cntmodel2/T_Packager.cpp	Fri Mar 19 09:27:18 2010 +0200
@@ -1,19 +1,21 @@
-// Copyright (c) 2005-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Packaging Test module
-// 
-//
+/*
+* Copyright (c) 2005-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* Packaging Test module
+*
+*/
+
 
 
 #include <e32test.h>
@@ -23,13 +25,13 @@
 
 #include <cntfldst.h>
 #include "testhelpers.h"
-//#include "T_CntTest.h"
+//#include "t_cnttest.h"
 
-#include "NbCntTestLib/NbCntTestLib.h" 
+#include "nbcnttestlib/nbcnttestlib.h" 
 
-#include "T_Packager.h"
-#include "T_CntTestImplDefs.h"
-#include "CCntPackager.h"
+#include "t_packager.h"
+#include "t_cnttestimpldefs.h"
+#include "ccntpackager.h"
 #include <cntfilt.h>
 
 
@@ -37,7 +39,7 @@
 //#define RUN_CNT
 #define RUN_PL
 
-//
+////////////////////////////////////////////////////////////////////
 // This test used to spit out a lot of html files which display
 // the contents of contact items. There are a lot of files
 // generated in the process which, as this is normally run on the
@@ -47,7 +49,7 @@
 //
 // So, uncomment the following line to turn on contact dumping.
 //#define __T_PACKAGER_DUMP_CONTACT__
-//
+////////////////////////////////////////////////////////////////////
 
 
 #define KUidContactFieldCustom1Value		0x101FD209
@@ -95,8 +97,8 @@
 	CContactItem* card = CContactCard::NewLC(&goldenTemplate);
 	TCnt theCnt(card);
 
-	theCnt[KUidContactFieldGivenName] = _L("AExample");
-	theCnt[KUidContactFieldFamilyName] = _L("BExample");
+	theCnt[KUidContactFieldGivenName] = _L("David");
+	theCnt[KUidContactFieldFamilyName] = _L("Coulthard");
 
 	theCnt[KUidContactFieldPhoneNumber] & KHome & KVoice & KCell = _L("mo1 39849342");
 	theCnt[KUidContactFieldPhoneNumber] & KHome & KVoice & KCell += _L("mo2 34530903495803948503984545");
@@ -107,7 +109,7 @@
 	theCnt[KUidContactFieldIMAddress] & KHome & KWv = _L("wireless@village");
 	theCnt[KUidContactFieldSecondName] = _L("Second name");
 
-	theCnt[KUidContactFieldCompanyName] = _L("SymbianFoundation");
+	theCnt[KUidContactFieldCompanyName] = _L("McLaren");
 	theCnt[KUidContactFieldJobTitle]	= _L("Driver");
 	theCnt[KUidContactFieldPhoneNumber] & KWork & KVoice = _L("work Tel 2342");
 
@@ -226,8 +228,8 @@
 	CContactItem* card = CContactCard::NewLC(&goldenTemplate);
 	TCnt theCnt(card);
 
-	theCnt[KUidContactFieldGivenName] = _L("AExample");
-	theCnt[KUidContactFieldFamilyName] = _L("BExample");
+	theCnt[KUidContactFieldGivenName] = _L("David");
+	theCnt[KUidContactFieldFamilyName] = _L("Coulthard");
 
 	theCnt[KUidContactFieldPhoneNumber] & KHome & KVoice & KCell = _L("mo1 39849342");
 	theCnt[KUidContactFieldPhoneNumber] & KHome & KVoice & KCell += _L("mo2 34530903495803948503984545");
@@ -238,7 +240,7 @@
 	theCnt[KUidContactFieldIMAddress] & KHome & KWv = _L("wireless@village");
 	theCnt[KUidContactFieldSecondName] = _L("Second name");
 
-	theCnt[KUidContactFieldCompanyName] = _L("SymbianFoundation");
+	theCnt[KUidContactFieldCompanyName] = _L("McLaren");
 	theCnt[KUidContactFieldJobTitle]	= _L("Driver");
 	theCnt[KUidContactFieldPhoneNumber] & KWork & KVoice = _L("work Tel 2342");
 
@@ -913,8 +915,8 @@
 	CContactItem* card = CContactCard::NewLC(&goldenTemplate);
 	TCnt theCnt(card);
 
-	theCnt[KUidContactFieldGivenName] = _L("AExample");
-	theCnt[KUidContactFieldFamilyName] = _L("BExample");
+	theCnt[KUidContactFieldGivenName] = _L("David");
+	theCnt[KUidContactFieldFamilyName] = _L("Coulthard");
 
 	theCnt[KUidContactFieldPhoneNumber] & KHome & KVoice & KCell = _L("mo1 39849342");
 	theCnt[KUidContactFieldPhoneNumber] & KHome & KVoice & KCell += _L("mo2 34530903495803948503984545");
@@ -925,7 +927,7 @@
 	theCnt[KUidContactFieldIMAddress] & KHome & KWv = _L("wireless@village");
 	theCnt[KUidContactFieldSecondName] = _L("Second name");
 
-	theCnt[KUidContactFieldCompanyName] = _L("SymbianFoundation");
+	theCnt[KUidContactFieldCompanyName] = _L("McLaren");
 	theCnt[KUidContactFieldJobTitle]	= _L("Driver");
 	theCnt[KUidContactFieldPhoneNumber] & KWork & KVoice = _L("work Tel 2342");