Fix namespace case structure in projectfix/namespace_case

9 files changed, 157 insertions, 157 deletions

diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py b/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py
index 6546b0ea89..c6a0145ac6 100755
--- a/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py
+++ b/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py
@@ -1572,10 +1572,10 @@ class CodeGenerator(object):
         u'''#include "smart_objects/number_schema_item.h"\n'''
         u'''#include "smart_objects/schema_item_parameter.h"\n'''
         u'''\n'''
-        u'''using namespace NsSmartDeviceLink::NsSmartObjects;\n'''
+        u'''using namespace ns_smart_device_link::ns_smart_objects;\n'''
         u'''\n'''
         u'''$namespace::$class_name::$class_name()\n'''
-        u''' : NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::eType, '''
+        u''' : ns_smart_device_link::ns_json_handler::CSmartFactory<FunctionID::eType, '''
         u'''messageType::eType, StructIdentifiers::eType>() {\n'''
         u'''  TStructsSchemaItems struct_schema_items;\n'''
         u'''  InitStructSchemes(struct_schema_items);\n'''
@@ -1600,7 +1600,7 @@ class CodeGenerator(object):
         u'''    return it->second;\n'''
         u'''  }\n'''
         u'''\n'''
-        u'''  return NsSmartDeviceLink::NsSmartObjects::'''
+        u'''  return ns_smart_device_link::ns_smart_objects::'''
         u'''CAlwaysFalseSchemaItem::create();\n'''
         u'''}\n'''
         u'''\n'''
@@ -1627,13 +1627,13 @@ class CodeGenerator(object):
         u'''\n'''
         u'''//-------------- String to value enum mapping ----------------\n'''
         u'''\n'''
-        u'''namespace NsSmartDeviceLink {\n'''
-        u'''namespace NsSmartObjects {\n'''
+        u'''namespace ns_smart_device_link {\n'''
+        u'''namespace ns_smart_objects {\n'''
         u'''\n'''
         u'''$enum_string_coversions'''
         u'''\n'''
