diff --git a/apps/registrar_client/SIPRegistrarClient.cpp b/apps/registrar_client/SIPRegistrarClient.cpp
index 52f31c54..7524c41a 100644
--- a/apps/registrar_client/SIPRegistrarClient.cpp
+++ b/apps/registrar_client/SIPRegistrarClient.cpp
@@ -60,7 +60,7 @@ SIPRegistrarClient* SIPRegistrarClient::instance()
 }
 
 SIPRegistrarClient::SIPRegistrarClient(const string& name)
-  : AmEventQueue(this),
+  : AmEventQueueThread(this),
     uac_auth_i(NULL),
     AmDynInvokeFactory(MOD_NAME)
 { 
diff --git a/apps/registrar_client/SIPRegistrarClient.h b/apps/registrar_client/SIPRegistrarClient.h
index 66dc951b..c9cdcc4f 100644
--- a/apps/registrar_client/SIPRegistrarClient.h
+++ b/apps/registrar_client/SIPRegistrarClient.h
@@ -41,8 +41,7 @@ using std::string;
 struct SIPNewRegistrationEvent;
 class SIPRemoveRegistrationEvent;
 
-class SIPRegistrarClient  : public AmThread,
-			    public AmEventQueue,
+class SIPRegistrarClient  : public AmEventQueueThread,
 			    public AmEventHandler,
 			    public AmDynInvoke,
 			    public AmDynInvokeFactory