--- a/creator/inc/creator_scriptelement.h	Sun Mar 14 13:16:37 2010 +0000
+++ b/creator/inc/creator_scriptelement.h	Sun Mar 28 16:41:16 2010 +0100
@@ -51,7 +51,7 @@
 class CCreatorScriptElementCache : public CBase
 {
 public:
-    static CCreatorScriptElementCache* CCreatorScriptElementCache::NewL();
+    static CCreatorScriptElementCache* NewL();
     virtual ~CCreatorScriptElementCache();    
         
     void RemoveElements();    
@@ -93,7 +93,7 @@
 {
 public:
 
-    static CCreatorScriptElement* CCreatorScriptElement::NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
+    static CCreatorScriptElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
 
     /**
      * Destructor

--- a/creator/inc/creator_virtualphonebook.h	Sun Mar 14 13:16:37 2010 +0000
+++ b/creator/inc/creator_virtualphonebook.h	Sun Mar 28 16:41:16 2010 +0100
@@ -275,8 +275,8 @@
 public:
 	void ParseL(CCommandParser* parser, TParseParams /*aCase = 0*/);
 	
-	TInt CVirtualPhonebookParameters::ScriptLinkId() const;
-	void CVirtualPhonebookParameters::SetScriptLinkId(TInt aLinkId);
+	TInt ScriptLinkId() const;
+	void SetScriptLinkId(TInt aLinkId);
 	RPointerArray<CCreatorContactField> iContactFields;
 
     HBufC*  iGroupName;

--- a/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/inc/HtiBtCommInterface.h	Sun Mar 14 13:16:37 2010 +0000
+++ b/htiui/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/inc/HtiBtCommInterface.h	Sun Mar 28 16:41:16 2010 +0100
@@ -139,8 +139,8 @@
         * During Connect(), connect the server
         * to remote BT host service.
         */
-        TInt RHtiBtCommInterface::ConnectBt( TDesC8& aDeviceNameOrAddress,
-                                             TInt aPort );
+        TInt ConnectBt( TDesC8& aDeviceNameOrAddress,
+                        TInt aPort );
 
 };