Fix namespace case structure in projectfix/namespace_case

44 files changed, 156 insertions, 151 deletions

diff --git a/src/components/application_manager/include/application_manager/app_extension.h b/src/components/application_manager/include/application_manager/app_extension.h
index 91bef0753a..e3231de347 100644
--- a/src/components/application_manager/include/application_manager/app_extension.h
+++ b/src/components/application_manager/include/application_manager/app_extension.h
@@ -33,8 +33,8 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_
 
-namespace NsSmartDeviceLink {
-namespace NsSmartObjects {
+namespace ns_smart_device_link {
+namespace ns_smart_objects {
 class SmartObject;
 }
 }
@@ -58,14 +58,14 @@ class AppExtension {
    * plugin
    */
   virtual void SaveResumptionData(
-      NsSmartDeviceLink::NsSmartObjects::SmartObject& resumption_data) = 0;
+      ns_smart_device_link::ns_smart_objects::SmartObject& resumption_data) = 0;
 
   /**
    * @brief ProcessResumption Method called by SDL during resumption.
    * @param resumption_data list of resumption data
    */
   virtual void ProcessResumption(
-      const NsSmartDeviceLink::NsSmartObjects::SmartObject&
+      const ns_smart_device_link::ns_smart_objects::SmartObject&
           resumption_data) = 0;
 
  private:
diff --git a/src/components/application_manager/include/application_manager/application_data_impl.h b/src/components/application_manager/include/application_manager/application_data_impl.h
index 05091dbfbd..8f24f124f9 100644
--- a/src/components/application_manager/include/application_manager/application_data_impl.h
+++ b/src/components/application_manager/include/application_manager/application_data_impl.h
@@ -295,7 +295,7 @@ class DynamicApplicationDataImpl : public virtual Application {
   void SetGlobalProperties(
       const smart_objects::SmartObject& param,
       void (DynamicApplicationData::*callback)(
-          const NsSmartDeviceLink::NsSmartObjects::SmartObject&));
+          const ns_smart_device_link::ns_smart_objects::SmartObject&));
   DISALLOW_COPY_AND_ASSIGN(DynamicApplicationDataImpl);
 };
 
diff --git a/src/components/application_manager/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
index 6fdeaea332..27aa93d1d8 100644
--- a/src/components/application_manager/include/application_manager/commands/command_request_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
@@ -55,7 +55,7 @@ struct ResponseInfo {
   bool is_not_used;
 };
 
-namespace NsSmart = NsSmartDeviceLink::NsSmartObjects;
+namespace ns_smart = ns_smart_device_link::ns_smart_objects;
 
 /**
  * @brief MergeInfos merge 2 infos in one string
@@ -189,7 +189,7 @@ class CommandRequestImpl : public CommandImpl,
    * @param msg_params HMI request msg params
    */
   void CreateHMINotification(const hmi_apis::FunctionID::eType& function_id,
-                             const NsSmart::SmartObject& msg_params) const;
+                             const ns_smart::SmartObject& msg_params) const;
 
   /**
    * @brief Converts HMI result code to Mobile result code
diff --git a/src/components/application_manager/include/application_manager/commands/request_from_hmi.h b/src/components/application_manager/include/application_manager/commands/request_from_hmi.h
index 11cd602b8e..927a45c6a6 100644
--- a/src/components/application_manager/include/application_manager/commands/request_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/request_from_hmi.h
@@ -41,7 +41,7 @@ namespace application_manager {
 
 namespace commands {
 
-namespace NsSmart = NsSmartDeviceLink::NsSmartObjects;
+namespace ns_smart = ns_smart_device_link::ns_smart_objects;
 
 class RequestFromHMI : public CommandImpl, public event_engine::EventObserver {
  public:
@@ -86,7 +86,7 @@ class RequestFromHMI : public CommandImpl, public event_engine::EventObserver {
    * @param function_id the function id for which response will be sent
    */
   void FillCommonParametersOfSO(
-      NsSmartDeviceLink::NsSmartObjects::SmartObject& message,
+      ns_smart_device_link::ns_smart_objects::SmartObject& message,
       const uint32_t correlation_id,
       const hmi_apis::FunctionID::eType function_id);
 
