Replaced all defines with constant strings of the SDLName typedef. Also modified SDLFunctionID to use a static dictionary.

114 files changed, 1002 insertions, 1002 deletions

diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
index 10efc2554..f95d26b78 100644
--- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
+++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
@@ -25,12 +25,12 @@
 QuickSpecBegin(SDLProtocolSpec)
 
 //Test dictionaries
-NSDictionary* dictionaryV1 = @{NAMES_request:
-                                   @{NAMES_operation_name:@"DeleteCommand",
-                                     NAMES_correlationID:@0x98765,
-                                     NAMES_parameters:
-                                         @{NAMES_cmdID:@55}}};
-NSDictionary* dictionaryV2 = @{NAMES_cmdID:@55};
+NSDictionary* dictionaryV1 = @{SDLNameRequest:
+                                   @{SDLNameOperationName:@"DeleteCommand",
+                                     SDLNameCorrelationId:@0x98765,
+                                     SDLNameParameters:
+                                         @{SDLNameCommandId:@55}}};
+NSDictionary* dictionaryV2 = @{SDLNameCommandId:@55};
 
 describe(@"Send StartService Tests", ^ {
     context(@"Unsecure", ^{
diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m
index 84a053004..8722dea1e 100644
--- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m
+++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m
@@ -46,12 +46,12 @@ describe(@"RPCDictionary Tests", ^ {
         
         SDLV2ProtocolMessage* testMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testHeader andPayload:[[NSMutableData alloc] initWithCapacity:0]];
         
-        expect([testMessage rpcDictionary]).to(equal(@{NAMES_request:
-                                                           @{NAMES_operation_name:NAMES_Slider,
-                                                             NAMES_correlationID:@99,
-                                                             NAMES_parameters:dictionary},
-                                                       NAMES_bulkData:[NSData dataWithBytes:"Database" length:strlen("Database")]}));
+        expect([testMessage rpcDictionary]).to(equal(@{SDLNameRequest:
+                                                           @{SDLNameOperationName:SDLNameSlider,
+                                                             SDLNameCorrelationId:@99,
+                                                             SDLNameParameters:dictionary},
+                                                       SDLNameBulkData:[NSData dataWithBytes:"Database" length:strlen("Database")]}));
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
index eff1ae3b2..01c822ceb 100644
--- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
+++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
@@ -17,135 +17,135 @@ SDLFunctionID* functionID = [[SDLFunctionID alloc] init];
 
 describe(@"GetFunctionName Tests", ^ {
     it(@"Should return the correct function name", ^ {
-        expect([functionID getFunctionName:1]).to(equal(NAMES_RegisterAppInterface));
-        expect([functionID getFunctionName:2]).to(equal(NAMES_UnregisterAppInterface));
-        expect([functionID getFunctionName:3]).to(equal(NAMES_SetGlobalProperties));
-        expect([functionID getFunctionName:4]).to(equal(NAMES_ResetGlobalProperties));
-        expect([functionID getFunctionName:5]).to(equal(NAMES_AddCommand));
-        expect([functionID getFunctionName:6]).to(equal(NAMES_DeleteCommand));
-        expect([functionID getFunctionName:7]).to(equal(NAMES_AddSubMenu));
-        expect([functionID getFunctionName:8]).to(equal(NAMES_DeleteSubMenu));
-        expect([functionID getFunctionName:9]).to(equal(NAMES_CreateInteractionChoiceSet));
-        expect([functionID getFunctionName:10]).to(equal(NAMES_PerformInteraction));
-        expect([functionID getFunctionName:11]).to(equal(NAMES_DeleteInteractionChoiceSet));
-        expect([functionID getFunctionName:12]).to(equal(NAMES_Alert));
-        expect([functionID getFunctionName:13]).to(equal(NAMES_Show));
-        expect([functionID getFunctionName:14]).to(equal(NAMES_Speak));
-        expect([functionID getFunctionName:15]).to(equal(NAMES_SetMediaClockTimer));
-        expect([functionID getFunctionName:16]).to(equal(NAMES_PerformAudioPassThru));
-        expect([functionID getFunctionName:17]).to(equal(NAMES_EndAudioPassThru));
-        expect([functionID getFunctionName:18]).to(equal(NAMES_SubscribeButton));
-        expect([functionID getFunctionName:19]).to(equal(NAMES_UnsubscribeButton));
-        expect([functionID getFunctionName:20]).to(equal(NAMES_SubscribeVehicleData));
-        expect([functionID getFunctionName:21]).to(equal(NAMES_UnsubscribeVehicleData));
-        expect([functionID getFunctionName:22]).to(equal(NAMES_GetVehicleData));
-        expect([functionID getFunctionName:23]).to(equal(NAMES_ReadDID));
-        expect([functionID getFunctionName:24]).to(equal(NAMES_GetDTCs));
-        expect([functionID getFunctionName:25]).to(equal(NAMES_ScrollableMessage));
-        expect([functionID getFunctionName:26]).to(equal(NAMES_Slider));
-        expect([functionID getFunctionName:27]).to(equal(NAMES_ShowConstantTBT));
-        expect([functionID getFunctionName:28]).to(equal(NAMES_AlertManeuver));
-        expect([functionID getFunctionName:29]).to(equal(NAMES_UpdateTurnList));
-        expect([functionID getFunctionName:30]).to(equal(NAMES_ChangeRegistration));
-        expect([functionID getFunctionName:31]).to(equal(NAMES_GenericResponse));
-        expect([functionID getFunctionName:32]).to(equal(NAMES_PutFile));
-        expect([functionID getFunctionName:33]).to(equal(NAMES_DeleteFile));
-        expect([functionID getFunctionName:34]).to(equal(NAMES_ListFiles));
-        expect([functionID getFunctionName:35]).to(equal(NAMES_SetAppIcon));
-        expect([functionID getFunctionName:36]).to(equal(NAMES_SetDisplayLayout));
-        expect([functionID getFunctionName:37]).to(equal(NAMES_DiagnosticMessage));
-        expect([functionID getFunctionName:38]).to(equal(NAMES_SystemRequest));
-        expect([functionID getFunctionName:39]).to(equal(NAMES_SendLocation));
-        expect([functionID getFunctionName:40]).to(equal(NAMES_DialNumber));
-        expect([functionID getFunctionName:32768]).to(equal(NAMES_OnHMIStatus));
-        expect([functionID getFunctionName:32769]).to(equal(NAMES_OnAppInterfaceUnregistered));
-        expect([functionID getFunctionName:32770]).to(equal(NAMES_OnButtonEvent));
-        expect([functionID getFunctionName:32771]).to(equal(NAMES_OnButtonPress));
-        expect([functionID getFunctionName:32772]).to(equal(NAMES_OnVehicleData));
-        expect([functionID getFunctionName:32773]).to(equal(NAMES_OnCommand));
-        expect([functionID getFunctionName:32774]).to(equal(NAMES_OnTBTClientState));
-        expect([functionID getFunctionName:32775]).to(equal(NAMES_OnDriverDistraction));
-        expect([functionID getFunctionName:32776]).to(equal(NAMES_OnPermissionsChange));
-        expect([functionID getFunctionName:32777]).to(equal(NAMES_OnAudioPassThru));
-        expect([functionID getFunctionName:32778]).to(equal(NAMES_OnLanguageChange));
-        expect([functionID getFunctionName:32779]).to(equal(NAMES_OnKeyboardInput));
-        expect([functionID getFunctionName:32780]).to(equal(NAMES_OnTouchEvent));
-        expect([functionID getFunctionName:32781]).to(equal(NAMES_OnSystemRequest));
-        expect([functionID getFunctionName:32782]).to(equal(NAMES_OnHashChange));
+        expect([functionID getFunctionName:1]).to(equal(SDLNameRegisterAppInterface));
+        expect([functionID getFunctionName:2]).to(equal(SDLNameUnregisterAppInterface));
+        expect([functionID getFunctionName:3]).to(equal(SDLNameSetGlobalProperties));
+        expect([functionID getFunctionName:4]).to(equal(SDLNameResetGlobalProperties));
+        expect([functionID getFunctionName:5]).to(equal(SDLNameAddCommand));
+        expect([functionID getFunctionName:6]).to(equal(SDLNameDeleteCommand));
+        expect([functionID getFunctionName:7]).to(equal(SDLNameAddSubMenu));
+        expect([functionID getFunctionName:8]).to(equal(SDLNameDeleteSubMenu));
+        expect([functionID getFunctionName:9]).to(equal(SDLNameCreateInteractionChoiceSet));
+        expect([functionID getFunctionName:10]).to(equal(SDLNamePerformInteraction));
+        expect([functionID getFunctionName:11]).to(equal(SDLNameDeleteInteractionChoiceSet));
+        expect([functionID getFunctionName:12]).to(equal(SDLNameAlert));
+        expect([functionID getFunctionName:13]).to(equal(SDLNameShow));
+        expect([functionID getFunctionName:14]).to(equal(SDLNameSpeak));
+        expect([functionID getFunctionName:15]).to(equal(SDLNameSetMediaClockTimer));
+        expect([functionID getFunctionName:16]).to(equal(SDLNamePerformAudioPassThru));
+        expect([functionID getFunctionName:17]).to(equal(SDLNameEndAudioPassThru));
+        expect([functionID getFunctionName:18]).to(equal(SDLNameSubscribeButton));
+        expect([functionID getFunctionName:19]).to(equal(SDLNameUnsubscribeButton));
+        expect([functionID getFunctionName:20]).to(equal(SDLNameSubscribeVehicleData));
+        expect([functionID getFunctionName:21]).to(equal(SDLNameUnsubscribeVehicleData));
+        expect([functionID getFunctionName:22]).to(equal(SDLNameGetVehicleData));
+        expect([functionID getFunctionName:23]).to(equal(SDLNameReadDid));
+        expect([functionID getFunctionName:24]).to(equal(SDLNameGetDtcs));
+        expect([functionID getFunctionName:25]).to(equal(SDLNameScrollableMessage));
+        expect([functionID getFunctionName:26]).to(equal(SDLNameSlider));
+        expect([functionID getFunctionName:27]).to(equal(SDLNameShowConstantTbt));
+        expect([functionID getFunctionName:28]).to(equal(SDLNameAlertManeuver));
+        expect([functionID getFunctionName:29]).to(equal(SDLNameUpdateTurnList));
+        expect([functionID getFunctionName:30]).to(equal(SDLNameChangeRegistration));
+        expect([functionID getFunctionName:31]).to(equal(SDLNameGenericResponse));
+        expect([functionID getFunctionName:32]).to(equal(SDLNamePutFile));
+        expect([functionID getFunctionName:33]).to(equal(SDLNameDeleteFile));
+        expect([functionID getFunctionName:34]).to(equal(SDLNameListFiles));
+        expect([functionID getFunctionName:35]).to(equal(SDLNameSetAppIcon));
+        expect([functionID getFunctionName:36]).to(equal(SDLNameSetDisplayLayout));
+        expect([functionID getFunctionName:37]).to(equal(SDLNameDiagnosticMessage));
+        expect([functionID getFunctionName:38]).to(equal(SDLNameSystemRequest));
+        expect([functionID getFunctionName:39]).to(equal(SDLNameSendLocation));
+        expect([functionID getFunctionName:40]).to(equal(SDLNameDialNumber));
+        expect([functionID getFunctionName:32768]).to(equal(SDLNameOnHmiStatus));
+        expect([functionID getFunctionName:32769]).to(equal(SDLNameOnAppInterfaceUnregistered));
+        expect([functionID getFunctionName:32770]).to(equal(SDLNameOnButtonEvent));
+        expect([functionID getFunctionName:32771]).to(equal(SDLNameOnButtonPress));
+        expect([functionID getFunctionName:32772]).to(equal(SDLNameOnVehicleData));
+        expect([functionID getFunctionName:32773]).to(equal(SDLNameOnCommand));
+        expect([functionID getFunctionName:32774]).to(equal(SDLNameOnTbtClientState));
+        expect([functionID getFunctionName:32775]).to(equal(SDLNameOnDriverDistraction));
+        expect([functionID getFunctionName:32776]).to(equal(SDLNameOnPermissionsChange));
+        expect([functionID getFunctionName:32777]).to(equal(SDLNameOnAudioPassThru));
+        expect([functionID getFunctionName:32778]).to(equal(SDLNameOnLanguageChange));
+        expect([functionID getFunctionName:32779]).to(equal(SDLNameOnKeyboardInput));
+        expect([functionID getFunctionName:32780]).to(equal(SDLNameOnTouchEvent));
+        expect([functionID getFunctionName:32781]).to(equal(SDLNameOnSystemRequest));
+        expect([functionID getFunctionName:32782]).to(equal(SDLNameOnHashChange));
         
         //Not listed in Spec
-        expect([functionID getFunctionName:65536]).to(equal(NAMES_EncodedSyncPData));
-        expect([functionID getFunctionName:65537]).to(equal(NAMES_SyncPData));
+        expect([functionID getFunctionName:65536]).to(equal(SDLNameEncodedSyncPData));
+        expect([functionID getFunctionName:65537]).to(equal(SDLNameSyncPData));
         
-        expect([functionID getFunctionName:98304]).to(equal(NAMES_OnEncodedSyncPData));
-        expect([functionID getFunctionName:98305]).to(equal(NAMES_OnSyncPData));
+        expect([functionID getFunctionName:98304]).to(equal(SDLNameOnEncodedSyncPData));
+        expect([functionID getFunctionName:98305]).to(equal(SDLNameOnSyncPData));
     });
 });
 
 describe(@"GetFunctionID Tests", ^ {
     it(@"Should return the correct function ID", ^ {
-        expect([functionID getFunctionID:NAMES_RegisterAppInterface]).to(equal(@1));
-        expect([functionID getFunctionID:NAMES_UnregisterAppInterface]).to(equal(@2));
-        expect([functionID getFunctionID:NAMES_SetGlobalProperties]).to(equal(@3));
-        expect([functionID getFunctionID:NAMES_ResetGlobalProperties]).to(equal(@4));
-        expect([functionID getFunctionID:NAMES_AddCommand]).to(equal(@5));
-        expect([functionID getFunctionID:NAMES_DeleteCommand]).to(equal(@6));
-        expect([functionID getFunctionID:NAMES_AddSubMenu]).to(equal(@7));
-        expect([functionID getFunctionID:NAMES_DeleteSubMenu]).to(equal(@8));
-        expect([functionID getFunctionID:NAMES_CreateInteractionChoiceSet]).to(equal(@9));
-        expect([functionID getFunctionID:NAMES_PerformInteraction]).to(equal(@10));
-        expect([functionID getFunctionID:NAMES_DeleteInteractionChoiceSet]).to(equal(@11));
-        expect([functionID getFunctionID:NAMES_Alert]).to(equal(@12));
-        expect([functionID getFunctionID:NAMES_Show]).to(equal(@13));
-        expect([functionID getFunctionID:NAMES_Speak]).to(equal(@14));
-        expect([functionID getFunctionID:NAMES_SetMediaClockTimer]).to(equal(@15));
-        expect([functionID getFunctionID:NAMES_PerformAudioPassThru]).to(equal(@16));
-        expect([functionID getFunctionID:NAMES_EndAudioPassThru]).to(equal(@17));
-        expect([functionID getFunctionID:NAMES_SubscribeButton]).to(equal(@18));
-        expect([functionID getFunctionID:NAMES_UnsubscribeButton]).to(equal(@19));
-        expect([functionID getFunctionID:NAMES_SubscribeVehicleData]).to(equal(@20));
-        expect([functionID getFunctionID:NAMES_UnsubscribeVehicleData]).to(equal(@21));
-        expect([functionID getFunctionID:NAMES_GetVehicleData]).to(equal(@22));
-        expect([functionID getFunctionID:NAMES_ReadDID]).to(equal(@23));
-        expect([functionID getFunctionID:NAMES_GetDTCs]).to(equal(@24));
-        expect([functionID getFunctionID:NAMES_ScrollableMessage]).to(equal(@25));
-        expect([functionID getFunctionID:NAMES_Slider]).to(equal(@26));
-        expect([functionID getFunctionID:NAMES_ShowConstantTBT]).to(equal(@27));
-        expect([functionID getFunctionID:NAMES_AlertManeuver]).to(equal(@28));
-        expect([functionID getFunctionID:NAMES_UpdateTurnList]).to(equal(@29));
-        expect([functionID getFunctionID:NAMES_ChangeRegistration]).to(equal(@30));
-        expect([functionID getFunctionID:NAMES_GenericResponse]).to(equal(@31));
-        expect([functionID getFunctionID:NAMES_PutFile]).to(equal(@32));
-        expect([functionID getFunctionID:NAMES_DeleteFile]).to(equal(@33));
-        expect([functionID getFunctionID:NAMES_ListFiles]).to(equal(@34));
-        expect([functionID getFunctionID:NAMES_SetAppIcon]).to(equal(@35));
-        expect([functionID getFunctionID:NAMES_SetDisplayLayout]).to(equal(@36));
-        expect([functionID getFunctionID:NAMES_DiagnosticMessage]).to(equal(@37));
-        expect([functionID getFunctionID:NAMES_SystemRequest]).to(equal(@38));
-        expect([functionID getFunctionID:NAMES_SendLocation]).to(equal(@39));
-        expect([functionID getFunctionID:NAMES_DialNumber]).to(equal(@40));
-        expect([functionID getFunctionID:NAMES_OnHMIStatus]).to(equal(@32768));
-        expect([functionID getFunctionID:NAMES_OnAppInterfaceUnregistered]).to(equal(@32769));
-        expect([functionID getFunctionID:NAMES_OnButtonEvent]).to(equal(@32770));
-        expect([functionID getFunctionID:NAMES_OnButtonPress]).to(equal(@32771));
-        expect([functionID getFunctionID:NAMES_OnVehicleData]).to(equal(@32772));
-        expect([functionID getFunctionID:NAMES_OnCommand]).to(equal(@32773));
-        expect([functionID getFunctionID:NAMES_OnTBTClientState]).to(equal(@32774));
-        expect([functionID getFunctionID:NAMES_OnDriverDistraction]).to(equal(@32775));
-        expect([functionID getFunctionID:NAMES_OnPermissionsChange]).to(equal(@32776));
-        expect([functionID getFunctionID:NAMES_OnAudioPassThru]).to(equal(@32777));
-        expect([functionID getFunctionID:NAMES_OnLanguageChange]).to(equal(@32778));
-        expect([functionID getFunctionID:NAMES_OnKeyboardInput]).to(equal(@32779));
-        expect([functionID getFunctionID:NAMES_OnTouchEvent]).to(equal(@32780));
-        expect([functionID getFunctionID:NAMES_OnSystemRequest]).to(equal(@32781));
-        expect([functionID getFunctionID:NAMES_OnHashChange]).to(equal(@32782));
+        expect([functionID getFunctionID:SDLNameRegisterAppInterface]).to(equal(@1));
+        expect([functionID getFunctionID:SDLNameUnregisterAppInterface]).to(equal(@2));
+        expect([functionID getFunctionID:SDLNameSetGlobalProperties]).to(equal(@3));
+        expect([functionID getFunctionID:SDLNameResetGlobalProperties]).to(equal(@4));
+        expect([functionID getFunctionID:SDLNameAddCommand]).to(equal(@5));
+        expect([functionID getFunctionID:SDLNameDeleteCommand]).to(equal(@6));
+        expect([functionID getFunctionID:SDLNameAddSubMenu]).to(equal(@7));
+        expect([functionID getFunctionID:SDLNameDeleteSubMenu]).to(equal(@8));
+        expect([functionID getFunctionID:SDLNameCreateInteractionChoiceSet]).to(equal(@9));
+        expect([functionID getFunctionID:SDLNamePerformInteraction]).to(equal(@10));
+        expect([functionID getFunctionID:SDLNameDeleteInteractionChoiceSet]).to(equal(@11));
+        expect([functionID getFunctionID:SDLNameAlert]).to(equal(@12));
+        expect([functionID getFunctionID:SDLNameShow]).to(equal(@13));
+        expect([functionID getFunctionID:SDLNameSpeak]).to(equal(@14));
+        expect([functionID getFunctionID:SDLNameSetMediaClockTimer]).to(equal(@15));
+        expect([functionID getFunctionID:SDLNamePerformAudioPassThru]).to(equal(@16));
+        expect([functionID getFunctionID:SDLNameEndAudioPassThru]).to(equal(@17));
+        expect([functionID getFunctionID:SDLNameSubscribeButton]).to(equal(@18));
+        expect([functionID getFunctionID:SDLNameUnsubscribeButton]).to(equal(@19));
+        expect([functionID getFunctionID:SDLNameSubscribeVehicleData]).to(equal(@20));
+        expect([functionID getFunctionID:SDLNameUnsubscribeVehicleData]).to(equal(@21));
+        expect([functionID getFunctionID:SDLNameGetVehicleData]).to(equal(@22));
+        expect([functionID getFunctionID:SDLNameReadDid]).to(equal(@23));
+        expect([functionID getFunctionID:SDLNameGetDtcs]).to(equal(@24));
+        expect([functionID getFunctionID:SDLNameScrollableMessage]).to(equal(@25));
+        expect([functionID getFunctionID:SDLNameSlider]).to(equal(@26));
+        expect([functionID getFunctionID:SDLNameShowConstantTbt]).to(equal(@27));
+        expect([functionID getFunctionID:SDLNameAlertManeuver]).to(equal(@28));
+        expect([functionID getFunctionID:SDLNameUpdateTurnList]).to(equal(@29));
+        expect([functionID getFunctionID:SDLNameChangeRegistration]).to(equal(@30));
+        expect([functionID getFunctionID:SDLNameGenericResponse]).to(equal(@31));
+        expect([functionID getFunctionID:SDLNamePutFile]).to(equal(@32));
+        expect([functionID getFunctionID:SDLNameDeleteFile]).to(equal(@33));
+        expect([functionID getFunctionID:SDLNameListFiles]).to(equal(@34));
+        expect([functionID getFunctionID:SDLNameSetAppIcon]).to(equal(@35));
+        expect([functionID getFunctionID:SDLNameSetDisplayLayout]).to(equal(@36));
+        expect([functionID getFunctionID:SDLNameDiagnosticMessage]).to(equal(@37));
+        expect([functionID getFunctionID:SDLNameSystemRequest]).to(equal(@38));
+        expect([functionID getFunctionID:SDLNameSendLocation]).to(equal(@39));
+        expect([functionID getFunctionID:SDLNameDialNumber]).to(equal(@40));
+        expect([functionID getFunctionID:SDLNameOnHmiStatus]).to(equal(@32768));
+        expect([functionID getFunctionID:SDLNameOnAppInterfaceUnregistered]).to(equal(@32769));
+        expect([functionID getFunctionID:SDLNameOnButtonEvent]).to(equal(@32770));
+        expect([functionID getFunctionID:SDLNameOnButtonPress]).to(equal(@32771));
+        expect([functionID getFunctionID:SDLNameOnVehicleData]).to(equal(@32772));
+        expect([functionID getFunctionID:SDLNameOnCommand]).to(equal(@32773));
+        expect([functionID getFunctionID:SDLNameOnTbtClientState]).to(equal(@32774));
+        expect([functionID getFunctionID:SDLNameOnDriverDistraction]).to(equal(@32775));
+        expect([functionID getFunctionID:SDLNameOnPermissionsChange]).to(equal(@32776));
+        expect([functionID getFunctionID:SDLNameOnAudioPassThru]).to(equal(@32777));
+        expect([functionID getFunctionID:SDLNameOnLanguageChange]).to(equal(@32778));
+        expect([functionID getFunctionID:SDLNameOnKeyboardInput]).to(equal(@32779));
+        expect([functionID getFunctionID:SDLNameOnTouchEvent]).to(equal(@32780));
+        expect([functionID getFunctionID:SDLNameOnSystemRequest]).to(equal(@32781));
+        expect([functionID getFunctionID:SDLNameOnHashChange]).to(equal(@32782));
         
         //Not listed in Spec
-        expect([functionID getFunctionID:NAMES_EncodedSyncPData]).to(equal(@65536));
-        expect([functionID getFunctionID:NAMES_SyncPData]).to(equal(@65537));
+        expect([functionID getFunctionID:SDLNameEncodedSyncPData]).to(equal(@65536));
+        expect([functionID getFunctionID:SDLNameSyncPData]).to(equal(@65537));
         
-        expect([functionID getFunctionID:NAMES_OnEncodedSyncPData]).to(equal(@98304));
-        expect([functionID getFunctionID:NAMES_OnSyncPData]).to(equal(@98305));
+        expect([functionID getFunctionID:SDLNameOnEncodedSyncPData]).to(equal(@98304));
+        expect([functionID getFunctionID:SDLNameOnSyncPData]).to(equal(@98305));
     });
 });
 
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
index 2ec566031..4bb54276a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
@@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_reason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]},
-                                             NAMES_operation_name:NAMES_OnAppInterfaceUnregistered}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameReason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]},
+                                             SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy];
         SDLOnAppInterfaceUnregistered* testNotification = [[SDLOnAppInterfaceUnregistered alloc] initWithDictionary:dict];
         
         expect(testNotification.reason).to(equal([SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]));
