6 files changed, 19 insertions, 25 deletions
diff --git a/src/plugins/utilities/events/EventRouter.cpp b/src/plugins/utilities/events/EventRouter.cpp
index 999c3dd..4564953 100644
--- a/src/plugins/utilities/events/EventRouter.cpp
+++ b/src/plugins/utilities/events/EventRouter.cpp
@@ -14,19 +14,18 @@
  */
 #include "utilities/events/EventRouter.h"
 
-static string TAG = "vshl::utilities::events::EventRouter";
+static string TAG = "vshlcore::utilities::events::EventRouter";
 
-using Level = vshl::common::interfaces::ILogger::Level;
-
-namespace vshl {
+using Level = vshlcore::common::interfaces::ILogger::Level;
+namespace vshlcore {
 namespace utilities {
 namespace events {
 
-unique_ptr<EventRouter> EventRouter::create(shared_ptr<vshl::common::interfaces::ILogger> logger) {
+unique_ptr<EventRouter> EventRouter::create(shared_ptr<vshlcore::common::interfaces::ILogger> logger) {
     return std::unique_ptr<EventRouter>(new EventRouter(logger));
 }
 
-EventRouter::EventRouter(shared_ptr<vshl::common::interfaces::ILogger> logger) : mLogger(logger) {
+EventRouter::EventRouter(shared_ptr<vshlcore::common::interfaces::ILogger> logger) : mLogger(logger) {
 }
 
 EventRouter::~EventRouter() {
@@ -43,7 +42,7 @@ bool EventRouter::handleIncomingEvent(const string eventName, const string voice
     return false;
 }
 
-bool EventRouter::addEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter) {
+bool EventRouter::addEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter) {
     if (!filter) {
         mLogger->log(Level::ERROR, TAG, "Failed to add event filter. Invalid arguments.");
         return false;
@@ -53,7 +52,7 @@ bool EventRouter::addEventFilter(shared_ptr<vshl::common::interfaces::IEventFilt
     return true;
 }
 
-bool EventRouter::removeEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter) {
+bool EventRouter::removeEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter) {
     if (!filter) {
         mLogger->log(Level::ERROR, TAG, "Failed to add remove filter. Invalid arguments.");
         return false;
diff --git a/src/plugins/utilities/events/EventRouter.h b/src/plugins/utilities/events/EventRouter.h
index fd7f0c2..752973a 100644
--- a/src/plugins/utilities/events/EventRouter.h
+++ b/src/plugins/utilities/events/EventRouter.h
@@ -23,8 +23,7 @@
 #include "interfaces/utilities/logging/ILogger.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace utilities {
 namespace events {
 /*
@@ -34,29 +33,29 @@ namespace events {
  */
 class EventRouter {
 public:
-    static unique_ptr<EventRouter> create(shared_ptr<vshl::common::interfaces::ILogger> logger);
+    static unique_ptr<EventRouter> create(shared_ptr<vshlcore::common::interfaces::ILogger> logger);
 
     // Destructor
     ~EventRouter();
 
     // Add event filter as listerner.
-    bool addEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter);
+    bool addEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter);
 
     // Remove event filter as listerner.
-    bool removeEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter);
+    bool removeEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter);
 
     // This method is called by the controller for routing
     // the event to appropriate listener.
     bool handleIncomingEvent(const string eventName, const string voiceAgentId, const string payload);
 
 private:
-    EventRouter(shared_ptr<vshl::common::interfaces::ILogger> logger);
+    EventRouter(shared_ptr<vshlcore::common::interfaces::ILogger> logger);
 
     // set of event filters.
-    unordered_set<shared_ptr<vshl::common::interfaces::IEventFilter>> mEventFilters;
+    unordered_set<shared_ptr<vshlcore::common::interfaces::IEventFilter>> mEventFilters;
 
     // Logger
-    shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+    shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 };
 
 }  // namespace events
diff --git a/src/plugins/utilities/logging/Logger.cpp b/src/plugins/utilities/logging/Logger.cpp
index 6374e19..b310695 100644
--- a/src/plugins/utilities/logging/Logger.cpp
+++ b/src/plugins/utilities/logging/Logger.cpp
@@ -13,8 +13,7 @@
  * permissions and limitations under the License.
  */
 #include "utilities/logging/Logger.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace utilities {
 namespace logging {
 
diff --git a/src/plugins/utilities/logging/Logger.h b/src/plugins/utilities/logging/Logger.h
index 79c89a5..d1d0196 100644
--- a/src/plugins/utilities/logging/Logger.h
+++ b/src/plugins/utilities/logging/Logger.h
@@ -26,12 +26,11 @@ extern "C" {
 #include "interfaces/utilities/logging/ILogger.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace utilities {
 namespace logging {
 
-class Logger : public vshl::common::interfaces::ILogger {
+class Logger : public vshlcore::common::interfaces::ILogger {
 public:
   static std::unique_ptr<Logger> create(AFB_ApiT api);
 
diff --git a/src/plugins/utilities/uuid/UUIDGeneration.cpp b/src/plugins/utilities/uuid/UUIDGeneration.cpp
index bb03fc6..c006a0e 100644
--- a/src/plugins/utilities/uuid/UUIDGeneration.cpp
+++ b/src/plugins/utilities/uuid/UUIDGeneration.cpp
@@ -25,8 +25,7 @@
 #include <functional>
 
 #include "utilities/uuid/UUIDGeneration.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace utilities {
 namespace uuid {
 
diff --git a/src/plugins/utilities/uuid/UUIDGeneration.h b/src/plugins/utilities/uuid/UUIDGeneration.h
index 7af9cb1..070c373 100644
--- a/src/plugins/utilities/uuid/UUIDGeneration.h
+++ b/src/plugins/utilities/uuid/UUIDGeneration.h
@@ -19,8 +19,7 @@
 #define VSHL_UTILITIES_UUID_UUIDGENERATION_H_
 
 #include <string>
-
-namespace vshl {
+namespace vshlcore {
 namespace utilities {
 namespace uuid {