diff --git a/src/components/application_manager/include/application_manager/commands/response_to_hmi.h b/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
index c8f5e90d4e..aa43d2e6d1 100644
--- a/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
@@ -42,7 +42,7 @@ namespace application_manager {
 
 namespace commands {
 
-namespace NsSmart = NsSmartDeviceLink::NsSmartObjects;
+namespace ns_smart = ns_smart_device_link::ns_smart_objects;
 
 class ResponseToHMI : public CommandImpl {
  public:
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index e45a3ca3ad..010816808c 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -348,7 +348,7 @@ class MessageHelper {
                                               bool is_unexpected_disconnect,
                                               ApplicationManager& app_mngr);
 
-  static NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr
+  static ns_smart_device_link::ns_smart_objects::SmartObjectSPtr
   GetBCActivateAppRequestToHMI(
       ApplicationConstSharedPtr app,
       const protocol_handler::SessionObserver& session_observer,
@@ -460,7 +460,7 @@ class MessageHelper {
 
   static void SendSystemRequestNotification(
       uint32_t connection_key,
-      NsSmartDeviceLink::NsSmartObjects::SmartObject& content,
+      ns_smart_device_link::ns_smart_objects::SmartObject& content,
       ApplicationManager& app_mngr);
 
   /**
diff --git a/src/components/application_manager/include/application_manager/rpc_handler_impl.h b/src/components/application_manager/include/application_manager/rpc_handler_impl.h
index 8f1d454c3b..cc93e4213c 100644
--- a/src/components/application_manager/include/application_manager/rpc_handler_impl.h
+++ b/src/components/application_manager/include/application_manager/rpc_handler_impl.h
@@ -150,8 +150,9 @@ class RPCHandlerImpl : public RPCHandler,
    * @param output - SmartObject Message received from mobile
    * @param messageVersion - message version to be updated
    */
-  void GetMessageVersion(NsSmartDeviceLink::NsSmartObjects::SmartObject& output,
-                         utils::SemanticVersion& message_version);
+  void GetMessageVersion(
+      ns_smart_device_link::ns_smart_objects::SmartObject& output,
+      utils::SemanticVersion& message_version);
 
  private:
   void ProcessMessageFromMobile(const std::shared_ptr<Message> message);
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h
index 14397237c5..e36968fc4b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h
@@ -80,10 +80,11 @@ class RCAppExtension : public application_manager::AppExtension {
 
   // AppExtension interface
  public:
-  void SaveResumptionData(
-      NsSmartDeviceLink::NsSmartObjects::SmartObject& resumption_data) OVERRIDE;
-  void ProcessResumption(const NsSmartDeviceLink::NsSmartObjects::SmartObject&
-                             resumption_data) OVERRIDE;
+  void SaveResumptionData(ns_smart_device_link::ns_smart_objects::SmartObject&
+                              resumption_data) OVERRIDE;
+  void ProcessResumption(
+      const ns_smart_device_link::ns_smart_objects::SmartObject&
+          resumption_data) OVERRIDE;
 };
 
 typedef std::shared_ptr<RCAppExtension> RCAppExtensionPtr;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc
index 05e44cfb44..5ce047071c 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc
@@ -173,7 +173,7 @@ void ButtonPressRequest::Execute() {
   LOG4CXX_AUTO_TRACE(logger_);
 
   const char* button_name;
-  NsSmartDeviceLink::NsSmartObjects::
+  ns_smart_device_link::ns_smart_objects::
       EnumConversionHelper<mobile_apis::ButtonName::eType>::EnumToCString(
           static_cast<mobile_apis::ButtonName::eType>(
               (*message_)[app_mngr::strings::msg_params]
@@ -281,7 +281,7 @@ std::string ButtonPressRequest::ModuleType() {
       (*message_)[app_mngr::strings::msg_params][message_params::kModuleType]
           .asUInt());
   const char* str;
-  const bool ok = NsSmartDeviceLink::NsSmartObjects::EnumConversionHelper<
+  const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper<
       mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str);
   return ok ? str : "unknown";
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
index 6178405808..93e37b95a7 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
@@ -248,7 +248,7 @@ void GetInteriorVehicleDataRequest::on_event(
 GetInteriorVehicleDataRequest::~GetInteriorVehicleDataRequest() {}
 
 void GetInteriorVehicleDataRequest::ProccessSubscription(
-    const NsSmartDeviceLink::NsSmartObjects::SmartObject& hmi_response) {
+    const ns_smart_device_link::ns_smart_objects::SmartObject& hmi_response) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   const bool is_subscribe_present_in_request =
@@ -267,7 +267,7 @@ void GetInteriorVehicleDataRequest::ProccessSubscription(
       application_manager_.application(CommandRequestImpl::connection_key());
   const auto extension = RCHelpers::GetRCExtension(*app);
   const char* module_type;
-  NsSmartDeviceLink::NsSmartObjects::
+  ns_smart_device_link::ns_smart_objects::
       EnumConversionHelper<mobile_apis::ModuleType::eType>::EnumToCString(
           static_cast<mobile_apis::ModuleType::eType>(
               hmi_response[app_mngr::strings::msg_params]
@@ -370,7 +370,7 @@ std::string GetInteriorVehicleDataRequest::ModuleType() {
       (*message_)[app_mngr::strings::msg_params][message_params::kModuleType]
           .asUInt());
   const char* str;
-  const bool ok = NsSmartDeviceLink::NsSmartObjects::EnumConversionHelper<
+  const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper<
       mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str);
   return ok ? str : "unknown";
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
index c8d1329c02..37890b7979 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
@@ -99,7 +99,7 @@ std::string OnInteriorVehicleDataNotification::ModuleType() {
                      [message_params::kModuleData][message_params::kModuleType]
                          .asUInt());
   const char* str;
-  const bool ok = NsSmartDeviceLink::NsSmartObjects::EnumConversionHelper<
+  const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper<
       mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str);
   return ok ? str : "unknown";
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
index e6f19a889c..88df9d8382 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
@@ -152,7 +152,7 @@ SetInteriorVehicleDataRequest::~SetInteriorVehicleDataRequest() {}
 
 const std::string LightName(const smart_objects::SmartObject& light_name) {
   const char* name;
-  const bool ok = NsSmartDeviceLink::NsSmartObjects::
+  const bool ok = ns_smart_device_link::ns_smart_objects::
       EnumConversionHelper<mobile_apis::LightName::eType>::EnumToCString(
           static_cast<mobile_apis::LightName::eType>(light_name.asUInt()),
           &name);
@@ -745,7 +745,7 @@ std::string SetInteriorVehicleDataRequest::ModuleType() {
                      [message_params::kModuleData][message_params::kModuleType]
                          .asUInt());
   const char* str;
-  const bool ok = NsSmartDeviceLink::NsSmartObjects::EnumConversionHelper<
+  const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper<
       mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str);
   return ok ? str : "unknown";
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
index 17f19e24e8..5282da8d83 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
@@ -59,10 +59,11 @@ bool RCAppExtension::IsSubscibedToInteriorVehicleData(
 }
 
 void RCAppExtension::SaveResumptionData(
-    NsSmartDeviceLink::NsSmartObjects::SmartObject& resumption_data) {}
+    ns_smart_device_link::ns_smart_objects::SmartObject& resumption_data) {}
 
 void RCAppExtension::ProcessResumption(
-    const NsSmartDeviceLink::NsSmartObjects::SmartObject& resumption_data) {}
+    const ns_smart_device_link::ns_smart_objects::SmartObject&
+        resumption_data) {}
 
 std::set<std::string> RCAppExtension::InteriorVehicleDataSubscriptions() const {
   return subscribed_interior_vehicle_data_;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
index 022a3e51c9..59d038a790 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
@@ -177,7 +177,7 @@ TEST_F(ButtonPressRequestTest,
        Execute_ButtonNameMatchesModuleType_ExpectCorrectMessageSentToHMI) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::CLIMATE;
   msg_params[message_params::kButtonName] = mobile_apis::ButtonName::AC;
@@ -212,7 +212,7 @@ TEST_F(
     Execute_ButtonNameDoesNotMatchModuleType_ExpectMessageNotSentToHMI_AndFalseSentToMobile) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO;
   msg_params[message_params::kButtonName] = mobile_apis::ButtonName::AC;
@@ -249,7 +249,7 @@ TEST_F(
 TEST_F(ButtonPressRequestTest, OnEvent_ExpectSuccessfullResponseSentToMobile) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::CLIMATE;
   msg_params[message_params::kButtonName] = mobile_apis::ButtonName::AC;
@@ -257,7 +257,7 @@ TEST_F(ButtonPressRequestTest, OnEvent_ExpectSuccessfullResponseSentToMobile) {
       mobile_apis::ButtonPressMode::SHORT;
 
   MessageSharedPtr hmi_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& hmi_msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& hmi_msg_params =
       (*hmi_message)[application_manager::strings::msg_params];
   hmi_apis::Common_Result::eType response_code =
       hmi_apis::Common_Result::SUCCESS;
@@ -288,7 +288,7 @@ TEST_F(ButtonPressRequestTest,
        OnEvent_ReadOnlyParamFromHMI_ExpectFalseSentToMobile) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::CLIMATE;
   msg_params[message_params::kButtonName] = mobile_apis::ButtonName::AC;
@@ -296,7 +296,7 @@ TEST_F(ButtonPressRequestTest,
       mobile_apis::ButtonPressMode::SHORT;
 
   MessageSharedPtr hmi_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& hmi_msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& hmi_msg_params =
       (*hmi_message)[application_manager::strings::params];
   hmi_apis::Common_Result::eType response_code =
       hmi_apis::Common_Result::READ_ONLY;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
index 0b30bbf654..25dad2dc04 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
@@ -281,7 +281,7 @@ TEST_F(
                    [message_params::kSubscribe] = false;
 
   MessageSharedPtr hmi_response = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& hmi_msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& hmi_msg_params =
       (*hmi_response)[application_manager::strings::msg_params];
   hmi_apis::Common_Result::eType response_code =
       hmi_apis::Common_Result::SUCCESS;
@@ -371,7 +371,7 @@ TEST_F(
     Execute_CapabilitiesValidationFailed_ExpectMessageNotSentToHMI_AndFalseSentToMobile) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO;
   std::shared_ptr<
@@ -397,7 +397,7 @@ TEST_F(
     Execute_PolicyValidationFailed_ExpectMessageNotSentToHMI_AndFalseSentToMobile) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO;
   std::shared_ptr<
@@ -506,7 +506,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
                    [message_params::kSubscribe] = false;
 
   MessageSharedPtr hmi_response = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& hmi_msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& hmi_msg_params =
       (*hmi_response)[application_manager::strings::params];
   hmi_msg_params[application_manager::hmi_response::code] =
       hmi_apis::Common_Result::READ_ONLY;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
index 4144beea2a..47e1c9a389 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
@@ -135,7 +135,7 @@ TEST_F(SetInteriorVehicleDataRequestTest,
        Execute_ValidWithoutReadOnlyParams_ExpectResendToHMI) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleData][message_params::kModuleType] =
       mobile_apis::ModuleType::CLIMATE;
@@ -167,7 +167,7 @@ TEST_F(
   // Arrange
 
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleData][message_params::kModuleType] =
       mobile_apis::ModuleType::RADIO;
@@ -205,7 +205,7 @@ TEST_F(
     Execute_MessageValidationFailed_ExpectMessageNotSentToHMI_AndFalseSentToMobile) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& msg_params =
+  ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleData][message_params::kModuleType] =
       mobile_apis::ModuleType::RADIO;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h
index 12b075af7a..4564858845 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h
@@ -221,8 +221,8 @@ class CreateInteractionChoiceSetRequest
    * otherwise FALSE
   */
   bool compareSynonyms(
-      const NsSmartDeviceLink::NsSmartObjects::SmartObject& choice1,
-      const NsSmartDeviceLink::NsSmartObjects::SmartObject& choice2);
+      const ns_smart_device_link::ns_smart_objects::SmartObject& choice1,
+      const ns_smart_device_link::ns_smart_objects::SmartObject& choice2);
 
   /*
    * @brief Checks VR synonyms ignoring differences in case.
@@ -234,8 +234,8 @@ class CreateInteractionChoiceSetRequest
    * otherwise FALSE
   */
   static bool compareStr(
-      const NsSmartDeviceLink::NsSmartObjects::SmartObject& str1,
-      const NsSmartDeviceLink::NsSmartObjects::SmartObject& str2);
+      const ns_smart_device_link::ns_smart_objects::SmartObject& str1,
+      const ns_smart_device_link::ns_smart_objects::SmartObject& str2);
 
   /**
    * @brief Checks choice set params(menuName, tertiaryText, ...)
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
index d50708c4eb..cd1f95b93c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
@@ -197,8 +197,8 @@ mobile_apis::Result::eType CreateInteractionChoiceSetRequest::CheckChoiceSet(
 }
 
 bool CreateInteractionChoiceSetRequest::compareSynonyms(
-    const NsSmartDeviceLink::NsSmartObjects::SmartObject& choice1,
-    const NsSmartDeviceLink::NsSmartObjects::SmartObject& choice2) {
+    const ns_smart_device_link::ns_smart_objects::SmartObject& choice1,
+    const ns_smart_device_link::ns_smart_objects::SmartObject& choice2) {
   // only compare if they both have vr commands
   if (!(choice1.keyExists(strings::vr_commands) &&
         choice2.keyExists(strings::vr_commands))) {
@@ -227,8 +227,8 @@ bool CreateInteractionChoiceSetRequest::compareSynonyms(
 }
 
 bool CreateInteractionChoiceSetRequest::compareStr(
-    const NsSmartDeviceLink::NsSmartObjects::SmartObject& str1,
-    const NsSmartDeviceLink::NsSmartObjects::SmartObject& str2) {
+    const ns_smart_device_link::ns_smart_objects::SmartObject& str1,
+    const ns_smart_device_link::ns_smart_objects::SmartObject& str2) {
   return 0 == strcasecmp(str1.asCharArray(), str2.asCharArray());
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc
index eef2750376..b0715225e4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc
@@ -41,7 +41,7 @@ using namespace application_manager;
 namespace commands {
 
 void GenericResponse::Run() {
-  /*NsSmartDeviceLink::NsSmartObjects::SmartObject response;
+  /*ns_smart_device_link::ns_smart_objects::SmartObject response;
 
    response[strings::params][strings::correlation_id] =
    (*message_)[strings::params][strings::correlation_id];
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
index 78de02b527..cea00a9d5e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
@@ -589,7 +589,7 @@ void SystemRequest::Run() {
     SendResponse(true, mobile_apis::Result::SUCCESS);
     return;
   } else if (mobile_apis::RequestType::QUERY_APPS == request_type) {
-    using namespace NsSmartDeviceLink::NsJSONHandler::Formatters;
+    using namespace ns_smart_device_link::ns_json_handler::formatters;
 
     smart_objects::SmartObject sm_object;
     Json::Reader reader;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc
index e39681498c..2191900750 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc
@@ -90,7 +90,7 @@ class GetUrlsTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {
 
   GetUrlsTest() {
     command_msg_ =
-        CreateMessage(NsSmartDeviceLink::NsSmartObjects::SmartType_Map);
+        CreateMessage(ns_smart_device_link::ns_smart_objects::SmartType_Map);
     (*command_msg_)[am::strings::params][am::strings::connection_key] =
         kConnectionKey;
     (*command_msg_)[am::strings::msg_params][am::hmi_request::service] =
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
index dfcceea889..7c99b5f2b8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
@@ -68,7 +68,7 @@ using ::testing::_;
 using ::testing::Return;
 using ::testing::InSequence;
 using sdl_rpc_plugin::commands::AddCommandRequest;
-using NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr;
+using ns_smart_device_link::ns_smart_objects::SmartObjectSPtr;
 using ::test::components::application_manager_test::MockApplication;
 using am::event_engine::EventObserver;
 using namespace smart_objects;
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h
index f7e6ae7887..ead6af841f 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h
@@ -99,8 +99,8 @@ class VehicleInfoAppExtension : public app_mngr::AppExtension {
    * @brief SaveResumptionData saves vehicle info data
    * @param resumption_data plase to store resumption data
    */
-  void SaveResumptionData(
-      NsSmartDeviceLink::NsSmartObjects::SmartObject& resumption_data) OVERRIDE;
+  void SaveResumptionData(ns_smart_device_link::ns_smart_objects::SmartObject&
+                              resumption_data) OVERRIDE;
 
   /**
    * @brief ProcessResumption load resumtion data back to plugin during
diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc
index ea7893ddc5..0636748977 100644
--- a/src/components/application_manager/src/application_data_impl.cc
+++ b/src/components/application_manager/src/application_data_impl.cc
@@ -470,7 +470,7 @@ void DynamicApplicationDataImpl::set_display_layout(const std::string& layout) {
 void DynamicApplicationDataImpl::SetGlobalProperties(
     const smart_objects::SmartObject& param,
     void (DynamicApplicationData::*callback)(
-        const NsSmartDeviceLink::NsSmartObjects::SmartObject&)) {
+        const ns_smart_device_link::ns_smart_objects::SmartObject&)) {
   smart_objects::SmartType so_type = param.getType();
   if (so_type != smart_objects::SmartType::SmartType_Invalid &&
       so_type != smart_objects::SmartType::SmartType_Null) {
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index c40b5292ca..3f877895ef 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -133,10 +133,10 @@ bool policy_app_id_comparator(const std::string& policy_app_id,
 uint32_t ApplicationManagerImpl::corelation_id_ = 0;
 const uint32_t ApplicationManagerImpl::max_corelation_id_ = UINT_MAX;
 
-namespace formatters = NsSmartDeviceLink::NsJSONHandler::Formatters;
-namespace jhs = NsSmartDeviceLink::NsJSONHandler::strings;
+namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
+namespace jhs = ns_smart_device_link::ns_json_handler::strings;
 
-using namespace NsSmartDeviceLink::NsSmartObjects;
+using namespace ns_smart_device_link::ns_smart_objects;
 
 ApplicationManagerImpl::ApplicationManagerImpl(
     const ApplicationManagerSettings& am_settings,
diff --git a/src/components/application_manager/src/commands/command_impl.cc b/src/components/application_manager/src/commands/command_impl.cc
index dcc521ae57..04fabfb2ec 100644
--- a/src/components/application_manager/src/commands/command_impl.cc
+++ b/src/components/application_manager/src/commands/command_impl.cc
@@ -111,7 +111,7 @@ void CommandImpl::SetAllowedToTerminate(const bool allowed) {
 }
 
 bool CommandImpl::ReplaceMobileWithHMIAppId(
-    NsSmartDeviceLink::NsSmartObjects::SmartObject& message) {
+    ns_smart_device_link::ns_smart_objects::SmartObject& message) {
   LOG4CXX_AUTO_TRACE(logger_);
   if (message.keyExists(strings::app_id)) {
     ApplicationSharedPtr application =
@@ -156,7 +156,7 @@ bool CommandImpl::ReplaceMobileWithHMIAppId(
 }
 
 bool CommandImpl::ReplaceHMIWithMobileAppId(
-    NsSmartDeviceLink::NsSmartObjects::SmartObject& message) {
+    ns_smart_device_link::ns_smart_objects::SmartObject& message) {
   if (message.keyExists(strings::app_id)) {
     ApplicationSharedPtr application =
         application_manager_.application_by_hmi_app(
diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc
index 420dbf6156..68e8cfe6b4 100644
--- a/src/components/application_manager/src/commands/command_request_impl.cc
+++ b/src/components/application_manager/src/commands/command_request_impl.cc
@@ -456,7 +456,7 @@ uint32_t CommandRequestImpl::SendHMIRequest(
 
 void CommandRequestImpl::CreateHMINotification(
     const hmi_apis::FunctionID::eType& function_id,
-    const NsSmart::SmartObject& msg_params) const {
+    const ns_smart::SmartObject& msg_params) const {
   smart_objects::SmartObjectSPtr result =
       std::make_shared<smart_objects::SmartObject>();
   if (!result) {
@@ -959,7 +959,7 @@ const std::string InfoInterfaceSeparator(
 
 void CommandRequestImpl::AddTimeOutComponentInfoToMessage(
     smart_objects::SmartObject& response) const {
-  using NsSmartDeviceLink::NsSmartObjects::SmartObject;
+  using ns_smart_device_link::ns_smart_objects::SmartObject;
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(awaiting_response_interfaces_lock_);
   if (awaiting_response_interfaces_.empty()) {
diff --git a/src/components/application_manager/src/commands/notification_from_hmi.cc b/src/components/application_manager/src/commands/notification_from_hmi.cc
index c8765be18a..75e49b180e 100644
--- a/src/components/application_manager/src/commands/notification_from_hmi.cc
+++ b/src/components/application_manager/src/commands/notification_from_hmi.cc
@@ -87,7 +87,7 @@ void NotificationFromHMI::CreateHMIRequest(
   const uint32_t hmi_correlation_id_ =
       application_manager_.GetNextHMICorrelationID();
 
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& request = *result;
+  ns_smart_device_link::ns_smart_objects::SmartObject& request = *result;
   request[strings::params][strings::message_type] =
       static_cast<int32_t>(application_manager::MessageType::kRequest);
   request[strings::params][strings::function_id] =
diff --git a/src/components/application_manager/src/commands/response_from_hmi.cc b/src/components/application_manager/src/commands/response_from_hmi.cc
index bdf5686159..c88b14bf9c 100644
--- a/src/components/application_manager/src/commands/response_from_hmi.cc
+++ b/src/components/application_manager/src/commands/response_from_hmi.cc
@@ -92,7 +92,7 @@ void ResponseFromHMI::CreateHMIRequest(
   const uint32_t hmi_correlation_id_ =
       application_manager_.GetNextHMICorrelationID();
 
-  NsSmartDeviceLink::NsSmartObjects::SmartObject& request = *result;
+  ns_smart_device_link::ns_smart_objects::SmartObject& request = *result;
   request[strings::params][strings::message_type] = MessageType::kRequest;
   request[strings::params][strings::function_id] = function_id;
   request[strings::params][strings::correlation_id] = hmi_correlation_id_;
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 806feac58a..f67590543d 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -44,7 +44,7 @@
 #include "utils/file_system.h"
 
 namespace application_manager {
-namespace Formatters = NsSmartDeviceLink::NsJSONHandler::Formatters;
+namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
 
 namespace {
 std::map<std::string, hmi_apis::Common_VrCapabilities::eType>
@@ -886,7 +886,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
       if (check_existing_json_member(ui, "displayCapabilities")) {
         smart_objects::SmartObject display_capabilities_so;
         Json::Value display_capabilities = ui.get("displayCapabilities", "");
-        Formatters::CFormatterJsonBase::jsonValueToObj(display_capabilities,
+        formatters::CFormatterJsonBase::jsonValueToObj(display_capabilities,
                                                        display_capabilities_so);
 
         if (display_capabilities_so.keyExists(hmi_response::display_type)) {
@@ -1083,7 +1083,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
         Json::Value soft_button_capabilities =
             ui.get("softButtonCapabilities", "");
         smart_objects::SmartObject soft_button_capabilities_so;
-        Formatters::CFormatterJsonBase::jsonValueToObj(
+        formatters::CFormatterJsonBase::jsonValueToObj(
             soft_button_capabilities, soft_button_capabilities_so);
         set_soft_button_capabilities(soft_button_capabilities_so);
       }
@@ -1094,7 +1094,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
           Json::Value navigation_capability =
               system_capabilities.get("navigationCapability", "");
           smart_objects::SmartObject navigation_capability_so;
-          Formatters::CFormatterJsonBase::jsonValueToObj(
+          formatters::CFormatterJsonBase::jsonValueToObj(
               navigation_capability, navigation_capability_so);
           set_navigation_capability(navigation_capability_so);
           if (!navigation_capability_so.empty()) {
@@ -1106,7 +1106,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
           Json::Value phone_capability =
               system_capabilities.get("phoneCapability", "");
           smart_objects::SmartObject phone_capability_so;
-          Formatters::CFormatterJsonBase::jsonValueToObj(phone_capability,
+          formatters::CFormatterJsonBase::jsonValueToObj(phone_capability,
                                                          phone_capability_so);
           set_phone_capability(phone_capability_so);
           if (!phone_capability_so.empty()) {
@@ -1118,7 +1118,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
           Json::Value vs_capability =
               system_capabilities.get("videoStreamingCapability", "");
           smart_objects::SmartObject vs_capability_so;
-          Formatters::CFormatterJsonBase::jsonValueToObj(vs_capability,
+          formatters::CFormatterJsonBase::jsonValueToObj(vs_capability,
                                                          vs_capability_so);
 
           if (vs_capability_so.keyExists("supportedFormats")) {
@@ -1168,7 +1168,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
           Json::Value rc_capability =
               system_capabilities.get("remoteControlCapability", "");
           smart_objects::SmartObject rc_capability_so;
-          Formatters::CFormatterJsonBase::jsonValueToObj(rc_capability,
+          formatters::CFormatterJsonBase::jsonValueToObj(rc_capability,
                                                          rc_capability_so);
           set_rc_capability(rc_capability_so);
           if (!rc_capability_so.empty()) {
@@ -1247,7 +1247,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
       if (check_existing_json_member(buttons, "capabilities")) {
         Json::Value bt_capabilities = buttons.get("capabilities", "");
         smart_objects::SmartObject buttons_capabilities_so;
-        Formatters::CFormatterJsonBase::jsonValueToObj(bt_capabilities,
+        formatters::CFormatterJsonBase::jsonValueToObj(bt_capabilities,
                                                        buttons_capabilities_so);
 
         for (uint32_t i = 0; i < buttons_capabilities_so.length(); ++i) {
@@ -1267,7 +1267,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
       if (check_existing_json_member(buttons, "presetBankCapabilities")) {
         Json::Value presetBank = buttons.get("presetBankCapabilities", "");
         smart_objects::SmartObject preset_bank_so;
-        Formatters::CFormatterJsonBase::jsonValueToObj(presetBank,
+        formatters::CFormatterJsonBase::jsonValueToObj(presetBank,
                                                        preset_bank_so);
         set_preset_bank_capabilities(preset_bank_so);
       }
@@ -1277,7 +1277,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
     if (check_existing_json_member(root_json, "VehicleInfo")) {
       Json::Value vehicle_info = root_json.get("VehicleInfo", "");
       smart_objects::SmartObject vehicle_type_so;
-      Formatters::CFormatterJsonBase::jsonValueToObj(vehicle_info,
+      formatters::CFormatterJsonBase::jsonValueToObj(vehicle_info,
                                                      vehicle_type_so);
       set_vehicle_type(vehicle_type_so);
     }  // VehicleType end
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index 0ad86b5541..5bda17ecbd 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -247,7 +247,7 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateNotification(
   return object;
 }
 
-NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr
+ns_smart_device_link::ns_smart_objects::SmartObjectSPtr
 MessageHelper::CreateHMINotification(hmi_apis::FunctionID::eType function_id) {
   using smart_objects::SmartObject;
   using smart_objects::SmartObjectSPtr;
@@ -277,7 +277,7 @@ const uint32_t MessageHelper::GetPriorityCode(const std::string& priority) {
 
 hmi_apis::Common_Language::eType MessageHelper::CommonLanguageFromString(
     const std::string& language) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   hmi_apis::Common_Language::eType value;
   if (EnumConversionHelper<hmi_apis::Common_Language::eType>::StringToEnum(
           language, &value)) {
@@ -298,7 +298,7 @@ std::string MessageHelper::GetDeviceMacAddressForHandle(
 
 std::string MessageHelper::CommonLanguageToString(
     hmi_apis::Common_Language::eType language) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   const char* str = 0;
   if (EnumConversionHelper<hmi_apis::Common_Language::eType>::EnumToCString(
           language, &str)) {
@@ -630,7 +630,7 @@ const VehicleData& MessageHelper::vehicle_data() {
 
 std::string MessageHelper::HMIResultToString(
     hmi_apis::Common_Result::eType hmi_result) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   const char* str = 0;
   if (EnumConversionHelper<hmi_apis::Common_Result::eType>::EnumToCString(
           hmi_result, &str)) {
@@ -641,7 +641,7 @@ std::string MessageHelper::HMIResultToString(
 
 hmi_apis::Common_Result::eType MessageHelper::HMIResultFromString(
     const std::string& hmi_result) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   hmi_apis::Common_Result::eType value;
   if (EnumConversionHelper<hmi_apis::Common_Result::eType>::StringToEnum(
           hmi_result, &value)) {
@@ -652,7 +652,7 @@ hmi_apis::Common_Result::eType MessageHelper::HMIResultFromString(
 
 std::string MessageHelper::MobileResultToString(
     mobile_apis::Result::eType mobile_result) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   const char* str = 0;
   if (EnumConversionHelper<mobile_apis::Result::eType>::EnumToCString(
           mobile_result, &str)) {
@@ -663,7 +663,7 @@ std::string MessageHelper::MobileResultToString(
 
 mobile_apis::Result::eType MessageHelper::MobileResultFromString(
     const std::string& mobile_result) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   mobile_apis::Result::eType value;
   if (EnumConversionHelper<mobile_apis::Result::eType>::StringToEnum(
           mobile_result, &value)) {
@@ -781,7 +781,7 @@ void MessageHelper::SendActivateAppToHMI(
 
 mobile_apis::HMILevel::eType MessageHelper::StringToHMILevel(
     const std::string& hmi_level) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   mobile_apis::HMILevel::eType value;
   if (EnumConversionHelper<mobile_apis::HMILevel::eType>::StringToEnum(
           hmi_level, &value)) {
@@ -792,7 +792,7 @@ mobile_apis::HMILevel::eType MessageHelper::StringToHMILevel(
 
 std::string MessageHelper::StringifiedHMILevel(
     const mobile_apis::HMILevel::eType hmi_level) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   const char* str = 0;
   if (EnumConversionHelper<mobile_apis::HMILevel::eType>::EnumToCString(
           hmi_level, &str)) {
@@ -804,7 +804,7 @@ std::string MessageHelper::StringifiedHMILevel(
 std::string MessageHelper::StringifiedFunctionID(
     mobile_apis::FunctionID::eType function_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   const char* str = 0;
   if (EnumConversionHelper<mobile_apis::FunctionID::eType>::EnumToCString(
           function_id, &str)) {
@@ -1517,9 +1517,9 @@ bool MessageHelper::CreateHMIApplicationStruct(
     ApplicationConstSharedPtr app,
     const protocol_handler::SessionObserver& session_observer,
     const policy::PolicyHandlerInterface& policy_handler,
-    NsSmartDeviceLink::NsSmartObjects::SmartObject* output,
+    ns_smart_device_link::ns_smart_objects::SmartObject* output,
     ApplicationManager& app_mngr) {
-  using NsSmartDeviceLink::NsSmartObjects::SmartObject;
+  using ns_smart_device_link::ns_smart_objects::SmartObject;
   DCHECK_OR_RETURN(output, false);
   SmartObject& message = *output;
 
@@ -2557,7 +2557,8 @@ mobile_apis::Result::eType MessageHelper::VerifyImageFiles(
     smart_objects::SmartObject& message,
     ApplicationConstSharedPtr app,
     ApplicationManager& app_mngr) {
-  if (NsSmartDeviceLink::NsSmartObjects::SmartType_Array == message.getType()) {
+  if (ns_smart_device_link::ns_smart_objects::SmartType_Array ==
+      message.getType()) {
     for (uint32_t i = 0; i < message.length(); ++i) {
       mobile_apis::Result::eType res =
           VerifyImageFiles(message[i], app, app_mngr);
@@ -2566,7 +2567,7 @@ mobile_apis::Result::eType MessageHelper::VerifyImageFiles(
         return res;
       }
     }
-  } else if (NsSmartDeviceLink::NsSmartObjects::SmartType_Map ==
+  } else if (ns_smart_device_link::ns_smart_objects::SmartType_Map ==
              message.getType()) {
     if (message.keyExists(strings::image_type)) {
       mobile_apis::Result::eType verification_result =
@@ -2888,7 +2889,7 @@ bool MessageHelper::PrintSmartObject(const smart_objects::SmartObject& object) {
   }
 
   switch (object.getType()) {
-    case NsSmartDeviceLink::NsSmartObjects::SmartType_Array: {
+    case ns_smart_device_link::ns_smart_objects::SmartType_Array: {
       for (size_t i = 0; i < object.length(); i++) {
         ++tab;
 
@@ -2900,7 +2901,7 @@ bool MessageHelper::PrintSmartObject(const smart_objects::SmartObject& object) {
       }
       break;
     }
-    case NsSmartDeviceLink::NsSmartObjects::SmartType_Map: {
+    case ns_smart_device_link::ns_smart_objects::SmartType_Map: {
       std::set<std::string> keys = object.enumerate();
 
       for (std::set<std::string>::const_iterator key = keys.begin();
@@ -2916,20 +2917,20 @@ bool MessageHelper::PrintSmartObject(const smart_objects::SmartObject& object) {
       }
       break;
     }
-    case NsSmartDeviceLink::NsSmartObjects::SmartType_Boolean:
+    case ns_smart_device_link::ns_smart_objects::SmartType_Boolean:
       object.asBool() ? printf("true\n") : printf("false\n");
       break;
-    case NsSmartDeviceLink::NsSmartObjects::SmartType_Double: {
+    case ns_smart_device_link::ns_smart_objects::SmartType_Double: {
       printf("%f", object.asDouble());
       break;
     }
-    case NsSmartDeviceLink::NsSmartObjects::SmartType_Integer:
+    case ns_smart_device_link::ns_smart_objects::SmartType_Integer:
       printf("%lld", static_cast<long long int>(object.asInt()));
       break;
-    case NsSmartDeviceLink::NsSmartObjects::SmartType_String:
+    case ns_smart_device_link::ns_smart_objects::SmartType_String:
       printf("%s", object.asString().c_str());
       break;
-    case NsSmartDeviceLink::NsSmartObjects::SmartType_Character:
+    case ns_smart_device_link::ns_smart_objects::SmartType_Character:
       printf("%c", object.asChar());
       break;
     default:
diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc
index 87241c883a..c8e9032dfa 100644
--- a/src/components/application_manager/src/resumption/resumption_data_json.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_json.cc
@@ -41,7 +41,7 @@
 
 namespace resumption {
 
-namespace Formatters = NsSmartDeviceLink::NsJSONHandler::Formatters;
+namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "Resumption")
 
@@ -81,22 +81,22 @@ void ResumptionDataJson::SaveApplication(
   json_app[strings::hmi_level] = static_cast<int32_t>(hmi_level);
   json_app[strings::ign_off_count] = 0;
   json_app[strings::hash_id] = hash;
-  Formatters::CFormatterJsonBase::objToJsonValue(
+  formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationCommands(application), tmp);
   json_app[strings::application_commands] = tmp;
-  Formatters::CFormatterJsonBase::objToJsonValue(
+  formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationSubMenus(application), tmp);
   json_app[strings::application_submenus] = tmp;
-  Formatters::CFormatterJsonBase::objToJsonValue(
+  formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationInteractionChoiseSets(application), tmp);
   json_app[strings::application_choice_sets] = tmp;
-  Formatters::CFormatterJsonBase::objToJsonValue(
+  formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationGlobalProperties(application), tmp);
   json_app[strings::application_global_properties] = tmp;
-  Formatters::CFormatterJsonBase::objToJsonValue(
+  formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationSubscriptions(application), tmp);
   json_app[strings::application_subscriptions] = tmp;
-  Formatters::CFormatterJsonBase::objToJsonValue(
+  formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationFiles(application), tmp);
   json_app[strings::application_files] = tmp;
   json_app[strings::time_stamp] = time_stamp;
@@ -225,7 +225,7 @@ bool ResumptionDataJson::GetSavedApplication(
     return false;
   }
   const Json::Value& json_saved_app = GetSavedApplications()[idx];
-  Formatters::CFormatterJsonBase::jsonValueToObj(json_saved_app, saved_app);
+  formatters::CFormatterJsonBase::jsonValueToObj(json_saved_app, saved_app);
 
   return true;
 }
diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc
index 54f85c6c0a..0ccdf8b758 100644
--- a/src/components/application_manager/src/rpc_handler_impl.cc
+++ b/src/components/application_manager/src/rpc_handler_impl.cc
@@ -36,8 +36,8 @@ namespace application_manager {
 namespace rpc_handler {
 
 CREATE_LOGGERPTR_LOCAL(logger_, "RPCHandlerImpl")
-namespace formatters = NsSmartDeviceLink::NsJSONHandler::Formatters;
-namespace jhs = NsSmartDeviceLink::NsJSONHandler::strings;
+namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
+namespace jhs = ns_smart_device_link::ns_json_handler::strings;
 
 RPCHandlerImpl::RPCHandlerImpl(ApplicationManager& app_manager)
     : app_manager_(app_manager)
@@ -195,15 +195,15 @@ void RPCHandlerImpl::SetTelemetryObserver(AMTelemetryObserver* observer) {
 #endif  // TELEMETRY_MONITOR
 
 void RPCHandlerImpl::GetMessageVersion(
-    NsSmartDeviceLink::NsSmartObjects::SmartObject& output,
+    ns_smart_device_link::ns_smart_objects::SmartObject& output,
     utils::SemanticVersion& message_version) {
   if (output.keyExists(
-          NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS) &&
-      output[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS].keyExists(
-          strings::sync_msg_version)) {
+          ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS) &&
+      output[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS]
+          .keyExists(strings::sync_msg_version)) {
     // SyncMsgVersion exists, check if it is valid.
     auto sync_msg_version =
-        output[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS]
+        output[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS]
               [strings::sync_msg_version];
     uint16_t major = 0;
     uint16_t minor = 0;
@@ -227,7 +227,7 @@ void RPCHandlerImpl::GetMessageVersion(
 
 bool RPCHandlerImpl::ConvertMessageToSO(
     const Message& message,
-    NsSmartDeviceLink::NsSmartObjects::SmartObject& output) {
+    ns_smart_device_link::ns_smart_objects::SmartObject& output) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_,
                 "\t\t\tMessage to convert: protocol "
@@ -263,7 +263,7 @@ bool RPCHandlerImpl::ConvertMessageToSO(
       if (!conversion_result ||
           !mobile_so_factory().attachSchema(output, true, msg_version) ||
           ((output.validate(&report, msg_version) !=
-            smart_objects::Errors::OK))) {
+            smart_objects::errors::OK))) {
         LOG4CXX_WARN(logger_,
                      "Failed to parse string to smart object with API version "
                          << msg_version.toString() << " : "
@@ -329,7 +329,7 @@ bool RPCHandlerImpl::ConvertMessageToSO(
 
       rpc::ValidationReport report("RPC");
 
-      if (output.validate(&report) != smart_objects::Errors::OK) {
+      if (output.validate(&report) != smart_objects::errors::OK) {
         LOG4CXX_ERROR(logger_,
                       "Incorrect parameter from HMI"
                           << rpc::PrettyFormat(report));
@@ -343,15 +343,15 @@ bool RPCHandlerImpl::ConvertMessageToSO(
       break;
     }
     case protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_1: {
-      static NsSmartDeviceLinkRPC::V1::v4_protocol_v1_2_no_extra v1_shema;
+      static ns_smart_device_link_rpc::V1::v4_protocol_v1_2_no_extra v1_shema;
 
       if (message.function_id() == 0 || message.type() == kUnknownType) {
         LOG4CXX_ERROR(logger_, "Message received: UNSUPPORTED_VERSION");
 
         int32_t conversation_result =
             formatters::CFormatterJsonSDLRPCv1::fromString<
-                NsSmartDeviceLinkRPC::V1::FunctionID::eType,
-                NsSmartDeviceLinkRPC::V1::messageType::eType>(
+                ns_smart_device_link_rpc::V1::FunctionID::eType,
+                ns_smart_device_link_rpc::V1::messageType::eType>(
                 message.json_message(), output);
 
         if (formatters::CFormatterJsonSDLRPCv1::kSuccess ==
@@ -360,7 +360,7 @@ bool RPCHandlerImpl::ConvertMessageToSO(
               smart_objects::SmartType::SmartType_Map);
 
           output[strings::params][strings::message_type] =
-              NsSmartDeviceLinkRPC::V1::messageType::response;
+              ns_smart_device_link_rpc::V1::messageType::response;
           output[strings::params][strings::connection_key] =
               message.connection_key();
 
@@ -368,7 +368,7 @@ bool RPCHandlerImpl::ConvertMessageToSO(
               smart_objects::SmartType::SmartType_Map);
           output[strings::msg_params][strings::success] = false;
           output[strings::msg_params][strings::result_code] =
-              NsSmartDeviceLinkRPC::V1::Result::UNSUPPORTED_VERSION;
+              ns_smart_device_link_rpc::V1::Result::UNSUPPORTED_VERSION;
 
           smart_objects::SmartObjectSPtr msg_to_send =
               std::make_shared<smart_objects::SmartObject>(output);
diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc
index bdd6c8e0c2..217af091b5 100644
--- a/src/components/application_manager/src/rpc_service_impl.cc
+++ b/src/components/application_manager/src/rpc_service_impl.cc
@@ -36,8 +36,8 @@ namespace application_manager {
 namespace rpc_service {
 
 CREATE_LOGGERPTR_LOCAL(logger_, "RPCServiceImpl")
-namespace formatters = NsSmartDeviceLink::NsJSONHandler::Formatters;
-namespace jhs = NsSmartDeviceLink::NsJSONHandler::strings;
+namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
+namespace jhs = ns_smart_device_link::ns_json_handler::strings;
 
 RPCServiceImpl::RPCServiceImpl(
     ApplicationManager& app_manager,
@@ -380,7 +380,7 @@ void RPCServiceImpl::SendMessageToMobile(
     LOG4CXX_ERROR(logger_, "No application associated with connection key");
     if (is_result_code_exists &&
         ((*message)[strings::msg_params][strings::result_code] ==
-         NsSmartDeviceLinkRPC::V1::Result::UNSUPPORTED_VERSION)) {
+         ns_smart_device_link_rpc::V1::Result::UNSUPPORTED_VERSION)) {
       (*message)[strings::params][strings::protocol_version] =
           protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_1;
     } else {
@@ -518,7 +518,7 @@ void RPCServiceImpl::set_hmi_message_handler(
 }
 
 bool RPCServiceImpl::ConvertSOtoMessage(
-    const NsSmartDeviceLink::NsSmartObjects::SmartObject& message,
+    const ns_smart_device_link::ns_smart_objects::SmartObject& message,
     Message& output) {
   LOG4CXX_AUTO_TRACE(logger_);
 
diff --git a/src/components/application_manager/src/usage_statistics.cc b/src/components/application_manager/src/usage_statistics.cc
index 1146d60717..1cfccd816e 100644
--- a/src/components/application_manager/src/usage_statistics.cc
+++ b/src/components/application_manager/src/usage_statistics.cc
@@ -37,7 +37,7 @@
 #include "utils/macro.h"
 
 using namespace mobile_apis;
-using namespace NsSmartDeviceLink::NsSmartObjects;
+using namespace ns_smart_device_link::ns_smart_objects;
 using namespace usage_statistics;
 
 namespace application_manager {
diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc
index 22ac534215..cf848ba159 100644
--- a/src/components/application_manager/test/application_manager_impl_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_test.cc
@@ -213,7 +213,7 @@ class ApplicationManagerImplTest : public ::testing::Test {
 };
 
 TEST_F(ApplicationManagerImplTest, ProcessQueryApp_ExpectSuccess) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
   SmartObject app_data;
   const uint32_t connection_key = 65537u;
   app_data[am::json::name] = "application_manager_test";
@@ -712,7 +712,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        OnSecondaryTransportStartedCallback_AfterAppRegistration) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   AddMockApplication();
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(app_id_));
@@ -739,7 +739,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        OnSecondaryTransportEndedCallback_AfterAppRegistration) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   const connection_handler::DeviceHandle device_handle = 1;
   const int32_t session_key = app_id_;
@@ -1130,7 +1130,7 @@ bool ApplicationManagerImplTest::CheckResumptionRequiredTransportAvailableTest(
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_PrimaryOnly_Success) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   app_types_array[0] = mobile_apis::AppHMIType::eType::DEFAULT;
@@ -1158,7 +1158,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_PrimaryOnly_NotListed) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   app_types_array[0] = mobile_apis::AppHMIType::eType::SOCIAL;
@@ -1183,7 +1183,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_PrimaryOnly_Disabled) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   app_types_array[0] = mobile_apis::AppHMIType::eType::TESTING;
@@ -1208,7 +1208,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_PrimaryOnly_NoAppTypes) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   // we don't specify any app type
@@ -1233,7 +1233,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_PrimaryOnly_NoAppTypes2) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   const connection_handler::DeviceHandle primary_device_handle = 1;
   const connection_handler::DeviceHandle secondary_device_handle = 0;
@@ -1255,7 +1255,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_TwoTransports_Success) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   app_types_array[0] = mobile_apis::AppHMIType::eType::MEDIA;
@@ -1283,7 +1283,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_TwoTransports_Failure) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   app_types_array[0] = mobile_apis::AppHMIType::eType::NAVIGATION;
@@ -1311,7 +1311,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_MultipleAppTypes_Failure) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   app_types_array[0] = mobile_apis::AppHMIType::eType::MEDIA;
@@ -1341,7 +1341,7 @@ TEST_F(ApplicationManagerImplTest,
 
 TEST_F(ApplicationManagerImplTest,
        CheckResumptionRequiredTransportAvailableTest_MultipleAppTypes_Empty) {
-  using namespace NsSmartDeviceLink::NsSmartObjects;
+  using namespace ns_smart_device_link::ns_smart_objects;
 
   smart_objects::SmartObject app_types_array(SmartType_Array);
   app_types_array[0] = mobile_apis::AppHMIType::eType::NAVIGATION;
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index 8a06102e99..84a3b6bc87 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -208,7 +208,7 @@ class MockMessageHelper {
                    bool send_policy_priority,
                    ApplicationManager& app_mngr));
   MOCK_METHOD2(GetOnAppInterfaceUnregisteredNotificationToMobile,
-               NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr(
+               ns_smart_device_link::ns_smart_objects::SmartObjectSPtr(
                    int32_t connection_key,
                    mobile_apis::AppInterfaceUnregisteredReason::eType reason));
   MOCK_METHOD4(ProcessSoftButtons,
diff --git a/src/components/application_manager/test/include/application_manager/resumption_data_test.h b/src/components/application_manager/test/include/application_manager/resumption_data_test.h
index 4f8c9fd25e..4e614c4d9f 100644
--- a/src/components/application_manager/test/include/application_manager/resumption_data_test.h
+++ b/src/components/application_manager/test/include/application_manager/resumption_data_test.h
@@ -125,7 +125,8 @@ class ResumptionDataTest : public ::testing::Test {
   void CheckMenuIcon(sm::SmartObject& res_list);
   void CheckHelpPrompt(sm::SmartObject& res_list);
   void CheckTimeoutPrompt(sm::SmartObject& res_list);
-  void CheckVRHelp(NsSmartDeviceLink::NsSmartObjects::SmartObject& res_list);
+  void CheckVRHelp(
+      ns_smart_device_link::ns_smart_objects::SmartObject& res_list);
   void CheckVRTitle(sm::SmartObject& res_list);
   void CheckSubscriptions(sm::SmartObject& res_list);
 
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index 0850361a20..f091e183dc 100644
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -376,7 +376,7 @@ smart_objects::SmartObjectSPtr MessageHelper::GetBCActivateAppRequestToHMI(
       app_mngr);
 }
 
-NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr
+ns_smart_device_link::ns_smart_objects::SmartObjectSPtr
 MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
     int32_t connection_key,
     mobile_apis::AppInterfaceUnregisteredReason::eType reason) {
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index 855d318f24..15123385a0 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -997,8 +997,8 @@ TEST_F(PolicyHandlerTest,
   AppPermissions permissions(kPolicyAppId_);
   permissions.appUnauthorized = true;
 
-  NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr message =
-      std::make_shared<NsSmartDeviceLink::NsSmartObjects::SmartObject>();
+  ns_smart_device_link::ns_smart_objects::SmartObjectSPtr message =
+      std::make_shared<ns_smart_device_link::ns_smart_objects::SmartObject>();
   // Check expectations
   EXPECT_CALL(mock_message_helper_,
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _));
@@ -1050,8 +1050,8 @@ TEST_F(PolicyHandlerTest,
   AppPermissions permissions(kPolicyAppId_);
   permissions.appUnauthorized = true;
 
-  NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr message =
-      std::make_shared<NsSmartDeviceLink::NsSmartObjects::SmartObject>();
+  ns_smart_device_link::ns_smart_objects::SmartObjectSPtr message =
+      std::make_shared<ns_smart_device_link::ns_smart_objects::SmartObject>();
   // Check expectations
   // Notification won't be sent
   EXPECT_CALL(mock_message_helper_,
diff --git a/src/components/application_manager/test/resumption/resumption_data_json_test.cc b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
index d049d0f541..40e61a3c53 100644
--- a/src/components/application_manager/test/resumption/resumption_data_json_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
@@ -61,7 +61,7 @@ using namespace file_system;
 
 using namespace resumption;
 using namespace mobile_apis;
-namespace Formatters = NsSmartDeviceLink::NsJSONHandler::Formatters;
+namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
 
 class ResumptionDataJsonTest : public ResumptionDataTest {
  protected:
@@ -92,7 +92,7 @@ class ResumptionDataJsonTest : public ResumptionDataTest {
         dictionary[am::strings::resumption][am::strings::resume_app_list];
     sm::SmartObject res_app_list;
     for (uint32_t i = 0; i < resume_app_list.size(); i++) {
-      Formatters::CFormatterJsonBase::jsonValueToObj(resume_app_list[i],
+      formatters::CFormatterJsonBase::jsonValueToObj(resume_app_list[i],
                                                      res_app_list);
       CheckSavedApp(res_app_list);
     }
diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc
index 5658ab8535..fe24ea39b6 100644
--- a/src/components/application_manager/test/resumption/resumption_data_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_test.cc
@@ -291,7 +291,7 @@ void ResumptionDataTest::CheckHelpPrompt(sm::SmartObject& res_list) {
 }
 
 void ResumptionDataTest::CheckTimeoutPrompt(
-    NsSmartDeviceLink::NsSmartObjects::SmartObject& res_list) {
+    ns_smart_device_link::ns_smart_objects::SmartObject& res_list) {
   for (uint i = 0; i < tts_chunks_count; ++i) {
     std::string text = (*timeout_prompt_)[i][am::strings::text].asString();
     SpeechCapabilities::eType speech = static_cast<SpeechCapabilities::eType>(
@@ -315,7 +315,7 @@ void ResumptionDataTest::CheckVRHelp(sm::SmartObject& res_list) {
 }
 
 void ResumptionDataTest::CheckVRTitle(
-    NsSmartDeviceLink::NsSmartObjects::SmartObject& res_list) {
+    ns_smart_device_link::ns_smart_objects::SmartObject& res_list) {
   std::string vtitle = (*vr_help_title_)[am::strings::vr_help_title].asString();
   EXPECT_EQ(vtitle, res_list[am::strings::vr_help_title].asString());
 }
diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc
index 8d2ed690b6..dfc694f3c5 100644
--- a/src/components/application_manager/test/usage_statistics_test.cc
+++ b/src/components/application_manager/test/usage_statistics_test.cc
@@ -41,9 +41,9 @@ namespace test {
 namespace components {
 namespace usage_statistics_test {
 
-using namespace mobile_apis;                        // For Language enums
-using namespace NsSmartDeviceLink::NsSmartObjects;  // For EnumToCString &
-                                                    // EnumConversionHelper
+using namespace mobile_apis;                             // For Language enums
+using namespace ns_smart_device_link::ns_smart_objects;  // For EnumToCString &
+                                                         // EnumConversionHelper
 using namespace usage_statistics;
 using testing::_;
 
diff --git a/src/components/application_manager/test/zero_request_amount_test.cc b/src/components/application_manager/test/zero_request_amount_test.cc
index cce0b2abf2..640a186e2b 100644
--- a/src/components/application_manager/test/zero_request_amount_test.cc
+++ b/src/components/application_manager/test/zero_request_amount_test.cc
@@ -51,7 +51,7 @@ using namespace ::profile;
 
 using namespace application_manager::request_controller;
 using namespace application_manager;
-using namespace NsSmartDeviceLink::NsSmartObjects;
+using namespace ns_smart_device_link::ns_smart_objects;
 
 commands::Command* RegisterApplication() {
   SmartObjectSPtr resultsmart =