@@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
index becc5c251..fe1b168aa 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
@@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_buttonName:[SDLButtonName CUSTOM_BUTTON],
-                                                   NAMES_buttonEventMode:[SDLButtonEventMode BUTTONDOWN],
-                                                   NAMES_customButtonID:@4252},
-                                             NAMES_operation_name:NAMES_OnButtonEvent}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON],
+                                                   SDLNameButtonEventMode:[SDLButtonEventMode BUTTONDOWN],
+                                                   SDLNameCustomButtonId:@4252},
+                                             SDLNameOperationName:SDLNameOnButtonEvent}} mutableCopy];
         SDLOnButtonEvent* testNotification = [[SDLOnButtonEvent alloc] initWithDictionary:dict];
         
         expect(testNotification.buttonName).to(equal([SDLButtonName CUSTOM_BUTTON]));
@@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
index 4467f72a5..6d369a4bb 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
@@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_buttonName:[SDLButtonName CUSTOM_BUTTON],
-                                                   NAMES_buttonPressMode:[SDLButtonPressMode LONG],
-                                                   NAMES_customButtonID:@5642},
-                                             NAMES_operation_name:NAMES_OnButtonPress}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON],
+                                                   SDLNameButtonPressMode:[SDLButtonPressMode LONG],
+                                                   SDLNameCustomButtonId:@5642},
+                                             SDLNameOperationName:SDLNameOnButtonPress}} mutableCopy];
         SDLOnButtonPress* testNotification = [[SDLOnButtonPress alloc] initWithDictionary:dict];
         
         expect(testNotification.buttonName).to(equal([SDLButtonName CUSTOM_BUTTON]));
@@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
index 6b8afd10b..424405876 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
@@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_cmdID:@5676544,
-                                                   NAMES_triggerSource:[SDLTriggerSource KEYBOARD]},
-                                             NAMES_operation_name:NAMES_OnCommand}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameCommandId:@5676544,
+                                                   SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]},
+                                             SDLNameOperationName:SDLNameOnCommand}} mutableCopy];
         SDLOnCommand* testNotification = [[SDLOnCommand alloc] initWithDictionary:dict];
         
         expect(testNotification.cmdID).to(equal(@5676544));
@@ -45,4 +45,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
index 79c90bdd7..b97df7e8d 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
@@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_state:[SDLDriverDistractionState DD_ON]},
-                                             NAMES_operation_name:NAMES_OnDriverDistraction}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameState:[SDLDriverDistractionState DD_ON]},
+                                             SDLNameOperationName:SDLNameOnDriverDistraction}} mutableCopy];
         SDLOnDriverDistraction* testNotification = [[SDLOnDriverDistraction alloc] initWithDictionary:dict];
         
         expect(testNotification.state).to(equal([SDLDriverDistractionState DD_ON]));
@@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
index a8844e22a..31fad837b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
@@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_data:[@[@0] mutableCopy],
-                                                   NAMES_URL:@"www.zombo.com",
-                                                   NAMES_Timeout:@564},
-                                             NAMES_operation_name:NAMES_OnEncodedSyncPData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameData:[@[@0] mutableCopy],
+                                                   SDLNameUrlUppercase:@"www.zombo.com",
+                                                   SDLNameTimeoutCapitalized:@564},
+                                             SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy];
         SDLOnEncodedSyncPData* testNotification = [[SDLOnEncodedSyncPData alloc] initWithDictionary:dict];
         
         expect(testNotification.data).to(equal([@[@0] mutableCopy]));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
index c2d58a484..b0c95cf67 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
@@ -31,12 +31,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_hmiLevel:[SDLHMILevel LIMITED],
-                                                   NAMES_audioStreamingState:[SDLAudioStreamingState ATTENUATED],
-                                                   NAMES_systemContext:[SDLSystemContext HMI_OBSCURED]},
-                                             NAMES_operation_name:NAMES_OnHMIStatus}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameHmiLevel:[SDLHMILevel LIMITED],
+                                                   SDLNameAudioStreamingState:[SDLAudioStreamingState ATTENUATED],
+                                                   SDLNameSystemContext:[SDLSystemContext HMI_OBSCURED]},
+                                             SDLNameOperationName:SDLNameOnHmiStatus}} mutableCopy];
         SDLOnHMIStatus* testNotification = [[SDLOnHMIStatus alloc] initWithDictionary:dict];
         
         expect(testNotification.hmiLevel).to(equal([SDLHMILevel LIMITED]));
@@ -53,4 +53,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m
index 308347c61..ea87449c6 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_hashID:@"hash"},
-                                             NAMES_operation_name:NAMES_OnHashChange}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameHashId:@"hash"},
+                                             SDLNameOperationName:SDLNameOnHashChange}} mutableCopy];
         SDLOnHashChange* testNotification = [[SDLOnHashChange alloc] initWithDictionary:dict];
         
         expect(testNotification.hashID).to(equal(@"hash"));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
index cf87e853d..96b867dad 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
@@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_event:[SDLKeyboardEvent ENTRY_SUBMITTED],
-                                                   NAMES_data:@"qwertyg"},
-                                             NAMES_operation_name:NAMES_OnKeyboardInput}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameEvent:[SDLKeyboardEvent ENTRY_SUBMITTED],
+                                                   SDLNameData:@"qwertyg"},
+                                             SDLNameOperationName:SDLNameOnKeyboardInput}} mutableCopy];
         SDLOnKeyboardInput* testNotification = [[SDLOnKeyboardInput alloc] initWithDictionary:dict];
         
         expect(testNotification.event).to(equal([SDLKeyboardEvent ENTRY_SUBMITTED]));
@@ -45,4 +45,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
index f9009f69c..ecb882b8a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
@@ -27,11 +27,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_language:[SDLLanguage ES_ES],
-                                                   NAMES_hmiDisplayLanguage:[SDLLanguage DE_DE]},
-                                             NAMES_operation_name:NAMES_OnLanguageChange}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameLanguage:[SDLLanguage ES_ES],
+                                                   SDLNameHmiDisplayLanguage:[SDLLanguage DE_DE]},
+                                             SDLNameOperationName:SDLNameOnLanguageChange}} mutableCopy];
         SDLOnLanguageChange* testNotification = [[SDLOnLanguageChange alloc] initWithDictionary:dict];
         
         expect(testNotification.language).to(equal([SDLLanguage ES_ES]));
@@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
index d438ec621..e8da95d84 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
@@ -31,13 +31,13 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
                                                  @{@"driverdistractionstatus":@NO,
                                                    @"userselected":@3,
                                                    @"OnLockScreenStatus":[SDLLockScreenStatus REQUIRED],
                                                    @"hmilevel":[SDLHMILevel NONE]},
-                                             NAMES_operation_name:@"OnLockScreenStatus"}} mutableCopy];
+                                             SDLNameOperationName:@"OnLockScreenStatus"}} mutableCopy];
         SDLOnLockScreenStatus* testNotification = [[SDLOnLockScreenStatus alloc] initWithDictionary:dict];
         
         expect(testNotification.driverDistractionStatus).to(equal(@NO));
