1 files changed, 16 insertions, 22 deletions
diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py b/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
index 6924ec67aa..07b55382a6 100755
--- a/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
+++ b/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
@@ -100,35 +100,35 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
         u'''error_response_schema));\n''')
 
     _error_response_schema_template = (
-        u'''CObjectSchemaItem::Members '''
+        u'''Members '''
         u'''params_members;\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember('''
+        u'''strings::S_FUNCTION_ID] = SMember('''
         u'''TEnumSchemaItem<FunctionID::eType>::create('''
         u'''function_id_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember('''
+        u'''strings::S_MESSAGE_TYPE] = SMember('''
         u'''TEnumSchemaItem<messageType::eType>::create('''
         u'''message_type_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember('''
+        u'''strings::S_PROTOCOL_VERSION] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember('''
+        u'''strings::S_PROTOCOL_TYPE] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember('''
+        u'''strings::S_CORRELATION_ID] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::kCode] = CObjectSchemaItem::SMember('''
+        u'''strings::kCode] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::kMessage] = CObjectSchemaItem::SMember('''
+        u'''strings::kMessage] = SMember('''
         u'''CStringSchemaItem::create(), true);\n'''
         u'''\n'''
-        u'''CObjectSchemaItem::Members root_members_map;\n'''
+        u'''Members root_members_map;\n'''
         u'''root_members_map[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PARAMS] = CObjectSchemaItem::SMember('''
+        u'''strings::S_PARAMS] = SMember('''
         u'''CObjectSchemaItem::create(params_members), true);\n'''
         u'''\n'''
         u'''CSmartSchema error_response_schema('''
@@ -137,29 +137,23 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
 
     _base_params = (
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::'''
-        u'''SMember(TEnumSchemaItem<FunctionID::eType>::'''
+        u'''strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::'''
         u'''create(function_id_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::'''
-        u'''SMember(TEnumSchemaItem<messageType::eType>::'''
+        u'''strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::'''
         u'''create(message_type_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
 
     _correlation_id_param = (
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
 
     _additional_response_params = (
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::kCode] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::kCode] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )