diff -r 613943a21004 -r 9386f31cc85b bluetoothengine/bteng/btengsettings/src/btengsettings.cpp
--- a/bluetoothengine/bteng/btengsettings/src/btengsettings.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/btengsettings/src/btengsettings.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 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"
@@ -191,7 +191,7 @@
     TRACE_FUNC_ENTRY
     aName.Zero();
     TBool nameStatus = EFalse;
-    TBuf<KMaxBluetoothNameLen> tmpName;
+    TBuf<KHCILocalDeviceNameMaxLength> tmpName;
     
     TInt err = GetLocalNameModified( nameStatus );
     
@@ -413,7 +413,7 @@
     if( !err )
         {
             // BT registry keeps the device name in UTF-8 format.
-        TBuf8<KMaxBluetoothNameLen> utf8Name;
+        TBuf8<KHCILocalDeviceNameMaxLength> utf8Name;
         if( aName.Length() == 0 )
             {
                 // The error can be > 0 if there are unconverted characters.