@@ -56,4 +56,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
index 5a5d349cc..9ad2026de 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
@@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_permissionItem:[@[item] mutableCopy]},
-                                             NAMES_operation_name:NAMES_OnPermissionsChange}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNamePermissionItem:[@[item] mutableCopy]},
+                                             SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy];
         SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict];
         
         expect(testNotification.permissionItem).to(equal([@[item] mutableCopy]));
@@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
index 34ac9af9e..ea916c9f8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
@@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_URL:@"https://www.youtube.com/watch?v=ygr5AHufBN4",
-                                                   NAMES_Timeout:@8357},
-                                             NAMES_operation_name:NAMES_OnSyncPData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameUrlUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4",
+                                                   SDLNameTimeoutCapitalized:@8357},
+                                             SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy];
         SDLOnSyncPData* testNotification = [[SDLOnSyncPData alloc] initWithDictionary:dict];
         
         expect(testNotification.URL).to(equal(@"https://www.youtube.com/watch?v=ygr5AHufBN4"));
@@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
index ed235871e..4b65f9a83 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
@@ -36,15 +36,15 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_requestType:[SDLRequestType FILE_RESUME],
-                                                   NAMES_url:[@[@"www.google.com"] mutableCopy],
-                                                   NAMES_timeout:@52345,
-                                                   NAMES_fileType:[SDLFileType GRAPHIC_PNG],
-                                                   NAMES_offset:@2532678684,
-                                                   NAMES_length:@50000000000},
-                                             NAMES_operation_name:NAMES_OnSystemRequest}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameRequestType:[SDLRequestType FILE_RESUME],
+                                                   SDLNameUrl:[@[@"www.google.com"] mutableCopy],
+                                                   SDLNameTimeout:@52345,
+                                                   SDLNameFileType:[SDLFileType GRAPHIC_PNG],
+                                                   SDLNameOffset:@2532678684,
+                                                   SDLNameLength:@50000000000},
+                                             SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy];
         SDLOnSystemRequest* testNotification = [[SDLOnSystemRequest alloc] initWithDictionary:dict];
         
         expect(testNotification.requestType).to(equal([SDLRequestType FILE_RESUME]));
@@ -67,4 +67,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
index b1391d033..db3396445 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
@@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_state:[SDLTBTState ETA_REQUEST]},
-                                             NAMES_operation_name:NAMES_OnTBTClientState}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameState:[SDLTBTState ETA_REQUEST]},
+                                             SDLNameOperationName:SDLNameOnTbtClientState}} mutableCopy];
         SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict];
         
         expect(testNotification.state).to(equal([SDLTBTState ETA_REQUEST]));
@@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
index 298ffef9f..c32f40d5f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
@@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_type:[SDLTouchType BEGIN],
-                                                   NAMES_event:[@[event] mutableCopy]},
-                                             NAMES_operation_name:NAMES_OnTouchEvent}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameType:[SDLTouchType BEGIN],
+                                                   SDLNameEvent:[@[event] mutableCopy]},
+                                             SDLNameOperationName:SDLNameOnTouchEvent}} mutableCopy];
         SDLOnTouchEvent* testNotification = [[SDLOnTouchEvent alloc] initWithDictionary:dict];
         
         expect(testNotification.type).to(equal([SDLTouchType BEGIN]));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
index 17704a304..68161263e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
@@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_gps:gps,
-                                                   NAMES_speed:@70.1,
-                                                   NAMES_rpm:@4242,
-                                                   NAMES_fuelLevel:@10.3,
-                                                   NAMES_fuelLevel_State:[SDLComponentVolumeStatus ALERT],
-                                                   NAMES_instantFuelConsumption:@4000.63,
-                                                   NAMES_externalTemperature:@-10,
-                                                   NAMES_vin:@"222222222722",
-                                                   NAMES_prndl:[SDLPRNDL DRIVE],
-                                                   NAMES_tirePressure:tires,
-                                                   NAMES_odometer:@100050,
-                                                   NAMES_beltStatus:belt,
-                                                   NAMES_bodyInformation:body,
-                                                   NAMES_deviceStatus:device,
-                                                   NAMES_driverBraking:[SDLVehicleDataEventStatus _YES],
-                                                   NAMES_wiperStatus:[SDLWiperStatus STALLED],
-                                                   NAMES_headLampStatus:headLamp,
-                                                   NAMES_engineTorque:@-200.124,
-                                                   NAMES_accPedalPosition:@99.99999999,
-                                                   NAMES_steeringWheelAngle:@0.000000001,
-                                                   NAMES_eCallInfo:eCall,
-                                                   NAMES_airbagStatus:airbag,
-                                                   NAMES_emergencyEvent:event,
-                                                   NAMES_clusterModeStatus:clusterMode,
-                                                   NAMES_myKey:myKey},
-                                             NAMES_operation_name:NAMES_OnVehicleData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameGps:gps,
+                                                   SDLNameSpeed:@70.1,
+                                                   SDLNameRpm:@4242,
+                                                   SDLNameFuelLevel:@10.3,
+                                                   SDLNameFuelLevelState:[SDLComponentVolumeStatus ALERT],
+                                                   SDLNameInstantFuelConsumption:@4000.63,
+                                                   SDLNameExternalTemperature:@-10,
+                                                   SDLNameVin:@"222222222722",
+                                                   SDLNamePrndl:[SDLPRNDL DRIVE],
+                                                   SDLNameTirePressure:tires,
+                                                   SDLNameOdometer:@100050,
+                                                   SDLNameBeltStatus:belt,
+                                                   SDLNameBodyInformation:body,
+                                                   SDLNameDeviceStatus:device,
+                                                   SDLNameDriverBraking:[SDLVehicleDataEventStatus _YES],
+                                                   SDLNameWiperStatus:[SDLWiperStatus STALLED],
+                                                   SDLNameHeadLampStatus:headLamp,
+                                                   SDLNameEngineTorque:@-200.124,
+                                                   SDLNameAccPedalPosition:@99.99999999,
+                                                   SDLNameSteeringWheelAngle:@0.000000001,
+                                                   SDLNameECallInfo:eCall,
+                                                   SDLNameAirbagStatus:airbag,
+                                                   SDLNameEmergencyEvent:event,
+                                                   SDLNameClusterModeStatus:clusterMode,
+                                                   SDLNameMyKey:myKey},
+                                             SDLNameOperationName:SDLNameOnVehicleData}} mutableCopy];
         SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] initWithDictionary:dict];
         
         expect(testNotification.gps).to(equal(gps));
@@ -172,4 +172,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m
index 441eca732..f0632eb87 100644
--- a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m
@@ -15,9 +15,9 @@
 QuickSpecBegin(SDLRPCPayloadSpec)
 
 __block SDLRPCPayload* testPayload;
-__block NSDictionary* dict = @{NAMES_response:
-                                   @{NAMES_parameters:@{},
-                                     NAMES_operation_name:NAMES_DeleteCommand}};
+__block NSDictionary* dict = @{SDLNameResponse:
+                                   @{SDLNameParameters:@{},
+                                     SDLNameOperationName:SDLNameDeleteCommand}};
 
 NSData* (^testData)() = ^NSData* {
     NSData* jsonData = [NSJSONSerialization dataWithJSONObject:dict options:0 error:0];
@@ -72,4 +72,4 @@ describe(@"RPCPayloadWithData Test", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
index 455552bad..6dfa5423c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
@@ -34,13 +34,13 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_cmdID:@434577,
-                                                   NAMES_menuParams:menu,
-                                                   NAMES_vrCommands:[@[@"name", @"anotherName"] mutableCopy],
-                                                   NAMES_cmdIcon:image},
-                                             NAMES_operation_name:NAMES_AddCommand}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameCommandId:@434577,
+                                                   SDLNameMenuParams:menu,
+                                                   SDLNameVrCommands:[@[@"name", @"anotherName"] mutableCopy],
+                                                   SDLNameCommandIcon:image},
+                                             SDLNameOperationName:SDLNameAddCommand}} mutableCopy];
         SDLAddCommand* testRequest = [[SDLAddCommand alloc] initWithDictionary:dict];
         
         expect(testRequest.cmdID).to(equal(@434577));
@@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m
index 04a6526a8..890049e5f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m
@@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_menuID:@4345645,
-                                                   NAMES_position:@27,
-                                                   NAMES_menuName:@"Welcome to the menu"},
-                                             NAMES_operation_name:NAMES_AddSubMenu}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameMenuId:@4345645,
+                                                   SDLNamePosition:@27,
+                                                   SDLNameMenuName:@"Welcome to the menu"},
+                                             SDLNameOperationName:SDLNameAddSubMenu}} mutableCopy];
         SDLAddSubMenu* testRequest = [[SDLAddSubMenu alloc] initWithDictionary:dict];
 
         expect(testRequest.menuID).to(equal(@4345645));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
index 16d5aa0e6..c64019d1b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
@@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_ttsChunks:[@[tts] mutableCopy],
-                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                             NAMES_operation_name:NAMES_AlertManeuver}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameTtsChunks:[@[tts] mutableCopy],
+                                                   SDLNameSoftButtons:[@[button] mutableCopy]},
+                                             SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy];
         SDLAlertManeuver* testRequest = [[SDLAlertManeuver alloc] initWithDictionary:dict];
         
         expect(testRequest.ttsChunks).to(equal([@[tts] mutableCopy]));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
index b5725e168..1e6bd589c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
@@ -42,17 +42,17 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_alertText1:@"alert#1",
-                                                   NAMES_alertText2:@"alert#2",
-                                                   NAMES_alertText3:@"alert#3",
-                                                   NAMES_ttsChunks:[@[tts] mutableCopy],
-                                                   NAMES_duration:@4357,
-                                                   NAMES_playTone:@YES,
-                                                   NAMES_progressIndicator:@NO,
-                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                             NAMES_operation_name:NAMES_Alert}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameAlertText1:@"alert#1",
+                                                   SDLNameAlertText2:@"alert#2",
+                                                   SDLNameAlertText3:@"alert#3",
+                                                   SDLNameTtsChunks:[@[tts] mutableCopy],
+                                                   SDLNameDuration:@4357,
+                                                   SDLNamePlayTone:@YES,
+                                                   SDLNameProgressIndicator:@NO,
+                                                   SDLNameSoftButtons:[@[button] mutableCopy]},
+                                             SDLNameOperationName:SDLNameAlert}} mutableCopy];
         SDLAlert* testRequest = [[SDLAlert alloc] initWithDictionary:dict];
         
         expect(testRequest.alertText1).to(equal(@"alert#1"));
@@ -79,4 +79,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
index 9bf496042..1fd8e21e5 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
@@ -112,15 +112,15 @@ describe(@"change registration", ^ {
                 someNGNMediaAppName = @"some media app name";
                 someVRSynonyms = @[@"some1", @"some2"];
                 
-                NSMutableDictionary* dict = [@{NAMES_request:
-                                                   @{NAMES_parameters:
-                                                         @{NAMES_language:someLanguage,
-                                                           NAMES_hmiDisplayLanguage:someOtherLanguage,
-                                                           NAMES_appName:someAppName,
-                                                           NAMES_ttsName:someTTSChunks,
-                                                           NAMES_ngnMediaScreenAppName:someNGNMediaAppName,
-                                                           NAMES_vrSynonyms:someVRSynonyms},
-                                                        NAMES_operation_name:NAMES_ChangeRegistration}} mutableCopy];
+                NSMutableDictionary* dict = [@{SDLNameRequest:
+                                                   @{SDLNameParameters:
+                                                         @{SDLNameLanguage:someLanguage,
+                                                           SDLNameHmiDisplayLanguage:someOtherLanguage,
+                                                           SDLNameAppName:someAppName,
+                                                           SDLNameTtsName:someTTSChunks,
+                                                           SDLNameNgnMediaScreenAppName:someNGNMediaAppName,
+                                                           SDLNameVrSynonyms:someVRSynonyms},
+                                                        SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy];
                 
                 testRequest = [[SDLChangeRegistration alloc] initWithDictionary:dict];
             });
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m
index 39cadb2d6..017b123f5 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m
@@ -28,11 +28,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_interactionChoiceSetID:@141414,
-                                                   NAMES_choiceSet:[@[choice] mutableCopy]},
-                                             NAMES_operation_name:NAMES_CreateInteractionChoiceSet}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameInteractionChoiceSetId:@141414,
+                                                   SDLNameChoiceSet:[@[choice] mutableCopy]},
+                                             SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy];
         SDLCreateInteractionChoiceSet* testRequest = [[SDLCreateInteractionChoiceSet alloc] initWithDictionary:dict];
 
         expect(testRequest.interactionChoiceSetID).to(equal(@141414));
@@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m
index 2d0be62d8..89ed13257 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_cmdID:@11223344},
-                                             NAMES_operation_name:NAMES_DeleteCommand}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameCommandId:@11223344},
+                                             SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy];
         SDLDeleteCommand* testRequest = [[SDLDeleteCommand alloc] initWithDictionary:dict];
         
         expect(testRequest.cmdID).to(equal(@11223344));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m
