--- a/gba/gbaserver/inc/dataretriever.h	Thu Aug 19 10:45:23 2010 +0300
+++ b/gba/gbaserver/inc/dataretriever.h	Tue Aug 31 16:04:40 2010 +0300
@@ -26,7 +26,7 @@
 #include <http.h>
 #include <es_sock.h> 
 #include <commdbconnpref.h>
-#include <cmmanagerext.h>
+#include <cmmanager.h>
 #include <hash.h>
 #include "M3GPPAuthenticationCallback.h"
 
@@ -147,7 +147,7 @@
           RSocketServ               iSockServ;
           C3GPPBootstrapHttpHandler* iHttpHandler;          // we own this    
           MBootstrapCallBack*       iBootstrapCallBack;     // don't own this
-          RCmManagerExt             iCmManagerExt;
+          RCmManager             	iCmManager;
     };