diff -r 91746b151f97 -r 997690c3397a bluetoothengine/btnotif/btnotifsrv/inc/btnotifconnectiontracker.h
--- a/bluetoothengine/btnotif/btnotifsrv/inc/btnotifconnectiontracker.h	Fri Jun 11 13:48:51 2010 +0300
+++ b/bluetoothengine/btnotif/btnotifsrv/inc/btnotifconnectiontracker.h	Wed Jun 23 18:23:52 2010 +0300
@@ -26,7 +26,7 @@
 
 class CBTNotificationManager;
 class CbtnotifConnectionTrackerTest;
-class CBTNotifPairingManager;
+class CBTNotifSecurityManager;
 
 
 
@@ -91,14 +91,14 @@
         { return iSockServ; }
   
     /**
-     * Processes a message for notifiers related to pairings.
+     * Processes a message for notifiers related to remote devices.
      * ( These are usually issued by BT stack. However, any application
      * is not restricted to do so (e.g., for testing purpose).
      *
      * @since Symbian^4
      * @param aMessage The message containing the details of the client request.
      */
-    void HandlePairingNotifierRequestL( const RMessage2& aMessage );
+    void HandleNotifierRequestL( const RMessage2& aMessage );
     
     /**
      * Handle a request related to pairing.
@@ -167,7 +167,7 @@
      * Object for managing the application pairing.
      * Own.
      */
-    CBTNotifPairingManager* iPairingManager;
+    CBTNotifSecurityManager* iPairingManager;
 
     BTUNITTESTHOOK