index c6e471fc4..5946c7ec0 100755
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_syncFileName:@"synchro"},
-                                             NAMES_operation_name:NAMES_DeleteFile}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSyncFileName:@"synchro"},
+                                             SDLNameOperationName:SDLNameDeleteFile}} mutableCopy];
         SDLDeleteFile* testRequest = [[SDLDeleteFile alloc] initWithDictionary:dict];
         
         expect(testRequest.syncFileName).to(equal(@"synchro"));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
 	});
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m
index 6d42d114f..540c08cb4 100755
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_interactionChoiceSetID:@20314},
-                                             NAMES_operation_name:NAMES_DeleteInteractionChoiceSet}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameInteractionChoiceSetId:@20314},
+                                             SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy];
         SDLDeleteInteractionChoiceSet* testRequest = [[SDLDeleteInteractionChoiceSet alloc] initWithDictionary:dict];
         
         expect(testRequest.interactionChoiceSetID).to(equal(@20314));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
 	});
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m
index 9b2d6588d..3185391ec 100755
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_menuID:@25614},
-                                             NAMES_operation_name:NAMES_DeleteSubMenu}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameMenuId:@25614},
+                                             SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy];
         SDLDeleteSubMenu* testRequest = [[SDLDeleteSubMenu alloc] initWithDictionary:dict];
         
         expect(testRequest.menuID).to(equal(@25614));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
 	});
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m
index 965920f39..fd25fd099 100755
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m
@@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_targetID:@3562,
-                                                   NAMES_messageLength:@55555,
-                                                   NAMES_messageData:[@[@1, @4, @16, @64] mutableCopy]},
-                                             NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameTargetId:@3562,
+                                                   SDLNameMessageLength:@55555,
+                                                   SDLNameMessageData:[@[@1, @4, @16, @64] mutableCopy]},
+                                             SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy];
         SDLDiagnosticMessage* testRequest = [[SDLDiagnosticMessage alloc] initWithDictionary:dict];
         
         expect(testRequest.targetID).to(equal(@3562));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
 	});
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m
index 7371fedf3..a150144c1 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m
@@ -43,9 +43,9 @@ describe(@"Dial Number RPC", ^{
         beforeEach(^{
             somePhoneNumber = @"1234567890";
             NSDictionary *initDict = @{
-                                       NAMES_request: @{
-                                               NAMES_parameters: @{
-                                                       NAMES_number: [somePhoneNumber copy]
+                                       SDLNameRequest: @{
+                                               SDLNameParameters: @{
+                                                       SDLNameNumber: [somePhoneNumber copy]
                                                        }
                                                }
                                        };
@@ -62,8 +62,8 @@ describe(@"Dial Number RPC", ^{
         __block SDLDialNumber *testRequest = nil;
         beforeEach(^{
             NSDictionary *initDict = @{
-                                       NAMES_request: @{
-                                               NAMES_parameters: @{
+                                       SDLNameRequest: @{
+                                               SDLNameParameters: @{
                                                        }
                                                }
                                        };
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m
index 753608940..accdd94a6 100755
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_data:[@[@2, @2, @2] mutableCopy]},
-                                             NAMES_operation_name:NAMES_EncodedSyncPData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameData:[@[@2, @2, @2] mutableCopy]},
+                                             SDLNameOperationName:SDLNameEncodedSyncPData}} mutableCopy];
         SDLEncodedSyncPData* testRequest = [[SDLEncodedSyncPData alloc] initWithDictionary:dict];
         
         expect(testRequest.data).to(equal([@[@2, @2, @2] mutableCopy]));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
 	});
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
index 87f84fd4d..d3373093c 100755
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
@@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_ecuName:@4321,
-                                                   NAMES_dtcMask:@22},
-                                             NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameEcuName:@4321,
+                                                   SDLNameDtcMask:@22},
+                                             SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy];
         SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict];
         
         expect(testRequest.ecuName).to(equal(@4321));
@@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ {
 	});
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
index 936550ce7..b83a1ee5e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
@@ -71,34 +71,34 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_gps:@NO,
-                                                   NAMES_speed:@YES,
-                                                   NAMES_rpm:@NO,
-                                                   NAMES_fuelLevel:@YES,
-                                                   NAMES_fuelLevel_State:@NO,
-                                                   NAMES_instantFuelConsumption:@YES,
-                                                   NAMES_externalTemperature:@NO,
-                                                   NAMES_vin:@YES,
-                                                   NAMES_prndl:@NO,
-                                                   NAMES_tirePressure:@YES,
-                                                   NAMES_odometer:@NO,
-                                                   NAMES_beltStatus:@YES,
-                                                   NAMES_bodyInformation:@NO,
-                                                   NAMES_deviceStatus:@YES,
-                                                   NAMES_driverBraking:@NO,
-                                                   NAMES_wiperStatus:@YES,
-                                                   NAMES_headLampStatus:@NO,
-                                                   NAMES_engineTorque:@YES,
-                                                   NAMES_accPedalPosition:@NO,
-                                                   NAMES_steeringWheelAngle:@YES,
-                                                   NAMES_eCallInfo:@NO,
-                                                   NAMES_airbagStatus:@YES,
-                                                   NAMES_emergencyEvent:@NO,
-                                                   NAMES_clusterModeStatus:@YES,
-                                                   NAMES_myKey:@NO},
-                                             NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameGps:@NO,
+                                                   SDLNameSpeed:@YES,
+                                                   SDLNameRpm:@NO,
+                                                   SDLNameFuelLevel:@YES,
+                                                   SDLNameFuelLevelState:@NO,
+                                                   SDLNameInstantFuelConsumption:@YES,
+                                                   SDLNameExternalTemperature:@NO,
+                                                   SDLNameVin:@YES,
+                                                   SDLNamePrndl:@NO,
+                                                   SDLNameTirePressure:@YES,
+                                                   SDLNameOdometer:@NO,
+                                                   SDLNameBeltStatus:@YES,
+                                                   SDLNameBodyInformation:@NO,
+                                                   SDLNameDeviceStatus:@YES,
+                                                   SDLNameDriverBraking:@NO,
+                                                   SDLNameWiperStatus:@YES,
+                                                   SDLNameHeadLampStatus:@NO,
+                                                   SDLNameEngineTorque:@YES,
+                                                   SDLNameAccPedalPosition:@NO,
+                                                   SDLNameSteeringWheelAngle:@YES,
+                                                   SDLNameECallInfo:@NO,
+                                                   SDLNameAirbagStatus:@YES,
+                                                   SDLNameEmergencyEvent:@NO,
+                                                   SDLNameClusterModeStatus:@YES,
+                                                   SDLNameMyKey:@NO},
+                                             SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy];
         SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] initWithDictionary:dict];
         
         expect(testRequest.gps).to(equal(@NO));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
index 011a7adf5..f843ede18 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
@@ -39,16 +39,16 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_audioPassThruDisplayText1:@"passthru#1",
-                                                   NAMES_audioPassThruDisplayText2:@"passthru#2",
-                                                   NAMES_samplingRate:[SDLSamplingRate _22KHZ],
-                                                   NAMES_maxDuration:@34563,
-                                                   NAMES_bitsPerSample:[SDLBitsPerSample _16_BIT],
-                                                   NAMES_audioType:[SDLAudioType PCM],
-                                                   NAMES_muteAudio:@NO},
-                                             NAMES_operation_name:NAMES_PerformAudioPassThru}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameAudioPassThruDisplayText1:@"passthru#1",
+                                                   SDLNameAudioPassThruDisplayText2:@"passthru#2",
+                                                   SDLNameSamplingRate:[SDLSamplingRate _22KHZ],
+                                                   SDLNameMaxDuration:@34563,
+                                                   SDLNameBitsPerSample:[SDLBitsPerSample _16_BIT],
+                                                   SDLNameAudioType:[SDLAudioType PCM],
+                                                   SDLNameMuteAudio:@NO},
+                                             SDLNameOperationName:SDLNamePerformAudioPassThru}} mutableCopy];
         SDLPerformAudioPassThru* testRequest = [[SDLPerformAudioPassThru alloc] initWithDictionary:dict];
         
         expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1"));
@@ -73,4 +73,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
index c89c3d5bd..232a2188d 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
@@ -48,18 +48,18 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_initialText:@"a",
-                                                   NAMES_initialPrompt:[@[chunk1] mutableCopy],
-                                                   NAMES_interactionMode:[SDLInteractionMode VR_ONLY],
-                                                   NAMES_interactionChoiceSetIDList:[@[@1, @2, @3] mutableCopy],
-                                                   NAMES_helpPrompt:[@[chunk2] mutableCopy],
-                                                   NAMES_timeoutPrompt:[@[chunk3] mutableCopy],
-                                                   NAMES_timeout:@42000,
-                                                   NAMES_vrHelp:[@[helpItem] mutableCopy],
-                                                   NAMES_interactionLayout:[SDLLayoutMode ICON_WITH_SEARCH]},
-                                             NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameInitialText:@"a",
+                                                   SDLNameInitialPrompt:[@[chunk1] mutableCopy],
+                                                   SDLNameInteractionMode:[SDLInteractionMode VR_ONLY],
+                                                   SDLNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy],
+                                                   SDLNameHelpPrompt:[@[chunk2] mutableCopy],
+                                                   SDLNameTimeoutPrompt:[@[chunk3] mutableCopy],
+                                                   SDLNameTimeout:@42000,
+                                                   SDLNameVrHelp:[@[helpItem] mutableCopy],
+                                                   SDLNameInteractionLayout:[SDLLayoutMode ICON_WITH_SEARCH]},
+                                             SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy];
         SDLPerformInteraction* testRequest = [[SDLPerformInteraction alloc] initWithDictionary:dict];
         
         expect(testRequest.initialText).to(equal(@"a"));
@@ -88,4 +88,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
index bfa24dc13..c58e5a9f8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
@@ -35,15 +35,15 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_syncFileName:@"fileName",
-                                                   NAMES_fileType:[SDLFileType GRAPHIC_JPEG],
-                                                   NAMES_persistentFile:@YES,
-                                                   NAMES_systemFile:@NO,
-                                                   NAMES_offset:@987654321,
-                                                   NAMES_length:@123456789},
-                                             NAMES_operation_name:NAMES_PutFile}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSyncFileName:@"fileName",
+                                                   SDLNameFileType:[SDLFileType GRAPHIC_JPEG],
+                                                   SDLNamePersistentFile:@YES,
+                                                   SDLNameSystemFile:@NO,
+                                                   SDLNameOffset:@987654321,
+                                                   SDLNameLength:@123456789},
+                                             SDLNameOperationName:SDLNamePutFile}} mutableCopy];
         SDLPutFile* testRequest = [[SDLPutFile alloc] initWithDictionary:dict];
         
         expect(testRequest.syncFileName).to(equal(@"fileName"));
@@ -66,4 +66,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
index 7c5598bbb..8c544159d 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
@@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_ecuName:@33112,
-                                                   NAMES_didLocation:[@[@200, @201, @205] mutableCopy]},
-                                             NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameEcuName:@33112,
+                                                   SDLNameDidLocation:[@[@200, @201, @205] mutableCopy]},
+                                             SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy];
         SDLReadDID* testRequest = [[SDLReadDID alloc] initWithDictionary:dict];
         
         expect(testRequest.ecuName).to(equal(@33112));
@@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
index 9aecc3127..f23c48dd4 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
@@ -59,22 +59,22 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_syncMsgVersion:version,
-                                                   NAMES_appName:@"app56",
-                                                   NAMES_ttsName:[@[chunk] mutableCopy],
-                                                   NAMES_ngnMediaScreenAppName:@"whatisanngn",
-                                                   NAMES_vrSynonyms:[@[@"paraphrase of the original name"] mutableCopy],
-                                                   NAMES_isMediaApplication:@NO,
-                                                   NAMES_languageDesired:[SDLLanguage NO_NO],
-                                                   NAMES_hmiDisplayLanguageDesired:[SDLLanguage PT_PT],
-                                                   NAMES_appHMIType:[@[[SDLAppHMIType MESSAGING], [SDLAppHMIType INFORMATION]] copy],
-                                                   NAMES_hashID:@"gercd35grw2",
-                                                   NAMES_deviceInfo:info,
-                                                   NAMES_appID:@"123456789",
-                                                   NAMES_appInfo:appInfo},
-                                             NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSyncMsgVersion:version,
+                                                   SDLNameAppName:@"app56",
+                                                   SDLNameTtsName:[@[chunk] mutableCopy],
+                                                   SDLNameNgnMediaScreenAppName:@"whatisanngn",
+                                                   SDLNameVrSynonyms:[@[@"paraphrase of the original name"] mutableCopy],
+                                                   SDLNameIsMediaApplication:@NO,
+                                                   SDLNameLanguageDesired:[SDLLanguage NO_NO],
+                                                   SDLNameHmiDisplayLanguageDesired:[SDLLanguage PT_PT],
+                                                   SDLNameAppHmiType:[@[[SDLAppHMIType MESSAGING], [SDLAppHMIType INFORMATION]] copy],
+                                                   SDLNameHashId:@"gercd35grw2",
+                                                   SDLNameDeviceInfo:info,
+                                                   SDLNameAppId:@"123456789",
+                                                   SDLNameAppInfo:appInfo},
+                                             SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy];
         SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] initWithDictionary:dict];
         
         expect(testRequest.syncMsgVersion).to(equal(version));
@@ -111,4 +111,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
index e99320f18..064f6faaf 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
@@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_properties:[@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]},
-                                             NAMES_operation_name:NAMES_ResetGlobalProperties}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameProperties:[@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]},
+                                             SDLNameOperationName:SDLNameResetGlobalProperties}} mutableCopy];
         SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] initWithDictionary:dict];
         
         expect(testRequest.properties).to(equal([@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]));
@@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m
index 6b1142d6b..0787d4e34 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m
@@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_scrollableMessageBody:@"thatmessagebody",
-                                                   NAMES_timeout:@9182,
-                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                             NAMES_operation_name:NAMES_ScrollableMessage}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameScrollableMessageBody:@"thatmessagebody",
+                                                   SDLNameTimeout:@9182,
+                                                   SDLNameSoftButtons:[@[button] mutableCopy]},
+                                             SDLNameOperationName:SDLNameScrollableMessage}} mutableCopy];
         SDLScrollableMessage* testRequest = [[SDLScrollableMessage alloc] initWithDictionary:dict];
         
         expect(testRequest.scrollableMessageBody).to(equal(@"thatmessagebody"));
@@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m
index ccd4bafdb..c1532a4ec 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m
@@ -124,15 +124,15 @@ describe(@"Send Location RPC", ^{
                 somePhoneNumber = @"248-591-0333";
                 someImage = [[SDLImage alloc] init];
                 NSDictionary *initDict = @{
-                                           NAMES_request: @{
-                                                   NAMES_parameters: @{
-                                                           NAMES_longitudeDegrees: someLongitude,
-                                                           NAMES_latitudeDegrees: someLatitude,
-                                                           NAMES_locationName: someLocation,
-                                                           NAMES_locationDescription: someLocationDescription,
-                                                           NAMES_addressLines: someAddressLines,
-                                                           NAMES_phoneNumber: somePhoneNumber,
-                                                           NAMES_locationImage: someImage
+                                           SDLNameRequest: @{
+                                                   SDLNameParameters: @{
+                                                           SDLNameLongitudeDegrees: someLongitude,
+                                                           SDLNameLatitudeDegrees: someLatitude,
+                                                           SDLNameLocationName: someLocation,
+                                                           SDLNameLocationDescription: someLocationDescription,
+                                                           SDLNameAddressLines: someAddressLines,
+                                                           SDLNamePhoneNumber: somePhoneNumber,
+                                                           SDLNameLocationImage: someImage
                                                            }
                                                    }
                                            };
@@ -180,8 +180,8 @@ describe(@"Send Location RPC", ^{
         context(@"when parameters are not set", ^{
             beforeEach(^{
                 NSDictionary *initDict = @{
-                                           NAMES_request: @{
-                                                   NAMES_parameters: @{}
+                                           SDLNameRequest: @{
+                                                   SDLNameParameters: @{}
                                                    }
                                            };
                 
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m
index 9c24c9e91..af6e55771 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_syncFileName:@"A/File/Name"},
-                                             NAMES_operation_name:NAMES_SetAppIcon}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSyncFileName:@"A/File/Name"},
+                                             SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy];
         SDLSetAppIcon* testRequest = [[SDLSetAppIcon alloc] initWithDictionary:dict];
         
         expect(testRequest.syncFileName).to(equal(@"A/File/Name"));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m
index 41e63323a..74684e7a7 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_displayLayout:@"wat"},
-                                             NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameDisplayLayout:@"wat"},
+                                             SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy];
         SDLSetDisplayLayout* testRequest = [[SDLSetDisplayLayout alloc] initWithDictionary:dict];
         
         expect(testRequest.displayLayout).to(equal(@"wat"));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
index 437218896..920363093 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
@@ -46,16 +46,16 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_helpPrompt:[@[chunk1] mutableCopy],
-                                                   NAMES_timeoutPrompt:[@[chunk2] mutableCopy],
-                                                   NAMES_vrHelpTitle:@"vr",
-                                                   NAMES_vrHelp:[@[help] mutableCopy],
-                                                   NAMES_menuTitle:@"TheNewMenu",
-                                                   NAMES_menuIcon:image,
-                                                   NAMES_keyboardProperties:keyboard},
-                                             NAMES_operation_name:NAMES_SetGlobalProperties}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameHelpPrompt:[@[chunk1] mutableCopy],
+                                                   SDLNameTimeoutPrompt:[@[chunk2] mutableCopy],
+                                                   SDLNameVrHelpTitle:@"vr",
+                                                   SDLNameVrHelp:[@[help] mutableCopy],
+                                                   SDLNameMenuTitle:@"TheNewMenu",
+                                                   SDLNameMenuIcon:image,
+                                                   SDLNameKeyboardProperties:keyboard},
+                                             SDLNameOperationName:SDLNameSetGlobalProperties}} mutableCopy];
         SDLSetGlobalProperties* testRequest = [[SDLSetGlobalProperties alloc] initWithDictionary:dict];
         
         expect(testRequest.helpPrompt).to(equal([@[chunk1] mutableCopy]));
@@ -80,4 +80,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
index 8d2a9a36e..968c64402 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
@@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_startTime:time1,
-                                                   NAMES_endTime:time2,
-                                                   NAMES_updateMode:[SDLUpdateMode COUNTUP]},
-                                             NAMES_operation_name:NAMES_SetMediaClockTimer}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameStartTime:time1,
+                                                   SDLNameEndTime:time2,
+                                                   SDLNameUpdateMode:[SDLUpdateMode COUNTUP]},
+                                             SDLNameOperationName:SDLNameSetMediaClockTimer}} mutableCopy];
         SDLSetMediaClockTimer* testRequest = [[SDLSetMediaClockTimer alloc] initWithDictionary:dict];
         
         expect(testRequest.startTime).to(equal(time1));
