--- a/hapticsservices_plat/tactile_feedback_server_api/tsrc/group/testdomtactilefeedbackserver.mmp	Mon Jun 21 16:00:04 2010 +0300
+++ b/hapticsservices_plat/tactile_feedback_server_api/tsrc/group/testdomtactilefeedbackserver.mmp	Thu Aug 19 10:13:11 2010 +0300
@@ -51,7 +51,7 @@
 SOURCE          testtactilefeedbackserver.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         tactileclickplugin.lib
 

--- a/hapticsservices_pub/tactile_feedback_client_api/tsrc/group/testsdktfc.mmp	Mon Jun 21 16:00:04 2010 +0300
+++ b/hapticsservices_pub/tactile_feedback_client_api/tsrc/group/testsdktfc.mmp	Thu Aug 19 10:13:11 2010 +0300
@@ -45,7 +45,7 @@
 SOURCE          testsdktfcblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         touchfeedback.lib
 

--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp	Mon Jun 21 16:00:04 2010 +0300
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp	Thu Aug 19 10:13:11 2010 +0300
@@ -35,6 +35,8 @@
 const TInt KTactileChunkInitialSize = 4096; // 4kB
 const TInt KTactileChunkMaxSize     = 262144; // 256kB
 const TUid KTactileClickPluginUid   = { 0x2000B493 };
+
+_LIT( KChunkNameFormat, "PID_0x%Lx_TID_0x%Lx" );
 // ======== MEMBER FUNCTIONS ========
 
 // ---------------------------------------------------------------------------
@@ -86,15 +88,14 @@
         }
 
     // #2 Create shared chunk 
-    RThread me;
-
     TTactileFeedbackConnectData data;
     
     // Set window group identifier
     data.iWindowGroupId = CCoeEnv::Static()->RootWin().Identifier();
            
-    // We use our own thread name as name for the chunk       
-    data.iChunkName.Copy( me.Name().Right( KMaxKernelName ) );
+    // We use our own process id and thread id as name for the chunk
+    data.iChunkName.Format( KChunkNameFormat,
+                            RProcess().Id().Id(), RThread().Id().Id() );
     
     // Now create the chunk
     TInt err = iChunk.CreateGlobal( data.iChunkName, 

--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/group/tactiletoneplugin.mmp	Mon Jun 21 16:00:04 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/group/tactiletoneplugin.mmp	Thu Aug 19 10:13:11 2010 +0300
@@ -53,4 +53,4 @@
 LIBRARY                 ecom.lib
 LIBRARY                 mediaclientaudio.lib
 LIBRARY                 tactilefeedbackresolver.lib
-LIBRARY                 profileeng.lib 
+LIBRARY                 profileeng.lib