--- a/dlnasrv_plat/upnp_media_server_metadata_api/inc/upnpfilesharing.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/dlnasrv_plat/upnp_media_server_metadata_api/inc/upnpfilesharing.h	Sun Mar 28 16:37:07 2010 +0100
@@ -287,7 +287,7 @@
     * @since S60 5.0 HN
     * @return media server client refernce
     */                              
-    IMPORT_C RUpnpMediaServerClient& CUpnpFileSharing::MediaServerClient( );
+    IMPORT_C RUpnpMediaServerClient& MediaServerClient( );
 
 private:
 

--- a/upnpframework/upnpmusicadapter/inc/upnpmpxhelper.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/upnpframework/upnpmusicadapter/inc/upnpmpxhelper.h	Sun Mar 28 16:37:07 2010 +0100
@@ -151,12 +151,12 @@
     /**
      * constructor
      */
-    CUPnPMpxHelper::CUPnPMpxHelper();
+    CUPnPMpxHelper();
 
     /**
      * 2nd phase constructor
      */
-    void CUPnPMpxHelper::ConstructL( const TUid& aModeId );
+    void ConstructL( const TUid& aModeId );
 
 private: // members
 

--- a/upnpframework/upnputilities/inc/upnpcommonutils.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/upnpframework/upnputilities/inc/upnpcommonutils.h	Sun Mar 28 16:37:07 2010 +0100
@@ -193,7 +193,7 @@
      * @param aFilePath original file path
      * @return HBufC pointer to the new filepath
      */
-    IMPORT_C static HBufC* UPnPCommonUtils::RenameFileL( const TDesC& aFilePath );
+    IMPORT_C static HBufC* RenameFileL( const TDesC& aFilePath );
     
     /**
      * Delete upnp genereated temporary files from download locations

--- a/upnpmediaserver/contentdirectoryservice/inc/dlna/upnpdlnafilter.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/upnpmediaserver/contentdirectoryservice/inc/dlna/upnpdlnafilter.h	Sun Mar 28 16:37:07 2010 +0100
@@ -144,7 +144,7 @@
      * @return a3rdhField 3rdhField from protocolInfo (if it is DLNA compatible) which is
      *       related to founded resource. Ownership is transfered to the caller.
      */
-    HBufC8* CUpnpDlnaFilter::ThirdFieldFromCdL( const TDesC8& aContentUri );
+    HBufC8* ThirdFieldFromCdL( const TDesC8& aContentUri );
 
     /**
      * Gets name of file with content for given object's id.

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h	Sun Mar 28 16:37:07 2010 +0100
@@ -156,7 +156,7 @@
    	static HBufC8* BuildImportUriLC(TInt aResId);
    	static HBufC8* BuildImportUriShorterLC(TInt64 aResId);
 	static HBufC8* BuildContentUriL(TInt aResId, const TDesC& aFileExten, TDesC8& aObjectId);
-    static HBufC8* UpnpCdUtils::RandomizeL(TInt aRange);
+    static HBufC8* RandomizeL(TInt aRange);
     /**
     * Checks whether the element is required and removes the attribute notifying it
     * @since Series S60 3.0

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h	Sun Mar 28 16:37:07 2010 +0100
@@ -99,7 +99,7 @@
 
 public: //from CUpnpServiceImplementation
     
-    CUpnpStateHandler* CUpnpContentDirectory::StateHandler();
+    CUpnpStateHandler* StateHandler();
     /**
     * Handles auto destroy events.
     * @since Series 60 2.6

--- a/upnpmpxplugins/upnpplaybackplugins/inc/upnpaudiopolicy.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/upnpmpxplugins/upnpplaybackplugins/inc/upnpaudiopolicy.h	Sun Mar 28 16:37:07 2010 +0100
@@ -73,7 +73,7 @@
     /**
      * destructor
      */
-    CUPnPAudioPolicy::~CUPnPAudioPolicy();
+    ~CUPnPAudioPolicy();
 
     /**
      * request for start playback

--- a/upnpmpxplugins/upnpplaybackplugins/inc/upnptrack.h	Sun Mar 14 13:10:49 2010 +0000
+++ b/upnpmpxplugins/upnpplaybackplugins/inc/upnptrack.h	Sun Mar 28 16:37:07 2010 +0100
@@ -257,7 +257,7 @@
      * A helper method that converts text from 8-bit to 16-bit.
      * Note that a member buffer is used that has static length.
      */
-    const HBufC16* CUPnPTrack::To16LC( const TDesC8& aText );
+    const HBufC16* To16LC( const TDesC8& aText );
 
 private: // data