@@ -55,4 +55,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
index 3af100462..7e4f1bb64 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
@@ -50,20 +50,20 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_navigationText1:@"nav1",
-                                                   NAMES_navigationText2:@"nav2",
-                                                   NAMES_eta:@"4/1/7015",
-                                                   NAMES_timeToDestination:@"5000 Years",
-                                                   NAMES_totalDistance:@"1 parsec",
-                                                   NAMES_turnIcon:image1,
-                                                   NAMES_nextTurnIcon:image2,
-                                                   NAMES_distanceToManeuver:@2,
-                                                   NAMES_distanceToManeuverScale:@4,
-                                                   NAMES_maneuverComplete:@NO,
-                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                             NAMES_operation_name:NAMES_ShowConstantTBT}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameNavigationText1:@"nav1",
+                                                   SDLNameNavigationText2:@"nav2",
+                                                   SDLNameEta:@"4/1/7015",
+                                                   SDLNameTimeToDestination:@"5000 Years",
+                                                   SDLNameTotalDistance:@"1 parsec",
+                                                   SDLNameTurnIcon:image1,
+                                                   SDLNameNextTurnIcon:image2,
+                                                   SDLNameDistanceToManeuver:@2,
+                                                   SDLNameDistanceToManeuverScale:@4,
+                                                   SDLNameManeuverComplete:@NO,
+                                                   SDLNameSoftButtons:[@[button] mutableCopy]},
+                                             SDLNameOperationName:SDLNameShowConstantTbt}} mutableCopy];
         SDLShowConstantTBT* testRequest = [[SDLShowConstantTBT alloc] initWithDictionary:dict];
         
         expect(testRequest.navigationText1).to(equal(@"nav1"));
@@ -96,4 +96,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
index 3058872e6..71e1300fe 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
@@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_mainField1:@"field1",
-                                                   NAMES_mainField2:@"field2",
-                                                   NAMES_mainField3:@"field3",
-                                                   NAMES_mainField4:@"field4",
-                                                   NAMES_alignment:[SDLTextAlignment LEFT_ALIGNED],
-                                                   NAMES_statusBar:@"status",
-                                                   NAMES_mediaClock:@"TheTime",
-                                                   NAMES_mediaTrack:@"In The Clear",
-                                                   NAMES_graphic:image1,
-                                                   NAMES_secondaryGraphic:image2,
-                                                   NAMES_softButtons:[@[button] mutableCopy],
-                                                   NAMES_customPresets:[@[@"preset1", @"preset2"] mutableCopy]},
-                                             NAMES_operation_name:NAMES_Show}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameMainField1:@"field1",
+                                                   SDLNameMainField2:@"field2",
+                                                   SDLNameMainField3:@"field3",
+                                                   SDLNameMainField4:@"field4",
+                                                   SDLNameAlignment:[SDLTextAlignment LEFT_ALIGNED],
+                                                   SDLNameStatusBar:@"status",
+                                                   SDLNameMediaClock:@"TheTime",
+                                                   SDLNameMediaTrack:@"In The Clear",
+                                                   SDLNameGraphic:image1,
+                                                   SDLNameSecondaryGraphic:image2,
+                                                   SDLNameSoftButtons:[@[button] mutableCopy],
+                                                   SDLNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy]},
+                                             SDLNameOperationName:SDLNameShow}} mutableCopy];
         SDLShow* testRequest = [[SDLShow alloc] initWithDictionary:dict];
         
         expect(testRequest.mainField1).to(equal(@"field1"));
@@ -102,4 +102,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
index 7455bcf51..3092d0024 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
@@ -31,14 +31,14 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_numTicks:@2,
-                                                   NAMES_position:@1,
-                                                   NAMES_sliderHeader:@"Head",
-                                                   NAMES_sliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy],
-                                                   NAMES_timeout:@2000},
-                                             NAMES_operation_name:NAMES_Slider}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameNumTicks:@2,
+                                                   SDLNamePosition:@1,
+                                                   SDLNameSliderHeader:@"Head",
+                                                   SDLNameSliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy],
+                                                   SDLNameTimeout:@2000},
+                                             SDLNameOperationName:SDLNameSlider}} mutableCopy];
         SDLSlider* testRequest = [[SDLSlider alloc] initWithDictionary:dict];
         
         expect(testRequest.numTicks).to(equal(@2));
@@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
index dd6b6a400..999eb9a08 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
@@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_ttsChunks:[@[chunk] mutableCopy]},
-                                             NAMES_operation_name:NAMES_Speak}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameTtsChunks:[@[chunk] mutableCopy]},
+                                             SDLNameOperationName:SDLNameSpeak}} mutableCopy];
         SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict];
         
         expect(testRequest.ttsChunks).to(equal([@[chunk] mutableCopy]));
@@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
index d51ae33a6..6759f5fbf 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
@@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_buttonName:[SDLButtonName PRESET_5]},
-                                             NAMES_operation_name:NAMES_SubscribeButton}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameButtonName:[SDLButtonName PRESET_5]},
+                                             SDLNameOperationName:SDLNameSubscribeButton}} mutableCopy];
         SDLSubscribeButton* testRequest = [[SDLSubscribeButton alloc] initWithDictionary:dict];
         
         expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_5]));
@@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
index c35d45db3..289d1b344 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
@@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_gps:@YES,
-                                                   NAMES_speed:@NO,
-                                                   NAMES_rpm:@YES,
-                                                   NAMES_fuelLevel:@NO,
-                                                   NAMES_fuelLevel_State:@YES,
-                                                   NAMES_instantFuelConsumption:@NO,
-                                                   NAMES_externalTemperature:@YES,
-                                                   NAMES_prndl:@YES,
-                                                   NAMES_tirePressure:@NO,
-                                                   NAMES_odometer:@YES,
-                                                   NAMES_beltStatus:@NO,
-                                                   NAMES_bodyInformation:@YES,
-                                                   NAMES_deviceStatus:@NO,
-                                                   NAMES_driverBraking:@YES,
-                                                   NAMES_wiperStatus:@NO,
-                                                   NAMES_headLampStatus:@YES,
-                                                   NAMES_engineTorque:@NO,
-                                                   NAMES_accPedalPosition:@YES,
-                                                   NAMES_steeringWheelAngle:@NO,
-                                                   NAMES_eCallInfo:@YES,
-                                                   NAMES_airbagStatus:@NO,
-                                                   NAMES_emergencyEvent:@YES,
-                                                   NAMES_clusterModeStatus:@NO,
-                                                   NAMES_myKey:@YES},
-                                             NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameGps:@YES,
+                                                   SDLNameSpeed:@NO,
+                                                   SDLNameRpm:@YES,
+                                                   SDLNameFuelLevel:@NO,
+                                                   SDLNameFuelLevelState:@YES,
+                                                   SDLNameInstantFuelConsumption:@NO,
+                                                   SDLNameExternalTemperature:@YES,
+                                                   SDLNamePrndl:@YES,
+                                                   SDLNameTirePressure:@NO,
+                                                   SDLNameOdometer:@YES,
+                                                   SDLNameBeltStatus:@NO,
+                                                   SDLNameBodyInformation:@YES,
+                                                   SDLNameDeviceStatus:@NO,
+                                                   SDLNameDriverBraking:@YES,
+                                                   SDLNameWiperStatus:@NO,
+                                                   SDLNameHeadLampStatus:@YES,
+                                                   SDLNameEngineTorque:@NO,
+                                                   SDLNameAccPedalPosition:@YES,
+                                                   SDLNameSteeringWheelAngle:@NO,
+                                                   SDLNameECallInfo:@YES,
+                                                   SDLNameAirbagStatus:@NO,
+                                                   SDLNameEmergencyEvent:@YES,
+                                                   SDLNameClusterModeStatus:@NO,
+                                                   SDLNameMyKey:@YES},
+                                             SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy];
         SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithDictionary:dict];
         
         expect(testRequest.gps).to(equal(@YES));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
index ade3fb762..a200fb147 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
@@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_requestType:[SDLRequestType AUTH_REQUEST],
-                                                   NAMES_fileName:@"AnotherFile"},
-                                             NAMES_operation_name:NAMES_SystemRequest}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameRequestType:[SDLRequestType AUTH_REQUEST],
+                                                   SDLNameFileName:@"AnotherFile"},
+                                             SDLNameOperationName:SDLNameSystemRequest}} mutableCopy];
         SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] initWithDictionary:dict];
         
         expect(testRequest.requestType).to(equal([SDLRequestType AUTH_REQUEST]));
@@ -45,4 +45,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
index 4c0bfc3f1..481243a73 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
@@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_buttonName:[SDLButtonName PRESET_0]},
-                                             NAMES_operation_name:NAMES_UnsubscribeButton}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameButtonName:[SDLButtonName PRESET_0]},
+                                             SDLNameOperationName:SDLNameUnsubscribeButton}} mutableCopy];
         SDLUnsubscribeButton* testRequest = [[SDLUnsubscribeButton alloc] initWithDictionary:dict];
         
         expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_0]));
@@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
index 1bb2cb125..529862cf4 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
@@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_gps:@YES,
-                                                   NAMES_speed:@YES,
-                                                   NAMES_rpm:@YES,
-                                                   NAMES_fuelLevel:@YES,
-                                                   NAMES_fuelLevel_State:@YES,
-                                                   NAMES_instantFuelConsumption:@YES,
-                                                   NAMES_externalTemperature:@YES,
-                                                   NAMES_prndl:@YES,
-                                                   NAMES_tirePressure:@YES,
-                                                   NAMES_odometer:@YES,
-                                                   NAMES_beltStatus:@YES,
-                                                   NAMES_bodyInformation:@YES,
-                                                   NAMES_deviceStatus:@YES,
-                                                   NAMES_driverBraking:@YES,
-                                                   NAMES_wiperStatus:@YES,
-                                                   NAMES_headLampStatus:@YES,
-                                                   NAMES_engineTorque:@YES,
-                                                   NAMES_accPedalPosition:@YES,
-                                                   NAMES_steeringWheelAngle:@YES,
-                                                   NAMES_eCallInfo:@YES,
-                                                   NAMES_airbagStatus:@YES,
-                                                   NAMES_emergencyEvent:@YES,
-                                                   NAMES_clusterModeStatus:@YES,
-                                                   NAMES_myKey:@YES},
-                                             NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameGps:@YES,
+                                                   SDLNameSpeed:@YES,
+                                                   SDLNameRpm:@YES,
+                                                   SDLNameFuelLevel:@YES,
+                                                   SDLNameFuelLevelState:@YES,
+                                                   SDLNameInstantFuelConsumption:@YES,
+                                                   SDLNameExternalTemperature:@YES,
+                                                   SDLNamePrndl:@YES,
+                                                   SDLNameTirePressure:@YES,
+                                                   SDLNameOdometer:@YES,
+                                                   SDLNameBeltStatus:@YES,
+                                                   SDLNameBodyInformation:@YES,
+                                                   SDLNameDeviceStatus:@YES,
+                                                   SDLNameDriverBraking:@YES,
+                                                   SDLNameWiperStatus:@YES,
+                                                   SDLNameHeadLampStatus:@YES,
+                                                   SDLNameEngineTorque:@YES,
+                                                   SDLNameAccPedalPosition:@YES,
+                                                   SDLNameSteeringWheelAngle:@YES,
+                                                   SDLNameECallInfo:@YES,
+                                                   SDLNameAirbagStatus:@YES,
+                                                   SDLNameEmergencyEvent:@YES,
+                                                   SDLNameClusterModeStatus:@YES,
+                                                   SDLNameMyKey:@YES},
+                                             SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy];
         SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] initWithDictionary:dict];
         
         expect(testRequest.gps).to(equal(@YES));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m
index ae1d55823..4806ef21f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m
@@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_turnList:[@[turn] mutableCopy],
-                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                             NAMES_operation_name:NAMES_UpdateTurnList}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameTurnList:[@[turn] mutableCopy],
+                                                   SDLNameSoftButtons:[@[button] mutableCopy]},
+                                             SDLNameOperationName:SDLNameUpdateTurnList}} mutableCopy];
         SDLUpdateTurnList* testRequest = [[SDLUpdateTurnList alloc] initWithDictionary:dict];
         
         expect(testRequest.turnList).to(equal([@[turn] mutableCopy]));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m
index 64e8522c9..a78d757c8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_spaceAvailable:@0},
-                                             NAMES_operation_name:NAMES_DeleteFile}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSpaceAvailable:@0},
+                                             SDLNameOperationName:SDLNameDeleteFile}} mutableCopy];
         SDLDeleteFileResponse* testResponse = [[SDLDeleteFileResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.spaceAvailable).to(equal(@0));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m
index 7507bbe5a..b322f961d 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_messageDataResult:[@[@3, @9, @27, @81] mutableCopy]},
-                                             NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameMessageDataResult:[@[@3, @9, @27, @81] mutableCopy]},
+                                             SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy];
         SDLDiagnosticMessageResponse* testResponse = [[SDLDiagnosticMessageResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.messageDataResult).to(equal([@[@3, @9, @27, @81] mutableCopy]));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
index 150f9bd73..c40eb2cfb 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
@@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                          @{NAMES_parameters:
-                                                @{NAMES_ecuHeader:@404,
-                                                  NAMES_dtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]},
-                                            NAMES_operation_name:NAMES_GetDTCs}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                          @{SDLNameParameters:
+                                                @{SDLNameEcuHeader:@404,
+                                                  SDLNameDtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]},
+                                            SDLNameOperationName:SDLNameGetDtcs}} mutableCopy];
         SDLGetDTCsResponse* testResponse = [[SDLGetDTCsResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.ecuHeader).to(equal(@404));
@@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
index d70e8f12b..974249c52 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
@@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_notification:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_gps:gps,
-                                                   NAMES_speed:@100,
-                                                   NAMES_rpm:@3,
-                                                   NAMES_fuelLevel:@99.9999,
-                                                   NAMES_fuelLevel_State:[SDLComponentVolumeStatus FAULT],
-                                                   NAMES_instantFuelConsumption:@40.7,
-                                                   NAMES_externalTemperature:@0,
-                                                   NAMES_vin:@"6574839201",
-                                                   NAMES_prndl:[SDLPRNDL PARK],
-                                                   NAMES_tirePressure:tires,
-                                                   NAMES_odometer:@70000,
-                                                   NAMES_beltStatus:belt,
-                                                   NAMES_bodyInformation:body,
-                                                   NAMES_deviceStatus:device,
-                                                   NAMES_driverBraking:[SDLVehicleDataEventStatus NO_EVENT],
-                                                   NAMES_wiperStatus:[SDLWiperStatus AUTO_HIGH],
-                                                   NAMES_headLampStatus:headLamp,
-                                                   NAMES_engineTorque:@630.4,
-                                                   NAMES_accPedalPosition:@0,
-                                                   NAMES_steeringWheelAngle:@-1500,
-                                                   NAMES_eCallInfo:eCall,
-                                                   NAMES_airbagStatus:airbag,
-                                                   NAMES_emergencyEvent:event,
-                                                   NAMES_clusterModeStatus:clusterMode,
-                                                   NAMES_myKey:myKey},
-                                             NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNotification:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameGps:gps,
+                                                   SDLNameSpeed:@100,
+                                                   SDLNameRpm:@3,
+                                                   SDLNameFuelLevel:@99.9999,
+                                                   SDLNameFuelLevelState:[SDLComponentVolumeStatus FAULT],
+                                                   SDLNameInstantFuelConsumption:@40.7,
+                                                   SDLNameExternalTemperature:@0,
+                                                   SDLNameVin:@"6574839201",
+                                                   SDLNamePrndl:[SDLPRNDL PARK],
+                                                   SDLNameTirePressure:tires,
+                                                   SDLNameOdometer:@70000,
+                                                   SDLNameBeltStatus:belt,
+                                                   SDLNameBodyInformation:body,
+                                                   SDLNameDeviceStatus:device,
+                                                   SDLNameDriverBraking:[SDLVehicleDataEventStatus NO_EVENT],
+                                                   SDLNameWiperStatus:[SDLWiperStatus AUTO_HIGH],
+                                                   SDLNameHeadLampStatus:headLamp,
+                                                   SDLNameEngineTorque:@630.4,
+                                                   SDLNameAccPedalPosition:@0,
+                                                   SDLNameSteeringWheelAngle:@-1500,
+                                                   SDLNameECallInfo:eCall,
+                                                   SDLNameAirbagStatus:airbag,
+                                                   SDLNameEmergencyEvent:event,
+                                                   SDLNameClusterModeStatus:clusterMode,
+                                                   SDLNameMyKey:myKey},
+                                             SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy];
         SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.gps).to(equal(gps));
