3 files changed, 27 insertions, 30 deletions

diff --git a/src/plugins/core/src/VRAgentsObserverImpl.cpp b/src/plugins/core/src/VRAgentsObserverImpl.cpp
index 7ee4a7e..b44a9a0 100644
--- a/src/plugins/core/src/VRAgentsObserverImpl.cpp
+++ b/src/plugins/core/src/VRAgentsObserverImpl.cpp
@@ -13,8 +13,7 @@
  * permissions and limitations under the License.
  */
 #include "core/include/VRAgentsObserver.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace core {
 
 shared_ptr<VRAgentsObserver> VRAgentsObserver::create(weak_ptr<VRRequestProcessorDelegate> delegate) {
@@ -29,26 +28,26 @@ VRAgentsObserver::VRAgentsObserver(weak_ptr<VRRequestProcessorDelegate> delegate
 VRAgentsObserver::~VRAgentsObserver() {
 }
 
-void VRAgentsObserver::OnDefaultVoiceAgentChanged(shared_ptr<vshl::common::interfaces::IVoiceAgent> defaultVoiceAgent) {
+void VRAgentsObserver::OnDefaultVoiceAgentChanged(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> defaultVoiceAgent) {
     if (auto delegate = mWeakDelegate.lock()) {
         delegate->setDefaultVoiceAgent(defaultVoiceAgent);
     }
 }
 
-void VRAgentsObserver::OnVoiceAgentAdded(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+void VRAgentsObserver::OnVoiceAgentAdded(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
 }
 
-void VRAgentsObserver::OnVoiceAgentRemoved(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+void VRAgentsObserver::OnVoiceAgentRemoved(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
 }
 
-void VRAgentsObserver::OnVoiceAgentActiveWakeWordChanged(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+void VRAgentsObserver::OnVoiceAgentActiveWakeWordChanged(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
     // Not Implemented
 }
 
-void VRAgentsObserver::OnVoiceAgentActivated(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+void VRAgentsObserver::OnVoiceAgentActivated(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
 }
 
-void VRAgentsObserver::OnVoiceAgentDeactivated(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+void VRAgentsObserver::OnVoiceAgentDeactivated(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
 }
 }  // namespace core
 }  // namespace vshl
diff --git a/src/plugins/core/src/VRRequestImpl.cpp b/src/plugins/core/src/VRRequestImpl.cpp
index 00adf96..63302d8 100644
--- a/src/plugins/core/src/VRRequestImpl.cpp
+++ b/src/plugins/core/src/VRRequestImpl.cpp
@@ -24,21 +24,20 @@
         break;          \
     }
 
-static string TAG = "vshl::core::VRRequest";
+static string TAG = "vshlcore::core::VRRequest";
 
-using Level = vshl::common::interfaces::ILogger::Level;
-
-namespace vshl {
+using Level = vshlcore::common::interfaces::ILogger::Level;
+namespace vshlcore {
 namespace core {
 
 string VRRequest::VA_VERB_STARTLISTENING = "startListening";
 string VRRequest::VA_VERB_CANCEL = "cancel";
 
 unique_ptr<VRRequest> 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,
     const string requestId,
-    shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+    shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
     if (logger == nullptr) {
         return nullptr;
     }
@@ -53,10 +52,10 @@ unique_ptr<VRRequest> VRRequest::create(
 }
 
 VRRequest::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,
     string requestId,
-    shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) :
+    shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) :
         mApi(afbApi),
         mRequestId(requestId),
         mVoiceAgent(voiceAgent),
diff --git a/src/plugins/core/src/VRRequestProcessorDelegateImpl.cpp b/src/plugins/core/src/VRRequestProcessorDelegateImpl.cpp
index e20b22e..78ef10a 100644
--- a/src/plugins/core/src/VRRequestProcessorDelegateImpl.cpp
+++ b/src/plugins/core/src/VRRequestProcessorDelegateImpl.cpp
@@ -14,22 +14,21 @@
  */
 #include "core/include/VRRequestProcessorDelegate.h"
 
-static string TAG = "vshl::core::VRRequestProcessorDelegate";
+static string TAG = "vshlcore::core::VRRequestProcessorDelegate";
 
-using Level = vshl::common::interfaces::ILogger::Level;
-
-namespace vshl {
+using Level = vshlcore::common::interfaces::ILogger::Level;
+namespace vshlcore {
 namespace core {
 shared_ptr<VRRequestProcessorDelegate> 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) {
     auto delegate = std::shared_ptr<VRRequestProcessorDelegate>(new VRRequestProcessorDelegate(logger, afbApi));
     return delegate;
 }
 
 VRRequestProcessorDelegate::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) :
         mApi(afbApi),
         mLogger(logger) {
 }
@@ -39,14 +38,14 @@ VRRequestProcessorDelegate::~VRRequestProcessorDelegate() {
 }
 
 string VRRequestProcessorDelegate::startRequestForVoiceAgent(
-    shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+    shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
     if (!mApi) {
         mLogger->log(Level::ERROR, TAG, "Failed to startRequestForVoiceAgent: " + voiceAgent->getId() + ", No API.");
         return "";
     }
 
     // Generate a new request ID.
-    string newReqId = vshl::utilities::uuid::generateUUID();
+    string newReqId = vshlcore::utilities::uuid::generateUUID();
 
     // Create a new request and start listening.
     shared_ptr<VRRequest> newRequest = VRRequest::create(mLogger, mApi, newReqId, voiceAgent);
@@ -81,11 +80,11 @@ unordered_map<string, shared_ptr<VRRequest>> VRRequestProcessorDelegate::getAllR
     return mVRRequests;
 }
 
-void VRRequestProcessorDelegate::setDefaultVoiceAgent(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent) {
+void VRRequestProcessorDelegate::setDefaultVoiceAgent(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent) {
     mDefaultVoiceAgent = voiceAgent;
 }
 
-shared_ptr<vshl::common::interfaces::IVoiceAgent> VRRequestProcessorDelegate::getDefaultVoiceAgent() const {
+shared_ptr<vshlcore::common::interfaces::IVoiceAgent> VRRequestProcessorDelegate::getDefaultVoiceAgent() const {
     return mDefaultVoiceAgent;
 }