--- a/vpnengine/vpnmanager/src/vpnmanagerserver.cpp	Thu Jan 07 13:26:15 2010 +0200
+++ b/vpnengine/vpnmanager/src/vpnmanagerserver.cpp	Mon Jan 18 21:14:04 2010 +0200
@@ -21,7 +21,7 @@
 
 #include "vpnmanagerserver.h"
 #include "vpnmanagersession.h"
-#include "requestdispatcher.h"
+#include "vpnapiservant.h"
 
 
 const TUint CVpnManagerServer::iVpnManRangeCount = 3;
@@ -60,7 +60,7 @@
 
 CVpnManagerServer::~CVpnManagerServer()
     {
-    delete iRequestDispatcher;
+    delete iVpnApiServant;
     iFs.Close();
     }
 
@@ -83,7 +83,7 @@
     {
     User::LeaveIfError(iFs.Connect());
     User::LeaveIfError(iFs.CreatePrivatePath(EDriveC));
-    iRequestDispatcher = CRequestDispatcher::NewL(iFs);    
+    iVpnApiServant = CVpnApiServant::NewL(iFs);       
     StartL(KVpnManagerServer);
     }
 
@@ -102,7 +102,7 @@
 
     // Make new session
     return CVpnManagerSession::NewL(*const_cast<CVpnManagerServer*>(this),
-                                    *iRequestDispatcher);
+                                    *iVpnApiServant);
     }
 
 void CVpnManagerServer::IncrementSessions()