@@ -172,4 +172,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m
index 824bc7517..8934562eb 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m
@@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_filenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy],
-                                                   NAMES_spaceAvailable:@500000000},
-                                             NAMES_operation_name:NAMES_ListFiles}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy],
+                                                   SDLNameSpaceAvailable:@500000000},
+                                             SDLNameOperationName:SDLNameListFiles}} mutableCopy];
         SDLListFilesResponse* testResponse = [[SDLListFilesResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.filenames).to(equal([@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy]));
@@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
index b32b44cd6..15e75cd48 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
@@ -29,12 +29,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                          @{NAMES_parameters:
-                                                @{NAMES_choiceID:@25,
-                                                  NAMES_manualTextEntry:@"entry",
-                                                  NAMES_triggerSource:[SDLTriggerSource KEYBOARD]},
-                                            NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                          @{SDLNameParameters:
+                                                @{SDLNameChoiceId:@25,
+                                                  SDLNameManualTextEntry:@"entry",
+                                                  SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]},
+                                            SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy];
         SDLPerformInteractionResponse* testResponse = [[SDLPerformInteractionResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.choiceID).to(equal(@25));
@@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m
index 565f97a79..52ed9bf7b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m
@@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_spaceAvailable:@1248},
-                                             NAMES_operation_name:NAMES_PutFile}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSpaceAvailable:@1248},
+                                             SDLNameOperationName:SDLNamePutFile}} mutableCopy];
         SDLPutFileResponse* testResponse = [[SDLPutFileResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.spaceAvailable).to(equal(@1248));
@@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
index 0ae2c5b9d..4dc152c48 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
@@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_didResult:[@[result] mutableCopy]},
-                                             NAMES_operation_name:NAMES_ReadDID}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameDidResult:[@[result] mutableCopy]},
+                                             SDLNameOperationName:SDLNameReadDid}} mutableCopy];
         SDLReadDIDResponse* testResponse = [[SDLReadDIDResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.didResult).to(equal([@[result] mutableCopy]));
@@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
index 62eb9b152..c3f40d585 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
@@ -65,27 +65,27 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_syncMsgVersion:version,
-                                                   NAMES_language:[SDLLanguage ES_MX],
-                                                   NAMES_hmiDisplayLanguage:[SDLLanguage RU_RU],
-                                                   NAMES_displayCapabilities:info,
-                                                   NAMES_buttonCapabilities:[@[button] mutableCopy],
-                                                   NAMES_softButtonCapabilities:[@[softButton] mutableCopy],
-                                                   NAMES_presetBankCapabilities:presetBank,
-                                                   NAMES_hmiZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy],
-                                                   NAMES_speechCapabilities:[@[[SDLSpeechCapabilities SAPI_PHONEMES], [SDLSpeechCapabilities SILENCE]] copy],
-                                                   NAMES_vrCapabilities:[@[[SDLVRCapabilities TEXT]] copy],
-                                                   NAMES_audioPassThruCapabilities:[@[audioPassThru] mutableCopy],
-                                                   NAMES_vehicleType:vehicle,
-                                                   NAMES_prerecordedSpeech:[@[[SDLPrerecordedSpeech LISTEN_JINGLE], [SDLPrerecordedSpeech HELP_JINGLE]] mutableCopy],
-                                                   NAMES_supportedDiagModes:[@[@67, @99, @111] mutableCopy],
-                                                   NAMES_hmiCapabilities: hmiCapabilities,
-                                                   NAMES_sdlVersion: @"sdlVersion",
-                                                   NAMES_systemSoftwareVersion: @"systemSoftwareVersion"
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSyncMsgVersion:version,
+                                                   SDLNameLanguage:[SDLLanguage ES_MX],
+                                                   SDLNameHmiDisplayLanguage:[SDLLanguage RU_RU],
+                                                   SDLNameDisplayCapabilities:info,
+                                                   SDLNameButtonCapabilities:[@[button] mutableCopy],
+                                                   SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy],
+                                                   SDLNamePresetBankCapabilities:presetBank,
+                                                   SDLNameHmiZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy],
+                                                   SDLNameSpeechCapabilities:[@[[SDLSpeechCapabilities SAPI_PHONEMES], [SDLSpeechCapabilities SILENCE]] copy],
+                                                   SDLNameVrCapabilities:[@[[SDLVRCapabilities TEXT]] copy],
+                                                   SDLNameAudioPassThruCapabilities:[@[audioPassThru] mutableCopy],
+                                                   SDLNameVehicleType:vehicle,
+                                                   SDLNamePrerecordedSpeech:[@[[SDLPrerecordedSpeech LISTEN_JINGLE], [SDLPrerecordedSpeech HELP_JINGLE]] mutableCopy],
+                                                   SDLNameSupportedDiagModes:[@[@67, @99, @111] mutableCopy],
+                                                   SDLNameHmiCapabilities: hmiCapabilities,
+                                                   SDLNameSdlVersion: @"sdlVersion",
+                                                   SDLNameSystemSoftwareVersion: @"systemSoftwareVersion"
                                                    },
-                                             NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy];
+                                             SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy];
         SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.syncMsgVersion).to(equal(version));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
index 3eeab76a1..a589bfeea 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
@@ -39,13 +39,13 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_request:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_displayCapabilities:info,
-                                                   NAMES_buttonCapabilities:[@[button] mutableCopy],
-                                                   NAMES_softButtonCapabilities:[@[softButton] mutableCopy],
-                                                   NAMES_presetBankCapabilities:presetBank},
-                                             NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRequest:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameDisplayCapabilities:info,
+                                                   SDLNameButtonCapabilities:[@[button] mutableCopy],
+                                                   SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy],
+                                                   SDLNamePresetBankCapabilities:presetBank},
+                                             SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy];
         SDLSetDisplayLayoutResponse* testResponse = [[SDLSetDisplayLayoutResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.displayCapabilities).to(equal(info));
@@ -64,4 +64,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m
index 6f92c1e48..61666d57b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m
@@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_sliderPosition:@13},
-                                             NAMES_operation_name:NAMES_Slider}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameSliderPosition:@13},
+                                             SDLNameOperationName:SDLNameSlider}} mutableCopy];
         SDLSliderResponse* testResponse = [[SDLSliderResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.sliderPosition).to(equal(@13));
@@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
index d6c0dc6ac..bc7db3765 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
@@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_gps:vehicleDataResult,
-                                                   NAMES_speed:vehicleDataResult,
-                                                   NAMES_rpm:vehicleDataResult,
-                                                   NAMES_fuelLevel:vehicleDataResult,
-                                                   NAMES_fuelLevel_State:vehicleDataResult,
-                                                   NAMES_instantFuelConsumption:vehicleDataResult,
-                                                   NAMES_externalTemperature:vehicleDataResult,
-                                                   NAMES_prndl:vehicleDataResult,
-                                                   NAMES_tirePressure:vehicleDataResult,
-                                                   NAMES_odometer:vehicleDataResult,
-                                                   NAMES_beltStatus:vehicleDataResult,
-                                                   NAMES_bodyInformation:vehicleDataResult,
-                                                   NAMES_deviceStatus:vehicleDataResult,
-                                                   NAMES_driverBraking:vehicleDataResult,
-                                                   NAMES_wiperStatus:vehicleDataResult,
-                                                   NAMES_headLampStatus:vehicleDataResult,
-                                                   NAMES_engineTorque:vehicleDataResult,
-                                                   NAMES_accPedalPosition:vehicleDataResult,
-                                                   NAMES_steeringWheelAngle:vehicleDataResult,
-                                                   NAMES_eCallInfo:vehicleDataResult,
-                                                   NAMES_airbagStatus:vehicleDataResult,
-                                                   NAMES_emergencyEvent:vehicleDataResult,
-                                                   NAMES_clusterModes:vehicleDataResult,
-                                                   NAMES_myKey:vehicleDataResult},
-                                             NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameGps:vehicleDataResult,
+                                                   SDLNameSpeed:vehicleDataResult,
+                                                   SDLNameRpm:vehicleDataResult,
+                                                   SDLNameFuelLevel:vehicleDataResult,
+                                                   SDLNameFuelLevelState:vehicleDataResult,
+                                                   SDLNameInstantFuelConsumption:vehicleDataResult,
+                                                   SDLNameExternalTemperature:vehicleDataResult,
+                                                   SDLNamePrndl:vehicleDataResult,
+                                                   SDLNameTirePressure:vehicleDataResult,
+                                                   SDLNameOdometer:vehicleDataResult,
+                                                   SDLNameBeltStatus:vehicleDataResult,
+                                                   SDLNameBodyInformation:vehicleDataResult,
+                                                   SDLNameDeviceStatus:vehicleDataResult,
+                                                   SDLNameDriverBraking:vehicleDataResult,
+                                                   SDLNameWiperStatus:vehicleDataResult,
+                                                   SDLNameHeadLampStatus:vehicleDataResult,
+                                                   SDLNameEngineTorque:vehicleDataResult,
+                                                   SDLNameAccPedalPosition:vehicleDataResult,
+                                                   SDLNameSteeringWheelAngle:vehicleDataResult,
+                                                   SDLNameECallInfo:vehicleDataResult,
+                                                   SDLNameAirbagStatus:vehicleDataResult,
+                                                   SDLNameEmergencyEvent:vehicleDataResult,
+                                                   SDLNameClusterModes:vehicleDataResult,
+                                                   SDLNameMyKey:vehicleDataResult},
+                                             SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy];
         SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.gps).to(equal(vehicleDataResult));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
index 29cb4e08c..0089e1ccf 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
@@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_response:
-                                           @{NAMES_parameters:
-                                                 @{NAMES_gps:vehicleDataResult,
-                                                   NAMES_speed:vehicleDataResult,
-                                                   NAMES_rpm:vehicleDataResult,
-                                                   NAMES_fuelLevel:vehicleDataResult,
-                                                   NAMES_fuelLevel_State:vehicleDataResult,
-                                                   NAMES_instantFuelConsumption:vehicleDataResult,
-                                                   NAMES_externalTemperature:vehicleDataResult,
-                                                   NAMES_prndl:vehicleDataResult,
-                                                   NAMES_tirePressure:vehicleDataResult,
-                                                   NAMES_odometer:vehicleDataResult,
-                                                   NAMES_beltStatus:vehicleDataResult,
-                                                   NAMES_bodyInformation:vehicleDataResult,
-                                                   NAMES_deviceStatus:vehicleDataResult,
-                                                   NAMES_driverBraking:vehicleDataResult,
-                                                   NAMES_wiperStatus:vehicleDataResult,
-                                                   NAMES_headLampStatus:vehicleDataResult,
-                                                   NAMES_engineTorque:vehicleDataResult,
-                                                   NAMES_accPedalPosition:vehicleDataResult,
-                                                   NAMES_steeringWheelAngle:vehicleDataResult,
-                                                   NAMES_eCallInfo:vehicleDataResult,
-                                                   NAMES_airbagStatus:vehicleDataResult,
-                                                   NAMES_emergencyEvent:vehicleDataResult,
-                                                   NAMES_clusterModes:vehicleDataResult,
-                                                   NAMES_myKey:vehicleDataResult},
-                                             NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResponse:
+                                           @{SDLNameParameters:
+                                                 @{SDLNameGps:vehicleDataResult,
+                                                   SDLNameSpeed:vehicleDataResult,
+                                                   SDLNameRpm:vehicleDataResult,
+                                                   SDLNameFuelLevel:vehicleDataResult,
+                                                   SDLNameFuelLevelState:vehicleDataResult,
+                                                   SDLNameInstantFuelConsumption:vehicleDataResult,
+                                                   SDLNameExternalTemperature:vehicleDataResult,
+                                                   SDLNamePrndl:vehicleDataResult,
+                                                   SDLNameTirePressure:vehicleDataResult,
+                                                   SDLNameOdometer:vehicleDataResult,
+                                                   SDLNameBeltStatus:vehicleDataResult,
+                                                   SDLNameBodyInformation:vehicleDataResult,
+                                                   SDLNameDeviceStatus:vehicleDataResult,
+                                                   SDLNameDriverBraking:vehicleDataResult,
+                                                   SDLNameWiperStatus:vehicleDataResult,
+                                                   SDLNameHeadLampStatus:vehicleDataResult,
+                                                   SDLNameEngineTorque:vehicleDataResult,
+                                                   SDLNameAccPedalPosition:vehicleDataResult,
+                                                   SDLNameSteeringWheelAngle:vehicleDataResult,
+                                                   SDLNameECallInfo:vehicleDataResult,
+                                                   SDLNameAirbagStatus:vehicleDataResult,
+                                                   SDLNameEmergencyEvent:vehicleDataResult,
+                                                   SDLNameClusterModes:vehicleDataResult,
+                                                   SDLNameMyKey:vehicleDataResult},
+                                             SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy];
         SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.gps).to(equal(vehicleDataResult));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
index ea88855c5..6ce077a0c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
@@ -39,14 +39,14 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_driverAirbagDeployed:[SDLVehicleDataEventStatus _YES],
-                                       NAMES_driverSideAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT],
-                                       NAMES_driverCurtainAirbagDeployed:[SDLVehicleDataEventStatus _NO],
-                                       NAMES_passengerAirbagDeployed:[SDLVehicleDataEventStatus NOT_SUPPORTED],
-                                       NAMES_passengerCurtainAirbagDeployed:[SDLVehicleDataEventStatus FAULT],
-                                       NAMES_driverKneeAirbagDeployed:[SDLVehicleDataEventStatus _NO],
-                                       NAMES_passengerSideAirbagDeployed:[SDLVehicleDataEventStatus _YES],
-                                       NAMES_passengerKneeAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameDriverAirbagDeployed:[SDLVehicleDataEventStatus _YES],
+                                       SDLNameDriverSideAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT],
+                                       SDLNameDriverCurtainAirbagDeployed:[SDLVehicleDataEventStatus _NO],
+                                       SDLNamePassengerAirbagDeployed:[SDLVehicleDataEventStatus NOT_SUPPORTED],
+                                       SDLNamePassengerCurtainAirbagDeployed:[SDLVehicleDataEventStatus FAULT],
+                                       SDLNameDriverKneeAirbagDeployed:[SDLVehicleDataEventStatus _NO],
+                                       SDLNamePassengerSideAirbagDeployed:[SDLVehicleDataEventStatus _YES],
+                                       SDLNamePassengerKneeAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT]} mutableCopy];
         SDLAirbagStatus* testStruct = [[SDLAirbagStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.driverAirbagDeployed).to(equal([SDLVehicleDataEventStatus _YES]));
@@ -73,4 +73,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m
index 424c299b8..73e2fc1bd 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m
@@ -28,9 +28,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_appDisplayName:@"display name",
-                                       NAMES_appVersion:@"1.2.3.4",
-                                       NAMES_appBundleID:@"com.app.bundle"} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameAppDisplayName:@"display name",
+                                       SDLNameAppVersion:@"1.2.3.4",
+                                       SDLNameAppBundleId:@"com.app.bundle"} mutableCopy];
         SDLAppInfo* testStruct = [[SDLAppInfo alloc] initWithDictionary:dict];
         
         expect(testStruct.appDisplayName).to(equal(@"display name"));
@@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
index 8d66fc8af..e4b62e1ff 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
@@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_samplingRate:[SDLSamplingRate _22KHZ],
-                                       NAMES_bitsPerSample:[SDLBitsPerSample _8_BIT],
-                                       NAMES_audioType:[SDLAudioType PCM]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameSamplingRate:[SDLSamplingRate _22KHZ],
+                                       SDLNameBitsPerSample:[SDLBitsPerSample _8_BIT],
+                                       SDLNameAudioType:[SDLAudioType PCM]} mutableCopy];
         SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.samplingRate).to(equal([SDLSamplingRate _22KHZ]));