-        u'''} // NsSmartObjects\n'''
-        u'''} // NsSmartDeviceLink\n'''
+        u'''} // ns_smart_objects\n'''
+        u'''} // ns_smart_device_link\n'''
         u'''\n''')
 
     _enum_to_str_converter_template = string.Template(
@@ -1678,8 +1678,8 @@ class CodeGenerator(object):
         u'''struct_schema_item_${name})));''')
 
     _function_schema_template = string.Template(
-        u'''functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::'''
-        u'''NsJSONHandler::'''
+        u'''functions_schemes_.insert(std::make_pair(ns_smart_device_link::'''
+        u'''ns_json_handler::'''
         u'''SmartSchemaKey<FunctionID::eType, messageType::eType>'''
         u'''(FunctionID::$function_id, messageType::$message_type), '''
         u'''InitFunction_${function_id}_${message_type}('''
@@ -1787,11 +1787,11 @@ class CodeGenerator(object):
         u'''\n'''
         u'''CObjectSchemaItem::Members '''
         u'''root_members_map;\n'''
-        u'''root_members_map[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''root_members_map[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_MSG_PARAMS] = '''
         u'''CObjectSchemaItem::SMember(CObjectSchemaItem::'''
         u'''create(schema_members), true);\n'''
-        u'''root_members_map[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''root_members_map[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_PARAMS] = '''
         u'''CObjectSchemaItem::SMember(CObjectSchemaItem::'''
         u'''create(params_members), true);\n\n'''
@@ -1800,7 +1800,7 @@ class CodeGenerator(object):
 
     _class_h_template = string.Template(
         u'''$comment\n'''
-        u'''class $class_name : public NsSmartDeviceLink::NsJSONHandler::'''
+        u'''class $class_name : public ns_smart_device_link::ns_json_handler::'''
         u'''CSmartFactory<FunctionID::eType, messageType::eType, '''
         u'''StructIdentifiers::eType> {\n'''
         u''' public:\n'''
@@ -1814,7 +1814,7 @@ class CodeGenerator(object):
         u'''   * @brief Type that maps of struct IDs to schema items.\n'''
         u'''   */\n'''
         u'''  typedef std::map<const StructIdentifiers::eType, '''
-        u'''std::shared_ptr<NsSmartDeviceLink::NsSmartObjects::'''
+        u'''std::shared_ptr<ns_smart_device_link::ns_smart_objects::'''
         u'''ISchemaItem> > TStructsSchemaItems;\n'''
         u'''\n'''
         u'''  /**\n'''
@@ -1826,7 +1826,7 @@ class CodeGenerator(object):
         u'''   * @return std::shared_ptr of strucute\n'''
         u'''   */\n'''
         u'''  static '''
-        u'''std::shared_ptr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> '''
+        u'''std::shared_ptr<ns_smart_device_link::ns_smart_objects::ISchemaItem> '''
         u'''ProvideObjectSchemaItemForStruct(\n'''
         u'''        const TStructsSchemaItems &struct_schema_items,\n'''
         u'''        const StructIdentifiers::eType struct_id);\n'''
@@ -1857,12 +1857,12 @@ class CodeGenerator(object):
         u'''$init_struct_decls'''
         u'''};''')
 
-    _function_return_comment = u''' * @return NsSmartDeviceLink::''' \
-                               u'''NsSmartObjects::CSmartSchema\n'''
+    _function_return_comment = u''' * @return ns_smart_device_link::''' \
+                               u'''ns_smart_objects::CSmartSchema\n'''
 
     _function_decl_template = string.Template(
         u'''$comment\n'''
-        u'''static NsSmartDeviceLink::NsSmartObjects::CSmartSchema '''
+        u'''static ns_smart_device_link::ns_smart_objects::CSmartSchema '''
         u'''InitFunction_${function_id}_${message_type}(\n'''
         u'''    const TStructsSchemaItems &struct_schema_items,\n'''
         u'''    const std::set<FunctionID::eType> &function_id_items,\n'''
@@ -1871,7 +1871,7 @@ class CodeGenerator(object):
     _struct_decl_template = string.Template(
         u'''$comment\n'''
         u'''static '''
-        u'''std::shared_ptr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> '''
+        u'''std::shared_ptr<ns_smart_device_link::ns_smart_objects::ISchemaItem> '''
         u'''InitStructSchemaItem_${struct_name}(\n'''
         u'''    const TStructsSchemaItems &struct_schema_items);''')
 
diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py b/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
index cf9887d39d..6924ec67aa 100755
--- a/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
+++ b/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
@@ -94,7 +94,7 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
 
     _error_response_insert_template = string.Template(
         u'''functions_schemes_.insert(std::make_pair('''
-        u'''NsSmartDeviceLink::NsJSONHandler::'''
+        u'''ns_smart_device_link::ns_json_handler::'''
         u'''SmartSchemaKey<FunctionID::eType, messageType::eType>('''
         u'''FunctionID::${function_id}, messageType::error_response), '''
         u'''error_response_schema));\n''')
@@ -102,32 +102,32 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
     _error_response_schema_template = (
         u'''CObjectSchemaItem::Members '''
         u'''params_members;\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember('''
         u'''TEnumSchemaItem<FunctionID::eType>::create('''
         u'''function_id_items), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember('''
         u'''TEnumSchemaItem<messageType::eType>::create('''
         u'''message_type_items), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::kCode] = CObjectSchemaItem::SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::kMessage] = CObjectSchemaItem::SMember('''
         u'''CStringSchemaItem::create(), true);\n'''
         u'''\n'''
         u'''CObjectSchemaItem::Members root_members_map;\n'''
-        u'''root_members_map[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''root_members_map[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_PARAMS] = CObjectSchemaItem::SMember('''
         u'''CObjectSchemaItem::create(params_members), true);\n'''
         u'''\n'''
@@ -136,30 +136,30 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
         u'''\n''')
 
     _base_params = (
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::'''
         u'''SMember(TEnumSchemaItem<FunctionID::eType>::'''
         u'''create(function_id_items), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::'''
         u'''SMember(TEnumSchemaItem<messageType::eType>::'''
         u'''create(message_type_items), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::'''
         u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::'''
         u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
 
     _correlation_id_param = (
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::'''
         u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
 
     _additional_response_params = (
-        u'''params_members[NsSmartDeviceLink::NsJSONHandler::'''
+        u'''params_members[ns_smart_device_link::ns_json_handler::'''
         u'''strings::kCode] = CObjectSchemaItem::'''
         u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py b/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py
index b3fb61f4a9..c3244f7e95 100755
--- a/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py
+++ b/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py
@@ -67,23 +67,23 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
         """
 
         base_params = \
-            u'''params_members[NsSmartDeviceLink::NsJSONHandler::''' \
+            u'''params_members[ns_smart_device_link::ns_json_handler::''' \
             u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::''' \
             u'''SMember(TEnumSchemaItem<FunctionID::eType>::''' \
             u'''create(function_id_items), true);\n''' \
-            u'''params_members[NsSmartDeviceLink::NsJSONHandler::''' \
+            u'''params_members[ns_smart_device_link::ns_json_handler::''' \
             u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::''' \
             u'''SMember(TEnumSchemaItem<messageType::eType>::''' \
             u'''create(message_type_items), true);\n''' \
-            u'''params_members[NsSmartDeviceLink::NsJSONHandler::''' \
+            u'''params_members[ns_smart_device_link::ns_json_handler::''' \
             u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::''' \
             u'''SMember(TNumberSchemaItem<int>::create(), true);\n''' \
-            u'''params_members[NsSmartDeviceLink::NsJSONHandler::''' \
+            u'''params_members[ns_smart_device_link::ns_json_handler::''' \
             u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::''' \
             u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
 
         correlation_id_param = \
-            u'''params_members[NsSmartDeviceLink::NsJSONHandler::''' \
+            u'''params_members[ns_smart_device_link::ns_json_handler::''' \
             u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::''' \
             u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
 
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
index b21e320038..c4813d00a8 100755
--- a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
+++ b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
@@ -17,61 +17,61 @@ from generator import Model
 
 
 EXPECTED_RESULT_REQUEST = (
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_RESULT_RESPONSE = (
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::kCode] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_RESULT_NOTIFICATION = (
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
@@ -79,33 +79,33 @@ EXPECTED_RESULT_NOTIFICATION = (
 EXPECTED_PRE_FUNCTION_CODE = (
     u"""  std::map<std::string, CObjectSchemaItem::SMember> """
     u"""params_members;\n"""
-    u"""  params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""  params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
-    u"""  params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""  params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
-    u"""  params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""  params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""  params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""  params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""  params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""  params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""  params_members[NsSmartDeviceLink::NsJSONHandler"""
+    u"""  params_members[ns_smart_device_link::ns_json_handler"""
     u"""::strings::kCode] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""  params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""  params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::kMessage] = CObjectSchemaItem::SMember("""
     u"""CStringSchemaItem::create(), true);\n"""
     u"""\n"""
     u"""  std::map<std::string, CObjectSchemaItem::SMember> """
     u"""root_members_map;\n"""
-    u"""  root_members_map[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""  root_members_map[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PARAMS] = CObjectSchemaItem::SMember("""
     u"""CObjectSchemaItem::create(params_members), true);\n"""
     u"""\n"""
@@ -113,7 +113,7 @@ EXPECTED_PRE_FUNCTION_CODE = (
     u"""root_members_map));\n"""
     u"""\n"""
     u"""  functions_schemes_.insert(std::make_pair("""
-    u"""NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<"""
+    u"""ns_smart_device_link::ns_json_handler::SmartSchemaKey<"""
     u"""FunctionID::eType, messageType::eType>("""
     u"""FunctionID::request, messageType::error_response)"""
     u""", error_response_schema));\n"""
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py
index 111ffb3cbc..35e4aeb6ce 100755
--- a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py
+++ b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py
@@ -17,23 +17,23 @@ from generator import Model
 
 
 EXPECTED_NOTIFICATION_RESULT = (
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n""")
 
 EXPECTED_REQ_RESP_RESULT = "".join([EXPECTED_NOTIFICATION_RESULT, (
-    u"""params_members[NsSmartDeviceLink::NsJSONHandler::"""
+    u"""params_members[ns_smart_device_link::ns_json_handler::"""
     u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n""")])
 
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc
index 458c27543b..49369d2559 100644
--- a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc
+++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc
@@ -50,7 +50,7 @@
 #include "SmartObjects/TNumberSchemaItem.hpp"
 #include "SmartObjects/TSchemaItemParameter.hpp"
 
-using namespace NsSmartDeviceLink::NsSmartObjects;
+using namespace ns_smart_device_link::ns_smart_objects;
 
 XXX::YYY::ZZZ::Test::Test()
  : CSmartFactory<FunctionID::eType, messageType::eType, StructIdentifiers::eType>() {
@@ -77,7 +77,7 @@ TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct(
     return it->second;
   }
 
-  return NsSmartDeviceLink::NsSmartObjects::CAlwaysFalseSchemaItem::create();
+  return ns_smart_device_link::ns_smart_objects::CAlwaysFalseSchemaItem::create();
 }
 
 void XXX::YYY::ZZZ::Test::InitStructSchemes(
@@ -96,24 +96,24 @@ void XXX::YYY::ZZZ::Test::InitFunctionSchemes(
     const std::set<FunctionID::eType> &function_id_items,
     const std::set<messageType::eType> &message_type_items) {
   std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::kCode] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::kMessage] = CObjectSchemaItem::SMember(CStringSchemaItem::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::kCode] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::kMessage] = CObjectSchemaItem::SMember(CStringSchemaItem::create(), true);
 
   std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
 
   CSmartSchema error_response_schema(CObjectSchemaItem::create(root_members_map));
 
-  functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_1, messageType::error_response), error_response_schema));
+  functions_schemes_.insert(std::make_pair(ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_1, messageType::error_response), error_response_schema));
 
-  functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::name1, messageType::request), InitFunction_name1_request(struct_schema_items, function_id_items, message_type_items)));
-  functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_1, messageType::response), InitFunction_val_1_response(struct_schema_items, function_id_items, message_type_items)));
-  functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_2, messageType::notification), InitFunction_val_2_notification(struct_schema_items, function_id_items, message_type_items)));
+  functions_schemes_.insert(std::make_pair(ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::name1, messageType::request), InitFunction_name1_request(struct_schema_items, function_id_items, message_type_items)));
+  functions_schemes_.insert(std::make_pair(ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_1, messageType::response), InitFunction_val_1_response(struct_schema_items, function_id_items, message_type_items)));
+  functions_schemes_.insert(std::make_pair(ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_2, messageType::notification), InitFunction_val_2_notification(struct_schema_items, function_id_items, message_type_items)));
 }
 
 //------------- Functions schemes initialization -------------
