2 files changed, 14 insertions, 16 deletions

diff --git a/src/plugins/voiceagents/include/VoiceAgent.h b/src/plugins/voiceagents/include/VoiceAgent.h
index 4dd55d4..684baf0 100644
--- a/src/plugins/voiceagents/include/VoiceAgent.h
+++ b/src/plugins/voiceagents/include/VoiceAgent.h
@@ -22,17 +22,16 @@
 #include "interfaces/voiceagents/IVoiceAgent.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace voiceagents {
 /*
  * Default implementation of IVoiceAgent interface.
  */
-class VoiceAgent : public vshl::common::interfaces::IVoiceAgent {
+class VoiceAgent : public vshlcore::common::interfaces::IVoiceAgent {
 public:
   // Creates @c VoiceAgent instance
   static shared_ptr<VoiceAgent>
-  create(shared_ptr<vshl::common::interfaces::ILogger> logger, const string &id,
+  create(shared_ptr<vshlcore::common::interfaces::ILogger> logger, const string &id,
          const string &name, const string &description, const string &api,
          const string &vendor, const string &activeWakeword,
          const bool isActive,
@@ -55,14 +54,14 @@ public:
 
 private:
   // Constructor
-  VoiceAgent(shared_ptr<vshl::common::interfaces::ILogger> logger,
+  VoiceAgent(shared_ptr<vshlcore::common::interfaces::ILogger> logger,
              const string &id, const string &name, const string &description,
              const string &api, const string &vendor,
              const string &activeWakeword, const bool isActive,
              const shared_ptr<unordered_set<string>> wakewords);
 
   // Logger
-  shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+  shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 
   // Id
   string mId;
diff --git a/src/plugins/voiceagents/include/VoiceAgentEventsHandler.h b/src/plugins/voiceagents/include/VoiceAgentEventsHandler.h
index 3c1ca6c..00acfe1 100644
--- a/src/plugins/voiceagents/include/VoiceAgentEventsHandler.h
+++ b/src/plugins/voiceagents/include/VoiceAgentEventsHandler.h
@@ -26,8 +26,7 @@
 #include "voiceagents/include/VoiceAgent.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace voiceagents {
 /*
  * This class is reponsible for handling agent specific events
@@ -35,12 +34,12 @@ namespace voiceagents {
  * This class also listen to the incoming events from voice agents
  * and implements propagation to application layer.
  */
-class VoiceAgentEventsHandler : public vshl::common::interfaces::IEventFilter {
+class VoiceAgentEventsHandler : public vshlcore::common::interfaces::IEventFilter {
 public:
     // Create a VREventFilter.
     static shared_ptr<VoiceAgentEventsHandler> create(
-        shared_ptr<vshl::common::interfaces::ILogger> logger,
-        shared_ptr<vshl::common::interfaces::IAFBApi> afbApi);
+        shared_ptr<vshlcore::common::interfaces::ILogger> logger,
+        shared_ptr<vshlcore::common::interfaces::IAFBApi> afbApi);
 
     // Creates all the vshl events for a specific voiceagent id.
     // For e.g if voiceagent is VA-001 then a new vshl event
@@ -53,7 +52,7 @@ public:
 
     // Subscribe to a vshl event corresponding to a voiceagent.
     bool subscribeToVshlEventFromVoiceAgent(
-        vshl::common::interfaces::IAFBRequest& request,
+        vshlcore::common::interfaces::IAFBRequest& request,
         const string eventName,
         const shared_ptr<VoiceAgent> voiceAgent);
 
@@ -68,8 +67,8 @@ protected:
 private:
     // Constructor
     VoiceAgentEventsHandler(
-        shared_ptr<vshl::common::interfaces::ILogger> logger,
-        shared_ptr<vshl::common::interfaces::IAFBApi> afbApi);
+        shared_ptr<vshlcore::common::interfaces::ILogger> logger,
+        shared_ptr<vshlcore::common::interfaces::IAFBApi> afbApi);
 
     // Helper method to generate the event name with voiceagent Id
     // concatenated.
@@ -80,13 +79,13 @@ private:
     bool callSubscribeVerb(const shared_ptr<VoiceAgent> voiceAgent);
 
     // Binding API reference
-    shared_ptr<vshl::common::interfaces::IAFBApi> mAfbApi;
+    shared_ptr<vshlcore::common::interfaces::IAFBApi> mAfbApi;
 
     // A map of VSHL event ID to its Event object
     unordered_map<string, shared_ptr<common::interfaces::IAFBApi::IAFBEvent>> mEventsMap;
 
     // Logger
-    shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+    shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 };
 
 }  // namespace voiceagents