@@ -50,4 +50,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
index e0d8c4883..761ff193b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
@@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_driverBeltDeployed:[SDLVehicleDataEventStatus NO_EVENT],
-                                       NAMES_passengerBeltDeployed:[SDLVehicleDataEventStatus _YES],
-                                       NAMES_passengerBuckleBelted:[SDLVehicleDataEventStatus _NO],
-                                       NAMES_driverBuckleBelted:[SDLVehicleDataEventStatus FAULT],
-                                       NAMES_leftRow2BuckleBelted:[SDLVehicleDataEventStatus _YES],
-                                       NAMES_passengerChildDetected:[SDLVehicleDataEventStatus _NO],
-                                       NAMES_rightRow2BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED],
-                                       NAMES_middleRow2BuckleBelted:[SDLVehicleDataEventStatus NO_EVENT],
-                                       NAMES_middleRow3BuckleBelted:[SDLVehicleDataEventStatus _YES],
-                                       NAMES_leftRow3BuckleBelted:[SDLVehicleDataEventStatus FAULT],
-                                       NAMES_rightRow3BuckleBelted:[SDLVehicleDataEventStatus _NO],
-                                       NAMES_leftRearInflatableBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED],
-                                       NAMES_rightRearInflatableBelted:[SDLVehicleDataEventStatus FAULT],
-                                       NAMES_middleRow1BeltDeployed:[SDLVehicleDataEventStatus NO_EVENT],
-                                       NAMES_middleRow1BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameDriverBeltDeployed:[SDLVehicleDataEventStatus NO_EVENT],
+                                       SDLNamePassengerBeltDeployed:[SDLVehicleDataEventStatus _YES],
+                                       SDLNamePassengerBuckleBelted:[SDLVehicleDataEventStatus _NO],
+                                       SDLNameDriverBuckleBelted:[SDLVehicleDataEventStatus FAULT],
+                                       SDLNameLeftRow2BuckleBelted:[SDLVehicleDataEventStatus _YES],
+                                       SDLNamePassengerChildDetected:[SDLVehicleDataEventStatus _NO],
+                                       SDLNameRightRow2BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED],
+                                       SDLNameMiddleRow2BuckleBelted:[SDLVehicleDataEventStatus NO_EVENT],
+                                       SDLNameMiddleRow3BuckleBelted:[SDLVehicleDataEventStatus _YES],
+                                       SDLNameLeftRow3BuckleBelted:[SDLVehicleDataEventStatus FAULT],
+                                       SDLNameRightRow3BuckleBelted:[SDLVehicleDataEventStatus _NO],
+                                       SDLNameLeftRearInflatableBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED],
+                                       SDLNameRightRearInflatableBelted:[SDLVehicleDataEventStatus FAULT],
+                                       SDLNameMiddleRow1BeltDeployed:[SDLVehicleDataEventStatus NO_EVENT],
+                                       SDLNameMiddleRow1BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED]} mutableCopy];
         SDLBeltStatus* testStruct = [[SDLBeltStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.driverBeltDeployed).to(equal([SDLVehicleDataEventStatus NO_EVENT]));
@@ -108,4 +108,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
index a13a7cc9c..70688afed 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
@@ -37,13 +37,13 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_parkBrakeActive:@YES,
-                                       NAMES_ignitionStableStatus:[SDLIgnitionStableStatus IGNITION_SWITCH_NOT_STABLE],
-                                       NAMES_ignitionStatus:[SDLIgnitionStatus START],
-                                       NAMES_driverDoorAjar:@NO,
-                                       NAMES_passengerDoorAjar:@NO,
-                                       NAMES_rearLeftDoorAjar:@NO,
-                                       NAMES_rearRightDoorAjar:@YES} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameParkBrakeActive:@YES,
+                                       SDLNameIgnitionStableStatus:[SDLIgnitionStableStatus IGNITION_SWITCH_NOT_STABLE],
+                                       SDLNameIgnitionStatus:[SDLIgnitionStatus START],
+                                       SDLNameDriverDoorAjar:@NO,
+                                       SDLNamePassengerDoorAjar:@NO,
+                                       SDLNameRearLeftDoorAjar:@NO,
+                                       SDLNameRearRightDoorAjar:@YES} mutableCopy];
         SDLBodyInformation* testStruct = [[SDLBodyInformation alloc] initWithDictionary:dict];
         
         expect(testStruct.parkBrakeActive).to(equal(@YES));
@@ -68,4 +68,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
index a5f753629..5cce60c0a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
@@ -31,10 +31,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_name:[SDLButtonName CUSTOM_BUTTON],
-                                       NAMES_shortPressAvailable:@YES,
-                                       NAMES_longPressAvailable:@YES,
-                                       NAMES_upDownAvailable:@NO} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameName:[SDLButtonName CUSTOM_BUTTON],
+                                       SDLNameShortPressAvailable:@YES,
+                                       SDLNameLongPressAvailable:@YES,
+                                       SDLNameUpDownAvailable:@NO} mutableCopy];
         SDLButtonCapabilities* testStruct = [[SDLButtonCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.name).to(equal([SDLButtonName CUSTOM_BUTTON]));
@@ -53,4 +53,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
index 63116976a..09857a90e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
@@ -40,13 +40,13 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_choiceID:@3,
-                                       NAMES_menuName:@"Hello",
-                                       NAMES_vrCommands:[@[@"1", @"2"] mutableCopy],
-                                       NAMES_image:image,
-                                       NAMES_secondaryText:@"Arbitrary",
-                                       NAMES_tertiaryText:@"qwerty",
-                                       NAMES_secondaryImage:secondaryImage} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameChoiceId:@3,
+                                       SDLNameMenuName:@"Hello",
+                                       SDLNameVrCommands:[@[@"1", @"2"] mutableCopy],
+                                       SDLNameImage:image,
+                                       SDLNameSecondaryText:@"Arbitrary",
+                                       SDLNameTertiaryText:@"qwerty",
+                                       SDLNameSecondaryImage:secondaryImage} mutableCopy];
         SDLChoice* testStruct = [[SDLChoice alloc] initWithDictionary:dict];
         
         expect(testStruct.choiceID).to(equal(@3));
@@ -71,4 +71,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
index 8e74324cf..459937f42 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
@@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_powerModeActive:@NO,
-                                       NAMES_powerModeQualificationStatus:[SDLPowerModeQualificationStatus POWER_MODE_OK],
-                                       NAMES_carModeStatus:[SDLCarModeStatus CRASH],
-                                       NAMES_powerModeStatus:[SDLPowerModeStatus KEY_OUT]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNamePowerModeActive:@NO,
+                                       SDLNamePowerModeQualificationStatus:[SDLPowerModeQualificationStatus POWER_MODE_OK],
+                                       SDLNameCarModeStatus:[SDLCarModeStatus CRASH],
+                                       SDLNamePowerModeStatus:[SDLPowerModeStatus KEY_OUT]} mutableCopy];
         SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.powerModeActive).to(equal(@NO));
@@ -54,4 +54,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
index db626f959..f88b1d92e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
@@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_resultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED],
-                                       NAMES_didLocation:@300,
-                                       NAMES_data:@"gertwydhty4235tdhedt4tue"} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED],
+                                       SDLNameDidLocation:@300,
+                                       SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy];
         SDLDIDResult* testStruct = [[SDLDIDResult alloc] initWithDictionary:dict];
         
         expect(testStruct.resultCode).to(equal([SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED]));
@@ -48,4 +48,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
index beb3b2d80..bfc36e708 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
@@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_hardware:@"GDFR34F",
-                                       NAMES_firmwareRev:@"4.2a",
-                                       NAMES_os:@"Robot",
-                                       NAMES_osVersion:@"9.9",
-                                       NAMES_carrier:@"ThatOneWirelessCompany",
-                                       NAMES_maxNumberRFCOMMPorts:@20} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameHardware:@"GDFR34F",
+                                       SDLNameFirmwareRev:@"4.2a",
+                                       SDLNameOs:@"Robot",
+                                       SDLNameOsVersion:@"9.9",
+                                       SDLNameCarrier:@"ThatOneWirelessCompany",
+                                       SDLNameMaxNumberRfcommPorts:@20} mutableCopy];
         SDLDeviceInfo* testStruct = [[SDLDeviceInfo alloc] initWithDictionary:dict];
         
         expect(testStruct.hardware).to(equal(@"GDFR34F"));
@@ -61,4 +61,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
index 1996e45a8..b15902c6c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
@@ -46,17 +46,17 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_voiceRecOn:@NO,
-                                       NAMES_btIconOn:@NO,
-                                       NAMES_callActive:@YES,
-                                       NAMES_phoneRoaming:@NO,
-                                       NAMES_textMsgAvailable:@YES,
-                                       NAMES_battLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS],
-                                       NAMES_stereoAudioOutputMuted:@YES,
-                                       NAMES_monoAudioOutputMuted:@YES,
-                                       NAMES_signalLevelStatus:[SDLDeviceLevelStatus TWO_LEVEL_BARS],
-                                       NAMES_primaryAudioSource:[SDLPrimaryAudioSource BLUETOOTH_STEREO_BTST],
-                                       NAMES_eCallEventActive:@NO} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameVoiceRecOn:@NO,
+                                       SDLNameBluetoothIconOn:@NO,
+                                       SDLNameCallActive:@YES,
+                                       SDLNamePhoneRoaming:@NO,
+                                       SDLNameTextMsgAvailable:@YES,
+                                       SDLNameBattLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS],
+                                       SDLNameStereoAudioOutputMuted:@YES,
+                                       SDLNameMonoAudioOutputMuted:@YES,
+                                       SDLNameSignalLevelStatus:[SDLDeviceLevelStatus TWO_LEVEL_BARS],
+                                       SDLNamePrimaryAudioSource:[SDLPrimaryAudioSource BLUETOOTH_STEREO_BTST],
+                                       SDLNameECallEventActive:@NO} mutableCopy];
         SDLDeviceStatus* testStruct = [[SDLDeviceStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.voiceRecOn).to(equal(@NO));
@@ -89,4 +89,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
index 02cac7f54..1db8cea08 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
@@ -47,14 +47,14 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_displayType:[SDLDisplayType GEN2_6_DMA],
-                                       NAMES_textFields:[@[textField] mutableCopy],
-                                       NAMES_imageFields:[@[imageField] mutableCopy],
-                                       NAMES_mediaClockFormats:[@[[SDLMediaClockFormat CLOCKTEXT1], [SDLMediaClockFormat CLOCK3], [SDLMediaClockFormat CLOCKTEXT3]] copy],
-                                       NAMES_graphicSupported:@YES,
-                                       NAMES_templatesAvailable:[@[@"String", @"String", @"String"] mutableCopy],
-                                       NAMES_screenParams:screenParams,
-                                       NAMES_numCustomPresetsAvailable:@43} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameDisplayType:[SDLDisplayType GEN2_6_DMA],
+                                       SDLNameTextFields:[@[textField] mutableCopy],
+                                       SDLNameImageFields:[@[imageField] mutableCopy],
+                                       SDLNameMediaClockFormats:[@[[SDLMediaClockFormat CLOCKTEXT1], [SDLMediaClockFormat CLOCK3], [SDLMediaClockFormat CLOCKTEXT3]] copy],
+                                       SDLNameGraphicSupported:@YES,
+                                       SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy],
+                                       SDLNameScreenParams:screenParams,
+                                       SDLNameNumCustomPresetsAvailable:@43} mutableCopy];
         SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.displayType).to(equal([SDLDisplayType GEN2_6_DMA]));
@@ -81,4 +81,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
index 28e226187..2e553a218 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
@@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_eCallNotificationStatus:[SDLVehicleDataNotificationStatus NORMAL],
-                                       NAMES_auxECallNotificationStatus:[SDLVehicleDataNotificationStatus ACTIVE],
-                                       NAMES_eCallConfirmationStatus:[SDLECallConfirmationStatus CALL_IN_PROGRESS]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameECallNotificationStatus:[SDLVehicleDataNotificationStatus NORMAL],
+                                       SDLNameAuxECallNotificationStatus:[SDLVehicleDataNotificationStatus ACTIVE],
+                                       SDLNameECallConfirmationStatus:[SDLECallConfirmationStatus CALL_IN_PROGRESS]} mutableCopy];
         SDLECallInfo* testStruct = [[SDLECallInfo alloc] initWithDictionary:dict];
         
         expect(testStruct.eCallNotificationStatus).to(equal([SDLVehicleDataNotificationStatus NORMAL]));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
index c67f45d45..2706297c2 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
@@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_emergencyEventType:[SDLEmergencyEventType FRONTAL],
-                                       NAMES_fuelCutoffStatus:[SDLFuelCutoffStatus NORMAL_OPERATION],
-                                       NAMES_rolloverEvent:[SDLVehicleDataEventStatus _YES],
-                                       NAMES_maximumChangeVelocity:@33,
-                                       NAMES_multipleEvents:[SDLVehicleDataEventStatus _NO]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameEmergencyEventType:[SDLEmergencyEventType FRONTAL],
+                                       SDLNameFuelCutoffStatus:[SDLFuelCutoffStatus NORMAL_OPERATION],
+                                       SDLNameRolloverEvent:[SDLVehicleDataEventStatus _YES],
+                                       SDLNameMaximumChangeVelocity:@33,
+                                       SDLNameMultipleEvents:[SDLVehicleDataEventStatus _NO]} mutableCopy];
         SDLEmergencyEvent* testStruct = [[SDLEmergencyEvent alloc] initWithDictionary:dict];
         
         expect(testStruct.emergencyEventType).to(equal([SDLEmergencyEventType FRONTAL]));
@@ -60,4 +60,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
index 6d19dbf77..e88bfaaab 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
@@ -60,24 +60,24 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_longitudeDegrees:@31.41592653589793,
-                                       NAMES_latitudeDegrees:@45,
-                                       NAMES_utcYear:@2015,
-                                       NAMES_utcMonth:@1,
-                                       NAMES_utcDay:@26,
-                                       NAMES_utcHours:@23,
-                                       NAMES_utcMinutes:@59,
-                                       NAMES_utcSeconds:@59,
-                                       NAMES_compassDirection:[SDLCompassDirection SOUTHEAST],
-                                       NAMES_pdop:@3.4,
-                                       NAMES_hdop:@9.9,
-                                       NAMES_vdop:@0,
-                                       NAMES_actual:@NO,
-                                       NAMES_satellites:@12,
-                                       NAMES_dimension:[SDLDimension _3D],
-                                       NAMES_altitude:@3000,
-                                       NAMES_heading:@96,
-                                       NAMES_speed:@64} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameLongitudeDegrees:@31.41592653589793,
+                                       SDLNameLatitudeDegrees:@45,
+                                       SDLNameUtcYear:@2015,
+                                       SDLNameUtcMonth:@1,
+                                       SDLNameUtcDay:@26,
+                                       SDLNameUtcHours:@23,
+                                       SDLNameUtcMinutes:@59,
+                                       SDLNameUtcSeconds:@59,
+                                       SDLNameCompassDirection:[SDLCompassDirection SOUTHEAST],
+                                       SDLNamePdop:@3.4,
+                                       SDLNameHdop:@9.9,
+                                       SDLNameVdop:@0,
+                                       SDLNameActual:@NO,
+                                       SDLNameSatellites:@12,
+                                       SDLNameDimension:[SDLDimension _3D],
+                                       SDLNameAltitude:@3000,
+                                       SDLNameHeading:@96,
+                                       SDLNameSpeed:@64} mutableCopy];
         SDLGPSData* testStruct = [[SDLGPSData alloc] initWithDictionary:dict];
         
         expect(testStruct.longitudeDegrees).to(equal(@31.41592653589793));
@@ -124,4 +124,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m
index e9935bedf..4121992df 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m
@@ -36,8 +36,8 @@ describe(@"SDLHMICapabilities struct", ^{
     context(@"When initialized with a dictionary", ^{
         beforeEach(^{
             NSDictionary *structInitDict = @{
-                                             NAMES_navigation: someNavigationState,
-                                             NAMES_phoneCall: somePhoneCallState
+                                             SDLNameNavigation: someNavigationState,
+                                             SDLNamePhoneCall: somePhoneCallState
                                              };
             testStruct = [[SDLHMICapabilities alloc] initWithDictionary:[structInitDict mutableCopy]];
         });
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
index 63df146cb..b02c79c2a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
@@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy],
-                                       NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy],
+                                       SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy];
         SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] initWithDictionary:dict];
         
         expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy]));
