--- a/mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadatampxaccess.h	Sun Mar 14 13:11:48 2010 +0000
+++ b/mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadatampxaccess.h	Sun Mar 28 16:37:43 2010 +0100
@@ -80,7 +80,7 @@
      * @param aCategory, specify the category
      * @return, name of the source, ownership transferred
      */
-    HBufC* CMmMtpDpMetadataMpxAccess::GetAbstractMediaNameL( CMPXMedia* aAbstractMedia,
+    HBufC* GetAbstractMediaNameL( CMPXMedia* aAbstractMedia,
         TMPXGeneralCategory aCategory );
 
     /**

--- a/mmappfw_plat/mpx_collection_utility_api/inc/mpxcollectionplaylist.h	Sun Mar 14 13:11:48 2010 +0000
+++ b/mmappfw_plat/mpx_collection_utility_api/inc/mpxcollectionplaylist.h	Sun Mar 28 16:37:43 2010 +0100
@@ -168,7 +168,7 @@
      *               The index can be -1 for no selection and must be
      *               Smaller than the number of items in the playlist
      */
-    IMPORT_C void CMPXCollectionPlaylist::SetToIndex( TInt aIndex );
+    IMPORT_C void SetToIndex( TInt aIndex );
     
 public: // State information   
     /**

--- a/mpx/collectionframework/collectionengine/inc/mpxcollectionengine.h	Sun Mar 14 13:11:48 2010 +0000
+++ b/mpx/collectionframework/collectionengine/inc/mpxcollectionengine.h	Sun Mar 28 16:37:43 2010 +0100
@@ -316,7 +316,7 @@
     *  cleanup stack item.
     *  @param aEngine pointer to the current engine instance
     */
-    static void CMPXCollectionEngine::ReleasePlugin(TAny* aEngine);
+    static void ReleasePlugin(TAny* aEngine);
 
     /**
     *  Called when a plugin is unloaded.