@@ -153,15 +153,15 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_name1_request(
   schema_members["param2"] = CObjectSchemaItem::SMember(param2_SchemaItem, true);
 
   std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
 
   std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -173,16 +173,16 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_1_response(
   std::map<std::string, CObjectSchemaItem::SMember> schema_members;
 
   std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::kCode] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::kCode] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
 
   std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -194,14 +194,14 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_2_notification(
   std::map<std::string, CObjectSchemaItem::SMember> schema_members;
 
   std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
 
   std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -298,8 +298,8 @@ TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2(
 
 //-------------- String to value enum mapping ----------------
 
-namespace NsSmartDeviceLink {
-namespace NsSmartObjects {
+namespace ns_smart_device_link {
+namespace ns_smart_objects {
 
 template <>
 const std::map<XXX::YYY::ZZZ::Enum1::eType, std::string> &TEnumSchemaItem<XXX::YYY::ZZZ::Enum1::eType>::getEnumElementsStringRepresentation() {
@@ -380,6 +380,6 @@ const std::map<XXX::YYY::ZZZ::messageType::eType, std::string> &TEnumSchemaItem<
   return enum_string_representation;
 }
 
-} // NsSmartObjects
-} // NsSmartDeviceLink
+} // ns_smart_objects
+} // ns_smart_device_link
 
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h
index b265603480..d7310e4d0f 100644
--- a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h
+++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h
@@ -223,7 +223,7 @@ enum eType {
  *     param2 - value2
  *     param1 - value1
  */
-class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::eType, messageType::eType, StructIdentifiers::eType> {
+class Test : public ns_smart_device_link::ns_json_handler::CSmartFactory<FunctionID::eType, messageType::eType, StructIdentifiers::eType> {
  public:
   /**
    * @brief Constructor.
@@ -234,7 +234,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Type that maps of struct IDs to schema items.
    */
-  typedef std::map<const StructIdentifiers::eType, NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> > TStructsSchemaItems;
+  typedef std::map<const StructIdentifiers::eType, ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> > TStructsSchemaItems;
 
   /**
    * @brief Helper that allows to make reference to struct
@@ -244,7 +244,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
    *
    * @return TSharedPtr of strucute
    */
-  static NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> ProvideObjectSchemaItemForStruct(
+  static ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> ProvideObjectSchemaItemForStruct(
         const TStructsSchemaItems &struct_schema_items,
         const StructIdentifiers::eType struct_id);
 
@@ -268,9 +268,9 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Method that generates schema for function Function1.
    *
-   * @return NsSmartDeviceLink::NsSmartObjects::CSmartSchema
+   * @return ns_smart_device_link::ns_smart_objects::CSmartSchema
    */
-  static NsSmartDeviceLink::NsSmartObjects::CSmartSchema InitFunction_name1_request(
+  static ns_smart_device_link::ns_smart_objects::CSmartSchema InitFunction_name1_request(
       const TStructsSchemaItems &struct_schema_items,
       const std::set<FunctionID::eType> &function_id_items,
       const std::set<messageType::eType> &message_type_items);
@@ -278,9 +278,9 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Method that generates schema for function Function2.
    *
-   * @return NsSmartDeviceLink::NsSmartObjects::CSmartSchema
+   * @return ns_smart_device_link::ns_smart_objects::CSmartSchema
    */
-  static NsSmartDeviceLink::NsSmartObjects::CSmartSchema InitFunction_val_1_response(
+  static ns_smart_device_link::ns_smart_objects::CSmartSchema InitFunction_val_1_response(
       const TStructsSchemaItems &struct_schema_items,
       const std::set<FunctionID::eType> &function_id_items,
       const std::set<messageType::eType> &message_type_items);
@@ -288,9 +288,9 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Method that generates schema for function Function2.
    *
-   * @return NsSmartDeviceLink::NsSmartObjects::CSmartSchema
+   * @return ns_smart_device_link::ns_smart_objects::CSmartSchema
    */
-  static NsSmartDeviceLink::NsSmartObjects::CSmartSchema InitFunction_val_2_notification(
+  static ns_smart_device_link::ns_smart_objects::CSmartSchema InitFunction_val_2_notification(
       const TStructsSchemaItems &struct_schema_items,
       const std::set<FunctionID::eType> &function_id_items,
       const std::set<messageType::eType> &message_type_items);
@@ -304,7 +304,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
    * @note Issue2
    * @note Issue3
    */
-  static NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> InitStructSchemaItem_Struct1(
+  static ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> InitStructSchemaItem_Struct1(
       const TStructsSchemaItems &struct_schema_items);
 
   /**
@@ -314,7 +314,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
    * @note Issue2
    * @note Issue3
    */
-  static NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> InitStructSchemaItem_Struct2(
+  static ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> InitStructSchemaItem_Struct2(
       const TStructsSchemaItems &struct_schema_items);
 };
 
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc
index 53e5b7f78a..a62f485eb9 100644
--- a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc
+++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc
@@ -50,7 +50,7 @@
 #include "SmartObjects/TNumberSchemaItem.hpp"
 #include "SmartObjects/TSchemaItemParameter.hpp"
 
-using namespace NsSmartDeviceLink::NsSmartObjects;
+using namespace ns_smart_device_link::ns_smart_objects;
 
 XXX::YYY::ZZZ::Test::Test()
  : CSmartFactory<FunctionID::eType, messageType::eType, StructIdentifiers::eType>() {
@@ -76,7 +76,7 @@ TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct(
     return it->second;
   }
 
-  return NsSmartDeviceLink::NsSmartObjects::CAlwaysFalseSchemaItem::create();
+  return ns_smart_device_link::ns_smart_objects::CAlwaysFalseSchemaItem::create();
 }
 
 void XXX::YYY::ZZZ::Test::InitStructSchemes(
@@ -94,9 +94,9 @@ void XXX::YYY::ZZZ::Test::InitFunctionSchemes(
     const TStructsSchemaItems &struct_schema_items,
     const std::set<FunctionID::eType> &function_id_items,
     const std::set<messageType::eType> &message_type_items) {
-  functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::name1, messageType::request), InitFunction_name1_request(struct_schema_items, function_id_items, message_type_items)));
-  functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_1, messageType::response), InitFunction_val_1_response(struct_schema_items, function_id_items, message_type_items)));
-  functions_schemes_.insert(std::make_pair(NsSmartDeviceLink::NsJSONHandler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_2, messageType::notification), InitFunction_val_2_notification(struct_schema_items, function_id_items, message_type_items)));
+  functions_schemes_.insert(std::make_pair(ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::name1, messageType::request), InitFunction_name1_request(struct_schema_items, function_id_items, message_type_items)));
+  functions_schemes_.insert(std::make_pair(ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_1, messageType::response), InitFunction_val_1_response(struct_schema_items, function_id_items, message_type_items)));
+  functions_schemes_.insert(std::make_pair(ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType>(FunctionID::val_2, messageType::notification), InitFunction_val_2_notification(struct_schema_items, function_id_items, message_type_items)));
 }
 
 //------------- Functions schemes initialization -------------
@@ -136,15 +136,15 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_name1_request(
   schema_members["param2"] = CObjectSchemaItem::SMember(param2_SchemaItem, true);
 
   std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
 
   std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -156,15 +156,15 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_1_response(
   std::map<std::string, CObjectSchemaItem::SMember> schema_members;
 
   std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
 
   std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -176,14 +176,14 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_2_notification(
   std::map<std::string, CObjectSchemaItem::SMember> schema_members;
 
   std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[NsSmartDeviceLink::NsJSONHandler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
 
   std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -280,8 +280,8 @@ TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2(
 
 //-------------- String to value enum mapping ----------------
 
-namespace NsSmartDeviceLink {
-namespace NsSmartObjects {
+namespace ns_smart_device_link {
+namespace ns_smart_objects {
 
 template <>
 const std::map<XXX::YYY::ZZZ::Enum1::eType, std::string> &TEnumSchemaItem<XXX::YYY::ZZZ::Enum1::eType>::getEnumElementsStringRepresentation() {
@@ -361,6 +361,6 @@ const std::map<XXX::YYY::ZZZ::messageType::eType, std::string> &TEnumSchemaItem<
   return enum_string_representation;
 }
 
-} // NsSmartObjects
-} // NsSmartDeviceLink
+} // ns_smart_objects
+} // ns_smart_device_link
 
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h
index 826ea55ce1..cf22f0711f 100644
--- a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h
+++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h
@@ -218,7 +218,7 @@ enum eType {
  *     param2 - value2
  *     param1 - value1
  */
-class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::eType, messageType::eType, StructIdentifiers::eType> {
+class Test : public ns_smart_device_link::ns_json_handler::CSmartFactory<FunctionID::eType, messageType::eType, StructIdentifiers::eType> {
  public:
   /**
    * @brief Constructor.
@@ -229,7 +229,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Type that maps of struct IDs to schema items.
    */
-  typedef std::map<const StructIdentifiers::eType, NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> > TStructsSchemaItems;
+  typedef std::map<const StructIdentifiers::eType, ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> > TStructsSchemaItems;
 
   /**
    * @brief Helper that allows to make reference to struct
@@ -239,7 +239,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
    *
    * @return TSharedPtr of strucute
    */
-  static NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> ProvideObjectSchemaItemForStruct(
+  static ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> ProvideObjectSchemaItemForStruct(
         const TStructsSchemaItems &struct_schema_items,
         const StructIdentifiers::eType struct_id);
 
@@ -263,9 +263,9 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Method that generates schema for function Function1.
    *
-   * @return NsSmartDeviceLink::NsSmartObjects::CSmartSchema
+   * @return ns_smart_device_link::ns_smart_objects::CSmartSchema
    */
-  static NsSmartDeviceLink::NsSmartObjects::CSmartSchema InitFunction_name1_request(
+  static ns_smart_device_link::ns_smart_objects::CSmartSchema InitFunction_name1_request(
       const TStructsSchemaItems &struct_schema_items,
       const std::set<FunctionID::eType> &function_id_items,
       const std::set<messageType::eType> &message_type_items);
@@ -273,9 +273,9 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Method that generates schema for function Function2.
    *
-   * @return NsSmartDeviceLink::NsSmartObjects::CSmartSchema
+   * @return ns_smart_device_link::ns_smart_objects::CSmartSchema
    */
-  static NsSmartDeviceLink::NsSmartObjects::CSmartSchema InitFunction_val_1_response(
+  static ns_smart_device_link::ns_smart_objects::CSmartSchema InitFunction_val_1_response(
       const TStructsSchemaItems &struct_schema_items,
       const std::set<FunctionID::eType> &function_id_items,
       const std::set<messageType::eType> &message_type_items);
@@ -283,9 +283,9 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
   /**
    * @brief Method that generates schema for function Function2.
    *
-   * @return NsSmartDeviceLink::NsSmartObjects::CSmartSchema
+   * @return ns_smart_device_link::ns_smart_objects::CSmartSchema
    */
-  static NsSmartDeviceLink::NsSmartObjects::CSmartSchema InitFunction_val_2_notification(
+  static ns_smart_device_link::ns_smart_objects::CSmartSchema InitFunction_val_2_notification(
       const TStructsSchemaItems &struct_schema_items,
       const std::set<FunctionID::eType> &function_id_items,
       const std::set<messageType::eType> &message_type_items);
@@ -299,7 +299,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
    * @note Issue2
    * @note Issue3
    */
-  static NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> InitStructSchemaItem_Struct1(
+  static ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> InitStructSchemaItem_Struct1(
       const TStructsSchemaItems &struct_schema_items);
 
   /**
@@ -309,7 +309,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory<FunctionID::
    * @note Issue2
    * @note Issue3
    */
-  static NsSmartDeviceLink::NsSmartObjects::TSharedPtr<NsSmartDeviceLink::NsSmartObjects::ISchemaItem> InitStructSchemaItem_Struct2(
+  static ns_smart_device_link::ns_smart_objects::TSharedPtr<ns_smart_device_link::ns_smart_objects::ISchemaItem> InitStructSchemaItem_Struct2(
       const TStructsSchemaItems &struct_schema_items);
 };