@@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
index b418b962b..a84c2f98b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
@@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_lowBeamsOn:@YES,
-                                       NAMES_highBeamsOn:@NO,
-                                       NAMES_ambientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameLowBeamsOn:@YES,
+                                       SDLNameHighBeamsOn:@NO,
+                                       SDLNameAmbientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy];
         SDLHeadLampStatus* testStruct = [[SDLHeadLampStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.lowBeamsOn).to(equal(@YES));
@@ -48,4 +48,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
index 2bcef11f1..0e7556b12 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
@@ -33,9 +33,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_name:[SDLImageFieldName turnIcon],
-                                       NAMES_imageTypeSupported:[@[[SDLFileType GRAPHIC_PNG], [SDLFileType GRAPHIC_JPEG]] copy],
-                                       NAMES_imageResolution:resolution} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameName:[SDLImageFieldName turnIcon],
+                                       SDLNameImageTypeSupported:[@[[SDLFileType GRAPHIC_PNG], [SDLFileType GRAPHIC_JPEG]] copy],
+                                       SDLNameImageResolution:resolution} mutableCopy];
         SDLImageField* testStruct = [[SDLImageField alloc] initWithDictionary:dict];
         
         expect(testStruct.name).to(equal([SDLImageFieldName turnIcon]));
@@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
index dba2d630e..ff33f04f2 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
@@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_value:@"value",
-                                       NAMES_imageType:[SDLImageType STATIC]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameValue:@"value",
+                                       SDLNameImageType:[SDLImageType STATIC]} mutableCopy];
         SDLImage* testStruct = [[SDLImage alloc] initWithDictionary:dict];
         
         expect(testStruct.value).to(equal(@"value"));
@@ -43,4 +43,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
index 3e6793b62..c1c9410fe 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
@@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_language:[SDLLanguage DA_DK],
-                                       NAMES_keyboardLayout:[SDLKeyboardLayout QWERTZ],
-                                       NAMES_keypressMode:[SDLKeypressMode RESEND_CURRENT_ENTRY],
-                                       NAMES_limitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy],
-                                       NAMES_autoCompleteText:@"Auto Carrot"} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameLanguage:[SDLLanguage DA_DK],
+                                       SDLNameKeyboardLayout:[SDLKeyboardLayout QWERTZ],
+                                       SDLNameKeypressMode:[SDLKeypressMode RESEND_CURRENT_ENTRY],
+                                       SDLNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy],
+                                       SDLNameAutoCompleteText:@"Auto Carrot"} mutableCopy];
         SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict];
         
         expect(testStruct.language).to(equal([SDLLanguage DA_DK]));
@@ -60,4 +60,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m
index 3d6bc6462..72b8029d4 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m
@@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_parentID:@504320489,
-                                       NAMES_position:@256,
-                                       NAMES_menuName:@"Menu"} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameParentId:@504320489,
+                                       SDLNamePosition:@256,
+                                       SDLNameMenuName:@"Menu"} mutableCopy];
         SDLMenuParams* testStruct = [[SDLMenuParams alloc] initWithDictionary:dict];
         
         expect(testStruct.parentID).to(equal(@504320489));
@@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
index c442e2cfc..1b546613c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
@@ -25,7 +25,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_e911Override:[SDLVehicleDataStatus ON]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameE911Override:[SDLVehicleDataStatus ON]} mutableCopy];
         SDLMyKey* testStruct = [[SDLMyKey alloc] initWithDictionary:dict];
         
         expect(testStruct.e911Override).to(equal([SDLVehicleDataStatus ON]));
@@ -38,4 +38,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
index 08e375e9f..80558faf3 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
@@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy],
-                                       NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy],
+                                       SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy];
         SDLParameterPermissions* testStruct = [[SDLParameterPermissions alloc] initWithDictionary:dict];
         
         expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy]));
@@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
index 0e5b367d1..e19b64258 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
@@ -32,9 +32,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_rpcName:@"RPCNameThing",
-                                       NAMES_hmiPermissions:hmiPermissions,
-                                       NAMES_parameterPermissions:parameterPermissions} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameRpcName:@"RPCNameThing",
+                                       SDLNameHmiPermissions:hmiPermissions,
+                                       SDLNameParameterPermissions:parameterPermissions} mutableCopy];
         SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict];
         
         expect(testStruct.rpcName).to(equal(@"RPCNameThing"));
@@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m
index f473c60b6..16330022f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m
@@ -23,7 +23,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_onScreenPresetsAvailable:@YES} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy];
         SDLPresetBankCapabilities* testStruct = [[SDLPresetBankCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.onScreenPresetsAvailable).to(equal(@YES));
@@ -36,4 +36,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m
index 0438b8a21..e24ee7ee8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m
@@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_resolution:resolution,
-                                       NAMES_touchEventAvailable:capabilities} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameResolution:resolution,
+                                       SDLNameTouchEventAvailable:capabilities} mutableCopy];
         SDLScreenParams* testStruct = [[SDLScreenParams alloc] initWithDictionary:dict];
         
         expect(testStruct.resolution).to(equal(resolution));
@@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
index 6482a4f75..5f65785fe 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
@@ -24,7 +24,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_status:[SDLComponentVolumeStatus LOW]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameStatus:[SDLComponentVolumeStatus LOW]} mutableCopy];
         SDLSingleTireStatus* testStruct = [[SDLSingleTireStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.status).to(equal([SDLComponentVolumeStatus LOW]));
@@ -37,4 +37,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m
index 0cb200414..6301272d6 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m
@@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_shortPressAvailable:@NO,
-                                       NAMES_longPressAvailable:@YES,
-                                       NAMES_upDownAvailable:@NO,
-                                       NAMES_imageSupported:@NO} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameShortPressAvailable:@NO,
+                                       SDLNameLongPressAvailable:@YES,
+                                       SDLNameUpDownAvailable:@NO,
+                                       SDLNameImageSupported:@NO} mutableCopy];
         SDLSoftButtonCapabilities* testStruct = [[SDLSoftButtonCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.shortPressAvailable).to(equal(@NO));
@@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
index c9e766a65..1451cd94d 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
@@ -39,12 +39,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_type:[SDLSoftButtonType IMAGE],
-                                       NAMES_text:@"Button",
-                                       NAMES_image:image,
-                                       NAMES_isHighlighted:@YES,
-                                       NAMES_softButtonID:@5423,
-                                       NAMES_systemAction:[SDLSystemAction KEEP_CONTEXT]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameType:[SDLSoftButtonType IMAGE],
+                                       SDLNameText:@"Button",
+                                       SDLNameImage:image,
+                                       SDLNameIsHighlighted:@YES,
+                                       SDLNameSoftButtonId:@5423,
+                                       SDLNameSystemAction:[SDLSystemAction KEEP_CONTEXT]} mutableCopy];
         SDLSoftButton* testStruct = [[SDLSoftButton alloc] initWithDictionary:dict];
         
         expect(testStruct.type).to(equal([SDLSoftButtonType IMAGE]));
@@ -67,4 +67,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m
index 476fc6500..201863048 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m
@@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_hours:@22,
-                                       NAMES_minutes:@39,
-                                       NAMES_seconds:@11} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameHours:@22,
+                                       SDLNameMinutes:@39,
+                                       SDLNameSeconds:@11} mutableCopy];
         SDLStartTime* testStruct = [[SDLStartTime alloc] initWithDictionary:dict];
         
         expect(testStruct.hours).to(equal(@22));
@@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m
index 56c74cd18..75e06f8de 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m
@@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_majorVersion:@4,
-                                       NAMES_minorVersion:@532} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameMajorVersion:@4,
+                                       SDLNameMinorVersion:@532} mutableCopy];
         SDLSyncMsgVersion* testStruct = [[SDLSyncMsgVersion alloc] initWithDictionary:dict];
         
         expect(testStruct.majorVersion).to(equal(@4));
@@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
index 78ca915c9..2a8650d70 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
@@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_text:@"TEXT",
-                                       NAMES_type:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameText:@"TEXT",
+                                       SDLNameType:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy];
         SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] initWithDictionary:dict];
         
         expect(testStruct.text).to(equal(@"TEXT"));
@@ -43,4 +43,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
index a07331a59..226d6269b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
@@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_name:[SDLTextFieldName tertiaryText],
-                                       NAMES_characterSet:[SDLCharacterSet TYPE5SET],
-                                       NAMES_width:@111,
-                                       NAMES_rows:@4} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameName:[SDLTextFieldName tertiaryText],
+                                       SDLNameCharacterSet:[SDLCharacterSet TYPE5SET],
+                                       SDLNameWidth:@111,
+                                       SDLNameRows:@4} mutableCopy];
         SDLTextField* testStruct = [[SDLTextField alloc] initWithDictionary:dict];
         
         expect(testStruct.name).to(equal([SDLTextFieldName tertiaryText]));
@@ -54,4 +54,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
index dcad4943d..d1b220fb3 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
@@ -44,13 +44,13 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_pressureTelltale:[SDLWarningLightStatus OFF],
-                                       NAMES_leftFront:tire1,
-                                       NAMES_rightFront:tire2,
-                                       NAMES_leftRear:tire3,
-                                       NAMES_rightRear:tire4,
-                                       NAMES_innerLeftRear:tire5,
-                                       NAMES_innerRightRear:tire6} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNamePressureTelltale:[SDLWarningLightStatus OFF],
+                                       SDLNameLeftFront:tire1,
+                                       SDLNameRightFront:tire2,
+                                       SDLNameLeftRear:tire3,
+                                       SDLNameRightRear:tire4,
+                                       SDLNameInnerLeftRear:tire5,
+                                       SDLNameInnerRightRear:tire6} mutableCopy];
         SDLTireStatus* testStruct = [[SDLTireStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.pressureTelltale).to(equal([SDLWarningLightStatus OFF]));
@@ -75,4 +75,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m
index eedca3a9b..0431fe455 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m
@@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_x:@67,
-                                       NAMES_y:@362} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameX:@67,
+                                       SDLNameY:@362} mutableCopy];
         SDLTouchCoord* testStruct = [[SDLTouchCoord alloc] initWithDictionary:dict];
         
         expect(testStruct.x).to(equal(@67));
@@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m
index a8b8c73e0..cdda41afc 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m
@@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_pressAvailable:@YES,
-                                       NAMES_multiTouchAvailable:@NO,
-                                       NAMES_doublePressAvailable:@NO} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNamePressAvailable:@YES,
+                                       SDLNameMultiTouchAvailable:@NO,
+                                       SDLNameDoublePressAvailable:@NO} mutableCopy];
         SDLTouchEventCapabilities* testStruct = [[SDLTouchEventCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.pressAvailable).to(equal(@YES));
@@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
index c95cfb525..63ffae0d7 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
@@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_id:@3,
-                                       NAMES_ts:[@[@23, @52, @41345234] mutableCopy],
-                                       NAMES_c:[@[coord] mutableCopy]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameId:@3,
+                                       SDLNameTs:[@[@23, @52, @41345234] mutableCopy],
+                                       SDLNameCoord:[@[coord] mutableCopy]} mutableCopy];
         SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict];
         
         expect(testStruct.touchEventId).to(equal(@3));
@@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m
index 07152ad92..7b44c251e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m
@@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_navigationText:@"NAVTEXT",
-                                       NAMES_turnIcon:image} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameNavigationText:@"NAVTEXT",
+                                       SDLNameTurnIcon:image} mutableCopy];
         SDLTurn* testStruct = [[SDLTurn alloc] initWithDictionary:dict];
         
         expect(testStruct.navigationText).to(equal(@"NAVTEXT"));
@@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
index ee3c4774a..4515c938b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
@@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_dataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS],
-                                       NAMES_resultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameDataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS],
+                                       SDLNameResultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy];
         SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDictionary:dict];
         
         expect(testStruct.dataType).to(equal([SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS]));
@@ -43,4 +43,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m
index 9a282b72e..0eaa6e698 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m
@@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_make:@"Make",
-                                       NAMES_model:@"Model",
-                                       NAMES_modelYear:@"3.141*10^36",
-                                       NAMES_trim:@"AE"} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameMake:@"Make",
+                                       SDLNameModel:@"Model",
+                                       SDLNameModelYear:@"3.141*10^36",
+                                       SDLNameTrim:@"AE"} mutableCopy];
         SDLVehicleType* testStruct = [[SDLVehicleType alloc] initWithDictionary:dict];
         
         expect(testStruct.make).to(equal(@"Make"));
@@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m
index e76be2558..6afde1d0a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m
@@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{NAMES_text:@"DON'T PANIC",
-                                       NAMES_image:image,
-                                       NAMES_position:@42} mutableCopy];
+        NSMutableDictionary* dict = [@{SDLNameText:@"DON'T PANIC",
+                                       SDLNameImage:image,
+                                       SDLNamePosition:@42} mutableCopy];
         SDLVRHelpItem* testStruct = [[SDLVRHelpItem alloc] initWithDictionary:dict];
         
         expect(testStruct.text).to(equal(@"DON'T PANIC"));
@@ -50,4 +50,4 @@ describe(@"Getter/Setter Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m
index 39a9ebc74..57dbd3513 100644
--- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m
@@ -21,13 +21,13 @@ describe(@"Readonly Property Tests", ^ {
     });
     
     it(@"Should get correctly when initialized with dictionary", ^ {
-        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification:
-                                                                                      @{NAMES_parameters:
+        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification:
+                                                                                      @{SDLNameParameters:
                                                                                             @{@"name":@"George"},
-                                                                                        NAMES_operation_name:@"Poorly Named"}} mutableCopy]];
+                                                                                        SDLNameOperationName:@"Poorly Named"}} mutableCopy]];
         
         expect(testMessage.name).to(equal(@"Poorly Named"));
-        expect(testMessage.messageType).to(equal(NAMES_notification));
+        expect(testMessage.messageType).to(equal(SDLNameNotification));
     });
 });
 
@@ -41,10 +41,10 @@ describe(@"Parameter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_response:
-                                                                                      @{NAMES_parameters:
+        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameResponse:
+                                                                                      @{SDLNameParameters:
                                                                                             @{@"age":@25},
-                                                                                        NAMES_operation_name:@"Nameless"}} mutableCopy]];
+                                                                                        SDLNameOperationName:@"Nameless"}} mutableCopy]];
         
         expect([testMessage getParameters:@"age"]).to(equal(@25));
     });
@@ -66,10 +66,10 @@ describe(@"FunctionName Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_request:
-                                                                                      @{NAMES_parameters:
+        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameRequest:
+                                                                                      @{SDLNameParameters:
                                                                                             @{@"age":@25},
-                                                                                        NAMES_operation_name:@"DoNothing"}} mutableCopy]];
+                                                                                        SDLNameOperationName:@"DoNothing"}} mutableCopy]];
         
         expect([testMessage getFunctionName]).to(equal(@"DoNothing"));
         
@@ -79,8 +79,8 @@ describe(@"FunctionName Tests", ^ {
     });
     
     it(@"Should be nil if not set", ^ {
-        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification:
-                                                                                      @{NAMES_parameters:
+        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification:
+                                                                                      @{SDLNameParameters:
                                                                                             @{}}} mutableCopy]];
         expect([testMessage getFunctionName]).to(beNil());
     });
@@ -97,10 +97,10 @@ describe(@"BulkDataTests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification:
-                                                                                      @{NAMES_parameters:
+        SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification:
+                                                                                      @{SDLNameParameters:
                                                                                             @{}},
-                                                                                  NAMES_bulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]];
+                                                                                  SDLNameBulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]];
         
         expect(testMessage.bulkData).to(equal([NSData dataWithBytes:"ImageData" length:strlen("ImageData")]));
     });
@@ -112,4 +112,4 @@ describe(@"BulkDataTests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd