3 files changed, 29 insertions, 32 deletions
diff --git a/src/plugins/core/include/VRAgentsObserver.h b/src/plugins/core/include/VRAgentsObserver.h
index d4c0c7b..ce1bd43 100644
--- a/src/plugins/core/include/VRAgentsObserver.h
+++ b/src/plugins/core/include/VRAgentsObserver.h
@@ -22,15 +22,14 @@
 #include "utilities/logging/Logger.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace core {
 /*
  * This class will observe the changes to the voiceagents data and transfers
  * the actual handling responsibility to its delegate.
  */
 class VRAgentsObserver
-    : public vshl::common::interfaces::IVoiceAgentsChangeObserver {
+    : public vshlcore::common::interfaces::IVoiceAgentsChangeObserver {
 public:
   // Create a VRAgentsObserver.
   static shared_ptr<VRAgentsObserver>
@@ -40,18 +39,18 @@ public:
 
 protected:
   void OnDefaultVoiceAgentChanged(
-      shared_ptr<vshl::common::interfaces::IVoiceAgent> defaultVoiceAgent)
+      shared_ptr<vshlcore::common::interfaces::IVoiceAgent> defaultVoiceAgent)
       override;
   void OnVoiceAgentAdded(
-      shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) override;
+      shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) override;
   void OnVoiceAgentRemoved(
-      shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) override;
+      shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) override;
   void OnVoiceAgentActiveWakeWordChanged(
-      shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) override;
+      shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) override;
   void OnVoiceAgentActivated(
-      shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) override;
+      shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) override;
   void OnVoiceAgentDeactivated(
-      shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) override;
+      shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) override;
 
 private:
   // Constructor
diff --git a/src/plugins/core/include/VRRequest.h b/src/plugins/core/include/VRRequest.h
index 522ec78..8b9e842 100644
--- a/src/plugins/core/include/VRRequest.h
+++ b/src/plugins/core/include/VRRequest.h
@@ -22,8 +22,7 @@
 #include "interfaces/voiceagents/IVoiceAgent.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace core {
 /*
  * This class implements the notion of a Voice Recognition Request.
@@ -37,10 +36,10 @@ public:
 
     // Create a VRRequest.
     static unique_ptr<VRRequest> 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,
         string requestId,
-        shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent);
+        shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent);
 
     // Destructor
     ~VRRequest();
@@ -56,22 +55,22 @@ public:
 private:
     // Constructor
     VRRequest(
-        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,
         const string requestId,
-        shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent);
+        shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent);
 
     // Binding API reference.
-    shared_ptr<vshl::common::interfaces::IAFBApi> mApi;
+    shared_ptr<vshlcore::common::interfaces::IAFBApi> mApi;
 
     // Voice agent associated with this request
-    shared_ptr<vshl::common::interfaces::IVoiceAgent> mVoiceAgent;
+    shared_ptr<vshlcore::common::interfaces::IVoiceAgent> mVoiceAgent;
 
     // Request ID
     string mRequestId;
 
     // Logger
-    shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+    shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 };
 
 }  // namespace core
diff --git a/src/plugins/core/include/VRRequestProcessorDelegate.h b/src/plugins/core/include/VRRequestProcessorDelegate.h
index 94b7304..2c36d38 100644
--- a/src/plugins/core/include/VRRequestProcessorDelegate.h
+++ b/src/plugins/core/include/VRRequestProcessorDelegate.h
@@ -25,8 +25,7 @@
 #include "utilities/uuid/UUIDGeneration.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace core {
 /*
  * This is a delegate for VRRequestProcessor actions.
@@ -39,22 +38,22 @@ class VRRequestProcessorDelegate {
 public:
     // create method
     static shared_ptr<VRRequestProcessorDelegate> 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);
 
     // Destructor
     ~VRRequestProcessorDelegate();
 
     // Set default voiceagent
-    void setDefaultVoiceAgent(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent);
+    void setDefaultVoiceAgent(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent);
 
     // Get the default voiceagent
-    shared_ptr<vshl::common::interfaces::IVoiceAgent> getDefaultVoiceAgent() const;
+    shared_ptr<vshlcore::common::interfaces::IVoiceAgent> getDefaultVoiceAgent() const;
 
     // Add new request to the list and start processing it.
     // New request is created and startListening on the
     // voiceagent is called.
-    string startRequestForVoiceAgent(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent);
+    string startRequestForVoiceAgent(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent);
 
     // Cancel all requests
     void cancelAllRequests();
@@ -66,20 +65,20 @@ public:
 private:
     // Constructor
     VRRequestProcessorDelegate(
-        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);
 
     // Binding API reference
-    shared_ptr<vshl::common::interfaces::IAFBApi> mApi;
+    shared_ptr<vshlcore::common::interfaces::IAFBApi> mApi;
 
     // Default voiceagent
-    shared_ptr<vshl::common::interfaces::IVoiceAgent> mDefaultVoiceAgent;
+    shared_ptr<vshlcore::common::interfaces::IVoiceAgent> mDefaultVoiceAgent;
 
     // A map of voiceagent IDs and their respective VR Request objects.
     unordered_map<string, shared_ptr<VRRequest>> mVRRequests;
 
     // Logger
-    shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+    shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 };
 
 }  // namespace core