diff -r 71ca22bcf22a -r 4f62049db6ac mmserv/tms/tmscallserver/inc/cspdevsound.h
--- a/mmserv/tms/tmscallserver/inc/cspdevsound.h	Tue Feb 02 01:08:46 2010 +0200
+++ b/mmserv/tms/tmscallserver/inc/cspdevsound.h	Fri Feb 19 23:19:48 2010 +0200
@@ -22,24 +22,24 @@
 
 namespace TMS {
 
-class MCSPDevSoundObserver;
+class TMSCSPDevSoundObserver;
 
 /**
  *  Wrapper for CMMFDevSound
  *
  */
-NONSHARABLE_CLASS(CSPDevSound) : public CBase,
-                                 public MDevSoundObserver
+NONSHARABLE_CLASS(TMSCSPDevSound) : public CBase,
+                                    public MDevSoundObserver
     {
 public:
 
     /**
      * Destructor.
      */
-    virtual ~CSPDevSound();
+    virtual ~TMSCSPDevSound();
 
     /**
-     * Activates the dev sound stream. MCSPDevSoundObserver methods are called
+     * Activates the dev sound stream. TMSCSPDevSoundObserver methods are called
      * when activation goes ok or fails. If the stream is already active or
      * activating then nothing is done.
      */
@@ -118,7 +118,7 @@
 
 protected:
 
-    CSPDevSound(MCSPDevSoundObserver& aObserver);
+    TMSCSPDevSound(TMSCSPDevSoundObserver& aObserver);
 
     void ConstructL(TMMFState aMode, gint aAudioPreference,
             gint aAudioPriority);
@@ -155,7 +155,7 @@
      * Observer for successfull activation.
      * Not own.
      */
-    MCSPDevSoundObserver& iObserver;
+    TMSCSPDevSoundObserver& iObserver;
 
     };