diff -r 71ca22bcf22a -r 4f62049db6ac mmserv/tms/tmsserver/src/cspaudiohandler.cpp
--- a/mmserv/tms/tmsserver/src/cspaudiohandler.cpp	Tue Feb 02 01:08:46 2010 +0200
+++ b/mmserv/tms/tmsserver/src/cspaudiohandler.cpp	Fri Feb 19 23:19:48 2010 +0200
@@ -11,7 +11,7 @@
  *
  * Contributors:
  *
- * Description:  Implements the class CSPAudioHandler
+ * Description:  Implements the class TMSCenRepAudioHandler
  *
  */
 
@@ -33,13 +33,13 @@
 
 using namespace TMS;
 // ---------------------------------------------------------------------------
-// CSPAudioHandler::NewL.
+// TMSCenRepAudioHandler::NewL.
 // ---------------------------------------------------------------------------
 //
-CSPAudioHandler* CSPAudioHandler::NewL(TMSServer* aServer)
+TMSCenRepAudioHandler* TMSCenRepAudioHandler::NewL(TMSServer* aServer)
     {
     TRACE_PRN_FN_ENT;
-    CSPAudioHandler* self = new (ELeave) CSPAudioHandler(aServer);
+    TMSCenRepAudioHandler* self = new (ELeave) TMSCenRepAudioHandler(aServer);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -51,7 +51,7 @@
 // Destructs the object by canceling first ongoing monitoring.
 // ---------------------------------------------------------------------------
 //
-CSPAudioHandler::~CSPAudioHandler()
+TMSCenRepAudioHandler::~TMSCenRepAudioHandler()
     {
     TRACE_PRN_FN_ENT;
     delete iIncallLoudspeakerVolumeListener;
@@ -60,10 +60,10 @@
     }
 
 // ---------------------------------------------------------------------------
-// CSPAudioHandler::SetLoudSpeakerVol
+// TMSCenRepAudioHandler::SetLoudSpeakerVol
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::SetLoudSpeakerVol(TInt vol)
+void TMSCenRepAudioHandler::SetLoudSpeakerVol(TInt vol)
     {
     if (iIncallLoudspeakerVolumeListener)
         {
@@ -72,10 +72,10 @@
     }
 
 // ---------------------------------------------------------------------------
-// CSPAudioHandler::SetEarPieceVol
+// TMSCenRepAudioHandler::SetEarPieceVol
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::SetEarPieceVol(TInt vol)
+void TMSCenRepAudioHandler::SetEarPieceVol(TInt vol)
     {
     if (iIncallEarVolumeListener)
         {
@@ -85,10 +85,10 @@
 
 // ---------------------------------------------------------------------------
 // From MCSPCenRepObserver
-// CSPAudioHandler::HandleNotifyCenRepL
+// TMSCenRepAudioHandler::HandleNotifyCenRepL
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::HandleNotifyCenRepL(const TUid /*aUid*/,
+void TMSCenRepAudioHandler::HandleNotifyCenRepL(const TUid /*aUid*/,
         const TUint32 aKey, TInt aVal)
     {
     TRACE_PRN_FN_ENT;
@@ -107,7 +107,7 @@
 // Constructs the monitor.
 // ---------------------------------------------------------------------------
 //
-CSPAudioHandler::CSPAudioHandler(TMSServer* aServer) :
+TMSCenRepAudioHandler::TMSCenRepAudioHandler(TMSServer* aServer) :
     iTMSSer(aServer)
     {
     TRACE_PRN_FN_ENT;
@@ -119,14 +119,14 @@
 // Second phase construction.
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::ConstructL()
+void TMSCenRepAudioHandler::ConstructL()
     {
     TRACE_PRN_FN_ENT;
 
-    iIncallLoudspeakerVolumeListener = CSPCenRepListener::NewL(
+    iIncallLoudspeakerVolumeListener = TMSCenRepListener::NewL(
             KCRUidInCallVolume, KTelIncallLoudspeakerVolume, this);
 
-    iIncallEarVolumeListener = CSPCenRepListener::NewL(KCRUidInCallVolume,
+    iIncallEarVolumeListener = TMSCenRepListener::NewL(KCRUidInCallVolume,
             KTelIncallEarVolume, this);
 
     // Initialize audio volumes