diff -r 71ca22bcf22a -r 4f62049db6ac mmserv/tms/tmsserver/inc/tmsserver.h
--- a/mmserv/tms/tmsserver/inc/tmsserver.h	Tue Feb 02 01:08:46 2010 +0200
+++ b/mmserv/tms/tmsserver/inc/tmsserver.h	Fri Feb 19 23:19:48 2010 +0200
@@ -28,12 +28,12 @@
 
 // FORWARD DECLARATIONS
 class TMSServerShutDown;
-class CStartAndMonitorTMSCallThread;
+class TMSStartAndMonitorTMSCallThread;
 class TMSCallProxyLocal;
-class GlobalEffectsSettings;
-class CTarEventHandler;
-class CSPCenRepListener;
-class CSPAudioHandler;
+class TMSGlobalEffectsSettings;
+class TMSTarEventHandler;
+class TMSCSPCenRepListener;
+class TMSCenRepAudioHandler;
 
 // -----------------------------------------------------------------------------
 // TMSServer class
@@ -96,10 +96,10 @@
     TBool iDnlinkSession;
     TBool iUplinkSession;
 
-    mutable RPointerArray<CStartAndMonitorTMSCallThread> iTMSCallServList;
-    GlobalEffectsSettings* iEffectSettings;
-    CTarEventHandler* iTarHandler;
-    CSPAudioHandler* iAudioCenRepHandler;
+    mutable RPointerArray<TMSStartAndMonitorTMSCallThread> iTMSCallServList;
+    TMSGlobalEffectsSettings* iEffectSettings;
+    TMSTarEventHandler* iTarHandler;
+    TMSCenRepAudioHandler* iAudioCenRepHandler;
     TMSAudioOutput iCurrentRouting;
 
     RArray<TFourCC> iDnlCodecs;
@@ -107,7 +107,7 @@
     };
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread class
+// TMSStartAndMonitorTMSCallThread class
 // -----------------------------------------------------------------------------
 //
 class TMSCallProxyLocal : public RSessionBase
@@ -121,19 +121,19 @@
     };
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread class
+// TMSStartAndMonitorTMSCallThread class
 // -----------------------------------------------------------------------------
 //
-class CStartAndMonitorTMSCallThread : public CActive
+class TMSStartAndMonitorTMSCallThread : public CActive
     {
 public:
-    static CStartAndMonitorTMSCallThread* NewL(TMSServer* aServer);
-    ~CStartAndMonitorTMSCallThread();
+    static TMSStartAndMonitorTMSCallThread* NewL(TMSServer* aServer);
+    ~TMSStartAndMonitorTMSCallThread();
     TInt StartTMSCallServer(TMSCallProxyLocal& aHandle);
 
 private:
     // Construct
-    CStartAndMonitorTMSCallThread(TMSServer* aServer);
+    TMSStartAndMonitorTMSCallThread(TMSServer* aServer);
     void ConstructL();
 
     // From CActive