Merge remote-tracking branch 'origin/develop' into feature/issue_247_objc_generics

* origin/develop: reverting function renaming in SDLRPCMessage. Fixed accidental function renaming. Updated SDLFunctionID to project instead of private. Updated SDLFunctionID to be private. Fixed remaining failing tests. Updated SDLFunctionID to be a singleton. Fixed issue with tests not passing Updated naming of some constant. Removed extensibility from SDLName Reverted SDLNames to Project instead of Public. Replaced all defines with constant strings of the SDLName typedef. Also modified SDLFunctionID to use a static dictionary. # Conflicts: # SmartDeviceLink/SDLAddCommand.m # SmartDeviceLink/SDLAlert.m # SmartDeviceLink/SDLAlertManeuver.m # SmartDeviceLink/SDLChangeRegistration.m # SmartDeviceLink/SDLChoice.m # SmartDeviceLink/SDLCreateInteractionChoiceSet.m # SmartDeviceLink/SDLDiagnosticMessage.m # SmartDeviceLink/SDLDiagnosticMessageResponse.m # SmartDeviceLink/SDLDisplayCapabilities.m # SmartDeviceLink/SDLEncodedSyncPData.m # SmartDeviceLink/SDLGetDTCsResponse.m # SmartDeviceLink/SDLHMIPermissions.m # SmartDeviceLink/SDLImageField.m # SmartDeviceLink/SDLKeyboardProperties.m # SmartDeviceLink/SDLListFilesResponse.m # SmartDeviceLink/SDLOnEncodedSyncPData.m # SmartDeviceLink/SDLOnPermissionsChange.m # SmartDeviceLink/SDLOnTouchEvent.m # SmartDeviceLink/SDLParameterPermissions.m # SmartDeviceLink/SDLPerformAudioPassThru.m # SmartDeviceLink/SDLPerformInteraction.m # SmartDeviceLink/SDLRPCStruct.m # SmartDeviceLink/SDLReadDID.m # SmartDeviceLink/SDLReadDIDResponse.m # SmartDeviceLink/SDLRegisterAppInterface.m # SmartDeviceLink/SDLRegisterAppInterfaceResponse.m # SmartDeviceLink/SDLResetGlobalProperties.m # SmartDeviceLink/SDLScrollableMessage.m # SmartDeviceLink/SDLSendLocation.m # SmartDeviceLink/SDLSetDisplayLayoutResponse.m # SmartDeviceLink/SDLSetGlobalProperties.m # SmartDeviceLink/SDLShow.m # SmartDeviceLink/SDLShowConstantTBT.m # SmartDeviceLink/SDLSlider.m # SmartDeviceLink/SDLSpeak.m # SmartDeviceLink/SDLTouchEvent.m # SmartDeviceLink/SDLUpdateTurnList.m # SmartDeviceLink/SDLV2ProtocolMessage.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m
author: Muller, Alexander (A.) <amulle19@ford.com> 2016-09-27 14:09:38 -0700
committer: Muller, Alexander (A.) <amulle19@ford.com> 2016-09-27 14:09:38 -0700
commit: 5667363639cf124e361a17b54be4d5905f8fa691 (patch)
tree: 8563f31304eb5b6fe379f36d7aa761182b868b89
parent: f1a0fe829619cc259bb99debf46e234bb86fc964 (diff)
parent: 530a160e69e9a8ffde0267ef289cc3ad0acac5bf (diff)
download: sdl_ios-5667363639cf124e361a17b54be4d5905f8fa691.tar.gz
278 files changed, 3638 insertions, 3209 deletions
diff --git a/.xctool-args b/.xctool-args
index 27942e3b9..5daa7d5f4 100644
--- a/.xctool-args
+++ b/.xctool-args
@@ -1,6 +1,6 @@
 [
     "-project", "SmartDeviceLink-iOS.xcodeproj",
-    "-scheme", "SmartDeviceLink",
+    "-scheme", "SmartDeviceLinkTests",
     "-sdk", "iphonesimulator",
     "ONLY_ACTIVE_ARCH=NO",
     "RUN_CLANG_STATIC_ANALYZER=NO"
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index 66a9e205d..faec75a62 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -891,6 +891,7 @@
 		DA4353EA1D2721680099B8C4 /* SDLTouchManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */; };
 		DA4353EB1D2721680099B8C4 /* SDLTouchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */; };
 		DA96C0661D4D4F730022F520 /* SDLAppInfoSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */; };
+		DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB537891D9319E8008EB556 /* SDLNames.m */; };
 		DAC572571D1067270004288B /* SDLTouchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC572551D1067270004288B /* SDLTouchManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAC572581D1067270004288B /* SDLTouchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572561D1067270004288B /* SDLTouchManager.m */; };
 		DAC5725B1D10B81E0004288B /* SDLTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572591D10B81E0004288B /* SDLTouch.m */; };
@@ -1877,6 +1878,7 @@
 		DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchManagerSpec.m; path = UtilitiesSpecs/Touches/SDLTouchManagerSpec.m; sourceTree = "<group>"; };
 		DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchSpec.m; path = UtilitiesSpecs/Touches/SDLTouchSpec.m; sourceTree = "<group>"; };
 		DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAppInfoSpec.m; sourceTree = "<group>"; };
+		DAB537891D9319E8008EB556 /* SDLNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNames.m; sourceTree = "<group>"; };
 		DAC572551D1067270004288B /* SDLTouchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTouchManager.h; sourceTree = "<group>"; };
 		DAC572561D1067270004288B /* SDLTouchManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouchManager.m; sourceTree = "<group>"; };
 		DAC572591D10B81E0004288B /* SDLTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouch.m; sourceTree = "<group>"; };
@@ -2956,6 +2958,7 @@
 				E9C32B8E1AB20BA200F283AF /* SDLTimer.h */,
 				E9C32B8F1AB20BA200F283AF /* SDLTimer.m */,
 				5D61FB0F1A84238A00846EE7 /* SDLNames.h */,
+				DAB537891D9319E8008EB556 /* SDLNames.m */,
 				5D535DC31B72473800CF7760 /* SDLGlobals.h */,
 				5D535DC41B72473800CF7760 /* SDLGlobals.m */,
 			);
@@ -4326,6 +4329,7 @@
 				5D61FE001A84238C00846EE7 /* SDLVehicleDataEventStatus.m in Sources */,
 				5D61FDC41A84238C00846EE7 /* SDLTBTState.m in Sources */,
 				5D61FDA61A84238C00846EE7 /* SDLSpeak.m in Sources */,
+				DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */,
 				5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */,
 				5D61FD9E1A84238C00846EE7 /* SDLSliderResponse.m in Sources */,
 				5D61FC5C1A84238C00846EE7 /* SDLChangeRegistration.m in Sources */,
diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index db663f188..3b13d9692 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -8,11 +8,10 @@
 #import "SDLMenuParams.h"
 #import "SDLNames.h"
 
-
 @implementation SDLAddCommand
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddCommand]) {
+    if (self = [super initWithName:SDLNameAddCommand]) {
     }
     return self;
 }
@@ -36,26 +35,26 @@
 
 - (void)setCmdID:(NSNumber *)cmdID {
     if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:NAMES_cmdID];
+        [parameters setObject:cmdID forKey:SDLNameCommandId];
     } else {
-        [parameters removeObjectForKey:NAMES_cmdID];
+        [parameters removeObjectForKey:SDLNameCommandId];
     }
 }
 
 - (NSNumber *)cmdID {
-    return [parameters objectForKey:NAMES_cmdID];
+    return [parameters objectForKey:SDLNameCommandId];
 }
 
 - (void)setMenuParams:(SDLMenuParams *)menuParams {
     if (menuParams != nil) {
-        [parameters setObject:menuParams forKey:NAMES_menuParams];
+        [parameters setObject:menuParams forKey:SDLNameMenuParams];
     } else {
-        [parameters removeObjectForKey:NAMES_menuParams];
+        [parameters removeObjectForKey:SDLNameMenuParams];
     }
 }
 
 - (SDLMenuParams *)menuParams {
-    NSObject *obj = [parameters objectForKey:NAMES_menuParams];
+    NSObject *obj = [parameters objectForKey:SDLNameMenuParams];
     if (obj == nil || [obj isKindOfClass:SDLMenuParams.class]) {
         return (SDLMenuParams *)obj;
     } else {
@@ -65,26 +64,26 @@
 
 - (void)setVrCommands:(NSMutableArray<NSString *> *)vrCommands {
     if (vrCommands != nil) {
-        [parameters setObject:vrCommands forKey:NAMES_vrCommands];
+        [parameters setObject:vrCommands forKey:SDLNameVRCommands];
     } else {
-        [parameters removeObjectForKey:NAMES_vrCommands];
+        [parameters removeObjectForKey:SDLNameVRCommands];
     }
 }
 
 - (NSMutableArray<NSString *> *)vrCommands {
-    return [parameters objectForKey:NAMES_vrCommands];
+    return [parameters objectForKey:SDLNameVRCommands];
 }
 
 - (void)setCmdIcon:(SDLImage *)cmdIcon {
     if (cmdIcon != nil) {
-        [parameters setObject:cmdIcon forKey:NAMES_cmdIcon];
+        [parameters setObject:cmdIcon forKey:SDLNameCommandIcon];
     } else {
-        [parameters removeObjectForKey:NAMES_cmdIcon];
+        [parameters removeObjectForKey:SDLNameCommandIcon];
     }
 }
 
 - (SDLImage *)cmdIcon {
-    NSObject *obj = [parameters objectForKey:NAMES_cmdIcon];
+    NSObject *obj = [parameters objectForKey:SDLNameCommandIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m
index 2e85976d5..4ed6e533e 100644
--- a/SmartDeviceLink/SDLAddCommandResponse.m
+++ b/SmartDeviceLink/SDLAddCommandResponse.m
@@ -7,7 +7,7 @@
 @implementation SDLAddCommandResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddCommand]) {
+    if (self = [super initWithName:SDLNameAddCommand]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 32dbaa679..8a1634dfb 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -7,7 +7,7 @@
 @implementation SDLAddSubMenu
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddSubMenu]) {
+    if (self = [super initWithName:SDLNameAddSubMenu]) {
     }
     return self;
 }
@@ -20,38 +20,38 @@
 
 - (void)setMenuID:(NSNumber *)menuID {
     if (menuID != nil) {
-        [parameters setObject:menuID forKey:NAMES_menuID];
+        [parameters setObject:menuID forKey:SDLNameMenuId];
     } else {
-        [parameters removeObjectForKey:NAMES_menuID];
+        [parameters removeObjectForKey:SDLNameMenuId];
     }
 }
 
 - (NSNumber *)menuID {
-    return [parameters objectForKey:NAMES_menuID];
+    return [parameters objectForKey:SDLNameMenuId];
 }
 
 - (void)setPosition:(NSNumber *)position {
     if (position != nil) {
-        [parameters setObject:position forKey:NAMES_position];
+        [parameters setObject:position forKey:SDLNamePosition];
     } else {
-        [parameters removeObjectForKey:NAMES_position];
+        [parameters removeObjectForKey:SDLNamePosition];
     }
 }
 
 - (NSNumber *)position {
-    return [parameters objectForKey:NAMES_position];
+    return [parameters objectForKey:SDLNamePosition];
 }
 
 - (void)setMenuName:(NSString *)menuName {
     if (menuName != nil) {
-        [parameters setObject:menuName forKey:NAMES_menuName];
+        [parameters setObject:menuName forKey:SDLNameMenuName];
     } else {
-        [parameters removeObjectForKey:NAMES_menuName];
+        [parameters removeObjectForKey:SDLNameMenuName];
     }
 }
 
 - (NSString *)menuName {
-    return [parameters objectForKey:NAMES_menuName];
+    return [parameters objectForKey:SDLNameMenuName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m
index c5fdbea4e..a07ec75f5 100644
--- a/SmartDeviceLink/SDLAddSubMenuResponse.m
+++ b/SmartDeviceLink/SDLAddSubMenuResponse.m
@@ -7,7 +7,7 @@
 @implementation SDLAddSubMenuResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddSubMenu]) {
+    if (self = [super initWithName:SDLNameAddSubMenu]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m
index ef010deb7..09f0583a1 100644
--- a/SmartDeviceLink/SDLAirbagStatus.m
+++ b/SmartDeviceLink/SDLAirbagStatus.m
@@ -5,7 +5,6 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataEventStatus.h"
 
-
 @implementation SDLAirbagStatus
 
 - (instancetype)init {
@@ -22,14 +21,14 @@
 
 - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus *)driverAirbagDeployed {
     if (driverAirbagDeployed != nil) {
-        [store setObject:driverAirbagDeployed forKey:NAMES_driverAirbagDeployed];
+        [store setObject:driverAirbagDeployed forKey:SDLNameDriverAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -39,14 +38,14 @@
 
 - (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
     if (driverSideAirbagDeployed != nil) {
-        [store setObject:driverSideAirbagDeployed forKey:NAMES_driverSideAirbagDeployed];
+        [store setObject:driverSideAirbagDeployed forKey:SDLNameDriverSideAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverSideAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverSideAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverSideAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverSideAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -56,14 +55,14 @@
 
 - (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
     if (driverCurtainAirbagDeployed != nil) {
-        [store setObject:driverCurtainAirbagDeployed forKey:NAMES_driverCurtainAirbagDeployed];
+        [store setObject:driverCurtainAirbagDeployed forKey:SDLNameDriverCurtainAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverCurtainAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverCurtainAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverCurtainAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverCurtainAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -73,14 +72,14 @@
 
 - (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus *)passengerAirbagDeployed {
     if (passengerAirbagDeployed != nil) {
-        [store setObject:passengerAirbagDeployed forKey:NAMES_passengerAirbagDeployed];
+        [store setObject:passengerAirbagDeployed forKey:SDLNamePassengerAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -90,14 +89,14 @@
 
 - (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
     if (passengerCurtainAirbagDeployed != nil) {
-        [store setObject:passengerCurtainAirbagDeployed forKey:NAMES_passengerCurtainAirbagDeployed];
+        [store setObject:passengerCurtainAirbagDeployed forKey:SDLNamePassengerCurtainAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerCurtainAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerCurtainAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerCurtainAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerCurtainAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -107,14 +106,14 @@
 
 - (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
     if (driverKneeAirbagDeployed != nil) {
-        [store setObject:driverKneeAirbagDeployed forKey:NAMES_driverKneeAirbagDeployed];
+        [store setObject:driverKneeAirbagDeployed forKey:SDLNameDriverKneeAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverKneeAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverKneeAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverKneeAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverKneeAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -124,14 +123,14 @@
 
 - (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
     if (passengerSideAirbagDeployed != nil) {
-        [store setObject:passengerSideAirbagDeployed forKey:NAMES_passengerSideAirbagDeployed];
+        [store setObject:passengerSideAirbagDeployed forKey:SDLNamePassengerSideAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerSideAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerSideAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerSideAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerSideAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -141,14 +140,14 @@
 
 - (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed {
     if (passengerKneeAirbagDeployed != nil) {
-        [store setObject:passengerKneeAirbagDeployed forKey:NAMES_passengerKneeAirbagDeployed];
+        [store setObject:passengerKneeAirbagDeployed forKey:SDLNamePassengerKneeAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerKneeAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerKneeAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerKneeAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerKneeAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index f7f19f609..8011dc01f 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -9,7 +9,7 @@
 @implementation SDLAlert
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Alert]) {
+    if (self = [super initWithName:SDLNameAlert]) {
     }
     return self;
 }
@@ -22,50 +22,50 @@
 
 - (void)setAlertText1:(NSString *)alertText1 {
     if (alertText1 != nil) {
-        [parameters setObject:alertText1 forKey:NAMES_alertText1];
+        [parameters setObject:alertText1 forKey:SDLNameAlertText1];
     } else {
-        [parameters removeObjectForKey:NAMES_alertText1];
+        [parameters removeObjectForKey:SDLNameAlertText1];
     }
 }
 
 - (NSString *)alertText1 {
-    return [parameters objectForKey:NAMES_alertText1];
+    return [parameters objectForKey:SDLNameAlertText1];
 }
 
 - (void)setAlertText2:(NSString *)alertText2 {
     if (alertText2 != nil) {
-        [parameters setObject:alertText2 forKey:NAMES_alertText2];
+        [parameters setObject:alertText2 forKey:SDLNameAlertText2];
     } else {
-        [parameters removeObjectForKey:NAMES_alertText2];
+        [parameters removeObjectForKey:SDLNameAlertText2];
     }
 }
 
 - (NSString *)alertText2 {
-    return [parameters objectForKey:NAMES_alertText2];
+    return [parameters objectForKey:SDLNameAlertText2];
 }
 
 - (void)setAlertText3:(NSString *)alertText3 {
     if (alertText3 != nil) {
-        [parameters setObject:alertText3 forKey:NAMES_alertText3];
+        [parameters setObject:alertText3 forKey:SDLNameAlertText3];
     } else {
-        [parameters removeObjectForKey:NAMES_alertText3];
+        [parameters removeObjectForKey:SDLNameAlertText3];
     }
 }
 
 - (NSString *)alertText3 {
-    return [parameters objectForKey:NAMES_alertText3];
+    return [parameters objectForKey:SDLNameAlertText3];
 }
 
 - (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks {
     if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:NAMES_ttsChunks];
+        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
     } else {
-        [parameters removeObjectForKey:NAMES_ttsChunks];
+        [parameters removeObjectForKey:SDLNameTTSChunks];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_ttsChunks];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -79,50 +79,50 @@
 
 - (void)setDuration:(NSNumber *)duration {
     if (duration != nil) {
-        [parameters setObject:duration forKey:NAMES_duration];
+        [parameters setObject:duration forKey:SDLNameDuration];
     } else {
-        [parameters removeObjectForKey:NAMES_duration];
+        [parameters removeObjectForKey:SDLNameDuration];
     }
 }
 
 - (NSNumber *)duration {
-    return [parameters objectForKey:NAMES_duration];
+    return [parameters objectForKey:SDLNameDuration];
 }
 
 - (void)setPlayTone:(NSNumber *)playTone {
     if (playTone != nil) {
-        [parameters setObject:playTone forKey:NAMES_playTone];
+        [parameters setObject:playTone forKey:SDLNamePlayTone];
     } else {
-        [parameters removeObjectForKey:NAMES_playTone];
+        [parameters removeObjectForKey:SDLNamePlayTone];
     }
 }
 
 - (NSNumber *)playTone {
-    return [parameters objectForKey:NAMES_playTone];
+    return [parameters objectForKey:SDLNamePlayTone];
 }
 
 - (void)setProgressIndicator:(NSNumber *)progressIndicator {
     if (progressIndicator != nil) {
-        [parameters setObject:progressIndicator forKey:NAMES_progressIndicator];
+        [parameters setObject:progressIndicator forKey:SDLNameProgressIndicator];
     } else {
-        [parameters removeObjectForKey:NAMES_progressIndicator];
+        [parameters removeObjectForKey:SDLNameProgressIndicator];
     }
 }
 
 - (NSNumber *)progressIndicator {
-    return [parameters objectForKey:NAMES_progressIndicator];
+    return [parameters objectForKey:SDLNameProgressIndicator];
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index 1a8eb1016..50e0edc0e 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -11,7 +11,7 @@
 @implementation SDLAlertManeuver
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AlertManeuver]) {
+    if (self = [super initWithName:SDLNameAlertManeuver]) {
     }
     return self;
 }
@@ -24,14 +24,14 @@
 
 - (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks {
     if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:NAMES_ttsChunks];
+        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
     } else {
-        [parameters removeObjectForKey:NAMES_ttsChunks];
+        [parameters removeObjectForKey:SDLNameTTSChunks];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_ttsChunks];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -45,14 +45,14 @@
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m
index 358a05afe..f194774fd 100644
--- a/SmartDeviceLink/SDLAlertManeuverResponse.m
+++ b/SmartDeviceLink/SDLAlertManeuverResponse.m
@@ -8,7 +8,7 @@
 @implementation SDLAlertManeuverResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AlertManeuver]) {
+    if (self = [super initWithName:SDLNameAlertManeuver]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m
index ee0615cee..85bf19953 100644
--- a/SmartDeviceLink/SDLAlertResponse.m
+++ b/SmartDeviceLink/SDLAlertResponse.m
@@ -8,7 +8,7 @@
 @implementation SDLAlertResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Alert]) {
+    if (self = [super initWithName:SDLNameAlert]) {
     }
     return self;
 }
@@ -21,14 +21,14 @@
 
 - (void)setTryAgainTime:(NSNumber *)tryAgainTime {
     if (tryAgainTime != nil) {
-        [parameters setObject:tryAgainTime forKey:NAMES_tryAgainTime];
+        [parameters setObject:tryAgainTime forKey:SDLNameTryAgainTime];
     } else {
-        [parameters removeObjectForKey:NAMES_tryAgainTime];
+        [parameters removeObjectForKey:SDLNameTryAgainTime];
     }
 }
 
 - (NSNumber *)tryAgainTime {
-    return [parameters objectForKey:NAMES_tryAgainTime];
+    return [parameters objectForKey:SDLNameTryAgainTime];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m
index 7318187bf..00eca0d8d 100644
--- a/SmartDeviceLink/SDLAppInfo.m
+++ b/SmartDeviceLink/SDLAppInfo.m
@@ -2,44 +2,45 @@
 //
 
 #import "SDLAppInfo.h"
+
 #import "SDLNames.h"
 
 @implementation SDLAppInfo
 
 - (void)setAppDisplayName:(NSString *)appDisplayName {
     if (appDisplayName != nil) {
-        [store setObject:appDisplayName forKey:NAMES_appDisplayName];
+        [store setObject:appDisplayName forKey:SDLNameAppDisplayName];
     } else {
-        [store removeObjectForKey:NAMES_appDisplayName];
+        [store removeObjectForKey:SDLNameAppDisplayName];
     }
 }
 
 - (NSString *)appDisplayName {
-    return [store objectForKey:NAMES_appDisplayName];
+    return [store objectForKey:SDLNameAppDisplayName];
 }
 
 - (void)setAppBundleID:(NSString *)appBundleID {
     if (appBundleID != nil) {
-        [store setObject:appBundleID forKey:NAMES_appBundleID];
+        [store setObject:appBundleID forKey:SDLNameAppBundleId];
     } else {
-        [store removeObjectForKey:NAMES_appBundleID];
+        [store removeObjectForKey:SDLNameAppBundleId];
     }
 }
 
 - (NSString *)appBundleID {
-    return [store objectForKey:NAMES_appBundleID];
+    return [store objectForKey:SDLNameAppBundleId];
 }
 
 - (void)setAppVersion:(NSString *)appVersion {
     if (appVersion != nil) {
-        [store setObject:appVersion forKey:NAMES_appVersion];
+        [store setObject:appVersion forKey:SDLNameAppVersion];
     } else {
-        [store removeObjectForKey:NAMES_appVersion];
+        [store removeObjectForKey:SDLNameAppVersion];
     }
 }
 
 - (NSString *)appVersion {
-    return [store objectForKey:NAMES_appVersion];
+    return [store objectForKey:SDLNameAppVersion];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
index a141efad3..8a0b1d254 100644
--- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m
+++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -26,14 +26,14 @@
 
 - (void)setSamplingRate:(SDLSamplingRate *)samplingRate {
     if (samplingRate != nil) {
-        [store setObject:samplingRate forKey:NAMES_samplingRate];
+        [store setObject:samplingRate forKey:SDLNameSamplingRate];
     } else {
-        [store removeObjectForKey:NAMES_samplingRate];
+        [store removeObjectForKey:SDLNameSamplingRate];
     }
 }
 
 - (SDLSamplingRate *)samplingRate {
-    NSObject *obj = [store objectForKey:NAMES_samplingRate];
+    NSObject *obj = [store objectForKey:SDLNameSamplingRate];
     if (obj == nil || [obj isKindOfClass:SDLSamplingRate.class]) {
         return (SDLSamplingRate *)obj;
     } else {
@@ -43,14 +43,14 @@
 
 - (void)setBitsPerSample:(SDLBitsPerSample *)bitsPerSample {
     if (bitsPerSample != nil) {
-        [store setObject:bitsPerSample forKey:NAMES_bitsPerSample];
+        [store setObject:bitsPerSample forKey:SDLNameBitsPerSample];
     } else {
-        [store removeObjectForKey:NAMES_bitsPerSample];
+        [store removeObjectForKey:SDLNameBitsPerSample];
     }
 }
 
 - (SDLBitsPerSample *)bitsPerSample {
-    NSObject *obj = [store objectForKey:NAMES_bitsPerSample];
+    NSObject *obj = [store objectForKey:SDLNameBitsPerSample];
     if (obj == nil || [obj isKindOfClass:SDLBitsPerSample.class]) {
         return (SDLBitsPerSample *)obj;
     } else {
@@ -60,14 +60,14 @@
 
 - (void)setAudioType:(SDLAudioType *)audioType {
     if (audioType != nil) {
-        [store setObject:audioType forKey:NAMES_audioType];
+        [store setObject:audioType forKey:SDLNameAudioType];
     } else {
-        [store removeObjectForKey:NAMES_audioType];
+        [store removeObjectForKey:SDLNameAudioType];
     }
 }
 
 - (SDLAudioType *)audioType {
-    NSObject *obj = [store objectForKey:NAMES_audioType];
+    NSObject *obj = [store objectForKey:SDLNameAudioType];
     if (obj == nil || [obj isKindOfClass:SDLAudioType.class]) {
         return (SDLAudioType *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m
index d2271afba..6dac20e24 100644
--- a/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink/SDLBeltStatus.m
@@ -6,7 +6,6 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataEventStatus.h"
 
-
 @implementation SDLBeltStatus
 
 - (instancetype)init {
@@ -23,14 +22,14 @@
 
 - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus *)driverBeltDeployed {
     if (driverBeltDeployed != nil) {
-        [store setObject:driverBeltDeployed forKey:NAMES_driverBeltDeployed];
+        [store setObject:driverBeltDeployed forKey:SDLNameDriverBeltDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverBeltDeployed];
+        [store removeObjectForKey:SDLNameDriverBeltDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverBeltDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverBeltDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverBeltDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -40,14 +39,14 @@
 
 - (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus *)passengerBeltDeployed {
     if (passengerBeltDeployed != nil) {
-        [store setObject:passengerBeltDeployed forKey:NAMES_passengerBeltDeployed];
+        [store setObject:passengerBeltDeployed forKey:SDLNamePassengerBeltDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerBeltDeployed];
+        [store removeObjectForKey:SDLNamePassengerBeltDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerBeltDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerBeltDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerBeltDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -57,14 +56,14 @@
 
 - (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus *)passengerBuckleBelted {
     if (passengerBuckleBelted != nil) {
-        [store setObject:passengerBuckleBelted forKey:NAMES_passengerBuckleBelted];
+        [store setObject:passengerBuckleBelted forKey:SDLNamePassengerBuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_passengerBuckleBelted];
+        [store removeObjectForKey:SDLNamePassengerBuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerBuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_passengerBuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNamePassengerBuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -74,14 +73,14 @@
 
 - (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus *)driverBuckleBelted {
     if (driverBuckleBelted != nil) {
-        [store setObject:driverBuckleBelted forKey:NAMES_driverBuckleBelted];
+        [store setObject:driverBuckleBelted forKey:SDLNameDriverBuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_driverBuckleBelted];
+        [store removeObjectForKey:SDLNameDriverBuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverBuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_driverBuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameDriverBuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -91,14 +90,14 @@
 
 - (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus *)leftRow2BuckleBelted {
     if (leftRow2BuckleBelted != nil) {
-        [store setObject:leftRow2BuckleBelted forKey:NAMES_leftRow2BuckleBelted];
+        [store setObject:leftRow2BuckleBelted forKey:SDLNameLeftRow2BuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_leftRow2BuckleBelted];
+        [store removeObjectForKey:SDLNameLeftRow2BuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)leftRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_leftRow2BuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameLeftRow2BuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -108,14 +107,14 @@
 
 - (void)setPassengerChildDetected:(SDLVehicleDataEventStatus *)passengerChildDetected {
     if (passengerChildDetected != nil) {
-        [store setObject:passengerChildDetected forKey:NAMES_passengerChildDetected];
+        [store setObject:passengerChildDetected forKey:SDLNamePassengerChildDetected];
     } else {
-        [store removeObjectForKey:NAMES_passengerChildDetected];
+        [store removeObjectForKey:SDLNamePassengerChildDetected];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerChildDetected {
-    NSObject *obj = [store objectForKey:NAMES_passengerChildDetected];
+    NSObject *obj = [store objectForKey:SDLNamePassengerChildDetected];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -125,14 +124,14 @@
 
 - (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus *)rightRow2BuckleBelted {
     if (rightRow2BuckleBelted != nil) {
-        [store setObject:rightRow2BuckleBelted forKey:NAMES_rightRow2BuckleBelted];
+        [store setObject:rightRow2BuckleBelted forKey:SDLNameRightRow2BuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_rightRow2BuckleBelted];
+        [store removeObjectForKey:SDLNameRightRow2BuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)rightRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_rightRow2BuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameRightRow2BuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -142,14 +141,14 @@
 
 - (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus *)middleRow2BuckleBelted {
     if (middleRow2BuckleBelted != nil) {
-        [store setObject:middleRow2BuckleBelted forKey:NAMES_middleRow2BuckleBelted];
+        [store setObject:middleRow2BuckleBelted forKey:SDLNameMiddleRow2BuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_middleRow2BuckleBelted];
+        [store removeObjectForKey:SDLNameMiddleRow2BuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)middleRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_middleRow2BuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameMiddleRow2BuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -159,14 +158,14 @@
 
 - (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus *)middleRow3BuckleBelted {
     if (middleRow3BuckleBelted != nil) {
-        [store setObject:middleRow3BuckleBelted forKey:NAMES_middleRow3BuckleBelted];
+        [store setObject:middleRow3BuckleBelted forKey:SDLNameMiddleRow3BuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_middleRow3BuckleBelted];
+        [store removeObjectForKey:SDLNameMiddleRow3BuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)middleRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_middleRow3BuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameMiddleRow3BuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -176,14 +175,14 @@
 
 - (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus *)leftRow3BuckleBelted {
     if (leftRow3BuckleBelted != nil) {
-        [store setObject:leftRow3BuckleBelted forKey:NAMES_leftRow3BuckleBelted];
+        [store setObject:leftRow3BuckleBelted forKey:SDLNameLeftRow3BuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_leftRow3BuckleBelted];
+        [store removeObjectForKey:SDLNameLeftRow3BuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)leftRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_leftRow3BuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameLeftRow3BuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -193,14 +192,14 @@
 
 - (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus *)rightRow3BuckleBelted {
     if (rightRow3BuckleBelted != nil) {
-        [store setObject:rightRow3BuckleBelted forKey:NAMES_rightRow3BuckleBelted];
+        [store setObject:rightRow3BuckleBelted forKey:SDLNameRightRow3BuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_rightRow3BuckleBelted];
+        [store removeObjectForKey:SDLNameRightRow3BuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)rightRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_rightRow3BuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameRightRow3BuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -210,14 +209,14 @@
 
 - (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus *)leftRearInflatableBelted {
     if (leftRearInflatableBelted != nil) {
-        [store setObject:leftRearInflatableBelted forKey:NAMES_leftRearInflatableBelted];
+        [store setObject:leftRearInflatableBelted forKey:SDLNameLeftRearInflatableBelted];
     } else {
-        [store removeObjectForKey:NAMES_leftRearInflatableBelted];
+        [store removeObjectForKey:SDLNameLeftRearInflatableBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)leftRearInflatableBelted {
-    NSObject *obj = [store objectForKey:NAMES_leftRearInflatableBelted];
+    NSObject *obj = [store objectForKey:SDLNameLeftRearInflatableBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -227,14 +226,14 @@
 
 - (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus *)rightRearInflatableBelted {
     if (rightRearInflatableBelted != nil) {
-        [store setObject:rightRearInflatableBelted forKey:NAMES_rightRearInflatableBelted];
+        [store setObject:rightRearInflatableBelted forKey:SDLNameRightRearInflatableBelted];
     } else {
-        [store removeObjectForKey:NAMES_rightRearInflatableBelted];
+        [store removeObjectForKey:SDLNameRightRearInflatableBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)rightRearInflatableBelted {
-    NSObject *obj = [store objectForKey:NAMES_rightRearInflatableBelted];
+    NSObject *obj = [store objectForKey:SDLNameRightRearInflatableBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -244,14 +243,14 @@
 
 - (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus *)middleRow1BeltDeployed {
     if (middleRow1BeltDeployed != nil) {
-        [store setObject:middleRow1BeltDeployed forKey:NAMES_middleRow1BeltDeployed];
+        [store setObject:middleRow1BeltDeployed forKey:SDLNameMiddleRow1BeltDeployed];
     } else {
-        [store removeObjectForKey:NAMES_middleRow1BeltDeployed];
+        [store removeObjectForKey:SDLNameMiddleRow1BeltDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)middleRow1BeltDeployed {
-    NSObject *obj = [store objectForKey:NAMES_middleRow1BeltDeployed];
+    NSObject *obj = [store objectForKey:SDLNameMiddleRow1BeltDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -261,14 +260,14 @@
 
 - (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus *)middleRow1BuckleBelted {
     if (middleRow1BuckleBelted != nil) {
-        [store setObject:middleRow1BuckleBelted forKey:NAMES_middleRow1BuckleBelted];
+        [store setObject:middleRow1BuckleBelted forKey:SDLNameMiddleRow1BuckleBelted];
     } else {
-        [store removeObjectForKey:NAMES_middleRow1BuckleBelted];
+        [store removeObjectForKey:SDLNameMiddleRow1BuckleBelted];
     }
 }
 
 - (SDLVehicleDataEventStatus *)middleRow1BuckleBelted {
-    NSObject *obj = [store objectForKey:NAMES_middleRow1BuckleBelted];
+    NSObject *obj = [store objectForKey:SDLNameMiddleRow1BuckleBelted];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m
index 5db5e25d2..b46d2ce0b 100644
--- a/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink/SDLBodyInformation.m
@@ -8,7 +8,6 @@
 #import "SDLIgnitionStatus.h"
 #import "SDLNames.h"
 
-
 @implementation SDLBodyInformation
 
 - (instancetype)init {
@@ -25,26 +24,26 @@
 
 - (void)setParkBrakeActive:(NSNumber *)parkBrakeActive {
     if (parkBrakeActive != nil) {
-        [store setObject:parkBrakeActive forKey:NAMES_parkBrakeActive];
+        [store setObject:parkBrakeActive forKey:SDLNameParkBrakeActive];
     } else {
-        [store removeObjectForKey:NAMES_parkBrakeActive];
+        [store removeObjectForKey:SDLNameParkBrakeActive];
     }
 }
 
 - (NSNumber *)parkBrakeActive {
-    return [store objectForKey:NAMES_parkBrakeActive];
+    return [store objectForKey:SDLNameParkBrakeActive];
 }
 
 - (void)setIgnitionStableStatus:(SDLIgnitionStableStatus *)ignitionStableStatus {
     if (ignitionStableStatus != nil) {
-        [store setObject:ignitionStableStatus forKey:NAMES_ignitionStableStatus];
+        [store setObject:ignitionStableStatus forKey:SDLNameIgnitionStableStatus];
     } else {
-        [store removeObjectForKey:NAMES_ignitionStableStatus];
+        [store removeObjectForKey:SDLNameIgnitionStableStatus];
     }
 }
 
 - (SDLIgnitionStableStatus *)ignitionStableStatus {
-    NSObject *obj = [store objectForKey:NAMES_ignitionStableStatus];
+    NSObject *obj = [store objectForKey:SDLNameIgnitionStableStatus];
     if (obj == nil || [obj isKindOfClass:SDLIgnitionStableStatus.class]) {
         return (SDLIgnitionStableStatus *)obj;
     } else {
@@ -54,14 +53,14 @@
 
 - (void)setIgnitionStatus:(SDLIgnitionStatus *)ignitionStatus {
     if (ignitionStatus != nil) {
-        [store setObject:ignitionStatus forKey:NAMES_ignitionStatus];
+        [store setObject:ignitionStatus forKey:SDLNameIgnitionStatus];
     } else {
-        [store removeObjectForKey:NAMES_ignitionStatus];
+        [store removeObjectForKey:SDLNameIgnitionStatus];
     }
 }
 
 - (SDLIgnitionStatus *)ignitionStatus {
-    NSObject *obj = [store objectForKey:NAMES_ignitionStatus];
+    NSObject *obj = [store objectForKey:SDLNameIgnitionStatus];
     if (obj == nil || [obj isKindOfClass:SDLIgnitionStatus.class]) {
         return (SDLIgnitionStatus *)obj;
     } else {
@@ -71,50 +70,50 @@
 
 - (void)setDriverDoorAjar:(NSNumber *)driverDoorAjar {
     if (driverDoorAjar != nil) {
-        [store setObject:driverDoorAjar forKey:NAMES_driverDoorAjar];
+        [store setObject:driverDoorAjar forKey:SDLNameDriverDoorAjar];
     } else {
-        [store removeObjectForKey:NAMES_driverDoorAjar];
+        [store removeObjectForKey:SDLNameDriverDoorAjar];
     }
 }
 
 - (NSNumber *)driverDoorAjar {
-    return [store objectForKey:NAMES_driverDoorAjar];
+    return [store objectForKey:SDLNameDriverDoorAjar];
 }
 
 - (void)setPassengerDoorAjar:(NSNumber *)passengerDoorAjar {
     if (passengerDoorAjar != nil) {
-        [store setObject:passengerDoorAjar forKey:NAMES_passengerDoorAjar];
+        [store setObject:passengerDoorAjar forKey:SDLNamePassengerDoorAjar];
     } else {
-        [store removeObjectForKey:NAMES_passengerDoorAjar];
+        [store removeObjectForKey:SDLNamePassengerDoorAjar];
     }
 }
 
 - (NSNumber *)passengerDoorAjar {
-    return [store objectForKey:NAMES_passengerDoorAjar];
+    return [store objectForKey:SDLNamePassengerDoorAjar];
 }
 
 - (void)setRearLeftDoorAjar:(NSNumber *)rearLeftDoorAjar {
     if (rearLeftDoorAjar != nil) {
-        [store setObject:rearLeftDoorAjar forKey:NAMES_rearLeftDoorAjar];
+        [store setObject:rearLeftDoorAjar forKey:SDLNameRearLeftDoorAjar];
     } else {
-        [store removeObjectForKey:NAMES_rearLeftDoorAjar];
+        [store removeObjectForKey:SDLNameRearLeftDoorAjar];
     }
 }
 
 - (NSNumber *)rearLeftDoorAjar {
-    return [store objectForKey:NAMES_rearLeftDoorAjar];
+    return [store objectForKey:SDLNameRearLeftDoorAjar];
 }
 
 - (void)setRearRightDoorAjar:(NSNumber *)rearRightDoorAjar {
     if (rearRightDoorAjar != nil) {
-        [store setObject:rearRightDoorAjar forKey:NAMES_rearRightDoorAjar];
+        [store setObject:rearRightDoorAjar forKey:SDLNameRearRightDoorAjar];
     } else {
-        [store removeObjectForKey:NAMES_rearRightDoorAjar];
+        [store removeObjectForKey:SDLNameRearRightDoorAjar];
     }
 }
 
 - (NSNumber *)rearRightDoorAjar {
-    return [store objectForKey:NAMES_rearRightDoorAjar];
+    return [store objectForKey:SDLNameRearRightDoorAjar];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m
index a2149d1ba..0e37308ca 100644
--- a/SmartDeviceLink/SDLButtonCapabilities.m
+++ b/SmartDeviceLink/SDLButtonCapabilities.m
@@ -6,7 +6,6 @@
 #import "SDLButtonName.h"
 #import "SDLNames.h"
 
-
 @implementation SDLButtonCapabilities
 
 - (instancetype)init {
@@ -23,14 +22,14 @@
 
 - (void)setName:(SDLButtonName *)name {
     if (name != nil) {
-        [store setObject:name forKey:NAMES_name];
+        [store setObject:name forKey:SDLNameName];
     } else {
-        [store removeObjectForKey:NAMES_name];
+        [store removeObjectForKey:SDLNameName];
     }
 }
 
 - (SDLButtonName *)name {
-    NSObject *obj = [store objectForKey:NAMES_name];
+    NSObject *obj = [store objectForKey:SDLNameName];
     if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
@@ -40,38 +39,38 @@
 
 - (void)setShortPressAvailable:(NSNumber *)shortPressAvailable {
     if (shortPressAvailable != nil) {
-        [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable];
+        [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable];
     } else {
-        [store removeObjectForKey:NAMES_shortPressAvailable];
+        [store removeObjectForKey:SDLNameShortPressAvailable];
     }
 }
 
 - (NSNumber *)shortPressAvailable {
-    return [store objectForKey:NAMES_shortPressAvailable];
+    return [store objectForKey:SDLNameShortPressAvailable];
 }
 
 - (void)setLongPressAvailable:(NSNumber *)longPressAvailable {
     if (longPressAvailable != nil) {
-        [store setObject:longPressAvailable forKey:NAMES_longPressAvailable];
+        [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable];
     } else {
-        [store removeObjectForKey:NAMES_longPressAvailable];
+        [store removeObjectForKey:SDLNameLongPressAvailable];
     }
 }
 
 - (NSNumber *)longPressAvailable {
-    return [store objectForKey:NAMES_longPressAvailable];
+    return [store objectForKey:SDLNameLongPressAvailable];
 }
 
 - (void)setUpDownAvailable:(NSNumber *)upDownAvailable {
     if (upDownAvailable != nil) {
-        [store setObject:upDownAvailable forKey:NAMES_upDownAvailable];
+        [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable];
     } else {
-        [store removeObjectForKey:NAMES_upDownAvailable];
+        [store removeObjectForKey:SDLNameUpDownAvailable];
     }
 }
 
 - (NSNumber *)upDownAvailable {
-    return [store objectForKey:NAMES_upDownAvailable];
+    return [store objectForKey:SDLNameUpDownAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index be97f6cd0..deaed99b5 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -10,7 +10,7 @@
 @implementation SDLChangeRegistration
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ChangeRegistration]) {
+    if (self = [super initWithName:SDLNameChangeRegistration]) {
     }
     return self;
 }
@@ -23,14 +23,14 @@
 
 - (void)setLanguage:(SDLLanguage *)language {
     if (language != nil) {
-        [parameters setObject:language forKey:NAMES_language];
+        [parameters setObject:language forKey:SDLNameLanguage];
     } else {
-        [parameters removeObjectForKey:NAMES_language];
+        [parameters removeObjectForKey:SDLNameLanguage];
     }
 }
 
 - (SDLLanguage *)language {
-    NSObject *obj = [parameters objectForKey:NAMES_language];
+    NSObject *obj = [parameters objectForKey:SDLNameLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -40,14 +40,14 @@
 
 - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage {
     if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
+        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
     } else {
-        [parameters removeObjectForKey:NAMES_hmiDisplayLanguage];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -57,50 +57,50 @@
 
 - (void)setAppName:(NSString *)appName {
     if (appName != nil) {
-        parameters[NAMES_appName] = [appName copy];
+        parameters[SDLNameAppName] = [appName copy];
     } else {
-        [parameters removeObjectForKey:NAMES_appName];
+        [parameters removeObjectForKey:SDLNameAppName];
     }
 }
 
 - (NSString *)appName {
-    return [parameters[NAMES_appName] copy];
+    return [parameters[SDLNameAppName] copy];
 }
 
 - (void)setTtsName:(NSArray<SDLTTSChunk *> *)ttsName {
     if (ttsName != nil) {
-        [parameters setObject:[ttsName copy] forKey:NAMES_ttsName];
+        [parameters setObject:[ttsName copy] forKey:SDLNameTTSName];
     } else {
-        [parameters removeObjectForKey:NAMES_ttsName];
+        [parameters removeObjectForKey:SDLNameTTSName];
     }
 }
 
 - (NSArray<SDLTTSChunk *> *)ttsName {
-    return [parameters[NAMES_ttsName] copy];
+    return [parameters[SDLNameTTSName] copy];
 }
 
 - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName {
     if (ngnMediaScreenAppName != nil) {
-        parameters[NAMES_ngnMediaScreenAppName] = [ngnMediaScreenAppName copy];
+        parameters[SDLNameNGNMediaScreenAppName] = [ngnMediaScreenAppName copy];
     } else {
-        [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName];
+        [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName];
     }
 }
 
 - (NSString *)ngnMediaScreenAppName {
-    return [parameters[NAMES_ngnMediaScreenAppName] copy];
+    return [parameters[SDLNameNGNMediaScreenAppName] copy];
 }
 
 - (void)setVrSynonyms:(NSArray<NSString *> *)vrSynonyms {
     if (vrSynonyms != nil) {
-        [parameters setObject:[vrSynonyms copy] forKey:NAMES_vrSynonyms];
+        [parameters setObject:[vrSynonyms copy] forKey:SDLNameVRSynonyms];
     } else {
-        [parameters removeObjectForKey:NAMES_vrSynonyms];
+        [parameters removeObjectForKey:SDLNameVRSynonyms];
     }
 }
 
 - (NSArray<NSString *> *)vrSynonyms {
-    return [parameters[NAMES_vrSynonyms] copy];
+    return [parameters[SDLNameVRSynonyms] copy];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m
index d530a8fb9..b32e22fa4 100644
--- a/SmartDeviceLink/SDLChangeRegistrationResponse.m
+++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLChangeRegistrationResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ChangeRegistration]) {
+    if (self = [super initWithName:SDLNameChangeRegistration]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index 632b6ca05..43e1cb02f 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -6,7 +6,6 @@
 #import "SDLImage.h"
 #import "SDLNames.h"
 
-
 @implementation SDLChoice
 
 - (instancetype)init {
@@ -23,50 +22,50 @@
 
 - (void)setChoiceID:(NSNumber *)choiceID {
     if (choiceID != nil) {
-        [store setObject:choiceID forKey:NAMES_choiceID];
+        [store setObject:choiceID forKey:SDLNameChoiceId];
     } else {
-        [store removeObjectForKey:NAMES_choiceID];
+        [store removeObjectForKey:SDLNameChoiceId];
     }
 }
 
 - (NSNumber *)choiceID {
-    return [store objectForKey:NAMES_choiceID];
+    return [store objectForKey:SDLNameChoiceId];
 }
 
 - (void)setMenuName:(NSString *)menuName {
     if (menuName != nil) {
-        [store setObject:menuName forKey:NAMES_menuName];
+        [store setObject:menuName forKey:SDLNameMenuName];
     } else {
-        [store removeObjectForKey:NAMES_menuName];
+        [store removeObjectForKey:SDLNameMenuName];
     }
 }
 
 - (NSString *)menuName {
-    return [store objectForKey:NAMES_menuName];
+    return [store objectForKey:SDLNameMenuName];
 }
 
 - (void)setVrCommands:(NSMutableArray<NSString *> *)vrCommands {
     if (vrCommands != nil) {
-        [store setObject:vrCommands forKey:NAMES_vrCommands];
+        [store setObject:vrCommands forKey:SDLNameVRCommands];
     } else {
-        [store removeObjectForKey:NAMES_vrCommands];
+        [store removeObjectForKey:SDLNameVRCommands];
     }
 }
 
 - (NSMutableArray<NSString *> *)vrCommands {
-    return [store objectForKey:NAMES_vrCommands];
+    return [store objectForKey:SDLNameVRCommands];
 }
 
 - (void)setImage:(SDLImage *)image {
     if (image != nil) {
-        [store setObject:image forKey:NAMES_image];
+        [store setObject:image forKey:SDLNameImage];
     } else {
-        [store removeObjectForKey:NAMES_image];
+        [store removeObjectForKey:SDLNameImage];
     }
 }
 
 - (SDLImage *)image {
-    NSObject *obj = [store objectForKey:NAMES_image];
+    NSObject *obj = [store objectForKey:SDLNameImage];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -76,38 +75,38 @@
 
 - (void)setSecondaryText:(NSString *)secondaryText {
     if (secondaryText != nil) {
-        [store setObject:secondaryText forKey:NAMES_secondaryText];
+        [store setObject:secondaryText forKey:SDLNameSecondaryText];
     } else {
-        [store removeObjectForKey:NAMES_secondaryText];
+        [store removeObjectForKey:SDLNameSecondaryText];
     }
 }
 
 - (NSString *)secondaryText {
-    return [store objectForKey:NAMES_secondaryText];
+    return [store objectForKey:SDLNameSecondaryText];
 }
 
 - (void)setTertiaryText:(NSString *)tertiaryText {
     if (tertiaryText != nil) {
-        [store setObject:tertiaryText forKey:NAMES_tertiaryText];
+        [store setObject:tertiaryText forKey:SDLNameTertiaryText];
     } else {
-        [store removeObjectForKey:NAMES_tertiaryText];
+        [store removeObjectForKey:SDLNameTertiaryText];
     }
 }
 
 - (NSString *)tertiaryText {
-    return [store objectForKey:NAMES_tertiaryText];
+    return [store objectForKey:SDLNameTertiaryText];
 }
 
 - (void)setSecondaryImage:(SDLImage *)secondaryImage {
     if (secondaryImage != nil) {
-        [store setObject:secondaryImage forKey:NAMES_secondaryImage];
+        [store setObject:secondaryImage forKey:SDLNameSecondaryImage];
     } else {
-        [store removeObjectForKey:NAMES_secondaryImage];
+        [store removeObjectForKey:SDLNameSecondaryImage];
     }
 }
 
 - (SDLImage *)secondaryImage {
-    NSObject *obj = [store objectForKey:NAMES_secondaryImage];
+    NSObject *obj = [store objectForKey:SDLNameSecondaryImage];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m
index 17c198f92..89f1e1125 100644
--- a/SmartDeviceLink/SDLClusterModeStatus.m
+++ b/SmartDeviceLink/SDLClusterModeStatus.m
@@ -8,7 +8,6 @@
 #import "SDLPowerModeQualificationStatus.h"
 #import "SDLPowerModeStatus.h"
 
-
 @implementation SDLClusterModeStatus
 
 - (instancetype)init {
@@ -25,26 +24,26 @@
 
 - (void)setPowerModeActive:(NSNumber *)powerModeActive {
     if (powerModeActive != nil) {
-        [store setObject:powerModeActive forKey:NAMES_powerModeActive];
+        [store setObject:powerModeActive forKey:SDLNamePowerModeActive];
     } else {
-        [store removeObjectForKey:NAMES_powerModeActive];
+        [store removeObjectForKey:SDLNamePowerModeActive];
     }
 }
 
 - (NSNumber *)powerModeActive {
-    return [store objectForKey:NAMES_powerModeActive];
+    return [store objectForKey:SDLNamePowerModeActive];
 }
 
 - (void)setPowerModeQualificationStatus:(SDLPowerModeQualificationStatus *)powerModeQualificationStatus {
     if (powerModeQualificationStatus != nil) {
-        [store setObject:powerModeQualificationStatus forKey:NAMES_powerModeQualificationStatus];
+        [store setObject:powerModeQualificationStatus forKey:SDLNamePowerModeQualificationStatus];
     } else {
-        [store removeObjectForKey:NAMES_powerModeQualificationStatus];
+        [store removeObjectForKey:SDLNamePowerModeQualificationStatus];
     }
 }
 
 - (SDLPowerModeQualificationStatus *)powerModeQualificationStatus {
-    NSObject *obj = [store objectForKey:NAMES_powerModeQualificationStatus];
+    NSObject *obj = [store objectForKey:SDLNamePowerModeQualificationStatus];
     if (obj == nil || [obj isKindOfClass:SDLPowerModeQualificationStatus.class]) {
         return (SDLPowerModeQualificationStatus *)obj;
     } else {
@@ -54,14 +53,14 @@
 
 - (void)setCarModeStatus:(SDLCarModeStatus *)carModeStatus {
     if (carModeStatus != nil) {
-        [store setObject:carModeStatus forKey:NAMES_carModeStatus];
+        [store setObject:carModeStatus forKey:SDLNameCarModeStatus];
     } else {
-        [store removeObjectForKey:NAMES_carModeStatus];
+        [store removeObjectForKey:SDLNameCarModeStatus];
     }
 }
 
 - (SDLCarModeStatus *)carModeStatus {
-    NSObject *obj = [store objectForKey:NAMES_carModeStatus];
+    NSObject *obj = [store objectForKey:SDLNameCarModeStatus];
     if (obj == nil || [obj isKindOfClass:SDLCarModeStatus.class]) {
         return (SDLCarModeStatus *)obj;
     } else {
@@ -71,14 +70,14 @@
 
 - (void)setPowerModeStatus:(SDLPowerModeStatus *)powerModeStatus {
     if (powerModeStatus != nil) {
-        [store setObject:powerModeStatus forKey:NAMES_powerModeStatus];
+        [store setObject:powerModeStatus forKey:SDLNamePowerModeStatus];
     } else {
-        [store removeObjectForKey:NAMES_powerModeStatus];
+        [store removeObjectForKey:SDLNamePowerModeStatus];
     }
 }
 
 - (SDLPowerModeStatus *)powerModeStatus {
-    NSObject *obj = [store objectForKey:NAMES_powerModeStatus];
+    NSObject *obj = [store objectForKey:SDLNamePowerModeStatus];
     if (obj == nil || [obj isKindOfClass:SDLPowerModeStatus.class]) {
         return (SDLPowerModeStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index 47a9c04ad..e97de3d90 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -10,7 +10,7 @@
 @implementation SDLCreateInteractionChoiceSet
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_CreateInteractionChoiceSet]) {
+    if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) {
     }
     return self;
 }
@@ -23,26 +23,26 @@
 
 - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID {
     if (interactionChoiceSetID != nil) {
-        [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID];
+        [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionChoiceSetID];
+        [parameters removeObjectForKey:SDLNameInteractionChoiceSetId];
     }
 }
 
 - (NSNumber *)interactionChoiceSetID {
-    return [parameters objectForKey:NAMES_interactionChoiceSetID];
+    return [parameters objectForKey:SDLNameInteractionChoiceSetId];
 }
 
 - (void)setChoiceSet:(NSMutableArray<SDLChoice *> *)choiceSet {
     if (choiceSet != nil) {
-        [parameters setObject:choiceSet forKey:NAMES_choiceSet];
+        [parameters setObject:choiceSet forKey:SDLNameChoiceSet];
     } else {
-        [parameters removeObjectForKey:NAMES_choiceSet];
+        [parameters removeObjectForKey:SDLNameChoiceSet];
     }
 }
 
 - (NSMutableArray<SDLChoice *> *)choiceSet {
-    NSMutableArray<SDLChoice *> *array = [parameters objectForKey:NAMES_choiceSet];
+    NSMutableArray<SDLChoice *> *array = [parameters objectForKey:SDLNameChoiceSet];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLChoice.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
index d161b10f7..9e02c07fb 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLCreateInteractionChoiceSetResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_CreateInteractionChoiceSet]) {
+    if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m
index 00b0f5f8b..9b9e4e7e5 100644
--- a/SmartDeviceLink/SDLDIDResult.m
+++ b/SmartDeviceLink/SDLDIDResult.m
@@ -6,7 +6,6 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataResultCode.h"
 
-
 @implementation SDLDIDResult
 
 - (instancetype)init {
@@ -23,14 +22,14 @@
 
 - (void)setResultCode:(SDLVehicleDataResultCode *)resultCode {
     if (resultCode != nil) {
-        [store setObject:resultCode forKey:NAMES_resultCode];
+        [store setObject:resultCode forKey:SDLNameResultCode];
     } else {
-        [store removeObjectForKey:NAMES_resultCode];
+        [store removeObjectForKey:SDLNameResultCode];
     }
 }
 
 - (SDLVehicleDataResultCode *)resultCode {
-    NSObject *obj = [store objectForKey:NAMES_resultCode];
+    NSObject *obj = [store objectForKey:SDLNameResultCode];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResultCode.class]) {
         return (SDLVehicleDataResultCode *)obj;
     } else {
@@ -40,26 +39,26 @@
 
 - (void)setDidLocation:(NSNumber *)didLocation {
     if (didLocation != nil) {
-        [store setObject:didLocation forKey:NAMES_didLocation];
+        [store setObject:didLocation forKey:SDLNameDIDLocation];
     } else {
-        [store removeObjectForKey:NAMES_didLocation];
+        [store removeObjectForKey:SDLNameDIDLocation];
     }
 }
 
 - (NSNumber *)didLocation {
-    return [store objectForKey:NAMES_didLocation];
+    return [store objectForKey:SDLNameDIDLocation];
 }
 
 - (void)setData:(NSString *)data {
     if (data != nil) {
-        [store setObject:data forKey:NAMES_data];
+        [store setObject:data forKey:SDLNameData];
     } else {
-        [store removeObjectForKey:NAMES_data];
+        [store removeObjectForKey:SDLNameData];
     }
 }
 
 - (NSString *)data {
-    return [store objectForKey:NAMES_data];
+    return [store objectForKey:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m
index 4d5fdb5ab..6e2a7f82b 100644
--- a/SmartDeviceLink/SDLDeleteCommand.m
+++ b/SmartDeviceLink/SDLDeleteCommand.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteCommand
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteCommand]) {
+    if (self = [super initWithName:SDLNameDeleteCommand]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setCmdID:(NSNumber *)cmdID {
     if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:NAMES_cmdID];
+        [parameters setObject:cmdID forKey:SDLNameCommandId];
     } else {
-        [parameters removeObjectForKey:NAMES_cmdID];
+        [parameters removeObjectForKey:SDLNameCommandId];
     }
 }
 
 - (NSNumber *)cmdID {
-    return [parameters objectForKey:NAMES_cmdID];
+    return [parameters objectForKey:SDLNameCommandId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m
index 1cd607103..e15849348 100644
--- a/SmartDeviceLink/SDLDeleteCommandResponse.m
+++ b/SmartDeviceLink/SDLDeleteCommandResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteCommandResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteCommand]) {
+    if (self = [super initWithName:SDLNameDeleteCommand]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m
index 6bdace611..8544335a1 100644
--- a/SmartDeviceLink/SDLDeleteFile.m
+++ b/SmartDeviceLink/SDLDeleteFile.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteFile
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteFile]) {
+    if (self = [super initWithName:SDLNameDeleteFile]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setSyncFileName:(NSString *)syncFileName {
     if (syncFileName != nil) {
-        [parameters setObject:syncFileName forKey:NAMES_syncFileName];
+        [parameters setObject:syncFileName forKey:SDLNameSyncFileName];
     } else {
-        [parameters removeObjectForKey:NAMES_syncFileName];
+        [parameters removeObjectForKey:SDLNameSyncFileName];
     }
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:NAMES_syncFileName];
+    return [parameters objectForKey:SDLNameSyncFileName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m
index 0b6ea199b..c23706df8 100644
--- a/SmartDeviceLink/SDLDeleteFileResponse.m
+++ b/SmartDeviceLink/SDLDeleteFileResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteFileResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteFile]) {
+    if (self = [super initWithName:SDLNameDeleteFile]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setSpaceAvailable:(NSNumber *)spaceAvailable {
     if (spaceAvailable != nil) {
-        [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable];
+        [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable];
     } else {
-        [parameters removeObjectForKey:NAMES_spaceAvailable];
+        [parameters removeObjectForKey:SDLNameSpaceAvailable];
     }
 }
 
 - (NSNumber *)spaceAvailable {
-    return [parameters objectForKey:NAMES_spaceAvailable];
+    return [parameters objectForKey:SDLNameSpaceAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
index 536a88a45..dea3aed97 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteInteractionChoiceSet
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteInteractionChoiceSet]) {
+    if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID {
     if (interactionChoiceSetID != nil) {
-        [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID];
+        [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionChoiceSetID];
+        [parameters removeObjectForKey:SDLNameInteractionChoiceSetId];
     }
 }
 
 - (NSNumber *)interactionChoiceSetID {
-    return [parameters objectForKey:NAMES_interactionChoiceSetID];
+    return [parameters objectForKey:SDLNameInteractionChoiceSetId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
index f09b6d87e..64c8afff0 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteInteractionChoiceSetResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteInteractionChoiceSet]) {
+    if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m
index 43c741f20..e04408957 100644
--- a/SmartDeviceLink/SDLDeleteSubMenu.m
+++ b/SmartDeviceLink/SDLDeleteSubMenu.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteSubMenu
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteSubMenu]) {
+    if (self = [super initWithName:SDLNameDeleteSubMenu]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setMenuID:(NSNumber *)menuID {
     if (menuID != nil) {
-        [parameters setObject:menuID forKey:NAMES_menuID];
+        [parameters setObject:menuID forKey:SDLNameMenuId];
     } else {
-        [parameters removeObjectForKey:NAMES_menuID];
+        [parameters removeObjectForKey:SDLNameMenuId];
     }
 }
 
 - (NSNumber *)menuID {
-    return [parameters objectForKey:NAMES_menuID];
+    return [parameters objectForKey:SDLNameMenuId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
index b1a3a0f60..047697b42 100644
--- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m
+++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLDeleteSubMenuResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DeleteSubMenu]) {
+    if (self = [super initWithName:SDLNameDeleteSubMenu]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m
index aab9948d1..7575d66c1 100644
--- a/SmartDeviceLink/SDLDeviceInfo.m
+++ b/SmartDeviceLink/SDLDeviceInfo.m
@@ -5,7 +5,6 @@
 
 #import "SDLNames.h"
 
-
 @implementation SDLDeviceInfo
 
 - (instancetype)init {
@@ -22,74 +21,74 @@
 
 - (void)setHardware:(NSString *)hardware {
     if (hardware != nil) {
-        [store setObject:hardware forKey:NAMES_hardware];
+        [store setObject:hardware forKey:SDLNameHardware];
     } else {
-        [store removeObjectForKey:NAMES_hardware];
+        [store removeObjectForKey:SDLNameHardware];
     }
 }
 
 - (NSString *)hardware {
-    return [store objectForKey:NAMES_hardware];
+    return [store objectForKey:SDLNameHardware];
 }
 
 - (void)setFirmwareRev:(NSString *)firmwareRev {
     if (firmwareRev != nil) {
-        [store setObject:firmwareRev forKey:NAMES_firmwareRev];
+        [store setObject:firmwareRev forKey:SDLNameFirmwareRevision];
     } else {
-        [store removeObjectForKey:NAMES_firmwareRev];
+        [store removeObjectForKey:SDLNameFirmwareRevision];
     }
 }
 
 - (NSString *)firmwareRev {
-    return [store objectForKey:NAMES_firmwareRev];
+    return [store objectForKey:SDLNameFirmwareRevision];
 }
 
 - (void)setOs:(NSString *)os {
     if (os != nil) {
-        [store setObject:os forKey:NAMES_os];
+        [store setObject:os forKey:SDLNameOS];
     } else {
-        [store removeObjectForKey:NAMES_os];
+        [store removeObjectForKey:SDLNameOS];
     }
 }
 
 - (NSString *)os {
-    return [store objectForKey:NAMES_os];
+    return [store objectForKey:SDLNameOS];
 }
 
 - (void)setOsVersion:(NSString *)osVersion {
     if (osVersion != nil) {
-        [store setObject:osVersion forKey:NAMES_osVersion];
+        [store setObject:osVersion forKey:SDLNameOSVersion];
     } else {
-        [store removeObjectForKey:NAMES_osVersion];
+        [store removeObjectForKey:SDLNameOSVersion];
     }
 }
 
 - (NSString *)osVersion {
-    return [store objectForKey:NAMES_osVersion];
+    return [store objectForKey:SDLNameOSVersion];
 }
 
 - (void)setCarrier:(NSString *)carrier {
     if (carrier != nil) {
-        [store setObject:carrier forKey:NAMES_carrier];
+        [store setObject:carrier forKey:SDLNameCarrier];
     } else {
-        [store removeObjectForKey:NAMES_carrier];
+        [store removeObjectForKey:SDLNameCarrier];
     }
 }
 
 - (NSString *)carrier {
-    return [store objectForKey:NAMES_carrier];
+    return [store objectForKey:SDLNameCarrier];
 }
 
 - (void)setMaxNumberRFCOMMPorts:(NSNumber *)maxNumberRFCOMMPorts {
     if (maxNumberRFCOMMPorts != nil) {
-        [store setObject:maxNumberRFCOMMPorts forKey:NAMES_maxNumberRFCOMMPorts];
+        [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRFCOMMPorts];
     } else {
-        [store removeObjectForKey:NAMES_maxNumberRFCOMMPorts];
+        [store removeObjectForKey:SDLNameMaxNumberRFCOMMPorts];
     }
 }
 
 - (NSNumber *)maxNumberRFCOMMPorts {
-    return [store objectForKey:NAMES_maxNumberRFCOMMPorts];
+    return [store objectForKey:SDLNameMaxNumberRFCOMMPorts];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m
index e74391b42..c3537326e 100644
--- a/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink/SDLDeviceStatus.m
@@ -7,7 +7,6 @@
 #import "SDLNames.h"
 #import "SDLPrimaryAudioSource.h"
 
-
 @implementation SDLDeviceStatus
 
 - (instancetype)init {
@@ -24,74 +23,74 @@
 
 - (void)setVoiceRecOn:(NSNumber *)voiceRecOn {
     if (voiceRecOn != nil) {
-        [store setObject:voiceRecOn forKey:NAMES_voiceRecOn];
+        [store setObject:voiceRecOn forKey:SDLNameVoiceRecognitionOn];
     } else {
-        [store removeObjectForKey:NAMES_voiceRecOn];
+        [store removeObjectForKey:SDLNameVoiceRecognitionOn];
     }
 }
 
 - (NSNumber *)voiceRecOn {
-    return [store objectForKey:NAMES_voiceRecOn];
+    return [store objectForKey:SDLNameVoiceRecognitionOn];
 }
 
 - (void)setBtIconOn:(NSNumber *)btIconOn {
     if (btIconOn != nil) {
-        [store setObject:btIconOn forKey:NAMES_btIconOn];
+        [store setObject:btIconOn forKey:SDLNameBluetoothIconOn];
     } else {
-        [store removeObjectForKey:NAMES_btIconOn];
+        [store removeObjectForKey:SDLNameBluetoothIconOn];
     }
 }
 
 - (NSNumber *)btIconOn {
-    return [store objectForKey:NAMES_btIconOn];
+    return [store objectForKey:SDLNameBluetoothIconOn];
 }
 
 - (void)setCallActive:(NSNumber *)callActive {
     if (callActive != nil) {
-        [store setObject:callActive forKey:NAMES_callActive];
+        [store setObject:callActive forKey:SDLNameCallActive];
     } else {
-        [store removeObjectForKey:NAMES_callActive];
+        [store removeObjectForKey:SDLNameCallActive];
     }
 }
 
 - (NSNumber *)callActive {
-    return [store objectForKey:NAMES_callActive];
+    return [store objectForKey:SDLNameCallActive];
 }
 
 - (void)setPhoneRoaming:(NSNumber *)phoneRoaming {
     if (phoneRoaming != nil) {
-        [store setObject:phoneRoaming forKey:NAMES_phoneRoaming];
+        [store setObject:phoneRoaming forKey:SDLNamePhoneRoaming];
     } else {
-        [store removeObjectForKey:NAMES_phoneRoaming];
+        [store removeObjectForKey:SDLNamePhoneRoaming];
     }
 }
 
 - (NSNumber *)phoneRoaming {
-    return [store objectForKey:NAMES_phoneRoaming];
+    return [store objectForKey:SDLNamePhoneRoaming];
 }
 
 - (void)setTextMsgAvailable:(NSNumber *)textMsgAvailable {
     if (textMsgAvailable != nil) {
-        [store setObject:textMsgAvailable forKey:NAMES_textMsgAvailable];
+        [store setObject:textMsgAvailable forKey:SDLNameTextMessageAvailable];
     } else {
-        [store removeObjectForKey:NAMES_textMsgAvailable];
+        [store removeObjectForKey:SDLNameTextMessageAvailable];
     }
 }
 
 - (NSNumber *)textMsgAvailable {
-    return [store objectForKey:NAMES_textMsgAvailable];
+    return [store objectForKey:SDLNameTextMessageAvailable];
 }
 
 - (void)setBattLevelStatus:(SDLDeviceLevelStatus *)battLevelStatus {
     if (battLevelStatus != nil) {
-        [store setObject:battLevelStatus forKey:NAMES_battLevelStatus];
+        [store setObject:battLevelStatus forKey:SDLNameBatteryLevelStatus];
     } else {
-        [store removeObjectForKey:NAMES_battLevelStatus];
+        [store removeObjectForKey:SDLNameBatteryLevelStatus];
     }
 }
 
 - (SDLDeviceLevelStatus *)battLevelStatus {
-    NSObject *obj = [store objectForKey:NAMES_battLevelStatus];
+    NSObject *obj = [store objectForKey:SDLNameBatteryLevelStatus];
     if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) {
         return (SDLDeviceLevelStatus *)obj;
     } else {
@@ -101,38 +100,38 @@
 
 - (void)setStereoAudioOutputMuted:(NSNumber *)stereoAudioOutputMuted {
     if (stereoAudioOutputMuted != nil) {
-        [store setObject:stereoAudioOutputMuted forKey:NAMES_stereoAudioOutputMuted];
+        [store setObject:stereoAudioOutputMuted forKey:SDLNameStereoAudioOutputMuted];
     } else {
-        [store removeObjectForKey:NAMES_stereoAudioOutputMuted];
+        [store removeObjectForKey:SDLNameStereoAudioOutputMuted];
     }
 }
 
 - (NSNumber *)stereoAudioOutputMuted {
-    return [store objectForKey:NAMES_stereoAudioOutputMuted];
+    return [store objectForKey:SDLNameStereoAudioOutputMuted];
 }
 
 - (void)setMonoAudioOutputMuted:(NSNumber *)monoAudioOutputMuted {
     if (monoAudioOutputMuted != nil) {
-        [store setObject:monoAudioOutputMuted forKey:NAMES_monoAudioOutputMuted];
+        [store setObject:monoAudioOutputMuted forKey:SDLNameMonoAudioOutputMuted];
     } else {
-        [store removeObjectForKey:NAMES_monoAudioOutputMuted];
+        [store removeObjectForKey:SDLNameMonoAudioOutputMuted];
     }
 }
 
 - (NSNumber *)monoAudioOutputMuted {
-    return [store objectForKey:NAMES_monoAudioOutputMuted];
+    return [store objectForKey:SDLNameMonoAudioOutputMuted];
 }
 
 - (void)setSignalLevelStatus:(SDLDeviceLevelStatus *)signalLevelStatus {
     if (signalLevelStatus != nil) {
-        [store setObject:signalLevelStatus forKey:NAMES_signalLevelStatus];
+        [store setObject:signalLevelStatus forKey:SDLNameSignalLevelStatus];
     } else {
-        [store removeObjectForKey:NAMES_signalLevelStatus];
+        [store removeObjectForKey:SDLNameSignalLevelStatus];
     }
 }
 
 - (SDLDeviceLevelStatus *)signalLevelStatus {
-    NSObject *obj = [store objectForKey:NAMES_signalLevelStatus];
+    NSObject *obj = [store objectForKey:SDLNameSignalLevelStatus];
     if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) {
         return (SDLDeviceLevelStatus *)obj;
     } else {
@@ -142,14 +141,14 @@
 
 - (void)setPrimaryAudioSource:(SDLPrimaryAudioSource *)primaryAudioSource {
     if (primaryAudioSource != nil) {
-        [store setObject:primaryAudioSource forKey:NAMES_primaryAudioSource];
+        [store setObject:primaryAudioSource forKey:SDLNamePrimaryAudioSource];
     } else {
-        [store removeObjectForKey:NAMES_primaryAudioSource];
+        [store removeObjectForKey:SDLNamePrimaryAudioSource];
     }
 }
 
 - (SDLPrimaryAudioSource *)primaryAudioSource {
-    NSObject *obj = [store objectForKey:NAMES_primaryAudioSource];
+    NSObject *obj = [store objectForKey:SDLNamePrimaryAudioSource];
     if (obj == nil || [obj isKindOfClass:SDLPrimaryAudioSource.class]) {
         return (SDLPrimaryAudioSource *)obj;
     } else {
@@ -159,14 +158,14 @@
 
 - (void)setECallEventActive:(NSNumber *)eCallEventActive {
     if (eCallEventActive != nil) {
-        [store setObject:eCallEventActive forKey:NAMES_eCallEventActive];
+        [store setObject:eCallEventActive forKey:SDLNameECallEventActive];
     } else {
-        [store removeObjectForKey:NAMES_eCallEventActive];
+        [store removeObjectForKey:SDLNameECallEventActive];
     }
 }
 
 - (NSNumber *)eCallEventActive {
-    return [store objectForKey:NAMES_eCallEventActive];
+    return [store objectForKey:SDLNameECallEventActive];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m
index 20b448bf2..f428cf7b1 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.m
+++ b/SmartDeviceLink/SDLDiagnosticMessage.m
@@ -9,7 +9,7 @@
 @implementation SDLDiagnosticMessage
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DiagnosticMessage]) {
+    if (self = [super initWithName:SDLNameDiagnosticMessage]) {
     }
     return self;
 }
@@ -22,38 +22,38 @@
 
 - (void)setTargetID:(NSNumber *)targetID {
     if (targetID != nil) {
-        [parameters setObject:targetID forKey:NAMES_targetID];
+        [parameters setObject:targetID forKey:SDLNameTargetId];
     } else {
-        [parameters removeObjectForKey:NAMES_targetID];
+        [parameters removeObjectForKey:SDLNameTargetId];
     }
 }
 
 - (NSNumber *)targetID {
-    return [parameters objectForKey:NAMES_targetID];
+    return [parameters objectForKey:SDLNameTargetId];
 }
 
 - (void)setMessageLength:(NSNumber *)messageLength {
     if (messageLength != nil) {
-        [parameters setObject:messageLength forKey:NAMES_messageLength];
+        [parameters setObject:messageLength forKey:SDLNameMessageLength];
     } else {
-        [parameters removeObjectForKey:NAMES_messageLength];
+        [parameters removeObjectForKey:SDLNameMessageLength];
     }
 }
 
 - (NSNumber *)messageLength {
-    return [parameters objectForKey:NAMES_messageLength];
+    return [parameters objectForKey:SDLNameMessageLength];
 }
 
 - (void)setMessageData:(NSMutableArray<NSNumber *> *)messageData {
     if (messageData != nil) {
-        [parameters setObject:messageData forKey:NAMES_messageData];
+        [parameters setObject:messageData forKey:SDLNameMessageData];
     } else {
-        [parameters removeObjectForKey:NAMES_messageData];
+        [parameters removeObjectForKey:SDLNameMessageData];
     }
 }
 
 - (NSMutableArray<NSNumber *> *)messageData {
-    return [parameters objectForKey:NAMES_messageData];
+    return [parameters objectForKey:SDLNameMessageData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
index ddee66851..318c7cf71 100644
--- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m
+++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
@@ -8,7 +8,7 @@
 @implementation SDLDiagnosticMessageResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DiagnosticMessage]) {
+    if (self = [super initWithName:SDLNameDiagnosticMessage]) {
     }
     return self;
 }
@@ -21,14 +21,14 @@
 
 - (void)setMessageDataResult:(NSMutableArray<NSNumber *> *)messageDataResult {
     if (messageDataResult != nil) {
-        [parameters setObject:messageDataResult forKey:NAMES_messageDataResult];
+        [parameters setObject:messageDataResult forKey:SDLNameMessageDataResult];
     } else {
-        [parameters removeObjectForKey:NAMES_messageDataResult];
+        [parameters removeObjectForKey:SDLNameMessageDataResult];
     }
 }
 
 - (NSMutableArray<NSNumber *> *)messageDataResult {
-    return [parameters objectForKey:NAMES_messageDataResult];
+    return [parameters objectForKey:SDLNameMessageDataResult];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m
index d330b7fe1..470a68503 100644
--- a/SmartDeviceLink/SDLDialNumber.m
+++ b/SmartDeviceLink/SDLDialNumber.m
@@ -9,7 +9,7 @@
 @implementation SDLDialNumber
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DialNumber]) {
+    if (self = [super initWithName:SDLNameDialNumber]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setNumber:(NSString *)number {
     if (number != nil) {
-        parameters[NAMES_number] = number;
+        parameters[SDLNameNumber] = number;
     } else {
-        [parameters removeObjectForKey:NAMES_number];
+        [parameters removeObjectForKey:SDLNameNumber];
     }
 }
 
 - (NSString *)number {
-    return parameters[NAMES_number];
+    return parameters[SDLNameNumber];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m
index 2646e5fa3..6414de5a0 100644
--- a/SmartDeviceLink/SDLDialNumberResponse.m
+++ b/SmartDeviceLink/SDLDialNumberResponse.m
@@ -10,7 +10,7 @@
 @implementation SDLDialNumberResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DialNumber]) {
+    if (self = [super initWithName:SDLNameDialNumber]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m
index 6433d039b..b48374918 100644
--- a/SmartDeviceLink/SDLDisplayCapabilities.m
+++ b/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -10,7 +10,6 @@
 #import "SDLScreenParams.h"
 #import "SDLTextField.h"
 
-
 @implementation SDLDisplayCapabilities
 
 - (instancetype)init {
@@ -27,14 +26,14 @@
 
 - (void)setDisplayType:(SDLDisplayType *)displayType {
     if (displayType != nil) {
-        [store setObject:displayType forKey:NAMES_displayType];
+        [store setObject:displayType forKey:SDLNameDisplayType];
     } else {
-        [store removeObjectForKey:NAMES_displayType];
+        [store removeObjectForKey:SDLNameDisplayType];
     }
 }
 
 - (SDLDisplayType *)displayType {
-    NSObject *obj = [store objectForKey:NAMES_displayType];
+    NSObject *obj = [store objectForKey:SDLNameDisplayType];
     if (obj == nil || [obj isKindOfClass:SDLDisplayType.class]) {
         return (SDLDisplayType *)obj;
     } else {
@@ -44,14 +43,14 @@
 
 - (void)setTextFields:(NSMutableArray<SDLTextField *> *)textFields {
     if (textFields != nil) {
-        [store setObject:textFields forKey:NAMES_textFields];
+        [store setObject:textFields forKey:SDLNameTextFields];
     } else {
-        [store removeObjectForKey:NAMES_textFields];
+        [store removeObjectForKey:SDLNameTextFields];
     }
 }
 
 - (NSMutableArray<SDLTextField *> *)textFields {
-    NSMutableArray<SDLTextField *> *array = [store objectForKey:NAMES_textFields];
+    NSMutableArray<SDLTextField *> *array = [store objectForKey:SDLNameTextFields];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTextField.class]) {
         return array;
     } else {
@@ -65,14 +64,14 @@
 
 - (void)setImageFields:(NSMutableArray<SDLImageField *> *)imageFields {
     if (imageFields != nil) {
-        [store setObject:imageFields forKey:NAMES_imageFields];
+        [store setObject:imageFields forKey:SDLNameImageFields];
     } else {
-        [store removeObjectForKey:NAMES_imageFields];
+        [store removeObjectForKey:SDLNameImageFields];
     }
 }
 
 - (NSMutableArray<SDLImageField *> *)imageFields {
-    NSMutableArray<SDLImageField *> *array = [store objectForKey:NAMES_imageFields];
+    NSMutableArray<SDLImageField *> *array = [store objectForKey:SDLNameImageFields];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLImageField.class]) {
         return array;
     } else {
@@ -86,14 +85,14 @@
 
 - (void)setMediaClockFormats:(NSMutableArray<SDLMediaClockFormat *> *)mediaClockFormats {
     if (mediaClockFormats != nil) {
-        [store setObject:mediaClockFormats forKey:NAMES_mediaClockFormats];
+        [store setObject:mediaClockFormats forKey:SDLNameMediaClockFormats];
     } else {
-        [store removeObjectForKey:NAMES_mediaClockFormats];
+        [store removeObjectForKey:SDLNameMediaClockFormats];
     }
 }
 
 - (NSMutableArray<SDLMediaClockFormat *> *)mediaClockFormats {
-    NSMutableArray<SDLMediaClockFormat *> *array = [store objectForKey:NAMES_mediaClockFormats];
+    NSMutableArray<SDLMediaClockFormat *> *array = [store objectForKey:SDLNameMediaClockFormats];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLMediaClockFormat.class]) {
         return array;
     } else {
@@ -107,38 +106,38 @@
 
 - (void)setGraphicSupported:(NSNumber *)graphicSupported {
     if (graphicSupported != nil) {
-        [store setObject:graphicSupported forKey:NAMES_graphicSupported];
+        [store setObject:graphicSupported forKey:SDLNameGraphicSupported];
     } else {
-        [store removeObjectForKey:NAMES_graphicSupported];
+        [store removeObjectForKey:SDLNameGraphicSupported];
     }
 }
 
 - (NSNumber *)graphicSupported {
-    return [store objectForKey:NAMES_graphicSupported];
+    return [store objectForKey:SDLNameGraphicSupported];
 }
 
 - (void)setTemplatesAvailable:(NSMutableArray<NSString *> *)templatesAvailable {
     if (templatesAvailable != nil) {
-        [store setObject:templatesAvailable forKey:NAMES_templatesAvailable];
+        [store setObject:templatesAvailable forKey:SDLNameTemplatesAvailable];
     } else {
-        [store removeObjectForKey:NAMES_templatesAvailable];
+        [store removeObjectForKey:SDLNameTemplatesAvailable];
     }
 }
 
 - (NSMutableArray<NSString *> *)templatesAvailable {
-    return [store objectForKey:NAMES_templatesAvailable];
+    return [store objectForKey:SDLNameTemplatesAvailable];
 }
 
 - (void)setScreenParams:(SDLScreenParams *)screenParams {
     if (screenParams != nil) {
-        [store setObject:screenParams forKey:NAMES_screenParams];
+        [store setObject:screenParams forKey:SDLNameScreenParams];
     } else {
-        [store removeObjectForKey:NAMES_screenParams];
+        [store removeObjectForKey:SDLNameScreenParams];
     }
 }
 
 - (SDLScreenParams *)screenParams {
-    NSObject *obj = [store objectForKey:NAMES_screenParams];
+    NSObject *obj = [store objectForKey:SDLNameScreenParams];
     if (obj == nil || [obj isKindOfClass:SDLScreenParams.class]) {
         return (SDLScreenParams *)obj;
     } else {
@@ -148,14 +147,14 @@
 
 - (void)setNumCustomPresetsAvailable:(NSNumber *)numCustomPresetsAvailable {
     if (numCustomPresetsAvailable != nil) {
-        [store setObject:numCustomPresetsAvailable forKey:NAMES_numCustomPresetsAvailable];
+        [store setObject:numCustomPresetsAvailable forKey:SDLNameNumberCustomPresetsAvailable];
     } else {
-        [store removeObjectForKey:NAMES_numCustomPresetsAvailable];
+        [store removeObjectForKey:SDLNameNumberCustomPresetsAvailable];
     }
 }
 
 - (NSNumber *)numCustomPresetsAvailable {
-    return [store objectForKey:NAMES_numCustomPresetsAvailable];
+    return [store objectForKey:SDLNameNumberCustomPresetsAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m
index 6ef0a4d52..dd648d70c 100644
--- a/SmartDeviceLink/SDLECallInfo.m
+++ b/SmartDeviceLink/SDLECallInfo.m
@@ -24,14 +24,14 @@
 
 - (void)setECallNotificationStatus:(SDLVehicleDataNotificationStatus *)eCallNotificationStatus {
     if (eCallNotificationStatus != nil) {
-        [store setObject:eCallNotificationStatus forKey:NAMES_eCallNotificationStatus];
+        [store setObject:eCallNotificationStatus forKey:SDLNameECallNotificationStatus];
     } else {
-        [store removeObjectForKey:NAMES_eCallNotificationStatus];
+        [store removeObjectForKey:SDLNameECallNotificationStatus];
     }
 }
 
 - (SDLVehicleDataNotificationStatus *)eCallNotificationStatus {
-    NSObject *obj = [store objectForKey:NAMES_eCallNotificationStatus];
+    NSObject *obj = [store objectForKey:SDLNameECallNotificationStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) {
         return (SDLVehicleDataNotificationStatus *)obj;
     } else {
@@ -41,14 +41,14 @@
 
 - (void)setAuxECallNotificationStatus:(SDLVehicleDataNotificationStatus *)auxECallNotificationStatus {
     if (auxECallNotificationStatus != nil) {
-        [store setObject:auxECallNotificationStatus forKey:NAMES_auxECallNotificationStatus];
+        [store setObject:auxECallNotificationStatus forKey:SDLNameAuxECallNotificationStatus];
     } else {
-        [store removeObjectForKey:NAMES_auxECallNotificationStatus];
+        [store removeObjectForKey:SDLNameAuxECallNotificationStatus];
     }
 }
 
 - (SDLVehicleDataNotificationStatus *)auxECallNotificationStatus {
-    NSObject *obj = [store objectForKey:NAMES_auxECallNotificationStatus];
+    NSObject *obj = [store objectForKey:SDLNameAuxECallNotificationStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) {
         return (SDLVehicleDataNotificationStatus *)obj;
     } else {
@@ -58,14 +58,14 @@
 
 - (void)setECallConfirmationStatus:(SDLECallConfirmationStatus *)eCallConfirmationStatus {
     if (eCallConfirmationStatus != nil) {
-        [store setObject:eCallConfirmationStatus forKey:NAMES_eCallConfirmationStatus];
+        [store setObject:eCallConfirmationStatus forKey:SDLNameECallConfirmationStatus];
     } else {
-        [store removeObjectForKey:NAMES_eCallConfirmationStatus];
+        [store removeObjectForKey:SDLNameECallConfirmationStatus];
     }
 }
 
 - (SDLECallConfirmationStatus *)eCallConfirmationStatus {
-    NSObject *obj = [store objectForKey:NAMES_eCallConfirmationStatus];
+    NSObject *obj = [store objectForKey:SDLNameECallConfirmationStatus];
     if (obj == nil || [obj isKindOfClass:SDLECallConfirmationStatus.class]) {
         return (SDLECallConfirmationStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m
index 64ccb0720..b4703426b 100644
--- a/SmartDeviceLink/SDLEmergencyEvent.m
+++ b/SmartDeviceLink/SDLEmergencyEvent.m
@@ -8,7 +8,6 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataEventStatus.h"
 
-
 @implementation SDLEmergencyEvent
 
 - (instancetype)init {
@@ -25,14 +24,14 @@
 
 - (void)setEmergencyEventType:(SDLEmergencyEventType *)emergencyEventType {
     if (emergencyEventType != nil) {
-        [store setObject:emergencyEventType forKey:NAMES_emergencyEventType];
+        [store setObject:emergencyEventType forKey:SDLNameEmergencyEventType];
     } else {
-        [store removeObjectForKey:NAMES_emergencyEventType];
+        [store removeObjectForKey:SDLNameEmergencyEventType];
     }
 }
 
 - (SDLEmergencyEventType *)emergencyEventType {
-    NSObject *obj = [store objectForKey:NAMES_emergencyEventType];
+    NSObject *obj = [store objectForKey:SDLNameEmergencyEventType];
     if (obj == nil || [obj isKindOfClass:SDLEmergencyEventType.class]) {
         return (SDLEmergencyEventType *)obj;
     } else {
@@ -42,14 +41,14 @@
 
 - (void)setFuelCutoffStatus:(SDLFuelCutoffStatus *)fuelCutoffStatus {
     if (fuelCutoffStatus != nil) {
-        [store setObject:fuelCutoffStatus forKey:NAMES_fuelCutoffStatus];
+        [store setObject:fuelCutoffStatus forKey:SDLNameFuelCutoffStatus];
     } else {
-        [store removeObjectForKey:NAMES_fuelCutoffStatus];
+        [store removeObjectForKey:SDLNameFuelCutoffStatus];
     }
 }
 
 - (SDLFuelCutoffStatus *)fuelCutoffStatus {
-    NSObject *obj = [store objectForKey:NAMES_fuelCutoffStatus];
+    NSObject *obj = [store objectForKey:SDLNameFuelCutoffStatus];
     if (obj == nil || [obj isKindOfClass:SDLFuelCutoffStatus.class]) {
         return (SDLFuelCutoffStatus *)obj;
     } else {
@@ -59,14 +58,14 @@
 
 - (void)setRolloverEvent:(SDLVehicleDataEventStatus *)rolloverEvent {
     if (rolloverEvent != nil) {
-        [store setObject:rolloverEvent forKey:NAMES_rolloverEvent];
+        [store setObject:rolloverEvent forKey:SDLNameRolloverEvent];
     } else {
-        [store removeObjectForKey:NAMES_rolloverEvent];
+        [store removeObjectForKey:SDLNameRolloverEvent];
     }
 }
 
 - (SDLVehicleDataEventStatus *)rolloverEvent {
-    NSObject *obj = [store objectForKey:NAMES_rolloverEvent];
+    NSObject *obj = [store objectForKey:SDLNameRolloverEvent];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -76,26 +75,26 @@
 
 - (void)setMaximumChangeVelocity:(NSNumber *)maximumChangeVelocity {
     if (maximumChangeVelocity != nil) {
-        [store setObject:maximumChangeVelocity forKey:NAMES_maximumChangeVelocity];
+        [store setObject:maximumChangeVelocity forKey:SDLNameMaximumChangeVelocity];
     } else {
-        [store removeObjectForKey:NAMES_maximumChangeVelocity];
+        [store removeObjectForKey:SDLNameMaximumChangeVelocity];
     }
 }
 
 - (NSNumber *)maximumChangeVelocity {
-    return [store objectForKey:NAMES_maximumChangeVelocity];
+    return [store objectForKey:SDLNameMaximumChangeVelocity];
 }
 
 - (void)setMultipleEvents:(SDLVehicleDataEventStatus *)multipleEvents {
     if (multipleEvents != nil) {
-        [store setObject:multipleEvents forKey:NAMES_multipleEvents];
+        [store setObject:multipleEvents forKey:SDLNameMultipleEvents];
     } else {
-        [store removeObjectForKey:NAMES_multipleEvents];
+        [store removeObjectForKey:SDLNameMultipleEvents];
     }
 }
 
 - (SDLVehicleDataEventStatus *)multipleEvents {
-    NSObject *obj = [store objectForKey:NAMES_multipleEvents];
+    NSObject *obj = [store objectForKey:SDLNameMultipleEvents];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m
index c663b08ce..57ac4197b 100644
--- a/SmartDeviceLink/SDLEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLEncodedSyncPData.m
@@ -9,7 +9,7 @@
 @implementation SDLEncodedSyncPData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_EncodedSyncPData]) {
+    if (self = [super initWithName:SDLNameEncodedSyncPData]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setData:(NSMutableArray<NSString *> *)data {
     if (data != nil) {
-        [parameters setObject:data forKey:NAMES_data];
+        [parameters setObject:data forKey:SDLNameData];
     } else {
-        [parameters removeObjectForKey:NAMES_data];
+        [parameters removeObjectForKey:SDLNameData];
     }
 }
 
 - (NSMutableArray<NSString *> *)data {
-    return [parameters objectForKey:NAMES_data];
+    return [parameters objectForKey:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
index 23829b587..a43d166d4 100644
--- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLEncodedSyncPDataResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_EncodedSyncPData]) {
+    if (self = [super initWithName:SDLNameEncodedSyncPData]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m
index fa8e9f3f0..4452f1875 100644
--- a/SmartDeviceLink/SDLEndAudioPassThru.m
+++ b/SmartDeviceLink/SDLEndAudioPassThru.m
@@ -9,7 +9,7 @@
 @implementation SDLEndAudioPassThru
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_EndAudioPassThru]) {
+    if (self = [super initWithName:SDLNameEndAudioPassThru]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
index 7c8e29724..cfd7995dc 100644
--- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLEndAudioPassThruResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_EndAudioPassThru]) {
+    if (self = [super initWithName:SDLNameEndAudioPassThru]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink/SDLFunctionID.h
index 8bbd1a52a..c9cd4afb7 100644
--- a/SmartDeviceLink/SDLFunctionID.h
+++ b/SmartDeviceLink/SDLFunctionID.h
@@ -4,12 +4,13 @@
 
 #import <Foundation/Foundation.h>
 
+#import "SDLNames.h"
 
-@interface SDLFunctionID : NSObject {
-    NSDictionary *functionIDs;
-}
+@interface SDLFunctionID : NSObject
 
-- (NSString *)getFunctionName:(int)functionID;
-- (NSNumber *)getFunctionID:(NSString *)functionName;
++ (instancetype)sharedInstance;
+
+- (SDLName)functionNameForId:(int)functionID;
+- (NSNumber *)functionIdForName:(SDLName)functionName;
 
 @end
diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m
index 802ee3df3..f03826df4 100644
--- a/SmartDeviceLink/SDLFunctionID.m
+++ b/SmartDeviceLink/SDLFunctionID.m
@@ -4,36 +4,98 @@
 
 #import "SDLFunctionID.h"
 
-#import "SDLNames.h"
+@interface SDLFunctionID ()
+
+@property (nonatomic, strong, nonnull) NSDictionary* functionIds;
+
+@end
 
 @implementation SDLFunctionID
 
++ (instancetype)sharedInstance {
+    static SDLFunctionID* functionId = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        functionId = [[SDLFunctionID alloc] init];
+    });
+    return functionId;
+}
+
 - (instancetype)init {
     if (self = [super init]) {
-        functionIDs = [NSDictionary dictionaryWithObjectsAndKeys:
-                                        NAMES_reserved, @"0", NAMES_RegisterAppInterface, @"1", NAMES_UnregisterAppInterface, @"2", NAMES_SetGlobalProperties, @"3", NAMES_ResetGlobalProperties, @"4", NAMES_AddCommand, @"5", NAMES_DeleteCommand, @"6", NAMES_AddSubMenu, @"7", NAMES_DeleteSubMenu, @"8", NAMES_CreateInteractionChoiceSet, @"9", NAMES_PerformInteraction, @"10", NAMES_DeleteInteractionChoiceSet, @"11", NAMES_Alert, @"12", NAMES_Show, @"13", NAMES_Speak, @"14", NAMES_SetMediaClockTimer, @"15", NAMES_PerformAudioPassThru, @"16", NAMES_EndAudioPassThru, @"17", NAMES_SubscribeButton, @"18", NAMES_UnsubscribeButton, @"19", NAMES_SubscribeVehicleData, @"20", NAMES_UnsubscribeVehicleData, @"21", NAMES_GetVehicleData, @"22", NAMES_ReadDID, @"23", NAMES_GetDTCs, @"24", NAMES_ScrollableMessage, @"25", NAMES_Slider, @"26", NAMES_ShowConstantTBT, @"27", NAMES_AlertManeuver, @"28", NAMES_UpdateTurnList, @"29", NAMES_ChangeRegistration, @"30", NAMES_GenericResponse, @"31", NAMES_PutFile, @"32", NAMES_DeleteFile, @"33", NAMES_ListFiles, @"34", NAMES_SetAppIcon, @"35", NAMES_SetDisplayLayout, @"36", NAMES_DiagnosticMessage, @"37", NAMES_SystemRequest, @"38", NAMES_SendLocation, @"39", NAMES_DialNumber, @"40", NAMES_OnHMIStatus, @"32768", NAMES_OnAppInterfaceUnregistered, @"32769", NAMES_OnButtonEvent, @"32770", NAMES_OnButtonPress, @"32771", NAMES_OnVehicleData, @"32772", NAMES_OnCommand, @"32773", NAMES_OnTBTClientState, @"32774", NAMES_OnDriverDistraction, @"32775", NAMES_OnPermissionsChange, @"32776", NAMES_OnAudioPassThru, @"32777", NAMES_OnLanguageChange, @"32778", NAMES_OnKeyboardInput, @"32779", NAMES_OnTouchEvent, @"32780", NAMES_OnSystemRequest, @"32781", NAMES_OnHashChange, @"32782",
-
-                                        NAMES_EncodedSyncPData,
-                                        @"65536",
-                                        NAMES_SyncPData,
-                                        @"65537",
-
-                                        NAMES_OnEncodedSyncPData,
-                                        @"98304",
-                                        NAMES_OnSyncPData,
-                                        @"98305",
-                                        nil];
+            self.functionIds = @{
+                                 @0: SDLNameReserved,
+                                 @1: SDLNameRegisterAppInterface,
+                                 @2: SDLNameUnregisterAppInterface,
+                                 @3: SDLNameSetGlobalProperties,
+                                 @4: SDLNameResetGlobalProperties,
+                                 @5: SDLNameAddCommand,
+                                 @6: SDLNameDeleteCommand,
+                                 @7: SDLNameAddSubMenu,
+                                 @8: SDLNameDeleteSubMenu,
+                                 @9: SDLNameCreateInteractionChoiceSet,
+                                 @10: SDLNamePerformInteraction,
+                                 @11: SDLNameDeleteInteractionChoiceSet,
+                                 @12: SDLNameAlert,
+                                 @13: SDLNameShow,
+                                 @14: SDLNameSpeak,
+                                 @15: SDLNameSetMediaClockTimer,
+                                 @16: SDLNamePerformAudioPassThru,
+                                 @17: SDLNameEndAudioPassThru,
+                                 @18: SDLNameSubscribeButton,
+                                 @19: SDLNameUnsubscribeButton,
+                                 @20: SDLNameSubscribeVehicleData,
+                                 @21: SDLNameUnsubscribeVehicleData,
+                                 @22: SDLNameGetVehicleData,
+                                 @23: SDLNameReadDID,
+                                 @24: SDLNameGetDTCs,
+                                 @25: SDLNameScrollableMessage,
+                                 @26: SDLNameSlider,
+                                 @27: SDLNameShowConstantTBT,
+                                 @28: SDLNameAlertManeuver,
+                                 @29: SDLNameUpdateTurnList,
+                                 @30: SDLNameChangeRegistration,
+                                 @31: SDLNameGenericResponse,
+                                 @32: SDLNamePutFile,
+                                 @33: SDLNameDeleteFile,
+                                 @34: SDLNameListFiles,
+                                 @35: SDLNameSetAppIcon,
+                                 @36: SDLNameSetDisplayLayout,
+                                 @37: SDLNameDiagnosticMessage,
+                                 @38: SDLNameSystemRequest,
+                                 @39: SDLNameSendLocation,
+                                 @40: SDLNameDialNumber,
+                                 @32768: SDLNameOnHMIStatus,
+                                 @32769: SDLNameOnAppInterfaceUnregistered,
+                                 @32770: SDLNameOnButtonEvent,
+                                 @32771: SDLNameOnButtonPress,
+                                 @32772: SDLNameOnVehicleData,
+                                 @32773: SDLNameOnCommand,
+                                 @32774: SDLNameOnTBTClientState,
+                                 @32775: SDLNameOnDriverDistraction,
+                                 @32776: SDLNameOnPermissionsChange,
+                                 @32777: SDLNameOnAudioPassThru,
+                                 @32778: SDLNameOnLanguageChange,
+                                 @32779: SDLNameOnKeyboardInput,
+                                 @32780: SDLNameOnTouchEvent,
+                                 @32781: SDLNameOnSystemRequest,
+                                 @32782: SDLNameOnHashChange,
+                                 @65536: SDLNameEncodedSyncPData,
+                                 @65537: SDLNameSyncPData,
+                                 @98304: SDLNameOnEncodedSyncPData,
+                                 @98305: SDLNameOnSyncPData
+                                 };
     }
     return self;
 }
 
-- (NSString *)getFunctionName:(int)functionID {
-    return [functionIDs objectForKey:[NSString stringWithFormat:@"%d", functionID]];
+- (SDLName)functionNameForId:(int)functionID {
+    return self.functionIds[@(functionID)];
 }
 
 
-- (NSNumber *)getFunctionID:(NSString *)functionName {
-    return [NSNumber numberWithInt:[[[functionIDs allKeysForObject:functionName] objectAtIndex:0] intValue]];
+- (NSNumber *)functionIdForName:(SDLName)functionName {
+    return [[self.functionIds allKeysForObject:functionName] firstObject];
 }
 
 
diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m
index 58dfaacbc..06b497614 100644
--- a/SmartDeviceLink/SDLGPSData.m
+++ b/SmartDeviceLink/SDLGPSData.m
@@ -7,7 +7,6 @@
 #import "SDLDimension.h"
 #import "SDLNames.h"
 
-
 @implementation SDLGPSData
 
 - (instancetype)init {
@@ -24,110 +23,110 @@
 
 - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees {
     if (longitudeDegrees != nil) {
-        [store setObject:longitudeDegrees forKey:NAMES_longitudeDegrees];
+        [store setObject:longitudeDegrees forKey:SDLNameLongitudeDegrees];
     } else {
-        [store removeObjectForKey:NAMES_longitudeDegrees];
+        [store removeObjectForKey:SDLNameLongitudeDegrees];
     }
 }
 
 - (NSNumber *)longitudeDegrees {
-    return [store objectForKey:NAMES_longitudeDegrees];
+    return [store objectForKey:SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees {
     if (latitudeDegrees != nil) {
-        [store setObject:latitudeDegrees forKey:NAMES_latitudeDegrees];
+        [store setObject:latitudeDegrees forKey:SDLNameLatitudeDegrees];
     } else {
-        [store removeObjectForKey:NAMES_latitudeDegrees];
+        [store removeObjectForKey:SDLNameLatitudeDegrees];
     }
 }
 
 - (NSNumber *)latitudeDegrees {
-    return [store objectForKey:NAMES_latitudeDegrees];
+    return [store objectForKey:SDLNameLatitudeDegrees];
 }
 
 - (void)setUtcYear:(NSNumber *)utcYear {
     if (utcYear != nil) {
-        [store setObject:utcYear forKey:NAMES_utcYear];
+        [store setObject:utcYear forKey:SDLNameUTCYear];
     } else {
-        [store removeObjectForKey:NAMES_utcYear];
+        [store removeObjectForKey:SDLNameUTCYear];
     }
 }
 
 - (NSNumber *)utcYear {
-    return [store objectForKey:NAMES_utcYear];
+    return [store objectForKey:SDLNameUTCYear];
 }
 
 - (void)setUtcMonth:(NSNumber *)utcMonth {
     if (utcMonth != nil) {
-        [store setObject:utcMonth forKey:NAMES_utcMonth];
+        [store setObject:utcMonth forKey:SDLNameUTCMonth];
     } else {
-        [store removeObjectForKey:NAMES_utcMonth];
+        [store removeObjectForKey:SDLNameUTCMonth];
     }
 }
 
 - (NSNumber *)utcMonth {
-    return [store objectForKey:NAMES_utcMonth];
+    return [store objectForKey:SDLNameUTCMonth];
 }
 
 - (void)setUtcDay:(NSNumber *)utcDay {
     if (utcDay != nil) {
-        [store setObject:utcDay forKey:NAMES_utcDay];
+        [store setObject:utcDay forKey:SDLNameUTCDay];
     } else {
-        [store removeObjectForKey:NAMES_utcDay];
+        [store removeObjectForKey:SDLNameUTCDay];
     }
 }
 
 - (NSNumber *)utcDay {
-    return [store objectForKey:NAMES_utcDay];
+    return [store objectForKey:SDLNameUTCDay];
 }
 
 - (void)setUtcHours:(NSNumber *)utcHours {
     if (utcHours != nil) {
-        [store setObject:utcHours forKey:NAMES_utcHours];
+        [store setObject:utcHours forKey:SDLNameUTCHours];
     } else {
-        [store removeObjectForKey:NAMES_utcHours];
+        [store removeObjectForKey:SDLNameUTCHours];
     }
 }
 
 - (NSNumber *)utcHours {
-    return [store objectForKey:NAMES_utcHours];
+    return [store objectForKey:SDLNameUTCHours];
 }
 
 - (void)setUtcMinutes:(NSNumber *)utcMinutes {
     if (utcMinutes != nil) {
-        [store setObject:utcMinutes forKey:NAMES_utcMinutes];
+        [store setObject:utcMinutes forKey:SDLNameUTCMinutes];
     } else {
-        [store removeObjectForKey:NAMES_utcMinutes];
+        [store removeObjectForKey:SDLNameUTCMinutes];
     }
 }
 
 - (NSNumber *)utcMinutes {
-    return [store objectForKey:NAMES_utcMinutes];
+    return [store objectForKey:SDLNameUTCMinutes];
 }
 
 - (void)setUtcSeconds:(NSNumber *)utcSeconds {
     if (utcSeconds != nil) {
-        [store setObject:utcSeconds forKey:NAMES_utcSeconds];
+        [store setObject:utcSeconds forKey:SDLNameUTCSeconds];
     } else {
-        [store removeObjectForKey:NAMES_utcSeconds];
+        [store removeObjectForKey:SDLNameUTCSeconds];
     }
 }
 
 - (NSNumber *)utcSeconds {
-    return [store objectForKey:NAMES_utcSeconds];
+    return [store objectForKey:SDLNameUTCSeconds];
 }
 
 - (void)setCompassDirection:(SDLCompassDirection *)compassDirection {
     if (compassDirection != nil) {
-        [store setObject:compassDirection forKey:NAMES_compassDirection];
+        [store setObject:compassDirection forKey:SDLNameCompassDirection];
     } else {
-        [store removeObjectForKey:NAMES_compassDirection];
+        [store removeObjectForKey:SDLNameCompassDirection];
     }
 }
 
 - (SDLCompassDirection *)compassDirection {
-    NSObject *obj = [store objectForKey:NAMES_compassDirection];
+    NSObject *obj = [store objectForKey:SDLNameCompassDirection];
     if (obj == nil || [obj isKindOfClass:SDLCompassDirection.class]) {
         return (SDLCompassDirection *)obj;
     } else {
@@ -137,74 +136,74 @@
 
 - (void)setPdop:(NSNumber *)pdop {
     if (pdop != nil) {
-        [store setObject:pdop forKey:NAMES_pdop];
+        [store setObject:pdop forKey:SDLNamePDOP];
     } else {
-        [store removeObjectForKey:NAMES_pdop];
+        [store removeObjectForKey:SDLNamePDOP];
     }
 }
 
 - (NSNumber *)pdop {
-    return [store objectForKey:NAMES_pdop];
+    return [store objectForKey:SDLNamePDOP];
 }
 
 - (void)setHdop:(NSNumber *)hdop {
     if (hdop != nil) {
-        [store setObject:hdop forKey:NAMES_hdop];
+        [store setObject:hdop forKey:SDLNameHDOP];
     } else {
-        [store removeObjectForKey:NAMES_hdop];
+        [store removeObjectForKey:SDLNameHDOP];
     }
 }
 
 - (NSNumber *)hdop {
-    return [store objectForKey:NAMES_hdop];
+    return [store objectForKey:SDLNameHDOP];
 }
 
 - (void)setVdop:(NSNumber *)vdop {
     if (vdop != nil) {
-        [store setObject:vdop forKey:NAMES_vdop];
+        [store setObject:vdop forKey:SDLNameVDOP];
     } else {
-        [store removeObjectForKey:NAMES_vdop];
+        [store removeObjectForKey:SDLNameVDOP];
     }
 }
 
 - (NSNumber *)vdop {
-    return [store objectForKey:NAMES_vdop];
+    return [store objectForKey:SDLNameVDOP];
 }
 
 - (void)setActual:(NSNumber *)actual {
     if (actual != nil) {
-        [store setObject:actual forKey:NAMES_actual];
+        [store setObject:actual forKey:SDLNameActual];
     } else {
-        [store removeObjectForKey:NAMES_actual];
+        [store removeObjectForKey:SDLNameActual];
     }
 }
 
 - (NSNumber *)actual {
-    return [store objectForKey:NAMES_actual];
+    return [store objectForKey:SDLNameActual];
 }
 
 - (void)setSatellites:(NSNumber *)satellites {
     if (satellites != nil) {
-        [store setObject:satellites forKey:NAMES_satellites];
+        [store setObject:satellites forKey:SDLNameSatellites];
     } else {
-        [store removeObjectForKey:NAMES_satellites];
+        [store removeObjectForKey:SDLNameSatellites];
     }
 }
 
 - (NSNumber *)satellites {
-    return [store objectForKey:NAMES_satellites];
+    return [store objectForKey:SDLNameSatellites];
 }
 
 - (void)setDimension:(SDLDimension *)dimension {
     if (dimension != nil) {
-        [store setObject:dimension forKey:NAMES_dimension];
+        [store setObject:dimension forKey:SDLNameDimension];
     } else {
-        [store removeObjectForKey:NAMES_dimension];
+        [store removeObjectForKey:SDLNameDimension];
     }
 }
 
 - (SDLDimension *)dimension {
-    NSObject *obj = [store objectForKey:NAMES_dimension];
+    NSObject *obj = [store objectForKey:SDLNameDimension];
     if (obj == nil || [obj isKindOfClass:SDLDimension.class]) {
         return (SDLDimension *)obj;
     } else {
@@ -214,38 +213,38 @@
 
 - (void)setAltitude:(NSNumber *)altitude {
     if (altitude != nil) {
-        [store setObject:altitude forKey:NAMES_altitude];
+        [store setObject:altitude forKey:SDLNameAltitude];
     } else {
-        [store removeObjectForKey:NAMES_altitude];
+        [store removeObjectForKey:SDLNameAltitude];
     }
 }
 
 - (NSNumber *)altitude {
-    return [store objectForKey:NAMES_altitude];
+    return [store objectForKey:SDLNameAltitude];
 }
 
 - (void)setHeading:(NSNumber *)heading {
     if (heading != nil) {
-        [store setObject:heading forKey:NAMES_heading];
+        [store setObject:heading forKey:SDLNameHeading];
     } else {
-        [store removeObjectForKey:NAMES_heading];
+        [store removeObjectForKey:SDLNameHeading];
     }
 }
 
 - (NSNumber *)heading {
-    return [store objectForKey:NAMES_heading];
+    return [store objectForKey:SDLNameHeading];
 }
 
 - (void)setSpeed:(NSNumber *)speed {
     if (speed != nil) {
-        [store setObject:speed forKey:NAMES_speed];
+        [store setObject:speed forKey:SDLNameSpeed];
     } else {
-        [store removeObjectForKey:NAMES_speed];
+        [store removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (NSNumber *)speed {
-    return [store objectForKey:NAMES_speed];
+    return [store objectForKey:SDLNameSpeed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m
index 45f90ed5f..77099a683 100644
--- a/SmartDeviceLink/SDLGenericResponse.m
+++ b/SmartDeviceLink/SDLGenericResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLGenericResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_GenericResponse]) {
+    if (self = [super initWithName:SDLNameGenericResponse]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m
index 64aca66d0..a6895f980 100644
--- a/SmartDeviceLink/SDLGetDTCs.m
+++ b/SmartDeviceLink/SDLGetDTCs.m
@@ -9,7 +9,7 @@
 @implementation SDLGetDTCs
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_GetDTCs]) {
+    if (self = [super initWithName:SDLNameGetDTCs]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setEcuName:(NSNumber *)ecuName {
     if (ecuName != nil) {
-        [parameters setObject:ecuName forKey:NAMES_ecuName];
+        [parameters setObject:ecuName forKey:SDLNameECUName];
     } else {
-        [parameters removeObjectForKey:NAMES_ecuName];
+        [parameters removeObjectForKey:SDLNameECUName];
     }
 }
 
 - (NSNumber *)ecuName {
-    return [parameters objectForKey:NAMES_ecuName];
+    return [parameters objectForKey:SDLNameECUName];
 }
 
 - (void)setDtcMask:(NSNumber *)dtcMask {
     if (dtcMask != nil) {
-        [parameters setObject:dtcMask forKey:NAMES_dtcMask];
+        [parameters setObject:dtcMask forKey:SDLNameDTCMask];
     } else {
-        [parameters removeObjectForKey:NAMES_dtcMask];
+        [parameters removeObjectForKey:SDLNameDTCMask];
     }
 }
 
 - (NSNumber *)dtcMask {
-    return [parameters objectForKey:NAMES_dtcMask];
+    return [parameters objectForKey:SDLNameDTCMask];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m
index 4928d633c..39a4e0a29 100644
--- a/SmartDeviceLink/SDLGetDTCsResponse.m
+++ b/SmartDeviceLink/SDLGetDTCsResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLGetDTCsResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_GetDTCs]) {
+    if (self = [super initWithName:SDLNameGetDTCs]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setEcuHeader:(NSNumber *)ecuHeader {
     if (ecuHeader != nil) {
-        [parameters setObject:ecuHeader forKey:NAMES_ecuHeader];
+        [parameters setObject:ecuHeader forKey:SDLNameECUHeader];
     } else {
-        [parameters removeObjectForKey:NAMES_ecuHeader];
+        [parameters removeObjectForKey:SDLNameECUHeader];
     }
 }
 
 - (NSNumber *)ecuHeader {
-    return [parameters objectForKey:NAMES_ecuHeader];
+    return [parameters objectForKey:SDLNameECUHeader];
 }
 
 - (void)setDtc:(NSMutableArray<NSString *> *)dtc {
     if (dtc != nil) {
-        [parameters setObject:dtc forKey:NAMES_dtc];
+        [parameters setObject:dtc forKey:SDLNameDTC];
     } else {
-        [parameters removeObjectForKey:NAMES_dtc];
+        [parameters removeObjectForKey:SDLNameDTC];
     }
 }
 
 - (NSMutableArray<NSString *> *)dtc {
-    return [parameters objectForKey:NAMES_dtc];
+    return [parameters objectForKey:SDLNameDTC];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index fd6b11090..92f174c4c 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -9,7 +9,7 @@
 @implementation SDLGetVehicleData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_GetVehicleData]) {
+    if (self = [super initWithName:SDLNameGetVehicleData]) {
     }
     return self;
 }
@@ -22,302 +22,302 @@
 
 - (void)setGps:(NSNumber *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:NAMES_gps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (NSNumber *)gps {
-    return [parameters objectForKey:NAMES_gps];
+    return [parameters objectForKey:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber *)speed {
     if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
+        [parameters setObject:speed forKey:SDLNameSpeed];
     } else {
-        [parameters removeObjectForKey:NAMES_speed];
+        [parameters removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (NSNumber *)speed {
-    return [parameters objectForKey:NAMES_speed];
+    return [parameters objectForKey:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:NAMES_rpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:NAMES_rpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
     if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
+        [parameters removeObjectForKey:SDLNameFuelLevel];
     }
 }
 
 - (NSNumber *)fuelLevel {
-    return [parameters objectForKey:NAMES_fuelLevel];
+    return [parameters objectForKey:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State {
     if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
+        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
+        [parameters removeObjectForKey:SDLNameFuelLevelState];
     }
 }
 
 - (NSNumber *)fuelLevel_State {
-    return [parameters objectForKey:NAMES_fuelLevel_State];
+    return [parameters objectForKey:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption {
     if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
     } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
     }
 }
 
 - (NSNumber *)instantFuelConsumption {
-    return [parameters objectForKey:NAMES_instantFuelConsumption];
+    return [parameters objectForKey:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber *)externalTemperature {
     if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
     } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
+        [parameters removeObjectForKey:SDLNameExternalTemperature];
     }
 }
 
 - (NSNumber *)externalTemperature {
-    return [parameters objectForKey:NAMES_externalTemperature];
+    return [parameters objectForKey:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(NSNumber *)vin {
     if (vin != nil) {
-        [parameters setObject:vin forKey:NAMES_vin];
+        [parameters setObject:vin forKey:SDLNameVIN];
     } else {
-        [parameters removeObjectForKey:NAMES_vin];
+        [parameters removeObjectForKey:SDLNameVIN];
     }
 }
 
 - (NSNumber *)vin {
-    return [parameters objectForKey:NAMES_vin];
+    return [parameters objectForKey:SDLNameVIN];
 }
 
 - (void)setPrndl:(NSNumber *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:NAMES_prndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (NSNumber *)prndl {
-    return [parameters objectForKey:NAMES_prndl];
+    return [parameters objectForKey:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber *)tirePressure {
     if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
     } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
+        [parameters removeObjectForKey:SDLNameTirePressure];
     }
 }
 
 - (NSNumber *)tirePressure {
-    return [parameters objectForKey:NAMES_tirePressure];
+    return [parameters objectForKey:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(NSNumber *)odometer {
     if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
+        [parameters setObject:odometer forKey:SDLNameOdometer];
     } else {
-        [parameters removeObjectForKey:NAMES_odometer];
+        [parameters removeObjectForKey:SDLNameOdometer];
     }
 }
 
 - (NSNumber *)odometer {
-    return [parameters objectForKey:NAMES_odometer];
+    return [parameters objectForKey:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(NSNumber *)beltStatus {
     if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
+        [parameters removeObjectForKey:SDLNameBeltStatus];
     }
 }
 
 - (NSNumber *)beltStatus {
-    return [parameters objectForKey:NAMES_beltStatus];
+    return [parameters objectForKey:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(NSNumber *)bodyInformation {
     if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
     } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
+        [parameters removeObjectForKey:SDLNameBodyInformation];
     }
 }
 
 - (NSNumber *)bodyInformation {
-    return [parameters objectForKey:NAMES_bodyInformation];
+    return [parameters objectForKey:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(NSNumber *)deviceStatus {
     if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
+        [parameters removeObjectForKey:SDLNameDeviceStatus];
     }
 }
 
 - (NSNumber *)deviceStatus {
-    return [parameters objectForKey:NAMES_deviceStatus];
+    return [parameters objectForKey:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(NSNumber *)driverBraking {
     if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
     } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
+        [parameters removeObjectForKey:SDLNameDriverBraking];
     }
 }
 
 - (NSNumber *)driverBraking {
-    return [parameters objectForKey:NAMES_driverBraking];
+    return [parameters objectForKey:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(NSNumber *)wiperStatus {
     if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
+        [parameters removeObjectForKey:SDLNameWiperStatus];
     }
 }
 
 - (NSNumber *)wiperStatus {
-    return [parameters objectForKey:NAMES_wiperStatus];
+    return [parameters objectForKey:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(NSNumber *)headLampStatus {
     if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
+        [parameters removeObjectForKey:SDLNameHeadLampStatus];
     }
 }
 
 - (NSNumber *)headLampStatus {
-    return [parameters objectForKey:NAMES_headLampStatus];
+    return [parameters objectForKey:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(NSNumber *)engineTorque {
     if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
     } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
+        [parameters removeObjectForKey:SDLNameEngineTorque];
     }
 }
 
 - (NSNumber *)engineTorque {
-    return [parameters objectForKey:NAMES_engineTorque];
+    return [parameters objectForKey:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:NAMES_accPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
     if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
     } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
     }
 }
 
 - (NSNumber *)steeringWheelAngle {
-    return [parameters objectForKey:NAMES_steeringWheelAngle];
+    return [parameters objectForKey:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(NSNumber *)eCallInfo {
     if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
+        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
+        [parameters removeObjectForKey:SDLNameECallInfo];
     }
 }
 
 - (NSNumber *)eCallInfo {
-    return [parameters objectForKey:NAMES_eCallInfo];
+    return [parameters objectForKey:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(NSNumber *)airbagStatus {
     if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
+        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
+        [parameters removeObjectForKey:SDLNameAirbagStatus];
     }
 }
 
 - (NSNumber *)airbagStatus {
-    return [parameters objectForKey:NAMES_airbagStatus];
+    return [parameters objectForKey:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(NSNumber *)emergencyEvent {
     if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
+        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
+        [parameters removeObjectForKey:SDLNameEmergencyEvent];
     }
 }
 
 - (NSNumber *)emergencyEvent {
-    return [parameters objectForKey:NAMES_emergencyEvent];
+    return [parameters objectForKey:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus {
     if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus];
+        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_clusterModeStatus];
+        [parameters removeObjectForKey:SDLNameClusterModeStatus];
     }
 }
 
 - (NSNumber *)clusterModeStatus {
-    return [parameters objectForKey:NAMES_clusterModeStatus];
+    return [parameters objectForKey:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(NSNumber *)myKey {
     if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
+        [parameters setObject:myKey forKey:SDLNameMyKey];
     } else {
-        [parameters removeObjectForKey:NAMES_myKey];
+        [parameters removeObjectForKey:SDLNameMyKey];
     }
 }
 
 - (NSNumber *)myKey {
-    return [parameters objectForKey:NAMES_myKey];
+    return [parameters objectForKey:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m
index bcedc804a..47763a4bd 100644
--- a/SmartDeviceLink/SDLGetVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -25,7 +25,7 @@
 @implementation SDLGetVehicleDataResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_GetVehicleData]) {
+    if (self = [super initWithName:SDLNameGetVehicleData]) {
     }
     return self;
 }
@@ -38,14 +38,14 @@
 
 - (void)setGps:(SDLGPSData *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:NAMES_gps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLGPSData *)gps {
-    NSObject *obj = [parameters objectForKey:NAMES_gps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) {
         return (SDLGPSData *)obj;
     } else {
@@ -55,50 +55,50 @@
 
 - (void)setSpeed:(NSNumber *)speed {
     if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
+        [parameters setObject:speed forKey:SDLNameSpeed];
     } else {
-        [parameters removeObjectForKey:NAMES_speed];
+        [parameters removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (NSNumber *)speed {
-    return [parameters objectForKey:NAMES_speed];
+    return [parameters objectForKey:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:NAMES_rpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:NAMES_rpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
     if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
+        [parameters removeObjectForKey:SDLNameFuelLevel];
     }
 }
 
 - (NSNumber *)fuelLevel {
-    return [parameters objectForKey:NAMES_fuelLevel];
+    return [parameters objectForKey:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(SDLComponentVolumeStatus *)fuelLevel_State {
     if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
+        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
+        [parameters removeObjectForKey:SDLNameFuelLevelState];
     }
 }
 
 - (SDLComponentVolumeStatus *)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
+    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
     if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) {
         return (SDLComponentVolumeStatus *)obj;
     } else {
@@ -108,50 +108,50 @@
 
 - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption {
     if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
     } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
     }
 }
 
 - (NSNumber *)instantFuelConsumption {
-    return [parameters objectForKey:NAMES_instantFuelConsumption];
+    return [parameters objectForKey:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber *)externalTemperature {
     if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
     } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
+        [parameters removeObjectForKey:SDLNameExternalTemperature];
     }
 }
 
 - (NSNumber *)externalTemperature {
-    return [parameters objectForKey:NAMES_externalTemperature];
+    return [parameters objectForKey:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(NSString *)vin {
     if (vin != nil) {
-        [parameters setObject:vin forKey:NAMES_vin];
+        [parameters setObject:vin forKey:SDLNameVIN];
     } else {
-        [parameters removeObjectForKey:NAMES_vin];
+        [parameters removeObjectForKey:SDLNameVIN];
     }
 }
 
 - (NSString *)vin {
-    return [parameters objectForKey:NAMES_vin];
+    return [parameters objectForKey:SDLNameVIN];
 }
 
 - (void)setPrndl:(SDLPRNDL *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:NAMES_prndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLPRNDL *)prndl {
-    NSObject *obj = [parameters objectForKey:NAMES_prndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) {
         return (SDLPRNDL *)obj;
     } else {
@@ -161,14 +161,14 @@
 
 - (void)setTirePressure:(SDLTireStatus *)tirePressure {
     if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
     } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
+        [parameters removeObjectForKey:SDLNameTirePressure];
     }
 }
 
 - (SDLTireStatus *)tirePressure {
-    NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
+    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
     if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) {
         return (SDLTireStatus *)obj;
     } else {
@@ -178,26 +178,26 @@
 
 - (void)setOdometer:(NSNumber *)odometer {
     if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
+        [parameters setObject:odometer forKey:SDLNameOdometer];
     } else {
-        [parameters removeObjectForKey:NAMES_odometer];
+        [parameters removeObjectForKey:SDLNameOdometer];
     }
 }
 
 - (NSNumber *)odometer {
-    return [parameters objectForKey:NAMES_odometer];
+    return [parameters objectForKey:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(SDLBeltStatus *)beltStatus {
     if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
+        [parameters removeObjectForKey:SDLNameBeltStatus];
     }
 }
 
 - (SDLBeltStatus *)beltStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
     if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) {
         return (SDLBeltStatus *)obj;
     } else {
@@ -207,14 +207,14 @@
 
 - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation {
     if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
     } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
+        [parameters removeObjectForKey:SDLNameBodyInformation];
     }
 }
 
 - (SDLBodyInformation *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
+    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
     if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) {
         return (SDLBodyInformation *)obj;
     } else {
@@ -224,14 +224,14 @@
 
 - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus {
     if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
+        [parameters removeObjectForKey:SDLNameDeviceStatus];
     }
 }
 
 - (SDLDeviceStatus *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
     if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) {
         return (SDLDeviceStatus *)obj;
     } else {
@@ -241,14 +241,14 @@
 
 - (void)setDriverBraking:(SDLVehicleDataEventStatus *)driverBraking {
     if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
     } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
+        [parameters removeObjectForKey:SDLNameDriverBraking];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverBraking {
-    NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
+    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -258,14 +258,14 @@
 
 - (void)setWiperStatus:(SDLWiperStatus *)wiperStatus {
     if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
+        [parameters removeObjectForKey:SDLNameWiperStatus];
     }
 }
 
 - (SDLWiperStatus *)wiperStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
     if (obj == nil || [obj isKindOfClass:SDLWiperStatus.class]) {
         return (SDLWiperStatus *)obj;
     } else {
@@ -275,14 +275,14 @@
 
 - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus {
     if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
+        [parameters removeObjectForKey:SDLNameHeadLampStatus];
     }
 }
 
 - (SDLHeadLampStatus *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
     if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) {
         return (SDLHeadLampStatus *)obj;
     } else {
@@ -292,50 +292,50 @@
 
 - (void)setEngineTorque:(NSNumber *)engineTorque {
     if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
     } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
+        [parameters removeObjectForKey:SDLNameEngineTorque];
     }
 }
 
 - (NSNumber *)engineTorque {
-    return [parameters objectForKey:NAMES_engineTorque];
+    return [parameters objectForKey:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:NAMES_accPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
     if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
     } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
     }
 }
 
 - (NSNumber *)steeringWheelAngle {
-    return [parameters objectForKey:NAMES_steeringWheelAngle];
+    return [parameters objectForKey:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(SDLECallInfo *)eCallInfo {
     if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
+        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
+        [parameters removeObjectForKey:SDLNameECallInfo];
     }
 }
 
 - (SDLECallInfo *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
+    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
     if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) {
         return (SDLECallInfo *)obj;
     } else {
@@ -345,14 +345,14 @@
 
 - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus {
     if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
+        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
+        [parameters removeObjectForKey:SDLNameAirbagStatus];
     }
 }
 
 - (SDLAirbagStatus *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
     if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) {
         return (SDLAirbagStatus *)obj;
     } else {
@@ -362,14 +362,14 @@
 
 - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent {
     if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
+        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
+        [parameters removeObjectForKey:SDLNameEmergencyEvent];
     }
 }
 
 - (SDLEmergencyEvent *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
+    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
     if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) {
         return (SDLEmergencyEvent *)obj;
     } else {
@@ -379,14 +379,14 @@
 
 - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus {
     if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus];
+        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_clusterModeStatus];
+        [parameters removeObjectForKey:SDLNameClusterModeStatus];
     }
 }
 
 - (SDLClusterModeStatus *)clusterModeStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus];
     if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) {
         return (SDLClusterModeStatus *)obj;
     } else {
@@ -396,14 +396,14 @@
 
 - (void)setMyKey:(SDLMyKey *)myKey {
     if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
+        [parameters setObject:myKey forKey:SDLNameMyKey];
     } else {
-        [parameters removeObjectForKey:NAMES_myKey];
+        [parameters removeObjectForKey:SDLNameMyKey];
     }
 }
 
 - (SDLMyKey *)myKey {
-    NSObject *obj = [parameters objectForKey:NAMES_myKey];
+    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
     if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) {
         return (SDLMyKey *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m
index ff103e86d..c7a24becb 100644
--- a/SmartDeviceLink/SDLHMICapabilities.m
+++ b/SmartDeviceLink/SDLHMICapabilities.m
@@ -6,7 +6,6 @@
 
 #import "SDLNames.h"
 
-
 @implementation SDLHMICapabilities
 
 - (instancetype)init {
@@ -29,26 +28,26 @@
 
 - (void)setNavigation:(NSNumber *)navigation {
     if (navigation != nil) {
-        store[NAMES_navigation] = navigation;
+        store[SDLNameNavigation] = navigation;
     } else {
-        [store removeObjectForKey:NAMES_navigation];
+        [store removeObjectForKey:SDLNameNavigation];
     }
 }
 
 - (NSNumber *)navigation {
-    return store[NAMES_navigation];
+    return store[SDLNameNavigation];
 }
 
 - (void)setPhoneCall:(NSNumber *)phoneCall {
     if (phoneCall != nil) {
-        store[NAMES_phoneCall] = phoneCall;
+        store[SDLNamePhoneCall] = phoneCall;
     } else {
-        [store removeObjectForKey:NAMES_phoneCall];
+        [store removeObjectForKey:SDLNamePhoneCall];
     }
 }
 
 - (NSNumber *)phoneCall {
-    return store[NAMES_phoneCall];
+    return store[SDLNamePhoneCall];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m
index 6695af565..fc393a5d5 100644
--- a/SmartDeviceLink/SDLHMIPermissions.m
+++ b/SmartDeviceLink/SDLHMIPermissions.m
@@ -23,14 +23,14 @@
 
 - (void)setAllowed:(NSMutableArray<SDLHMILevel *> *)allowed {
     if (allowed != nil) {
-        [store setObject:allowed forKey:NAMES_allowed];
+        [store setObject:allowed forKey:SDLNameAllowed];
     } else {
-        [store removeObjectForKey:NAMES_allowed];
+        [store removeObjectForKey:SDLNameAllowed];
     }
 }
 
 - (NSMutableArray<SDLHMILevel *> *)allowed {
-    NSMutableArray<SDLHMILevel *> *array = [store objectForKey:NAMES_allowed];
+    NSMutableArray<SDLHMILevel *> *array = [store objectForKey:SDLNameAllowed];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMILevel.class]) {
         return array;
     } else {
@@ -44,14 +44,14 @@
 
 - (void)setUserDisallowed:(NSMutableArray<SDLHMILevel *> *)userDisallowed {
     if (userDisallowed != nil) {
-        [store setObject:userDisallowed forKey:NAMES_userDisallowed];
+        [store setObject:userDisallowed forKey:SDLNameUserDisallowed];
     } else {
-        [store removeObjectForKey:NAMES_userDisallowed];
+        [store removeObjectForKey:SDLNameUserDisallowed];
     }
 }
 
 - (NSMutableArray<SDLHMILevel *> *)userDisallowed {
-    NSMutableArray<SDLHMILevel *> *array = [store objectForKey:NAMES_userDisallowed];
+    NSMutableArray<SDLHMILevel *> *array = [store objectForKey:SDLNameUserDisallowed];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMILevel.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m
index 66b526663..1a1ee6297 100644
--- a/SmartDeviceLink/SDLHeadLampStatus.m
+++ b/SmartDeviceLink/SDLHeadLampStatus.m
@@ -6,7 +6,6 @@
 #import "SDLAmbientLightStatus.h"
 #import "SDLNames.h"
 
-
 @implementation SDLHeadLampStatus
 
 - (instancetype)init {
@@ -23,38 +22,38 @@
 
 - (void)setLowBeamsOn:(NSNumber *)lowBeamsOn {
     if (lowBeamsOn != nil) {
-        [store setObject:lowBeamsOn forKey:NAMES_lowBeamsOn];
+        [store setObject:lowBeamsOn forKey:SDLNameLowBeamsOn];
     } else {
-        [store removeObjectForKey:NAMES_lowBeamsOn];
+        [store removeObjectForKey:SDLNameLowBeamsOn];
     }
 }
 
 - (NSNumber *)lowBeamsOn {
-    return [store objectForKey:NAMES_lowBeamsOn];
+    return [store objectForKey:SDLNameLowBeamsOn];
 }
 
 - (void)setHighBeamsOn:(NSNumber *)highBeamsOn {
     if (highBeamsOn != nil) {
-        [store setObject:highBeamsOn forKey:NAMES_highBeamsOn];
+        [store setObject:highBeamsOn forKey:SDLNameHighBeamsOn];
     } else {
-        [store removeObjectForKey:NAMES_highBeamsOn];
+        [store removeObjectForKey:SDLNameHighBeamsOn];
     }
 }
 
 - (NSNumber *)highBeamsOn {
-    return [store objectForKey:NAMES_highBeamsOn];
+    return [store objectForKey:SDLNameHighBeamsOn];
 }
 
 - (void)setAmbientLightSensorStatus:(SDLAmbientLightStatus *)ambientLightSensorStatus {
     if (ambientLightSensorStatus != nil) {
-        [store setObject:ambientLightSensorStatus forKey:NAMES_ambientLightSensorStatus];
+        [store setObject:ambientLightSensorStatus forKey:SDLNameAmbientLightSensorStatus];
     } else {
-        [store removeObjectForKey:NAMES_ambientLightSensorStatus];
+        [store removeObjectForKey:SDLNameAmbientLightSensorStatus];
     }
 }
 
 - (SDLAmbientLightStatus *)ambientLightSensorStatus {
-    NSObject *obj = [store objectForKey:NAMES_ambientLightSensorStatus];
+    NSObject *obj = [store objectForKey:SDLNameAmbientLightSensorStatus];
     if (obj == nil || [obj isKindOfClass:SDLAmbientLightStatus.class]) {
         return (SDLAmbientLightStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m
index 105435c90..767fd6eff 100644
--- a/SmartDeviceLink/SDLImage.m
+++ b/SmartDeviceLink/SDLImage.m
@@ -23,26 +23,26 @@
 
 - (void)setValue:(NSString *)value {
     if (value != nil) {
-        [store setObject:value forKey:NAMES_value];
+        [store setObject:value forKey:SDLNameValue];
     } else {
-        [store removeObjectForKey:NAMES_value];
+        [store removeObjectForKey:SDLNameValue];
     }
 }
 
 - (NSString *)value {
-    return [store objectForKey:NAMES_value];
+    return [store objectForKey:SDLNameValue];
 }
 
 - (void)setImageType:(SDLImageType *)imageType {
     if (imageType != nil) {
-        [store setObject:imageType forKey:NAMES_imageType];
+        [store setObject:imageType forKey:SDLNameImageType];
     } else {
-        [store removeObjectForKey:NAMES_imageType];
+        [store removeObjectForKey:SDLNameImageType];
     }
 }
 
 - (SDLImageType *)imageType {
-    NSObject *obj = [store objectForKey:NAMES_imageType];
+    NSObject *obj = [store objectForKey:SDLNameImageType];
     if (obj == nil || [obj isKindOfClass:SDLImageType.class]) {
         return (SDLImageType *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m
index 2f35158ff..9897ae7f2 100644
--- a/SmartDeviceLink/SDLImageField.m
+++ b/SmartDeviceLink/SDLImageField.m
@@ -8,7 +8,6 @@
 #import "SDLImageResolution.h"
 #import "SDLNames.h"
 
-
 @implementation SDLImageField
 
 - (instancetype)init {
@@ -25,14 +24,14 @@
 
 - (void)setName:(SDLImageFieldName *)name {
     if (name != nil) {
-        [store setObject:name forKey:NAMES_name];
+        [store setObject:name forKey:SDLNameName];
     } else {
-        [store removeObjectForKey:NAMES_name];
+        [store removeObjectForKey:SDLNameName];
     }
 }
 
 - (SDLImageFieldName *)name {
-    NSObject *obj = [store objectForKey:NAMES_name];
+    NSObject *obj = [store objectForKey:SDLNameName];
     if (obj == nil || [obj isKindOfClass:SDLImageFieldName.class]) {
         return (SDLImageFieldName *)obj;
     } else {
@@ -42,14 +41,14 @@
 
 - (void)setImageTypeSupported:(NSMutableArray<SDLFileType *> *)imageTypeSupported {
     if (imageTypeSupported != nil) {
-        [store setObject:imageTypeSupported forKey:NAMES_imageTypeSupported];
+        [store setObject:imageTypeSupported forKey:SDLNameImageTypeSupported];
     } else {
-        [store removeObjectForKey:NAMES_imageTypeSupported];
+        [store removeObjectForKey:SDLNameImageTypeSupported];
     }
 }
 
 - (NSMutableArray<SDLFileType *> *)imageTypeSupported {
-    NSMutableArray<SDLFileType *> *array = [store objectForKey:NAMES_imageTypeSupported];
+    NSMutableArray<SDLFileType *> *array = [store objectForKey:SDLNameImageTypeSupported];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLFileType.class]) {
         return array;
     } else {
@@ -63,14 +62,14 @@
 
 - (void)setImageResolution:(SDLImageResolution *)imageResolution {
     if (imageResolution != nil) {
-        [store setObject:imageResolution forKey:NAMES_imageResolution];
+        [store setObject:imageResolution forKey:SDLNameImageResolution];
     } else {
-        [store removeObjectForKey:NAMES_imageResolution];
+        [store removeObjectForKey:SDLNameImageResolution];
     }
 }
 
 - (SDLImageResolution *)imageResolution {
-    NSObject *obj = [store objectForKey:NAMES_imageResolution];
+    NSObject *obj = [store objectForKey:SDLNameImageResolution];
     if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) {
         return (SDLImageResolution *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m
index bdabd89a1..e9cc2a614 100644
--- a/SmartDeviceLink/SDLImageResolution.m
+++ b/SmartDeviceLink/SDLImageResolution.m
@@ -22,26 +22,26 @@
 
 - (void)setResolutionWidth:(NSNumber *)resolutionWidth {
     if (resolutionWidth != nil) {
-        [store setObject:resolutionWidth forKey:NAMES_resolutionWidth];
+        [store setObject:resolutionWidth forKey:SDLNameResolutionWidth];
     } else {
-        [store removeObjectForKey:NAMES_resolutionWidth];
+        [store removeObjectForKey:SDLNameResolutionWidth];
     }
 }
 
 - (NSNumber *)resolutionWidth {
-    return [store objectForKey:NAMES_resolutionWidth];
+    return [store objectForKey:SDLNameResolutionWidth];
 }
 
 - (void)setResolutionHeight:(NSNumber *)resolutionHeight {
     if (resolutionHeight != nil) {
-        [store setObject:resolutionHeight forKey:NAMES_resolutionHeight];
+        [store setObject:resolutionHeight forKey:SDLNameResolutionHeight];
     } else {
-        [store removeObjectForKey:NAMES_resolutionHeight];
+        [store removeObjectForKey:SDLNameResolutionHeight];
     }
 }
 
 - (NSNumber *)resolutionHeight {
-    return [store objectForKey:NAMES_resolutionHeight];
+    return [store objectForKey:SDLNameResolutionHeight];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLJsonDecoder.m b/SmartDeviceLink/SDLJsonDecoder.m
index 0ff561df8..3c76f1ebc 100644
--- a/SmartDeviceLink/SDLJsonDecoder.m
+++ b/SmartDeviceLink/SDLJsonDecoder.m
@@ -4,7 +4,7 @@
 #import "SDLJsonDecoder.h"
 
 #import "SDLDebugTool.h"
-#import "SDLNames.h"
+
 
 
 @implementation SDLJsonDecoder
diff --git a/SmartDeviceLink/SDLJsonEncoder.m b/SmartDeviceLink/SDLJsonEncoder.m
index dbb2374d9..df5cd2a11 100644
--- a/SmartDeviceLink/SDLJsonEncoder.m
+++ b/SmartDeviceLink/SDLJsonEncoder.m
@@ -4,7 +4,7 @@
 #import "SDLJsonEncoder.h"
 
 #import "SDLDebugTool.h"
-#import "SDLNames.h"
+
 
 
 @implementation SDLJsonEncoder
diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m
index a51e8af57..a9360b550 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink/SDLKeyboardProperties.m
@@ -8,7 +8,6 @@
 #import "SDLLanguage.h"
 #import "SDLNames.h"
 
-
 @implementation SDLKeyboardProperties
 
 - (instancetype)init {
@@ -25,14 +24,14 @@
 
 - (void)setLanguage:(SDLLanguage *)language {
     if (language != nil) {
-        [store setObject:language forKey:NAMES_language];
+        [store setObject:language forKey:SDLNameLanguage];
     } else {
-        [store removeObjectForKey:NAMES_language];
+        [store removeObjectForKey:SDLNameLanguage];
     }
 }
 
 - (SDLLanguage *)language {
-    NSObject *obj = [store objectForKey:NAMES_language];
+    NSObject *obj = [store objectForKey:SDLNameLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -42,14 +41,14 @@
 
 - (void)setKeyboardLayout:(SDLKeyboardLayout *)keyboardLayout {
     if (keyboardLayout != nil) {
-        [store setObject:keyboardLayout forKey:NAMES_keyboardLayout];
+        [store setObject:keyboardLayout forKey:SDLNameKeyboardLayout];
     } else {
-        [store removeObjectForKey:NAMES_keyboardLayout];
+        [store removeObjectForKey:SDLNameKeyboardLayout];
     }
 }
 
 - (SDLKeyboardLayout *)keyboardLayout {
-    NSObject *obj = [store objectForKey:NAMES_keyboardLayout];
+    NSObject *obj = [store objectForKey:SDLNameKeyboardLayout];
     if (obj == nil || [obj isKindOfClass:SDLKeyboardLayout.class]) {
         return (SDLKeyboardLayout *)obj;
     } else {
@@ -59,14 +58,14 @@
 
 - (void)setKeypressMode:(SDLKeypressMode *)keypressMode {
     if (keypressMode != nil) {
-        [store setObject:keypressMode forKey:NAMES_keypressMode];
+        [store setObject:keypressMode forKey:SDLNameKeypressMode];
     } else {
-        [store removeObjectForKey:NAMES_keypressMode];
+        [store removeObjectForKey:SDLNameKeypressMode];
     }
 }
 
 - (SDLKeypressMode *)keypressMode {
-    NSObject *obj = [store objectForKey:NAMES_keypressMode];
+    NSObject *obj = [store objectForKey:SDLNameKeypressMode];
     if (obj == nil || [obj isKindOfClass:SDLKeypressMode.class]) {
         return (SDLKeypressMode *)obj;
     } else {
@@ -76,26 +75,26 @@
 
 - (void)setLimitedCharacterList:(NSMutableArray<NSString *> *)limitedCharacterList {
     if (limitedCharacterList != nil) {
-        [store setObject:limitedCharacterList forKey:NAMES_limitedCharacterList];
+        [store setObject:limitedCharacterList forKey:SDLNameLimitedCharacterList];
     } else {
-        [store removeObjectForKey:NAMES_limitedCharacterList];
+        [store removeObjectForKey:SDLNameLimitedCharacterList];
     }
 }
 
 - (NSMutableArray<NSString *> *)limitedCharacterList {
-    return [store objectForKey:NAMES_limitedCharacterList];
+    return [store objectForKey:SDLNameLimitedCharacterList];
 }
 
 - (void)setAutoCompleteText:(NSString *)autoCompleteText {
     if (autoCompleteText != nil) {
-        [store setObject:autoCompleteText forKey:NAMES_autoCompleteText];
+        [store setObject:autoCompleteText forKey:SDLNameAutoCompleteText];
     } else {
-        [store removeObjectForKey:NAMES_autoCompleteText];
+        [store removeObjectForKey:SDLNameAutoCompleteText];
     }
 }
 
 - (NSString *)autoCompleteText {
-    return [store objectForKey:NAMES_autoCompleteText];
+    return [store objectForKey:SDLNameAutoCompleteText];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m
index 106608eeb..882b1a224 100644
--- a/SmartDeviceLink/SDLListFiles.m
+++ b/SmartDeviceLink/SDLListFiles.m
@@ -9,7 +9,7 @@
 @implementation SDLListFiles
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ListFiles]) {
+    if (self = [super initWithName:SDLNameListFiles]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m
index dba4f6366..5e699b5ab 100644
--- a/SmartDeviceLink/SDLListFilesResponse.m
+++ b/SmartDeviceLink/SDLListFilesResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLListFilesResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ListFiles]) {
+    if (self = [super initWithName:SDLNameListFiles]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setFilenames:(NSMutableArray<NSString *> *)filenames {
     if (filenames != nil) {
-        [parameters setObject:filenames forKey:NAMES_filenames];
+        [parameters setObject:filenames forKey:SDLNameFilenames];
     } else {
-        [parameters removeObjectForKey:NAMES_filenames];
+        [parameters removeObjectForKey:SDLNameFilenames];
     }
 }
 
 - (NSMutableArray<NSString *> *)filenames {
-    return [parameters objectForKey:NAMES_filenames];
+    return [parameters objectForKey:SDLNameFilenames];
 }
 
 - (void)setSpaceAvailable:(NSNumber *)spaceAvailable {
     if (spaceAvailable != nil) {
-        [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable];
+        [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable];
     } else {
-        [parameters removeObjectForKey:NAMES_spaceAvailable];
+        [parameters removeObjectForKey:SDLNameSpaceAvailable];
     }
 }
 
 - (NSNumber *)spaceAvailable {
-    return [parameters objectForKey:NAMES_spaceAvailable];
+    return [parameters objectForKey:SDLNameSpaceAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m
index cd461f79e..88143cf9d 100644
--- a/SmartDeviceLink/SDLMenuParams.m
+++ b/SmartDeviceLink/SDLMenuParams.m
@@ -22,38 +22,38 @@
 
 - (void)setParentID:(NSNumber *)parentID {
     if (parentID != nil) {
-        [store setObject:parentID forKey:NAMES_parentID];
+        [store setObject:parentID forKey:SDLNameParentId];
     } else {
-        [store removeObjectForKey:NAMES_parentID];
+        [store removeObjectForKey:SDLNameParentId];
     }
 }
 
 - (NSNumber *)parentID {
-    return [store objectForKey:NAMES_parentID];
+    return [store objectForKey:SDLNameParentId];
 }
 
 - (void)setPosition:(NSNumber *)position {
     if (position != nil) {
-        [store setObject:position forKey:NAMES_position];
+        [store setObject:position forKey:SDLNamePosition];
     } else {
-        [store removeObjectForKey:NAMES_position];
+        [store removeObjectForKey:SDLNamePosition];
     }
 }
 
 - (NSNumber *)position {
-    return [store objectForKey:NAMES_position];
+    return [store objectForKey:SDLNamePosition];
 }
 
 - (void)setMenuName:(NSString *)menuName {
     if (menuName != nil) {
-        [store setObject:menuName forKey:NAMES_menuName];
+        [store setObject:menuName forKey:SDLNameMenuName];
     } else {
-        [store removeObjectForKey:NAMES_menuName];
+        [store removeObjectForKey:SDLNameMenuName];
     }
 }
 
 - (NSString *)menuName {
-    return [store objectForKey:NAMES_menuName];
+    return [store objectForKey:SDLNameMenuName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m
index b8e88f8c3..01cceb4a1 100644
--- a/SmartDeviceLink/SDLMyKey.m
+++ b/SmartDeviceLink/SDLMyKey.m
@@ -6,7 +6,6 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataStatus.h"
 
-
 @implementation SDLMyKey
 
 - (instancetype)init {
@@ -23,14 +22,14 @@
 
 - (void)setE911Override:(SDLVehicleDataStatus *)e911Override {
     if (e911Override != nil) {
-        [store setObject:e911Override forKey:NAMES_e911Override];
+        [store setObject:e911Override forKey:SDLNameE911Override];
     } else {
-        [store removeObjectForKey:NAMES_e911Override];
+        [store removeObjectForKey:SDLNameE911Override];
     }
 }
 
 - (SDLVehicleDataStatus *)e911Override {
-    NSObject *obj = [store objectForKey:NAMES_e911Override];
+    NSObject *obj = [store objectForKey:SDLNameE911Override];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataStatus.class]) {
         return (SDLVehicleDataStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h
index d4adb7dc6..9ae9173b9 100644
--- a/SmartDeviceLink/SDLNames.h
+++ b/SmartDeviceLink/SDLNames.h
@@ -1,410 +1,413 @@
 //  SDLNames.h
 //
 
+#import <Foundation/Foundation.h>
 
-#define NAMES_accPedalPosition @"accPedalPosition"
-#define NAMES_actual @"actual"
-#define NAMES_AddCommand @"AddCommand"
-#define NAMES_addressLines @"addressLines"
-#define NAMES_AddSubMenu @"AddSubMenu"
-#define NAMES_airbagStatus @"airbagStatus"
-#define NAMES_Alert @"Alert"
-#define NAMES_AlertManeuver @"AlertManeuver"
-#define NAMES_alertText1 @"alertText1"
-#define NAMES_alertText2 @"alertText2"
-#define NAMES_alertText3 @"alertText3"
-#define NAMES_alignment @"alignment"
-#define NAMES_allowed @"allowed"
-#define NAMES_altitude @"altitude"
-#define NAMES_ambientLightSensorStatus @"ambientLightSensorStatus"
-#define NAMES_ambientLightStatus @"ambientLightStatus"
-#define NAMES_appBundleID @"appBundleID"
-#define NAMES_appHMIType @"appHMIType"
-#define NAMES_appID @"appID"
-#define NAMES_appInfo @"appInfo"
-#define NAMES_appName @"appName"
-#define NAMES_appDisplayName @"appDisplayName"
-#define NAMES_appVersion @"appVersion"
-#define NAMES_audioPassThruCapabilities @"audioPassThruCapabilities"
-#define NAMES_audioPassThruDisplayText1 @"audioPassThruDisplayText1"
-#define NAMES_audioPassThruDisplayText2 @"audioPassThruDisplayText2"
-#define NAMES_audioStreamingState @"audioStreamingState"
-#define NAMES_audioType @"audioType"
-#define NAMES_autoCompleteText @"autoCompleteText"
-#define NAMES_auxECallNotificationStatus @"auxECallNotificationStatus"
-#define NAMES_battLevelStatus @"battLevelStatus"
-#define NAMES_beltStatus @"beltStatus"
-#define NAMES_bitsPerSample @"bitsPerSample"
-#define NAMES_bodyInformation @"bodyInformation"
-#define NAMES_btIconOn @"btIconOn"
-#define NAMES_bulkData @"bulkData"
-#define NAMES_buttonCapabilities @"buttonCapabilities"
-#define NAMES_buttonEventMode @"buttonEventMode"
-#define NAMES_buttonName @"buttonName"
-#define NAMES_buttonPressMode @"buttonPressMode"
-#define NAMES_c @"c"
-#define NAMES_callActive @"callActive"
-#define NAMES_carModeStatus @"carModeStatus"
-#define NAMES_carrier @"carrier"
-#define NAMES_ChangeRegistration @"ChangeRegistration"
-#define NAMES_characterSet @"characterSet"
-#define NAMES_choiceID @"choiceID"
-#define NAMES_choiceSet @"choiceSet"
-#define NAMES_clusterModes @"clusterModes"
-#define NAMES_clusterModeStatus @"clusterModeStatus"
-#define NAMES_cmdIcon @"cmdIcon"
-#define NAMES_cmdID @"cmdID"
-#define NAMES_compassDirection @"compassDirection"
-#define NAMES_correlationID @"correlationID"
-#define NAMES_CreateInteractionChoiceSet @"CreateInteractionChoiceSet"
-#define NAMES_customButtonID @"customButtonID"
-#define NAMES_customPresets @"customPresets"
-#define NAMES_data @"data"
-#define NAMES_dataResult @"dataResult"
-#define NAMES_dataType @"dataType"
-#define NAMES_DeleteCommand @"DeleteCommand"
-#define NAMES_DeleteFile @"DeleteFile"
-#define NAMES_DeleteInteractionChoiceSet @"DeleteInteractionChoiceSet"
-#define NAMES_DeleteSubMenu @"DeleteSubMenu"
-#define NAMES_deviceInfo @"deviceInfo"
-#define NAMES_deviceStatus @"deviceStatus"
-#define NAMES_DiagnosticMessage @"DiagnosticMessage"
-#define NAMES_didLocation @"didLocation"
-#define NAMES_didResult @"didResult"
-#define NAMES_dimension @"dimension"
-#define NAMES_displayCapabilities @"displayCapabilities"
-#define NAMES_displayLayout @"displayLayout"
-#define NAMES_displayType @"displayType"
-#define NAMES_distanceToEmpty @"distanceToEmpty"
-#define NAMES_distanceToManeuver @"distanceToManeuver"
-#define NAMES_distanceToManeuverScale @"distanceToManeuverScale"
-#define NAMES_doublePressAvailable @"doublePressAvailable"
-#define NAMES_driverAirbagDeployed @"driverAirbagDeployed"
-#define NAMES_driverBeltDeployed @"driverBeltDeployed"
-#define NAMES_driverBraking @"driverBraking"
-#define NAMES_driverBuckleBelted @"driverBuckleBelted"
-#define NAMES_driverCurtainAirbagDeployed @"driverCurtainAirbagDeployed"
-#define NAMES_driverDoorAjar @"driverDoorAjar"
-#define NAMES_driverKneeAirbagDeployed @"driverKneeAirbagDeployed"
-#define NAMES_driverSideAirbagDeployed @"driverSideAirbagDeployed"
-#define NAMES_dtc @"dtc"
-#define NAMES_dtcMask @"dtcMask"
-#define NAMES_duration @"duration"
-#define NAMES_e911Override @"e911Override"
-#define NAMES_eCallConfirmationStatus @"eCallConfirmationStatus"
-#define NAMES_eCallEventActive @"eCallEventActive"
-#define NAMES_eCallInfo @"eCallInfo"
-#define NAMES_eCallNotificationStatus @"eCallNotificationStatus"
-#define NAMES_ecuHeader @"ecuHeader"
-#define NAMES_ecuName @"ecuName"
-#define NAMES_emergencyEvent @"emergencyEvent"
-#define NAMES_emergencyEventType @"emergencyEventType"
-#define NAMES_EncodedSyncPData @"EncodedSyncPData"
-#define NAMES_EndAudioPassThru @"EndAudioPassThru"
-#define NAMES_endTime @"endTime"
-#define NAMES_engineTorque @"engineTorque"
-#define NAMES_eta @"eta"
-#define NAMES_event @"event"
-#define NAMES_externalTemperature @"externalTemperature"
-#define NAMES_fileName @"fileName"
-#define NAMES_filenames @"filenames"
-#define NAMES_fileType @"fileType"
-#define NAMES_firmwareRev @"firmwareRev"
-#define NAMES_fuelCutoffStatus @"fuelCutoffStatus"
-#define NAMES_fuelLevel @"fuelLevel"
-#define NAMES_fuelLevel_State @"fuelLevel_State"
-#define NAMES_fuelMaintenanceMode @"fuelMaintenanceMode"
-#define NAMES_GenericResponse @"GenericResponse"
-#define NAMES_GetDTCs @"GetDTCs"
-#define NAMES_GetVehicleData @"GetVehicleData"
-#define NAMES_gps @"gps"
-#define NAMES_graphic @"graphic"
-#define NAMES_graphicSupported @"graphicSupported"
-#define NAMES_hardware @"hardware"
-#define NAMES_hashID @"hashID"
-#define NAMES_hdop @"hdop"
-#define NAMES_heading @"heading"
-#define NAMES_headLampStatus @"headLampStatus"
-#define NAMES_helpPrompt @"helpPrompt"
-#define NAMES_highBeamsOn @"highBeamsOn"
-#define NAMES_hmiDisplayLanguage @"hmiDisplayLanguage"
-#define NAMES_hmiDisplayLanguageDesired @"hmiDisplayLanguageDesired"
-#define NAMES_hmiLevel @"hmiLevel"
-#define NAMES_hmiPermissions @"hmiPermissions"
-#define NAMES_hmiCapabilities @"hmiCapabilities"
-#define NAMES_hmiZoneCapabilities @"hmiZoneCapabilities"
-#define NAMES_hours @"hours"
-#define NAMES_id @"id"
-#define NAMES_ignitionStableStatus @"ignitionStableStatus"
-#define NAMES_ignitionStatus @"ignitionStatus"
-#define NAMES_image @"image"
-#define NAMES_imageFields @"imageFields"
-#define NAMES_imageResolution @"imageResolution"
-#define NAMES_imageSupported @"imageSupported"
-#define NAMES_imageType @"imageType"
-#define NAMES_imageTypeSupported @"imageTypeSupported"
-#define NAMES_info @"info"
-#define NAMES_initialPrompt @"initialPrompt"
-#define NAMES_initialText @"initialText"
-#define NAMES_innerLeftRear @"innerLeftRear"
-#define NAMES_innerRightRear @"innerRightRear"
-#define NAMES_instantFuelConsumption @"instantFuelConsumption"
-#define NAMES_interactionChoiceSetID @"interactionChoiceSetID"
-#define NAMES_interactionChoiceSetIDList @"interactionChoiceSetIDList"
-#define NAMES_interactionLayout @"interactionLayout"
-#define NAMES_interactionMode @"interactionMode"
-#define NAMES_isHighlighted @"isHighlighted"
-#define NAMES_isMediaApplication @"isMediaApplication"
-#define NAMES_keyboardLayout @"keyboardLayout"
-#define NAMES_keyboardProperties @"keyboardProperties"
-#define NAMES_keypressMode @"keypressMode"
-#define NAMES_language @"language"
-#define NAMES_languageDesired @"languageDesired"
-#define NAMES_latitudeDegrees @"latitudeDegrees"
-#define NAMES_leftFront @"leftFront"
-#define NAMES_leftRear @"leftRear"
-#define NAMES_leftRearInflatableBelted @"leftRearInflatableBelted"
-#define NAMES_leftRow2BuckleBelted @"leftRow2BuckleBelted"
-#define NAMES_leftRow3BuckleBelted @"leftRow3BuckleBelted"
-#define NAMES_length @"length"
-#define NAMES_limitedCharacterList @"limitedCharacterList"
-#define NAMES_ListFiles @"ListFiles"
-#define NAMES_locationDescription @"locationDescription"
-#define NAMES_locationImage @"locationImage"
-#define NAMES_locationName @"locationName"
-#define NAMES_longitudeDegrees @"longitudeDegrees"
-#define NAMES_longPress @"longPress"
-#define NAMES_longPressAvailable @"longPressAvailable"
-#define NAMES_lowBeamsOn @"lowBeamsOn"
-#define NAMES_mainField1 @"mainField1"
-#define NAMES_mainField2 @"mainField2"
-#define NAMES_mainField3 @"mainField3"
-#define NAMES_mainField4 @"mainField4"
-#define NAMES_majorVersion @"majorVersion"
-#define NAMES_make @"make"
-#define NAMES_maneuverComplete @"maneuverComplete"
-#define NAMES_manualTextEntry @"manualTextEntry"
-#define NAMES_maxDuration @"maxDuration"
-#define NAMES_maximumChangeVelocity @"maximumChangeVelocity"
-#define NAMES_maxNumberRFCOMMPorts @"maxNumberRFCOMMPorts"
-#define NAMES_mediaClock @"mediaClock"
-#define NAMES_mediaClockFormats @"mediaClockFormats"
-#define NAMES_mediaTrack @"mediaTrack"
-#define NAMES_menuIcon @"menuIcon"
-#define NAMES_menuID @"menuID"
-#define NAMES_menuName @"menuName"
-#define NAMES_menuParams @"menuParams"
-#define NAMES_menuTitle @"menuTitle"
-#define NAMES_messageData @"messageData"
-#define NAMES_messageDataResult @"messageDataResult"
-#define NAMES_messageLength @"messageLength"
-#define NAMES_middleRow1BeltDeployed @"middleRow1BeltDeployed"
-#define NAMES_middleRow1BuckleBelted @"middleRow1BuckleBelted"
-#define NAMES_middleRow2BuckleBelted @"middleRow2BuckleBelted"
-#define NAMES_middleRow3BuckleBelted @"middleRow3BuckleBelted"
-#define NAMES_minorVersion @"minorVersion"
-#define NAMES_minutes @"minutes"
-#define NAMES_model @"model"
-#define NAMES_modelYear @"modelYear"
-#define NAMES_monoAudioOutputMuted @"monoAudioOutputMuted"
-#define NAMES_multipleEvents @"multipleEvents"
-#define NAMES_multiTouchAvailable @"multiTouchAvailable"
-#define NAMES_muteAudio @"muteAudio"
-#define NAMES_myKey @"myKey"
-#define NAMES_name @"name"
-#define NAMES_navigation @"navigation"
-#define NAMES_navigationText @"navigationText"
-#define NAMES_navigationText1 @"navigationText1"
-#define NAMES_navigationText2 @"navigationText2"
-#define NAMES_nextTurnIcon @"nextTurnIcon"
-#define NAMES_ngnMediaScreenAppName @"ngnMediaScreenAppName"
-#define NAMES_notification @"notification"
-#define NAMES_number @"number"
-#define NAMES_numCustomPresetsAvailable @"numCustomPresetsAvailable"
-#define NAMES_numTicks @"numTicks"
-#define NAMES_odometer @"odometer"
-#define NAMES_offset @"offset"
-#define NAMES_OnAppInterfaceUnregistered @"OnAppInterfaceUnregistered"
-#define NAMES_OnAudioPassThru @"OnAudioPassThru"
-#define NAMES_OnButtonEvent @"OnButtonEvent"
-#define NAMES_OnButtonPress @"OnButtonPress"
-#define NAMES_OnCommand @"OnCommand"
-#define NAMES_OnDriverDistraction @"OnDriverDistraction"
-#define NAMES_OnEncodedSyncPData @"OnEncodedSyncPData"
-#define NAMES_OnHashChange @"OnHashChange"
-#define NAMES_OnHMIStatus @"OnHMIStatus"
-#define NAMES_OnKeyboardInput @"OnKeyboardInput"
-#define NAMES_OnLanguageChange @"OnLanguageChange"
-#define NAMES_OnPermissionsChange @"OnPermissionsChange"
-#define NAMES_onScreenPresetsAvailable @"onScreenPresetsAvailable"
-#define NAMES_OnSyncPData @"OnSyncPData"
-#define NAMES_OnSystemRequest @"OnSystemRequest"
-#define NAMES_OnTBTClientState @"OnTBTClientState"
-#define NAMES_OnTouchEvent @"OnTouchEvent"
-#define NAMES_OnVehicleData @"OnVehicleData"
-#define NAMES_operation_name @"name"
-#define NAMES_os @"os"
-#define NAMES_osVersion @"osVersion"
-#define NAMES_parameterPermissions @"parameterPermissions"
-#define NAMES_parameters @"parameters"
-#define NAMES_parentID @"parentID"
-#define NAMES_parkBrakeActive @"parkBrakeActive"
-#define NAMES_passengerAirbagDeployed @"passengerAirbagDeployed"
-#define NAMES_passengerBeltDeployed @"passengerBeltDeployed"
-#define NAMES_passengerBuckleBelted @"passengerBuckleBelted"
-#define NAMES_passengerChildDetected @"passengerChildDetected"
-#define NAMES_passengerCurtainAirbagDeployed @"passengerCurtainAirbagDeployed"
-#define NAMES_passengerDoorAjar @"passengerDoorAjar"
-#define NAMES_passengerKneeAirbagDeployed @"passengerKneeAirbagDeployed"
-#define NAMES_passengerSideAirbagDeployed @"passengerSideAirbagDeployed"
-#define NAMES_pdop @"pdop"
-#define NAMES_PerformAudioPassThru @"PerformAudioPassThru"
-#define NAMES_PerformInteraction @"PerformInteraction"
-#define NAMES_permissionItem @"permissionItem"
-#define NAMES_persistentFile @"persistentFile"
-#define NAMES_phoneCall @"phoneCall"
-#define NAMES_phoneNumber @"phoneNumber"
-#define NAMES_phoneRoaming @"phoneRoaming"
-#define NAMES_playTone @"playTone"
-#define NAMES_position @"position"
-#define NAMES_powerModeActive @"powerModeActive"
-#define NAMES_powerModeQualificationStatus @"powerModeQualificationStatus"
-#define NAMES_powerModeStatus @"powerModeStatus"
-#define NAMES_prerecordedSpeech @"prerecordedSpeech"
-#define NAMES_presetBankCapabilities @"presetBankCapabilities"
-#define NAMES_pressAvailable @"pressAvailable"
-#define NAMES_pressure @"pressure"
-#define NAMES_pressureTelltale @"pressureTelltale"
-#define NAMES_primaryAudioSource @"primaryAudioSource"
-#define NAMES_prndl @"prndl"
-#define NAMES_progressIndicator @"progressIndicator"
-#define NAMES_properties @"properties"
-#define NAMES_PutFile @"PutFile"
-#define NAMES_ReadDID @"ReadDID"
-#define NAMES_rearLeftDoorAjar @"rearLeftDoorAjar"
-#define NAMES_rearRightDoorAjar @"rearRightDoorAjar"
-#define NAMES_reason @"reason"
-#define NAMES_RegisterAppInterface @"RegisterAppInterface"
-#define NAMES_request @"request"
-#define NAMES_requestType @"requestType"
-#define NAMES_reserved @"reserved"
-#define NAMES_ResetGlobalProperties @"ResetGlobalProperties"
-#define NAMES_resolution @"resolution"
-#define NAMES_resolutionHeight @"resolutionHeight"
-#define NAMES_resolutionWidth @"resolutionWidth"
-#define NAMES_response @"response"
-#define NAMES_result @"result"
-#define NAMES_resultCode @"resultCode"
-#define NAMES_rightFront @"rightFront"
-#define NAMES_rightRear @"rightRear"
-#define NAMES_rightRearInflatableBelted @"rightRearInflatableBelted"
-#define NAMES_rightRow2BuckleBelted @"rightRow2BuckleBelted"
-#define NAMES_rightRow3BuckleBelted @"rightRow3BuckleBelted"
-#define NAMES_rolloverEvent @"rolloverEvent"
-#define NAMES_rows @"rows"
-#define NAMES_rpcName @"rpcName"
-#define NAMES_rpm @"rpm"
-#define NAMES_samplingRate @"samplingRate"
-#define NAMES_satellites @"satellites"
-#define NAMES_screenParams @"screenParams"
-#define NAMES_ScrollableMessage @"ScrollableMessage"
-#define NAMES_scrollableMessageBody @"scrollableMessageBody"
-#define NAMES_sdlVersion @"sdlVersion"
-#define NAMES_secondaryGraphic @"secondaryGraphic"
-#define NAMES_secondaryImage @"secondaryImage"
-#define NAMES_secondaryText @"secondaryText"
-#define NAMES_seconds @"seconds"
-#define NAMES_SendLocation @"SendLocation"
-#define NAMES_SetAppIcon @"SetAppIcon"
-#define NAMES_SetDisplayLayout @"SetDisplayLayout"
-#define NAMES_SetGlobalProperties @"SetGlobalProperties"
-#define NAMES_SetMediaClockTimer @"SetMediaClockTimer"
-#define NAMES_shortPress @"shortPress"
-#define NAMES_shortPressAvailable @"shortPressAvailable"
-#define NAMES_Show @"Show"
-#define NAMES_ShowConstantTBT @"ShowConstantTBT"
-#define NAMES_signalLevelStatus @"signalLevelStatus"
-#define NAMES_Slider @"Slider"
-#define NAMES_sliderFooter @"sliderFooter"
-#define NAMES_sliderHeader @"sliderHeader"
-#define NAMES_sliderPosition @"sliderPosition"
-#define NAMES_softButtonCapabilities @"softButtonCapabilities"
-#define NAMES_softButtonID @"softButtonID"
-#define NAMES_softButtons @"softButtons"
-#define NAMES_spaceAvailable @"spaceAvailable"
-#define NAMES_Speak @"Speak"
-#define NAMES_speechCapabilities @"speechCapabilities"
-#define NAMES_speed @"speed"
-#define NAMES_startTime @"startTime"
-#define NAMES_state @"state"
-#define NAMES_stateOfCharge @"stateOfCharge"
-#define NAMES_status @"status"
-#define NAMES_statusBar @"statusBar"
-#define NAMES_steeringWheelAngle @"steeringWheelAngle"
-#define NAMES_stereoAudioOutputMuted @"stereoAudioOutputMuted"
-#define NAMES_Subscribe @"Subscribe"
-#define NAMES_SubscribeButton @"SubscribeButton"
-#define NAMES_SubscribeVehicleData @"SubscribeVehicleData"
-#define NAMES_success @"success"
-#define NAMES_supportedDiagModes @"supportedDiagModes"
-#define NAMES_syncFileName @"syncFileName"
-#define NAMES_syncMsgVersion @"syncMsgVersion"
-#define NAMES_SyncPData @"SyncPData"
-#define NAMES_systemAction @"systemAction"
-#define NAMES_systemContext @"systemContext"
-#define NAMES_systemFile @"systemFile"
-#define NAMES_SystemRequest @"SystemRequest"
-#define NAMES_systemSoftwareVersion @"systemSoftwareVersion"
-#define NAMES_DialNumber @"DialNumber"
-#define NAMES_targetID @"targetID"
-#define NAMES_templatesAvailable @"templatesAvailable"
-#define NAMES_tertiaryText @"tertiaryText"
-#define NAMES_text @"text"
-#define NAMES_textFields @"textFields"
-#define NAMES_textMsgAvailable @"textMsgAvailable"
-#define NAMES_timeout @"timeout"
-#define NAMES_Timeout @"Timeout"
-#define NAMES_timeoutPrompt @"timeoutPrompt"
-#define NAMES_timeToDestination @"timeToDestination"
-#define NAMES_tirePressure @"tirePressure"
-#define NAMES_totalDistance @"totalDistance"
-#define NAMES_touchEventAvailable @"touchEventAvailable"
-#define NAMES_triggerSource @"triggerSource"
-#define NAMES_trim @"trim"
-#define NAMES_tryAgainTime @"tryAgainTime"
-#define NAMES_ts @"ts"
-#define NAMES_ttsChunks @"ttsChunks"
-#define NAMES_ttsName @"ttsName"
-#define NAMES_turnIcon @"turnIcon"
-#define NAMES_turnList @"turnList"
-#define NAMES_type @"type"
-#define NAMES_UnregisterAppInterface @"UnregisterAppInterface"
-#define NAMES_Unsubscribe @"Unsubscribe"
-#define NAMES_UnsubscribeButton @"UnsubscribeButton"
-#define NAMES_UnsubscribeVehicleData @"UnsubscribeVehicleData"
-#define NAMES_updateMode @"updateMode"
-#define NAMES_UpdateTurnList @"UpdateTurnList"
-#define NAMES_upDownAvailable @"upDownAvailable"
-#define NAMES_url @"url"
-#define NAMES_URL @"URL"
-#define NAMES_userDisallowed @"userDisallowed"
-#define NAMES_utcDay @"utcDay"
-#define NAMES_utcHours @"utcHours"
-#define NAMES_utcMinutes @"utcMinutes"
-#define NAMES_utcMonth @"utcMonth"
-#define NAMES_utcSeconds @"utcSeconds"
-#define NAMES_utcYear @"utcYear"
-#define NAMES_value @"value"
-#define NAMES_vdop @"vdop"
-#define NAMES_vehicleType @"vehicleType"
-#define NAMES_vin @"vin"
-#define NAMES_voiceRecOn @"voiceRecOn"
-#define NAMES_vrCapabilities @"vrCapabilities"
-#define NAMES_vrCommands @"vrCommands"
-#define NAMES_vrHelp @"vrHelp"
-#define NAMES_vrHelpTitle @"vrHelpTitle"
-#define NAMES_vrSynonyms @"vrSynonyms"
-#define NAMES_width @"width"
-#define NAMES_wiperStatus @"wiperStatus"
-#define NAMES_x @"x"
-#define NAMES_y @"y"
+typedef NSString* SDLName NS_STRING_ENUM;
+
+extern SDLName const SDLNameAccelerationPedalPosition;
+extern SDLName const SDLNameActual;
+extern SDLName const SDLNameAddCommand;
+extern SDLName const SDLNameAddressLines;
+extern SDLName const SDLNameAddSubMenu;
+extern SDLName const SDLNameAirbagStatus;
+extern SDLName const SDLNameAlert;
+extern SDLName const SDLNameAlertManeuver;
+extern SDLName const SDLNameAlertText1;
+extern SDLName const SDLNameAlertText2;
+extern SDLName const SDLNameAlertText3;
+extern SDLName const SDLNameAlignment;
+extern SDLName const SDLNameAllowed;
+extern SDLName const SDLNameAltitude;
+extern SDLName const SDLNameAmbientLightSensorStatus;
+extern SDLName const SDLNameAmbientLightStatus;
+extern SDLName const SDLNameAppBundleId;
+extern SDLName const SDLNameAppHMIType;
+extern SDLName const SDLNameAppId;
+extern SDLName const SDLNameAppInfo;
+extern SDLName const SDLNameAppName;
+extern SDLName const SDLNameAppDisplayName;
+extern SDLName const SDLNameAppVersion;
+extern SDLName const SDLNameAudioPassThruCapabilities;
+extern SDLName const SDLNameAudioPassThruDisplayText1;
+extern SDLName const SDLNameAudioPassThruDisplayText2;
+extern SDLName const SDLNameAudioStreamingState;
+extern SDLName const SDLNameAudioType;
+extern SDLName const SDLNameAutoCompleteText;
+extern SDLName const SDLNameAuxECallNotificationStatus;
+extern SDLName const SDLNameBatteryLevelStatus;
+extern SDLName const SDLNameBeltStatus;
+extern SDLName const SDLNameBitsPerSample;
+extern SDLName const SDLNameBodyInformation;
+extern SDLName const SDLNameBluetoothIconOn;
+extern SDLName const SDLNameBulkData;
+extern SDLName const SDLNameButtonCapabilities;
+extern SDLName const SDLNameButtonEventMode;
+extern SDLName const SDLNameButtonName;
+extern SDLName const SDLNameButtonPressMode;
+extern SDLName const SDLNameCoordinate;
+extern SDLName const SDLNameCallActive;
+extern SDLName const SDLNameCarModeStatus;
+extern SDLName const SDLNameCarrier;
+extern SDLName const SDLNameChangeRegistration;
+extern SDLName const SDLNameCharacterSet;
+extern SDLName const SDLNameChoiceId;
+extern SDLName const SDLNameChoiceSet;
+extern SDLName const SDLNameClusterModes;
+extern SDLName const SDLNameClusterModeStatus;
+extern SDLName const SDLNameCommandIcon;
+extern SDLName const SDLNameCommandId;
+extern SDLName const SDLNameCompassDirection;
+extern SDLName const SDLNameCorrelationId;
+extern SDLName const SDLNameCreateInteractionChoiceSet;
+extern SDLName const SDLNameCustomButtonId;
+extern SDLName const SDLNameCustomPresets;
+extern SDLName const SDLNameData;
+extern SDLName const SDLNameDataResult;
+extern SDLName const SDLNameDataType;
+extern SDLName const SDLNameDeleteCommand;
+extern SDLName const SDLNameDeleteFile;
+extern SDLName const SDLNameDeleteInteractionChoiceSet;
+extern SDLName const SDLNameDeleteSubMenu;
+extern SDLName const SDLNameDeviceInfo;
+extern SDLName const SDLNameDeviceStatus;
+extern SDLName const SDLNameDiagnosticMessage;
+extern SDLName const SDLNameDIDLocation;
+extern SDLName const SDLNameDIDResult;
+extern SDLName const SDLNameDimension;
+extern SDLName const SDLNameDisplayCapabilities;
+extern SDLName const SDLNameDisplayLayout;
+extern SDLName const SDLNameDisplayType;
+extern SDLName const SDLNameDistanceToEmpty;
+extern SDLName const SDLNameDistanceToManeuver;
+extern SDLName const SDLNameDistanceToManeuverScale;
+extern SDLName const SDLNameDoublePressAvailable;
+extern SDLName const SDLNameDriverAirbagDeployed;
+extern SDLName const SDLNameDriverBeltDeployed;
+extern SDLName const SDLNameDriverBraking;
+extern SDLName const SDLNameDriverBuckleBelted;
+extern SDLName const SDLNameDriverCurtainAirbagDeployed;
+extern SDLName const SDLNameDriverDoorAjar;
+extern SDLName const SDLNameDriverKneeAirbagDeployed;
+extern SDLName const SDLNameDriverSideAirbagDeployed;
+extern SDLName const SDLNameDTC;
+extern SDLName const SDLNameDTCMask;
+extern SDLName const SDLNameDuration;
+extern SDLName const SDLNameE911Override;
+extern SDLName const SDLNameECallConfirmationStatus;
+extern SDLName const SDLNameECallEventActive;
+extern SDLName const SDLNameECallInfo;
+extern SDLName const SDLNameECallNotificationStatus;
+extern SDLName const SDLNameECUHeader;
+extern SDLName const SDLNameECUName;
+extern SDLName const SDLNameEmergencyEvent;
+extern SDLName const SDLNameEmergencyEventType;
+extern SDLName const SDLNameEncodedSyncPData;
+extern SDLName const SDLNameEndAudioPassThru;
+extern SDLName const SDLNameEndTime;
+extern SDLName const SDLNameEngineTorque;
+extern SDLName const SDLNameETA;
+extern SDLName const SDLNameEvent;
+extern SDLName const SDLNameExternalTemperature;
+extern SDLName const SDLNameFilename;
+extern SDLName const SDLNameFilenames;
+extern SDLName const SDLNameFileType;
+extern SDLName const SDLNameFirmwareRevision;
+extern SDLName const SDLNameFuelCutoffStatus;
+extern SDLName const SDLNameFuelLevel;
+extern SDLName const SDLNameFuelLevelState;
+extern SDLName const SDLNameFuelMaintenanceMode;
+extern SDLName const SDLNameGenericResponse;
+extern SDLName const SDLNameGetDTCs;
+extern SDLName const SDLNameGetVehicleData;
+extern SDLName const SDLNameGPS;
+extern SDLName const SDLNameGraphic;
+extern SDLName const SDLNameGraphicSupported;
+extern SDLName const SDLNameHardware;
+extern SDLName const SDLNameHashId;
+extern SDLName const SDLNameHDOP;
+extern SDLName const SDLNameHeading;
+extern SDLName const SDLNameHeadLampStatus;
+extern SDLName const SDLNameHelpPrompt;
+extern SDLName const SDLNameHighBeamsOn;
+extern SDLName const SDLNameHMIDisplayLanguage;
+extern SDLName const SDLNameHMIDisplayLanguageDesired;
+extern SDLName const SDLNameHMILevel;
+extern SDLName const SDLNameHMIPermissions;
+extern SDLName const SDLNameHMICapabilities;
+extern SDLName const SDLNameHMIZoneCapabilities;
+extern SDLName const SDLNameHours;
+extern SDLName const SDLNameId;
+extern SDLName const SDLNameIgnitionStableStatus;
+extern SDLName const SDLNameIgnitionStatus;
+extern SDLName const SDLNameImage;
+extern SDLName const SDLNameImageFields;
+extern SDLName const SDLNameImageResolution;
+extern SDLName const SDLNameImageSupported;
+extern SDLName const SDLNameImageType;
+extern SDLName const SDLNameImageTypeSupported;
+extern SDLName const SDLNameInfo;
+extern SDLName const SDLNameInitialPrompt;
+extern SDLName const SDLNameInitialText;
+extern SDLName const SDLNameInnerLeftRear;
+extern SDLName const SDLNameInnerRightRear;
+extern SDLName const SDLNameInstantFuelConsumption;
+extern SDLName const SDLNameInteractionChoiceSetId;
+extern SDLName const SDLNameInteractionChoiceSetIdList;
+extern SDLName const SDLNameInteractionLayout;
+extern SDLName const SDLNameInteractionMode;
+extern SDLName const SDLNameIsHighlighted;
+extern SDLName const SDLNameIsMediaApplication;
+extern SDLName const SDLNameKeyboardLayout;
+extern SDLName const SDLNameKeyboardProperties;
+extern SDLName const SDLNameKeypressMode;
+extern SDLName const SDLNameLanguage;
+extern SDLName const SDLNameLanguageDesired;
+extern SDLName const SDLNameLatitudeDegrees;
+extern SDLName const SDLNameLeftFront;
+extern SDLName const SDLNameLeftRear;
+extern SDLName const SDLNameLeftRearInflatableBelted;
+extern SDLName const SDLNameLeftRow2BuckleBelted;
+extern SDLName const SDLNameLeftRow3BuckleBelted;
+extern SDLName const SDLNameLength;
+extern SDLName const SDLNameLimitedCharacterList;
+extern SDLName const SDLNameListFiles;
+extern SDLName const SDLNameLocationDescription;
+extern SDLName const SDLNameLocationImage;
+extern SDLName const SDLNameLocationName;
+extern SDLName const SDLNameLongitudeDegrees;
+extern SDLName const SDLNameLongPress;
+extern SDLName const SDLNameLongPressAvailable;
+extern SDLName const SDLNameLowBeamsOn;
+extern SDLName const SDLNameMainField1;
+extern SDLName const SDLNameMainField2;
+extern SDLName const SDLNameMainField3;
+extern SDLName const SDLNameMainField4;
+extern SDLName const SDLNameMajorVersion;
+extern SDLName const SDLNameMake;
+extern SDLName const SDLNameManeuverComplete;
+extern SDLName const SDLNameManualTextEntry;
+extern SDLName const SDLNameMaxDuration;
+extern SDLName const SDLNameMaximumChangeVelocity;
+extern SDLName const SDLNameMaxNumberRFCOMMPorts;
+extern SDLName const SDLNameMediaClock;
+extern SDLName const SDLNameMediaClockFormats;
+extern SDLName const SDLNameMediaTrack;
+extern SDLName const SDLNameMenuIcon;
+extern SDLName const SDLNameMenuId;
+extern SDLName const SDLNameMenuName;
+extern SDLName const SDLNameMenuParams;
+extern SDLName const SDLNameMenuTitle;
+extern SDLName const SDLNameMessageData;
+extern SDLName const SDLNameMessageDataResult;
+extern SDLName const SDLNameMessageLength;
+extern SDLName const SDLNameMiddleRow1BeltDeployed;
+extern SDLName const SDLNameMiddleRow1BuckleBelted;
+extern SDLName const SDLNameMiddleRow2BuckleBelted;
+extern SDLName const SDLNameMiddleRow3BuckleBelted;
+extern SDLName const SDLNameMinorVersion;
+extern SDLName const SDLNameMinutes;
+extern SDLName const SDLNameModel;
+extern SDLName const SDLNameModelYear;
+extern SDLName const SDLNameMonoAudioOutputMuted;
+extern SDLName const SDLNameMultipleEvents;
+extern SDLName const SDLNameMultiTouchAvailable;
+extern SDLName const SDLNameMuteAudio;
+extern SDLName const SDLNameMyKey;
+extern SDLName const SDLNameName;
+extern SDLName const SDLNameNavigation;
+extern SDLName const SDLNameNavigationText;
+extern SDLName const SDLNameNavigationText1;
+extern SDLName const SDLNameNavigationText2;
+extern SDLName const SDLNameNextTurnIcon;
+extern SDLName const SDLNameNGNMediaScreenAppName;
+extern SDLName const SDLNameNotification;
+extern SDLName const SDLNameNumber;
+extern SDLName const SDLNameNumberCustomPresetsAvailable;
+extern SDLName const SDLNameNumberTicks;
+extern SDLName const SDLNameOdometer;
+extern SDLName const SDLNameOffset;
+extern SDLName const SDLNameOnAppInterfaceUnregistered;
+extern SDLName const SDLNameOnAudioPassThru;
+extern SDLName const SDLNameOnButtonEvent;
+extern SDLName const SDLNameOnButtonPress;
+extern SDLName const SDLNameOnCommand;
+extern SDLName const SDLNameOnDriverDistraction;
+extern SDLName const SDLNameOnEncodedSyncPData;
+extern SDLName const SDLNameOnHashChange;
+extern SDLName const SDLNameOnHMIStatus;
+extern SDLName const SDLNameOnKeyboardInput;
+extern SDLName const SDLNameOnLanguageChange;
+extern SDLName const SDLNameOnPermissionsChange;
+extern SDLName const SDLNameOnScreenPresetsAvailable;
+extern SDLName const SDLNameOnSyncPData;
+extern SDLName const SDLNameOnSystemRequest;
+extern SDLName const SDLNameOnTBTClientState;
+extern SDLName const SDLNameOnTouchEvent;
+extern SDLName const SDLNameOnVehicleData;
+extern SDLName const SDLNameOperationName;
+extern SDLName const SDLNameOS;
+extern SDLName const SDLNameOSVersion;
+extern SDLName const SDLNameParameterPermissions;
+extern SDLName const SDLNameParameters;
+extern SDLName const SDLNameParentId;
+extern SDLName const SDLNameParkBrakeActive;
+extern SDLName const SDLNamePassengerAirbagDeployed;
+extern SDLName const SDLNamePassengerBeltDeployed;
+extern SDLName const SDLNamePassengerBuckleBelted;
+extern SDLName const SDLNamePassengerChildDetected;
+extern SDLName const SDLNamePassengerCurtainAirbagDeployed;
+extern SDLName const SDLNamePassengerDoorAjar;
+extern SDLName const SDLNamePassengerKneeAirbagDeployed;
+extern SDLName const SDLNamePassengerSideAirbagDeployed;
+extern SDLName const SDLNamePDOP;
+extern SDLName const SDLNamePerformAudioPassThru;
+extern SDLName const SDLNamePerformInteraction;
+extern SDLName const SDLNamePermissionItem;
+extern SDLName const SDLNamePersistentFile;
+extern SDLName const SDLNamePhoneCall;
+extern SDLName const SDLNamePhoneNumber;
+extern SDLName const SDLNamePhoneRoaming;
+extern SDLName const SDLNamePlayTone;
+extern SDLName const SDLNamePosition;
+extern SDLName const SDLNamePowerModeActive;
+extern SDLName const SDLNamePowerModeQualificationStatus;
+extern SDLName const SDLNamePowerModeStatus;
+extern SDLName const SDLNamePrerecordedSpeech;
+extern SDLName const SDLNamePresetBankCapabilities;
+extern SDLName const SDLNamePressAvailable;
+extern SDLName const SDLNamePressure;
+extern SDLName const SDLNamePressureTelltale;
+extern SDLName const SDLNamePrimaryAudioSource;
+extern SDLName const SDLNamePRNDL;
+extern SDLName const SDLNameProgressIndicator;
+extern SDLName const SDLNameProperties;
+extern SDLName const SDLNamePutFile;
+extern SDLName const SDLNameReadDID;
+extern SDLName const SDLNameRearLeftDoorAjar;
+extern SDLName const SDLNameRearRightDoorAjar;
+extern SDLName const SDLNameReason;
+extern SDLName const SDLNameRegisterAppInterface;
+extern SDLName const SDLNameRequest;
+extern SDLName const SDLNameRequestType;
+extern SDLName const SDLNameReserved;
+extern SDLName const SDLNameResetGlobalProperties;
+extern SDLName const SDLNameResolution;
+extern SDLName const SDLNameResolutionHeight;
+extern SDLName const SDLNameResolutionWidth;
+extern SDLName const SDLNameResponse;
+extern SDLName const SDLNameResult;
+extern SDLName const SDLNameResultCode;
+extern SDLName const SDLNameRightFront;
+extern SDLName const SDLNameRightRear;
+extern SDLName const SDLNameRightRearInflatableBelted;
+extern SDLName const SDLNameRightRow2BuckleBelted;
+extern SDLName const SDLNameRightRow3BuckleBelted;
+extern SDLName const SDLNameRolloverEvent;
+extern SDLName const SDLNameRows;
+extern SDLName const SDLNameRPCName;
+extern SDLName const SDLNameRPM;
+extern SDLName const SDLNameSamplingRate;
+extern SDLName const SDLNameSatellites;
+extern SDLName const SDLNameScreenParams;
+extern SDLName const SDLNameScrollableMessage;
+extern SDLName const SDLNameScrollableMessageBody;
+extern SDLName const SDLNameSDLVersion;
+extern SDLName const SDLNameSecondaryGraphic;
+extern SDLName const SDLNameSecondaryImage;
+extern SDLName const SDLNameSecondaryText;
+extern SDLName const SDLNameSeconds;
+extern SDLName const SDLNameSendLocation;
+extern SDLName const SDLNameSetAppIcon;
+extern SDLName const SDLNameSetDisplayLayout;
+extern SDLName const SDLNameSetGlobalProperties;
+extern SDLName const SDLNameSetMediaClockTimer;
+extern SDLName const SDLNameShortPress;
+extern SDLName const SDLNameShortPressAvailable;
+extern SDLName const SDLNameShow;
+extern SDLName const SDLNameShowConstantTBT;
+extern SDLName const SDLNameSignalLevelStatus;
+extern SDLName const SDLNameSlider;
+extern SDLName const SDLNameSliderFooter;
+extern SDLName const SDLNameSliderHeader;
+extern SDLName const SDLNameSliderPosition;
+extern SDLName const SDLNameSoftButtonCapabilities;
+extern SDLName const SDLNameSoftButtonId;
+extern SDLName const SDLNameSoftButtons;
+extern SDLName const SDLNameSpaceAvailable;
+extern SDLName const SDLNameSpeak;
+extern SDLName const SDLNameSpeechCapabilities;
+extern SDLName const SDLNameSpeed;
+extern SDLName const SDLNameStartTime;
+extern SDLName const SDLNameState;
+extern SDLName const SDLNameStateOfCharge;
+extern SDLName const SDLNameStatus;
+extern SDLName const SDLNameStatusBar;
+extern SDLName const SDLNameSteeringWheelAngle;
+extern SDLName const SDLNameStereoAudioOutputMuted;
+extern SDLName const SDLNameSubscribe;
+extern SDLName const SDLNameSubscribeButton;
+extern SDLName const SDLNameSubscribeVehicleData;
+extern SDLName const SDLNameSuccess;
+extern SDLName const SDLNameSupportedDiagnosticModes;
+extern SDLName const SDLNameSyncFileName;
+extern SDLName const SDLNameSyncMessageVersion;
+extern SDLName const SDLNameSyncPData;
+extern SDLName const SDLNameSystemAction;
+extern SDLName const SDLNameSystemContext;
+extern SDLName const SDLNameSystemFile;
+extern SDLName const SDLNameSystemRequest;
+extern SDLName const SDLNameSystemSoftwareVersion;
+extern SDLName const SDLNameDialNumber;
+extern SDLName const SDLNameTargetId;
+extern SDLName const SDLNameTemplatesAvailable;
+extern SDLName const SDLNameTertiaryText;
+extern SDLName const SDLNameText;
+extern SDLName const SDLNameTextFields;
+extern SDLName const SDLNameTextMessageAvailable;
+extern SDLName const SDLNameTimeout;
+extern SDLName const SDLNameTimeoutCapitalized;
+extern SDLName const SDLNameTimeoutPrompt;
+extern SDLName const SDLNameTimeToDestination;
+extern SDLName const SDLNameTirePressure;
+extern SDLName const SDLNameTotalDistance;
+extern SDLName const SDLNameTouchEventAvailable;
+extern SDLName const SDLNameTriggerSource;
+extern SDLName const SDLNameTrim;
+extern SDLName const SDLNameTryAgainTime;
+extern SDLName const SDLNameTimestamp;
+extern SDLName const SDLNameTTSChunks;
+extern SDLName const SDLNameTTSName;
+extern SDLName const SDLNameTurnIcon;
+extern SDLName const SDLNameTurnList;
+extern SDLName const SDLNameType;
+extern SDLName const SDLNameUnregisterAppInterface;
+extern SDLName const SDLNameUnsubscribe;
+extern SDLName const SDLNameUnsubscribeButton;
+extern SDLName const SDLNameUnsubscribeVehicleData;
+extern SDLName const SDLNameUpdateMode;
+extern SDLName const SDLNameUpdateTurnList;
+extern SDLName const SDLNameUpDownAvailable;
+extern SDLName const SDLNameURL;
+extern SDLName const SDLNameURLUppercase;
+extern SDLName const SDLNameUserDisallowed;
+extern SDLName const SDLNameUTCDay;
+extern SDLName const SDLNameUTCHours;
+extern SDLName const SDLNameUTCMinutes;
+extern SDLName const SDLNameUTCMonth;
+extern SDLName const SDLNameUTCSeconds;
+extern SDLName const SDLNameUTCYear;
+extern SDLName const SDLNameValue;
+extern SDLName const SDLNameVDOP;
+extern SDLName const SDLNameVehicleType;
+extern SDLName const SDLNameVIN;
+extern SDLName const SDLNameVoiceRecognitionOn;
+extern SDLName const SDLNameVRCapabilities;
+extern SDLName const SDLNameVRCommands;
+extern SDLName const SDLNameVRHelp;
+extern SDLName const SDLNameVRHelpTitle;
+extern SDLName const SDLNameVRSynonyms;
+extern SDLName const SDLNameWidth;
+extern SDLName const SDLNameWiperStatus;
+extern SDLName const SDLNameX;
+extern SDLName const SDLNameY;
diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m
new file mode 100644
index 000000000..a3314d1bd
--- /dev/null
+++ b/SmartDeviceLink/SDLNames.m
@@ -0,0 +1,411 @@
+//  SDLNames.h
+//
+
+#import "SDLNames.h"
+
+SDLName const SDLNameAccelerationPedalPosition = @"accPedalPosition";
+SDLName const SDLNameActual = @"actual";
+SDLName const SDLNameAddCommand = @"AddCommand";
+SDLName const SDLNameAddressLines = @"addressLines";
+SDLName const SDLNameAddSubMenu = @"AddSubMenu";
+SDLName const SDLNameAirbagStatus = @"airbagStatus";
+SDLName const SDLNameAlert = @"Alert";
+SDLName const SDLNameAlertManeuver = @"AlertManeuver";
+SDLName const SDLNameAlertText1 = @"alertText1";
+SDLName const SDLNameAlertText2 = @"alertText2";
+SDLName const SDLNameAlertText3 = @"alertText3";
+SDLName const SDLNameAlignment = @"alignment";
+SDLName const SDLNameAllowed = @"allowed";
+SDLName const SDLNameAltitude = @"altitude";
+SDLName const SDLNameAmbientLightSensorStatus = @"ambientLightSensorStatus";
+SDLName const SDLNameAmbientLightStatus = @"ambientLightStatus";
+SDLName const SDLNameAppBundleId = @"appBundleID";
+SDLName const SDLNameAppHMIType = @"appHMIType";
+SDLName const SDLNameAppId = @"appID";
+SDLName const SDLNameAppInfo = @"appInfo";
+SDLName const SDLNameAppName = @"appName";
+SDLName const SDLNameAppDisplayName = @"appDisplayName";
+SDLName const SDLNameAppVersion = @"appVersion";
+SDLName const SDLNameAudioPassThruCapabilities = @"audioPassThruCapabilities";
+SDLName const SDLNameAudioPassThruDisplayText1 = @"audioPassThruDisplayText1";
+SDLName const SDLNameAudioPassThruDisplayText2 = @"audioPassThruDisplayText2";
+SDLName const SDLNameAudioStreamingState = @"audioStreamingState";
+SDLName const SDLNameAudioType = @"audioType";
+SDLName const SDLNameAutoCompleteText = @"autoCompleteText";
+SDLName const SDLNameAuxECallNotificationStatus = @"auxECallNotificationStatus";
+SDLName const SDLNameBatteryLevelStatus = @"battLevelStatus";
+SDLName const SDLNameBeltStatus = @"beltStatus";
+SDLName const SDLNameBitsPerSample = @"bitsPerSample";
+SDLName const SDLNameBodyInformation = @"bodyInformation";
+SDLName const SDLNameBluetoothIconOn = @"btIconOn";
+SDLName const SDLNameBulkData = @"bulkData";
+SDLName const SDLNameButtonCapabilities = @"buttonCapabilities";
+SDLName const SDLNameButtonEventMode = @"buttonEventMode";
+SDLName const SDLNameButtonName = @"buttonName";
+SDLName const SDLNameButtonPressMode = @"buttonPressMode";
+SDLName const SDLNameCoordinate = @"c";
+SDLName const SDLNameCallActive = @"callActive";
+SDLName const SDLNameCarModeStatus = @"carModeStatus";
+SDLName const SDLNameCarrier = @"carrier";
+SDLName const SDLNameChangeRegistration = @"ChangeRegistration";
+SDLName const SDLNameCharacterSet = @"characterSet";
+SDLName const SDLNameChoiceId = @"choiceID";
+SDLName const SDLNameChoiceSet = @"choiceSet";
+SDLName const SDLNameClusterModes = @"clusterModes";
+SDLName const SDLNameClusterModeStatus = @"clusterModeStatus";
+SDLName const SDLNameCommandIcon = @"cmdIcon";
+SDLName const SDLNameCommandId = @"cmdID";
+SDLName const SDLNameCompassDirection = @"compassDirection";
+SDLName const SDLNameCorrelationId = @"correlationID";
+SDLName const SDLNameCreateInteractionChoiceSet = @"CreateInteractionChoiceSet";
+SDLName const SDLNameCustomButtonId = @"customButtonID";
+SDLName const SDLNameCustomPresets = @"customPresets";
+SDLName const SDLNameData = @"data";
+SDLName const SDLNameDataResult = @"dataResult";
+SDLName const SDLNameDataType = @"dataType";
+SDLName const SDLNameDeleteCommand = @"DeleteCommand";
+SDLName const SDLNameDeleteFile = @"DeleteFile";
+SDLName const SDLNameDeleteInteractionChoiceSet = @"DeleteInteractionChoiceSet";
+SDLName const SDLNameDeleteSubMenu = @"DeleteSubMenu";
+SDLName const SDLNameDeviceInfo = @"deviceInfo";
+SDLName const SDLNameDeviceStatus = @"deviceStatus";
+SDLName const SDLNameDiagnosticMessage = @"DiagnosticMessage";
+SDLName const SDLNameDIDLocation = @"didLocation";
+SDLName const SDLNameDIDResult = @"didResult";
+SDLName const SDLNameDimension = @"dimension";
+SDLName const SDLNameDisplayCapabilities = @"displayCapabilities";
+SDLName const SDLNameDisplayLayout = @"displayLayout";
+SDLName const SDLNameDisplayType = @"displayType";
+SDLName const SDLNameDistanceToEmpty = @"distanceToEmpty";
+SDLName const SDLNameDistanceToManeuver = @"distanceToManeuver";
+SDLName const SDLNameDistanceToManeuverScale = @"distanceToManeuverScale";
+SDLName const SDLNameDoublePressAvailable = @"doublePressAvailable";
+SDLName const SDLNameDriverAirbagDeployed = @"driverAirbagDeployed";
+SDLName const SDLNameDriverBeltDeployed = @"driverBeltDeployed";
+SDLName const SDLNameDriverBraking = @"driverBraking";
+SDLName const SDLNameDriverBuckleBelted = @"driverBuckleBelted";
+SDLName const SDLNameDriverCurtainAirbagDeployed = @"driverCurtainAirbagDeployed";
+SDLName const SDLNameDriverDoorAjar = @"driverDoorAjar";
+SDLName const SDLNameDriverKneeAirbagDeployed = @"driverKneeAirbagDeployed";
+SDLName const SDLNameDriverSideAirbagDeployed = @"driverSideAirbagDeployed";
+SDLName const SDLNameDTC = @"dtc";
+SDLName const SDLNameDTCMask = @"dtcMask";
+SDLName const SDLNameDuration = @"duration";
+SDLName const SDLNameE911Override = @"e911Override";
+SDLName const SDLNameECallConfirmationStatus = @"eCallConfirmationStatus";
+SDLName const SDLNameECallEventActive = @"eCallEventActive";
+SDLName const SDLNameECallInfo = @"eCallInfo";
+SDLName const SDLNameECallNotificationStatus = @"eCallNotificationStatus";
+SDLName const SDLNameECUHeader = @"ecuHeader";
+SDLName const SDLNameECUName = @"ecuName";
+SDLName const SDLNameEmergencyEvent = @"emergencyEvent";
+SDLName const SDLNameEmergencyEventType = @"emergencyEventType";
+SDLName const SDLNameEncodedSyncPData = @"EncodedSyncPData";
+SDLName const SDLNameEndAudioPassThru = @"EndAudioPassThru";
+SDLName const SDLNameEndTime = @"endTime";
+SDLName const SDLNameEngineTorque = @"engineTorque";
+SDLName const SDLNameETA = @"eta";
+SDLName const SDLNameEvent = @"event";
+SDLName const SDLNameExternalTemperature = @"externalTemperature";
+SDLName const SDLNameFilename = @"fileName";
+SDLName const SDLNameFilenames = @"filenames";
+SDLName const SDLNameFileType = @"fileType";
+SDLName const SDLNameFirmwareRevision = @"firmwareRev";
+SDLName const SDLNameFuelCutoffStatus = @"fuelCutoffStatus";
+SDLName const SDLNameFuelLevel = @"fuelLevel";
+SDLName const SDLNameFuelLevelState = @"fuelLevel_State";
+SDLName const SDLNameFuelMaintenanceMode = @"fuelMaintenanceMode";
+SDLName const SDLNameGenericResponse = @"GenericResponse";
+SDLName const SDLNameGetDTCs = @"GetDTCs";
+SDLName const SDLNameGetVehicleData = @"GetVehicleData";
+SDLName const SDLNameGPS = @"gps";
+SDLName const SDLNameGraphic = @"graphic";
+SDLName const SDLNameGraphicSupported = @"graphicSupported";
+SDLName const SDLNameHardware = @"hardware";
+SDLName const SDLNameHashId = @"hashID";
+SDLName const SDLNameHDOP = @"hdop";
+SDLName const SDLNameHeading = @"heading";
+SDLName const SDLNameHeadLampStatus = @"headLampStatus";
+SDLName const SDLNameHelpPrompt = @"helpPrompt";
+SDLName const SDLNameHighBeamsOn = @"highBeamsOn";
+SDLName const SDLNameHMIDisplayLanguage = @"hmiDisplayLanguage";
+SDLName const SDLNameHMIDisplayLanguageDesired = @"hmiDisplayLanguageDesired";
+SDLName const SDLNameHMILevel = @"hmiLevel";
+SDLName const SDLNameHMIPermissions = @"hmiPermissions";
+SDLName const SDLNameHMICapabilities = @"hmiCapabilities";
+SDLName const SDLNameHMIZoneCapabilities = @"hmiZoneCapabilities";
+SDLName const SDLNameHours = @"hours";
+SDLName const SDLNameId = @"id";
+SDLName const SDLNameIgnitionStableStatus = @"ignitionStableStatus";
+SDLName const SDLNameIgnitionStatus = @"ignitionStatus";
+SDLName const SDLNameImage = @"image";
+SDLName const SDLNameImageFields = @"imageFields";
+SDLName const SDLNameImageResolution = @"imageResolution";
+SDLName const SDLNameImageSupported = @"imageSupported";
+SDLName const SDLNameImageType = @"imageType";
+SDLName const SDLNameImageTypeSupported = @"imageTypeSupported";
+SDLName const SDLNameInfo = @"info";
+SDLName const SDLNameInitialPrompt = @"initialPrompt";
+SDLName const SDLNameInitialText = @"initialText";
+SDLName const SDLNameInnerLeftRear = @"innerLeftRear";
+SDLName const SDLNameInnerRightRear = @"innerRightRear";
+SDLName const SDLNameInstantFuelConsumption = @"instantFuelConsumption";
+SDLName const SDLNameInteractionChoiceSetId = @"interactionChoiceSetID";
+SDLName const SDLNameInteractionChoiceSetIdList = @"interactionChoiceSetIDList";
+SDLName const SDLNameInteractionLayout = @"interactionLayout";
+SDLName const SDLNameInteractionMode = @"interactionMode";
+SDLName const SDLNameIsHighlighted = @"isHighlighted";
+SDLName const SDLNameIsMediaApplication = @"isMediaApplication";
+SDLName const SDLNameKeyboardLayout = @"keyboardLayout";
+SDLName const SDLNameKeyboardProperties = @"keyboardProperties";
+SDLName const SDLNameKeypressMode = @"keypressMode";
+SDLName const SDLNameLanguage = @"language";
+SDLName const SDLNameLanguageDesired = @"languageDesired";
+SDLName const SDLNameLatitudeDegrees = @"latitudeDegrees";
+SDLName const SDLNameLeftFront = @"leftFront";
+SDLName const SDLNameLeftRear = @"leftRear";
+SDLName const SDLNameLeftRearInflatableBelted = @"leftRearInflatableBelted";
+SDLName const SDLNameLeftRow2BuckleBelted = @"leftRow2BuckleBelted";
+SDLName const SDLNameLeftRow3BuckleBelted = @"leftRow3BuckleBelted";
+SDLName const SDLNameLength = @"length";
+SDLName const SDLNameLimitedCharacterList = @"limitedCharacterList";
+SDLName const SDLNameListFiles = @"ListFiles";
+SDLName const SDLNameLocationDescription = @"locationDescription";
+SDLName const SDLNameLocationImage = @"locationImage";
+SDLName const SDLNameLocationName = @"locationName";
+SDLName const SDLNameLongitudeDegrees = @"longitudeDegrees";
+SDLName const SDLNameLongPress = @"longPress";
+SDLName const SDLNameLongPressAvailable = @"longPressAvailable";
+SDLName const SDLNameLowBeamsOn = @"lowBeamsOn";
+SDLName const SDLNameMainField1 = @"mainField1";
+SDLName const SDLNameMainField2 = @"mainField2";
+SDLName const SDLNameMainField3 = @"mainField3";
+SDLName const SDLNameMainField4 = @"mainField4";
+SDLName const SDLNameMajorVersion = @"majorVersion";
+SDLName const SDLNameMake = @"make";
+SDLName const SDLNameManeuverComplete = @"maneuverComplete";
+SDLName const SDLNameManualTextEntry = @"manualTextEntry";
+SDLName const SDLNameMaxDuration = @"maxDuration";
+SDLName const SDLNameMaximumChangeVelocity = @"maximumChangeVelocity";
+SDLName const SDLNameMaxNumberRFCOMMPorts = @"maxNumberRFCOMMPorts";
+SDLName const SDLNameMediaClock = @"mediaClock";
+SDLName const SDLNameMediaClockFormats = @"mediaClockFormats";
+SDLName const SDLNameMediaTrack = @"mediaTrack";
+SDLName const SDLNameMenuIcon = @"menuIcon";
+SDLName const SDLNameMenuId = @"menuID";
+SDLName const SDLNameMenuName = @"menuName";
+SDLName const SDLNameMenuParams = @"menuParams";
+SDLName const SDLNameMenuTitle = @"menuTitle";
+SDLName const SDLNameMessageData = @"messageData";
+SDLName const SDLNameMessageDataResult = @"messageDataResult";
+SDLName const SDLNameMessageLength = @"messageLength";
+SDLName const SDLNameMiddleRow1BeltDeployed = @"middleRow1BeltDeployed";
+SDLName const SDLNameMiddleRow1BuckleBelted = @"middleRow1BuckleBelted";
+SDLName const SDLNameMiddleRow2BuckleBelted = @"middleRow2BuckleBelted";
+SDLName const SDLNameMiddleRow3BuckleBelted = @"middleRow3BuckleBelted";
+SDLName const SDLNameMinorVersion = @"minorVersion";
+SDLName const SDLNameMinutes = @"minutes";
+SDLName const SDLNameModel = @"model";
+SDLName const SDLNameModelYear = @"modelYear";
+SDLName const SDLNameMonoAudioOutputMuted = @"monoAudioOutputMuted";
+SDLName const SDLNameMultipleEvents = @"multipleEvents";
+SDLName const SDLNameMultiTouchAvailable = @"multiTouchAvailable";
+SDLName const SDLNameMuteAudio = @"muteAudio";
+SDLName const SDLNameMyKey = @"myKey";
+SDLName const SDLNameName = @"name";
+SDLName const SDLNameNavigation = @"navigation";
+SDLName const SDLNameNavigationText = @"navigationText";
+SDLName const SDLNameNavigationText1 = @"navigationText1";
+SDLName const SDLNameNavigationText2 = @"navigationText2";
+SDLName const SDLNameNextTurnIcon = @"nextTurnIcon";
+SDLName const SDLNameNGNMediaScreenAppName = @"ngnMediaScreenAppName";
+SDLName const SDLNameNotification = @"notification";
+SDLName const SDLNameNumber = @"number";
+SDLName const SDLNameNumberCustomPresetsAvailable = @"numCustomPresetsAvailable";
+SDLName const SDLNameNumberTicks = @"numTicks";
+SDLName const SDLNameOdometer = @"odometer";
+SDLName const SDLNameOffset = @"offset";
+SDLName const SDLNameOnAppInterfaceUnregistered = @"OnAppInterfaceUnregistered";
+SDLName const SDLNameOnAudioPassThru = @"OnAudioPassThru";
+SDLName const SDLNameOnButtonEvent = @"OnButtonEvent";
+SDLName const SDLNameOnButtonPress = @"OnButtonPress";
+SDLName const SDLNameOnCommand = @"OnCommand";
+SDLName const SDLNameOnDriverDistraction = @"OnDriverDistraction";
+SDLName const SDLNameOnEncodedSyncPData = @"OnEncodedSyncPData";
+SDLName const SDLNameOnHashChange = @"OnHashChange";
+SDLName const SDLNameOnHMIStatus = @"OnHMIStatus";
+SDLName const SDLNameOnKeyboardInput = @"OnKeyboardInput";
+SDLName const SDLNameOnLanguageChange = @"OnLanguageChange";
+SDLName const SDLNameOnPermissionsChange = @"OnPermissionsChange";
+SDLName const SDLNameOnScreenPresetsAvailable = @"onScreenPresetsAvailable";
+SDLName const SDLNameOnSyncPData = @"OnSyncPData";
+SDLName const SDLNameOnSystemRequest = @"OnSystemRequest";
+SDLName const SDLNameOnTBTClientState = @"OnTBTClientState";
+SDLName const SDLNameOnTouchEvent = @"OnTouchEvent";
+SDLName const SDLNameOnVehicleData = @"OnVehicleData";
+SDLName const SDLNameOperationName = @"name";
+SDLName const SDLNameOS = @"os";
+SDLName const SDLNameOSVersion = @"osVersion";
+SDLName const SDLNameParameterPermissions = @"parameterPermissions";
+SDLName const SDLNameParameters = @"parameters";
+SDLName const SDLNameParentId = @"parentID";
+SDLName const SDLNameParkBrakeActive = @"parkBrakeActive";
+SDLName const SDLNamePassengerAirbagDeployed = @"passengerAirbagDeployed";
+SDLName const SDLNamePassengerBeltDeployed = @"passengerBeltDeployed";
+SDLName const SDLNamePassengerBuckleBelted = @"passengerBuckleBelted";
+SDLName const SDLNamePassengerChildDetected = @"passengerChildDetected";
+SDLName const SDLNamePassengerCurtainAirbagDeployed = @"passengerCurtainAirbagDeployed";
+SDLName const SDLNamePassengerDoorAjar = @"passengerDoorAjar";
+SDLName const SDLNamePassengerKneeAirbagDeployed = @"passengerKneeAirbagDeployed";
+SDLName const SDLNamePassengerSideAirbagDeployed = @"passengerSideAirbagDeployed";
+SDLName const SDLNamePDOP = @"pdop";
+SDLName const SDLNamePerformAudioPassThru = @"PerformAudioPassThru";
+SDLName const SDLNamePerformInteraction = @"PerformInteraction";
+SDLName const SDLNamePermissionItem = @"permissionItem";
+SDLName const SDLNamePersistentFile = @"persistentFile";
+SDLName const SDLNamePhoneCall = @"phoneCall";
+SDLName const SDLNamePhoneNumber = @"phoneNumber";
+SDLName const SDLNamePhoneRoaming = @"phoneRoaming";
+SDLName const SDLNamePlayTone = @"playTone";
+SDLName const SDLNamePosition = @"position";
+SDLName const SDLNamePowerModeActive = @"powerModeActive";
+SDLName const SDLNamePowerModeQualificationStatus = @"powerModeQualificationStatus";
+SDLName const SDLNamePowerModeStatus = @"powerModeStatus";
+SDLName const SDLNamePrerecordedSpeech = @"prerecordedSpeech";
+SDLName const SDLNamePresetBankCapabilities = @"presetBankCapabilities";
+SDLName const SDLNamePressAvailable = @"pressAvailable";
+SDLName const SDLNamePressure = @"pressure";
+SDLName const SDLNamePressureTelltale = @"pressureTelltale";
+SDLName const SDLNamePrimaryAudioSource = @"primaryAudioSource";
+SDLName const SDLNamePRNDL = @"prndl";
+SDLName const SDLNameProgressIndicator = @"progressIndicator";
+SDLName const SDLNameProperties = @"properties";
+SDLName const SDLNamePutFile = @"PutFile";
+SDLName const SDLNameReadDID = @"ReadDID";
+SDLName const SDLNameRearLeftDoorAjar = @"rearLeftDoorAjar";
+SDLName const SDLNameRearRightDoorAjar = @"rearRightDoorAjar";
+SDLName const SDLNameReason = @"reason";
+SDLName const SDLNameRegisterAppInterface = @"RegisterAppInterface";
+SDLName const SDLNameRequest = @"request";
+SDLName const SDLNameRequestType = @"requestType";
+SDLName const SDLNameReserved = @"reserved";
+SDLName const SDLNameResetGlobalProperties = @"ResetGlobalProperties";
+SDLName const SDLNameResolution = @"resolution";
+SDLName const SDLNameResolutionHeight = @"resolutionHeight";
+SDLName const SDLNameResolutionWidth = @"resolutionWidth";
+SDLName const SDLNameResponse = @"response";
+SDLName const SDLNameResult = @"result";
+SDLName const SDLNameResultCode = @"resultCode";
+SDLName const SDLNameRightFront = @"rightFront";
+SDLName const SDLNameRightRear = @"rightRear";
+SDLName const SDLNameRightRearInflatableBelted = @"rightRearInflatableBelted";
+SDLName const SDLNameRightRow2BuckleBelted = @"rightRow2BuckleBelted";
+SDLName const SDLNameRightRow3BuckleBelted = @"rightRow3BuckleBelted";
+SDLName const SDLNameRolloverEvent = @"rolloverEvent";
+SDLName const SDLNameRows = @"rows";
+SDLName const SDLNameRPCName = @"rpcName";
+SDLName const SDLNameRPM = @"rpm";
+SDLName const SDLNameSamplingRate = @"samplingRate";
+SDLName const SDLNameSatellites = @"satellites";
+SDLName const SDLNameScreenParams = @"screenParams";
+SDLName const SDLNameScrollableMessage = @"ScrollableMessage";
+SDLName const SDLNameScrollableMessageBody = @"scrollableMessageBody";
+SDLName const SDLNameSDLVersion = @"sdlVersion";
+SDLName const SDLNameSecondaryGraphic = @"secondaryGraphic";
+SDLName const SDLNameSecondaryImage = @"secondaryImage";
+SDLName const SDLNameSecondaryText = @"secondaryText";
+SDLName const SDLNameSeconds = @"seconds";
+SDLName const SDLNameSendLocation = @"SendLocation";
+SDLName const SDLNameSetAppIcon = @"SetAppIcon";
+SDLName const SDLNameSetDisplayLayout = @"SetDisplayLayout";
+SDLName const SDLNameSetGlobalProperties = @"SetGlobalProperties";
+SDLName const SDLNameSetMediaClockTimer = @"SetMediaClockTimer";
+SDLName const SDLNameShortPress = @"shortPress";
+SDLName const SDLNameShortPressAvailable = @"shortPressAvailable";
+SDLName const SDLNameShow = @"Show";
+SDLName const SDLNameShowConstantTBT = @"ShowConstantTBT";
+SDLName const SDLNameSignalLevelStatus = @"signalLevelStatus";
+SDLName const SDLNameSlider = @"Slider";
+SDLName const SDLNameSliderFooter = @"sliderFooter";
+SDLName const SDLNameSliderHeader = @"sliderHeader";
+SDLName const SDLNameSliderPosition = @"sliderPosition";
+SDLName const SDLNameSoftButtonCapabilities = @"softButtonCapabilities";
+SDLName const SDLNameSoftButtonId = @"softButtonID";
+SDLName const SDLNameSoftButtons = @"softButtons";
+SDLName const SDLNameSpaceAvailable = @"spaceAvailable";
+SDLName const SDLNameSpeak = @"Speak";
+SDLName const SDLNameSpeechCapabilities = @"speechCapabilities";
+SDLName const SDLNameSpeed = @"speed";
+SDLName const SDLNameStartTime = @"startTime";
+SDLName const SDLNameState = @"state";
+SDLName const SDLNameStateOfCharge = @"stateOfCharge";
+SDLName const SDLNameStatus = @"status";
+SDLName const SDLNameStatusBar = @"statusBar";
+SDLName const SDLNameSteeringWheelAngle = @"steeringWheelAngle";
+SDLName const SDLNameStereoAudioOutputMuted = @"stereoAudioOutputMuted";
+SDLName const SDLNameSubscribe = @"Subscribe";
+SDLName const SDLNameSubscribeButton = @"SubscribeButton";
+SDLName const SDLNameSubscribeVehicleData = @"SubscribeVehicleData";
+SDLName const SDLNameSuccess = @"success";
+SDLName const SDLNameSupportedDiagnosticModes = @"supportedDiagModes";
+SDLName const SDLNameSyncFileName = @"syncFileName";
+SDLName const SDLNameSyncMessageVersion = @"syncMessageVersion";
+SDLName const SDLNameSyncPData = @"SyncPData";
+SDLName const SDLNameSystemAction = @"systemAction";
+SDLName const SDLNameSystemContext = @"systemContext";
+SDLName const SDLNameSystemFile = @"systemFile";
+SDLName const SDLNameSystemRequest = @"SystemRequest";
+SDLName const SDLNameSystemSoftwareVersion = @"systemSoftwareVersion";
+SDLName const SDLNameDialNumber = @"DialNumber";
+SDLName const SDLNameTargetId = @"targetID";
+SDLName const SDLNameTemplatesAvailable = @"templatesAvailable";
+SDLName const SDLNameTertiaryText = @"tertiaryText";
+SDLName const SDLNameText = @"text";
+SDLName const SDLNameTextFields = @"textFields";
+SDLName const SDLNameTextMessageAvailable = @"textMessageAvailable";
+SDLName const SDLNameTimeout = @"timeout";
+SDLName const SDLNameTimeoutCapitalized = @"Timeout";
+SDLName const SDLNameTimeoutPrompt = @"timeoutPrompt";
+SDLName const SDLNameTimeToDestination = @"timeToDestination";
+SDLName const SDLNameTirePressure = @"tirePressure";
+SDLName const SDLNameTotalDistance = @"totalDistance";
+SDLName const SDLNameTouchEventAvailable = @"touchEventAvailable";
+SDLName const SDLNameTriggerSource = @"triggerSource";
+SDLName const SDLNameTrim = @"trim";
+SDLName const SDLNameTryAgainTime = @"tryAgainTime";
+SDLName const SDLNameTimestamp = @"ts";
+SDLName const SDLNameTTSChunks = @"ttsChunks";
+SDLName const SDLNameTTSName = @"ttsName";
+SDLName const SDLNameTurnIcon = @"turnIcon";
+SDLName const SDLNameTurnList = @"turnList";
+SDLName const SDLNameType = @"type";
+SDLName const SDLNameUnregisterAppInterface = @"UnregisterAppInterface";
+SDLName const SDLNameUnsubscribe = @"Unsubscribe";
+SDLName const SDLNameUnsubscribeButton = @"UnsubscribeButton";
+SDLName const SDLNameUnsubscribeVehicleData = @"UnsubscribeVehicleData";
+SDLName const SDLNameUpdateMode = @"updateMode";
+SDLName const SDLNameUpdateTurnList = @"UpdateTurnList";
+SDLName const SDLNameUpDownAvailable = @"upDownAvailable";
+SDLName const SDLNameURL = @"url";
+SDLName const SDLNameURLUppercase = @"URL";
+SDLName const SDLNameUserDisallowed = @"userDisallowed";
+SDLName const SDLNameUTCDay = @"utcDay";
+SDLName const SDLNameUTCHours = @"utcHours";
+SDLName const SDLNameUTCMinutes = @"utcMinutes";
+SDLName const SDLNameUTCMonth = @"utcMonth";
+SDLName const SDLNameUTCSeconds = @"utcSeconds";
+SDLName const SDLNameUTCYear = @"utcYear";
+SDLName const SDLNameValue = @"value";
+SDLName const SDLNameVDOP = @"vdop";
+SDLName const SDLNameVehicleType = @"vehicleType";
+SDLName const SDLNameVIN = @"vin";
+SDLName const SDLNameVoiceRecognitionOn = @"voiceRecOn";
+SDLName const SDLNameVRCapabilities = @"vrCapabilities";
+SDLName const SDLNameVRCommands = @"vrCommands";
+SDLName const SDLNameVRHelp = @"vrHelp";
+SDLName const SDLNameVRHelpTitle = @"vrHelpTitle";
+SDLName const SDLNameVRSynonyms = @"vrSynonyms";
+SDLName const SDLNameWidth = @"width";
+SDLName const SDLNameWiperStatus = @"wiperStatus";
+SDLName const SDLNameX = @"x";
+SDLName const SDLNameY = @"y";
diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index e77c7b43d..a4acc4377 100644
--- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
+++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -6,11 +6,10 @@
 #import "SDLAppInterfaceUnregisteredReason.h"
 #import "SDLNames.h"
 
-
 @implementation SDLOnAppInterfaceUnregistered
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnAppInterfaceUnregistered]) {
+    if (self = [super initWithName:SDLNameOnAppInterfaceUnregistered]) {
     }
     return self;
 }
@@ -23,14 +22,14 @@
 
 - (void)setReason:(SDLAppInterfaceUnregisteredReason *)reason {
     if (reason != nil) {
-        [parameters setObject:reason forKey:NAMES_reason];
+        [parameters setObject:reason forKey:SDLNameReason];
     } else {
-        [parameters removeObjectForKey:NAMES_reason];
+        [parameters removeObjectForKey:SDLNameReason];
     }
 }
 
 - (SDLAppInterfaceUnregisteredReason *)reason {
-    NSObject *obj = [parameters objectForKey:NAMES_reason];
+    NSObject *obj = [parameters objectForKey:SDLNameReason];
     if (obj == nil || [obj isKindOfClass:SDLAppInterfaceUnregisteredReason.class]) {
         return (SDLAppInterfaceUnregisteredReason *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m
index e0518e003..7b1069d91 100644
--- a/SmartDeviceLink/SDLOnAudioPassThru.m
+++ b/SmartDeviceLink/SDLOnAudioPassThru.m
@@ -9,7 +9,7 @@
 @implementation SDLOnAudioPassThru
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnAudioPassThru]) {
+    if (self = [super initWithName:SDLNameOnAudioPassThru]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m
index 6038995c8..f87df7b41 100644
--- a/SmartDeviceLink/SDLOnButtonEvent.m
+++ b/SmartDeviceLink/SDLOnButtonEvent.m
@@ -7,11 +7,10 @@
 #import "SDLButtonName.h"
 #import "SDLNames.h"
 
-
 @implementation SDLOnButtonEvent
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnButtonEvent]) {
+    if (self = [super initWithName:SDLNameOnButtonEvent]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setButtonName:(SDLButtonName *)buttonName {
     if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:NAMES_buttonName];
+        [parameters setObject:buttonName forKey:SDLNameButtonName];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonName];
+        [parameters removeObjectForKey:SDLNameButtonName];
     }
 }
 
 - (SDLButtonName *)buttonName {
-    NSObject *obj = [parameters objectForKey:NAMES_buttonName];
+    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
     if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setButtonEventMode:(SDLButtonEventMode *)buttonEventMode {
     if (buttonEventMode != nil) {
-        [parameters setObject:buttonEventMode forKey:NAMES_buttonEventMode];
+        [parameters setObject:buttonEventMode forKey:SDLNameButtonEventMode];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonEventMode];
+        [parameters removeObjectForKey:SDLNameButtonEventMode];
     }
 }
 
 - (SDLButtonEventMode *)buttonEventMode {
-    NSObject *obj = [parameters objectForKey:NAMES_buttonEventMode];
+    NSObject *obj = [parameters objectForKey:SDLNameButtonEventMode];
     if (obj == nil || [obj isKindOfClass:SDLButtonEventMode.class]) {
         return (SDLButtonEventMode *)obj;
     } else {
@@ -58,14 +57,14 @@
 
 - (void)setCustomButtonID:(NSNumber *)customButtonID {
     if (customButtonID != nil) {
-        [parameters setObject:customButtonID forKey:NAMES_customButtonID];
+        [parameters setObject:customButtonID forKey:SDLNameCustomButtonId];
     } else {
-        [parameters removeObjectForKey:NAMES_customButtonID];
+        [parameters removeObjectForKey:SDLNameCustomButtonId];
     }
 }
 
 - (NSNumber *)customButtonID {
-    return [parameters objectForKey:NAMES_customButtonID];
+    return [parameters objectForKey:SDLNameCustomButtonId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m
index c8246af1c..18b5aae1d 100644
--- a/SmartDeviceLink/SDLOnButtonPress.m
+++ b/SmartDeviceLink/SDLOnButtonPress.m
@@ -7,11 +7,10 @@
 #import "SDLButtonPressMode.h"
 #import "SDLNames.h"
 
-
 @implementation SDLOnButtonPress
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnButtonPress]) {
+    if (self = [super initWithName:SDLNameOnButtonPress]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setButtonName:(SDLButtonName *)buttonName {
     if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:NAMES_buttonName];
+        [parameters setObject:buttonName forKey:SDLNameButtonName];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonName];
+        [parameters removeObjectForKey:SDLNameButtonName];
     }
 }
 
 - (SDLButtonName *)buttonName {
-    NSObject *obj = [parameters objectForKey:NAMES_buttonName];
+    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
     if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setButtonPressMode:(SDLButtonPressMode *)buttonPressMode {
     if (buttonPressMode != nil) {
-        [parameters setObject:buttonPressMode forKey:NAMES_buttonPressMode];
+        [parameters setObject:buttonPressMode forKey:SDLNameButtonPressMode];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonPressMode];
+        [parameters removeObjectForKey:SDLNameButtonPressMode];
     }
 }
 
 - (SDLButtonPressMode *)buttonPressMode {
-    NSObject *obj = [parameters objectForKey:NAMES_buttonPressMode];
+    NSObject *obj = [parameters objectForKey:SDLNameButtonPressMode];
     if (obj == nil || [obj isKindOfClass:SDLButtonPressMode.class]) {
         return (SDLButtonPressMode *)obj;
     } else {
@@ -58,14 +57,14 @@
 
 - (void)setCustomButtonID:(NSNumber *)customButtonID {
     if (customButtonID != nil) {
-        [parameters setObject:customButtonID forKey:NAMES_customButtonID];
+        [parameters setObject:customButtonID forKey:SDLNameCustomButtonId];
     } else {
-        [parameters removeObjectForKey:NAMES_customButtonID];
+        [parameters removeObjectForKey:SDLNameCustomButtonId];
     }
 }
 
 - (NSNumber *)customButtonID {
-    return [parameters objectForKey:NAMES_customButtonID];
+    return [parameters objectForKey:SDLNameCustomButtonId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m
index 22b5556d6..f5773c046 100644
--- a/SmartDeviceLink/SDLOnCommand.m
+++ b/SmartDeviceLink/SDLOnCommand.m
@@ -6,11 +6,10 @@
 #import "SDLNames.h"
 #import "SDLTriggerSource.h"
 
-
 @implementation SDLOnCommand
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnCommand]) {
+    if (self = [super initWithName:SDLNameOnCommand]) {
     }
     return self;
 }
@@ -23,26 +22,26 @@
 
 - (void)setCmdID:(NSNumber *)cmdID {
     if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:NAMES_cmdID];
+        [parameters setObject:cmdID forKey:SDLNameCommandId];
     } else {
-        [parameters removeObjectForKey:NAMES_cmdID];
+        [parameters removeObjectForKey:SDLNameCommandId];
     }
 }
 
 - (NSNumber *)cmdID {
-    return [parameters objectForKey:NAMES_cmdID];
+    return [parameters objectForKey:SDLNameCommandId];
 }
 
 - (void)setTriggerSource:(SDLTriggerSource *)triggerSource {
     if (triggerSource != nil) {
-        [parameters setObject:triggerSource forKey:NAMES_triggerSource];
+        [parameters setObject:triggerSource forKey:SDLNameTriggerSource];
     } else {
-        [parameters removeObjectForKey:NAMES_triggerSource];
+        [parameters removeObjectForKey:SDLNameTriggerSource];
     }
 }
 
 - (SDLTriggerSource *)triggerSource {
-    NSObject *obj = [parameters objectForKey:NAMES_triggerSource];
+    NSObject *obj = [parameters objectForKey:SDLNameTriggerSource];
     if (obj == nil || [obj isKindOfClass:SDLTriggerSource.class]) {
         return (SDLTriggerSource *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m
index 3f9618d1e..35532251c 100644
--- a/SmartDeviceLink/SDLOnDriverDistraction.m
+++ b/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -3,14 +3,13 @@
 
 #import "SDLOnDriverDistraction.h"
 
-#import "SDLDriverDistractionState.h"
 #import "SDLNames.h"
-
+#import "SDLDriverDistractionState.h"
 
 @implementation SDLOnDriverDistraction
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnDriverDistraction]) {
+    if (self = [super initWithName:SDLNameOnDriverDistraction]) {
     }
     return self;
 }
@@ -23,14 +22,14 @@
 
 - (void)setState:(SDLDriverDistractionState *)state {
     if (state != nil) {
-        [parameters setObject:state forKey:NAMES_state];
+        [parameters setObject:state forKey:SDLNameState];
     } else {
-        [parameters removeObjectForKey:NAMES_state];
+        [parameters removeObjectForKey:SDLNameState];
     }
 }
 
 - (SDLDriverDistractionState *)state {
-    NSObject *obj = [parameters objectForKey:NAMES_state];
+    NSObject *obj = [parameters objectForKey:SDLNameState];
     if (obj == nil || [obj isKindOfClass:SDLDriverDistractionState.class]) {
         return (SDLDriverDistractionState *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m
index 3079a604c..e78cdf475 100644
--- a/SmartDeviceLink/SDLOnEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -5,11 +5,10 @@
 
 #import "SDLNames.h"
 
-
 @implementation SDLOnEncodedSyncPData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnEncodedSyncPData]) {
+    if (self = [super initWithName:SDLNameOnEncodedSyncPData]) {
     }
     return self;
 }
@@ -22,38 +21,38 @@
 
 - (void)setData:(NSMutableArray<NSString *> *)data {
     if (data != nil) {
-        [parameters setObject:data forKey:NAMES_data];
+        [parameters setObject:data forKey:SDLNameData];
     } else {
-        [parameters removeObjectForKey:NAMES_data];
+        [parameters removeObjectForKey:SDLNameData];
     }
 }
 
 - (NSMutableArray<NSString *> *)data {
-    return [parameters objectForKey:NAMES_data];
+    return [parameters objectForKey:SDLNameData];
 }
 
 - (void)setURL:(NSString *)URL {
     if (URL != nil) {
-        [parameters setObject:URL forKey:NAMES_URL];
+        [parameters setObject:URL forKey:SDLNameURLUppercase];
     } else {
-        [parameters removeObjectForKey:NAMES_URL];
+        [parameters removeObjectForKey:SDLNameURLUppercase];
     }
 }
 
 - (NSString *)URL {
-    return [parameters objectForKey:NAMES_URL];
+    return [parameters objectForKey:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(NSNumber *)Timeout {
     if (Timeout != nil) {
-        [parameters setObject:Timeout forKey:NAMES_Timeout];
+        [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized];
     } else {
-        [parameters removeObjectForKey:NAMES_Timeout];
+        [parameters removeObjectForKey:SDLNameTimeoutCapitalized];
     }
 }
 
 - (NSNumber *)Timeout {
-    return [parameters objectForKey:NAMES_Timeout];
+    return [parameters objectForKey:SDLNameTimeoutCapitalized];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m
index b12f601a9..0e89e76ec 100644
--- a/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/SmartDeviceLink/SDLOnHMIStatus.m
@@ -8,11 +8,10 @@
 #import "SDLNames.h"
 #import "SDLSystemContext.h"
 
-
 @implementation SDLOnHMIStatus
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnHMIStatus]) {
+    if (self = [super initWithName:SDLNameOnHMIStatus]) {
     }
     return self;
 }
@@ -25,14 +24,14 @@
 
 - (void)setHmiLevel:(SDLHMILevel *)hmiLevel {
     if (hmiLevel != nil) {
-        [parameters setObject:hmiLevel forKey:NAMES_hmiLevel];
+        [parameters setObject:hmiLevel forKey:SDLNameHMILevel];
     } else {
-        [parameters removeObjectForKey:NAMES_hmiLevel];
+        [parameters removeObjectForKey:SDLNameHMILevel];
     }
 }
 
 - (SDLHMILevel *)hmiLevel {
-    NSObject *obj = [parameters objectForKey:NAMES_hmiLevel];
+    NSObject *obj = [parameters objectForKey:SDLNameHMILevel];
     if (obj == nil || [obj isKindOfClass:SDLHMILevel.class]) {
         return (SDLHMILevel *)obj;
     } else {
@@ -42,14 +41,14 @@
 
 - (void)setAudioStreamingState:(SDLAudioStreamingState *)audioStreamingState {
     if (audioStreamingState != nil) {
-        [parameters setObject:audioStreamingState forKey:NAMES_audioStreamingState];
+        [parameters setObject:audioStreamingState forKey:SDLNameAudioStreamingState];
     } else {
-        [parameters removeObjectForKey:NAMES_audioStreamingState];
+        [parameters removeObjectForKey:SDLNameAudioStreamingState];
     }
 }
 
 - (SDLAudioStreamingState *)audioStreamingState {
-    NSObject *obj = [parameters objectForKey:NAMES_audioStreamingState];
+    NSObject *obj = [parameters objectForKey:SDLNameAudioStreamingState];
     if (obj == nil || [obj isKindOfClass:SDLAudioStreamingState.class]) {
         return (SDLAudioStreamingState *)obj;
     } else {
@@ -59,14 +58,14 @@
 
 - (void)setSystemContext:(SDLSystemContext *)systemContext {
     if (systemContext != nil) {
-        [parameters setObject:systemContext forKey:NAMES_systemContext];
+        [parameters setObject:systemContext forKey:SDLNameSystemContext];
     } else {
-        [parameters removeObjectForKey:NAMES_systemContext];
+        [parameters removeObjectForKey:SDLNameSystemContext];
     }
 }
 
 - (SDLSystemContext *)systemContext {
-    NSObject *obj = [parameters objectForKey:NAMES_systemContext];
+    NSObject *obj = [parameters objectForKey:SDLNameSystemContext];
     if (obj == nil || [obj isKindOfClass:SDLSystemContext.class]) {
         return (SDLSystemContext *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m
index 5b1f412c1..9e9e44491 100644
--- a/SmartDeviceLink/SDLOnHashChange.m
+++ b/SmartDeviceLink/SDLOnHashChange.m
@@ -9,7 +9,7 @@
 @implementation SDLOnHashChange
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnHashChange]) {
+    if (self = [super initWithName:SDLNameOnHashChange]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setHashID:(NSString *)hashID {
     if (hashID != nil) {
-        [parameters setObject:hashID forKey:NAMES_hashID];
+        [parameters setObject:hashID forKey:SDLNameHashId];
     } else {
-        [parameters removeObjectForKey:NAMES_hashID];
+        [parameters removeObjectForKey:SDLNameHashId];
     }
 }
 
 - (NSString *)hashID {
-    return [parameters objectForKey:NAMES_hashID];
+    return [parameters objectForKey:SDLNameHashId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m
index f5ba64cd7..bad9a6713 100644
--- a/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -6,11 +6,10 @@
 #import "SDLKeyboardEvent.h"
 #import "SDLNames.h"
 
-
 @implementation SDLOnKeyboardInput
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnKeyboardInput]) {
+    if (self = [super initWithName:SDLNameOnKeyboardInput]) {
     }
     return self;
 }
@@ -23,14 +22,14 @@
 
 - (void)setEvent:(SDLKeyboardEvent *)event {
     if (event != nil) {
-        [parameters setObject:event forKey:NAMES_event];
+        [parameters setObject:event forKey:SDLNameEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_event];
+        [parameters removeObjectForKey:SDLNameEvent];
     }
 }
 
 - (SDLKeyboardEvent *)event {
-    NSObject *obj = [parameters objectForKey:NAMES_event];
+    NSObject *obj = [parameters objectForKey:SDLNameEvent];
     if (obj == nil || [obj isKindOfClass:SDLKeyboardEvent.class]) {
         return (SDLKeyboardEvent *)obj;
     } else {
@@ -40,14 +39,14 @@
 
 - (void)setData:(NSString *)data {
     if (data != nil) {
-        [parameters setObject:data forKey:NAMES_data];
+        [parameters setObject:data forKey:SDLNameData];
     } else {
-        [parameters removeObjectForKey:NAMES_data];
+        [parameters removeObjectForKey:SDLNameData];
     }
 }
 
 - (NSString *)data {
-    return [parameters objectForKey:NAMES_data];
+    return [parameters objectForKey:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m
index 1091dbd6e..cdba0ac00 100644
--- a/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/SmartDeviceLink/SDLOnLanguageChange.m
@@ -6,11 +6,10 @@
 #import "SDLLanguage.h"
 #import "SDLNames.h"
 
-
 @implementation SDLOnLanguageChange
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnLanguageChange]) {
+    if (self = [super initWithName:SDLNameOnLanguageChange]) {
     }
     return self;
 }
@@ -23,14 +22,14 @@
 
 - (void)setLanguage:(SDLLanguage *)language {
     if (language != nil) {
-        [parameters setObject:language forKey:NAMES_language];
+        [parameters setObject:language forKey:SDLNameLanguage];
     } else {
-        [parameters removeObjectForKey:NAMES_language];
+        [parameters removeObjectForKey:SDLNameLanguage];
     }
 }
 
 - (SDLLanguage *)language {
-    NSObject *obj = [parameters objectForKey:NAMES_language];
+    NSObject *obj = [parameters objectForKey:SDLNameLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -40,14 +39,14 @@
 
 - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage {
     if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
+        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
     } else {
-        [parameters removeObjectForKey:NAMES_hmiDisplayLanguage];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m
index 73e2c6951..fb847b1dd 100644
--- a/SmartDeviceLink/SDLOnPermissionsChange.m
+++ b/SmartDeviceLink/SDLOnPermissionsChange.m
@@ -6,11 +6,10 @@
 #import "SDLNames.h"
 #import "SDLPermissionItem.h"
 
-
 @implementation SDLOnPermissionsChange
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnPermissionsChange]) {
+    if (self = [super initWithName:SDLNameOnPermissionsChange]) {
     }
     return self;
 }
@@ -23,14 +22,14 @@
 
 - (void)setPermissionItem:(NSMutableArray<SDLPermissionItem *> *)permissionItem {
     if (permissionItem != nil) {
-        [parameters setObject:permissionItem forKey:NAMES_permissionItem];
+        [parameters setObject:permissionItem forKey:SDLNamePermissionItem];
     } else {
-        [parameters removeObjectForKey:NAMES_permissionItem];
+        [parameters removeObjectForKey:SDLNamePermissionItem];
     }
 }
 
 - (NSMutableArray<SDLPermissionItem *> *)permissionItem {
-    NSMutableArray<SDLPermissionItem *> *array = [parameters objectForKey:NAMES_permissionItem];
+    NSMutableArray<SDLPermissionItem *> *array = [parameters objectForKey:SDLNamePermissionItem];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLPermissionItem.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m
index 1d08f2f0e..32fcafd83 100644
--- a/SmartDeviceLink/SDLOnSyncPData.m
+++ b/SmartDeviceLink/SDLOnSyncPData.m
@@ -9,7 +9,7 @@
 @implementation SDLOnSyncPData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnSyncPData]) {
+    if (self = [super initWithName:SDLNameOnSyncPData]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setURL:(NSString *)URL {
     if (URL != nil) {
-        [parameters setObject:URL forKey:NAMES_URL];
+        [parameters setObject:URL forKey:SDLNameURLUppercase];
     } else {
-        [parameters removeObjectForKey:NAMES_URL];
+        [parameters removeObjectForKey:SDLNameURLUppercase];
     }
 }
 
 - (NSString *)URL {
-    return [parameters objectForKey:NAMES_URL];
+    return [parameters objectForKey:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(NSNumber *)Timeout {
     if (Timeout != nil) {
-        [parameters setObject:Timeout forKey:NAMES_Timeout];
+        [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized];
     } else {
-        [parameters removeObjectForKey:NAMES_Timeout];
+        [parameters removeObjectForKey:SDLNameTimeoutCapitalized];
     }
 }
 
 - (NSNumber *)Timeout {
-    return [parameters objectForKey:NAMES_Timeout];
+    return [parameters objectForKey:SDLNameTimeoutCapitalized];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m
index 46074f3fb..1bc5ef632 100644
--- a/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/SmartDeviceLink/SDLOnSystemRequest.m
@@ -7,11 +7,10 @@
 #import "SDLNames.h"
 #import "SDLRequestType.h"
 
-
 @implementation SDLOnSystemRequest
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnSystemRequest]) {
+    if (self = [super initWithName:SDLNameOnSystemRequest]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setRequestType:(SDLRequestType *)requestType {
     if (requestType != nil) {
-        [parameters setObject:requestType forKey:NAMES_requestType];
+        [parameters setObject:requestType forKey:SDLNameRequestType];
     } else {
-        [parameters removeObjectForKey:NAMES_requestType];
+        [parameters removeObjectForKey:SDLNameRequestType];
     }
 }
 
 - (SDLRequestType *)requestType {
-    NSObject *obj = [parameters objectForKey:NAMES_requestType];
+    NSObject *obj = [parameters objectForKey:SDLNameRequestType];
     if (obj == nil || [obj isKindOfClass:SDLRequestType.class]) {
         return (SDLRequestType *)obj;
     } else {
@@ -41,38 +40,38 @@
 
 - (void)setUrl:(NSString *)url {
     if (url != nil) {
-        [parameters setObject:url forKey:NAMES_url];
+        [parameters setObject:url forKey:SDLNameURL];
     } else {
-        [parameters removeObjectForKey:NAMES_url];
+        [parameters removeObjectForKey:SDLNameURL];
     }
 }
 
 - (NSString *)url {
-    return [parameters objectForKey:NAMES_url];
+    return [parameters objectForKey:SDLNameURL];
 }
 
 - (void)setTimeout:(NSNumber *)timeout {
     if (timeout != nil) {
-        [parameters setObject:timeout forKey:NAMES_timeout];
+        [parameters setObject:timeout forKey:SDLNameTimeout];
     } else {
-        [parameters removeObjectForKey:NAMES_timeout];
+        [parameters removeObjectForKey:SDLNameTimeout];
     }
 }
 
 - (NSNumber *)timeout {
-    return [parameters objectForKey:NAMES_timeout];
+    return [parameters objectForKey:SDLNameTimeout];
 }
 
 - (void)setFileType:(SDLFileType *)fileType {
     if (fileType != nil) {
-        [parameters setObject:fileType forKey:NAMES_fileType];
+        [parameters setObject:fileType forKey:SDLNameFileType];
     } else {
-        [parameters removeObjectForKey:NAMES_fileType];
+        [parameters removeObjectForKey:SDLNameFileType];
     }
 }
 
 - (SDLFileType *)fileType {
-    NSObject *obj = [parameters objectForKey:NAMES_fileType];
+    NSObject *obj = [parameters objectForKey:SDLNameFileType];
     if (obj == nil || [obj isKindOfClass:SDLFileType.class]) {
         return (SDLFileType *)obj;
     } else {
@@ -82,26 +81,26 @@
 
 - (void)setOffset:(NSNumber *)offset {
     if (offset != nil) {
-        [parameters setObject:offset forKey:NAMES_offset];
+        [parameters setObject:offset forKey:SDLNameOffset];
     } else {
-        [parameters removeObjectForKey:NAMES_offset];
+        [parameters removeObjectForKey:SDLNameOffset];
     }
 }
 
 - (NSNumber *)offset {
-    return [parameters objectForKey:NAMES_offset];
+    return [parameters objectForKey:SDLNameOffset];
 }
 
 - (void)setLength:(NSNumber *)length {
     if (length != nil) {
-        [parameters setObject:length forKey:NAMES_length];
+        [parameters setObject:length forKey:SDLNameLength];
     } else {
-        [parameters removeObjectForKey:NAMES_length];
+        [parameters removeObjectForKey:SDLNameLength];
     }
 }
 
 - (NSNumber *)length {
-    return [parameters objectForKey:NAMES_length];
+    return [parameters objectForKey:SDLNameLength];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m
index abc2b6032..8dcd36867 100644
--- a/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/SmartDeviceLink/SDLOnTBTClientState.m
@@ -6,11 +6,10 @@
 #import "SDLNames.h"
 #import "SDLTBTState.h"
 
-
 @implementation SDLOnTBTClientState
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnTBTClientState]) {
+    if (self = [super initWithName:SDLNameOnTBTClientState]) {
     }
     return self;
 }
@@ -23,14 +22,14 @@
 
 - (void)setState:(SDLTBTState *)state {
     if (state != nil) {
-        [parameters setObject:state forKey:NAMES_state];
+        [parameters setObject:state forKey:SDLNameState];
     } else {
-        [parameters removeObjectForKey:NAMES_state];
+        [parameters removeObjectForKey:SDLNameState];
     }
 }
 
 - (SDLTBTState *)state {
-    NSObject *obj = [parameters objectForKey:NAMES_state];
+    NSObject *obj = [parameters objectForKey:SDLNameState];
     if (obj == nil || [obj isKindOfClass:SDLTBTState.class]) {
         return (SDLTBTState *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m
index 8d431a14f..0c97a69c4 100644
--- a/SmartDeviceLink/SDLOnTouchEvent.m
+++ b/SmartDeviceLink/SDLOnTouchEvent.m
@@ -7,11 +7,10 @@
 #import "SDLTouchEvent.h"
 #import "SDLTouchType.h"
 
-
 @implementation SDLOnTouchEvent
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnTouchEvent]) {
+    if (self = [super initWithName:SDLNameOnTouchEvent]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setType:(SDLTouchType *)type {
     if (type != nil) {
-        [parameters setObject:type forKey:NAMES_type];
+        [parameters setObject:type forKey:SDLNameType];
     } else {
-        [parameters removeObjectForKey:NAMES_type];
+        [parameters removeObjectForKey:SDLNameType];
     }
 }
 
 - (SDLTouchType *)type {
-    NSObject *obj = [parameters objectForKey:NAMES_type];
+    NSObject *obj = [parameters objectForKey:SDLNameType];
     if (obj == nil || [obj isKindOfClass:SDLTouchType.class]) {
         return (SDLTouchType *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setEvent:(NSMutableArray<SDLTouchEvent*> *)event {
     if (event != nil) {
-        [parameters setObject:event forKey:NAMES_event];
+        [parameters setObject:event forKey:SDLNameEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_event];
+        [parameters removeObjectForKey:SDLNameEvent];
     }
 }
 
 - (NSMutableArray<SDLTouchEvent*> *)event {
-    NSMutableArray<SDLTouchEvent*> *array = [parameters objectForKey:NAMES_event];
+    NSMutableArray<SDLTouchEvent*> *array = [parameters objectForKey:SDLNameEvent];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchEvent.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m
index 4ea755fcf..83190a195 100644
--- a/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink/SDLOnVehicleData.m
@@ -24,7 +24,7 @@
 @implementation SDLOnVehicleData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_OnVehicleData]) {
+    if (self = [super initWithName:SDLNameOnVehicleData]) {
     }
     return self;
 }
@@ -37,14 +37,14 @@
 
 - (void)setGps:(SDLGPSData *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:NAMES_gps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLGPSData *)gps {
-    NSObject *obj = [parameters objectForKey:NAMES_gps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) {
         return (SDLGPSData *)obj;
     } else {
@@ -54,50 +54,50 @@
 
 - (void)setSpeed:(NSNumber *)speed {
     if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
+        [parameters setObject:speed forKey:SDLNameSpeed];
     } else {
-        [parameters removeObjectForKey:NAMES_speed];
+        [parameters removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (NSNumber *)speed {
-    return [parameters objectForKey:NAMES_speed];
+    return [parameters objectForKey:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:NAMES_rpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:NAMES_rpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
     if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
+        [parameters removeObjectForKey:SDLNameFuelLevel];
     }
 }
 
 - (NSNumber *)fuelLevel {
-    return [parameters objectForKey:NAMES_fuelLevel];
+    return [parameters objectForKey:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(SDLComponentVolumeStatus *)fuelLevel_State {
     if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
+        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
+        [parameters removeObjectForKey:SDLNameFuelLevelState];
     }
 }
 
 - (SDLComponentVolumeStatus *)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
+    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
     if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) {
         return (SDLComponentVolumeStatus *)obj;
     } else {
@@ -107,50 +107,50 @@
 
 - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption {
     if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
     } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
     }
 }
 
 - (NSNumber *)instantFuelConsumption {
-    return [parameters objectForKey:NAMES_instantFuelConsumption];
+    return [parameters objectForKey:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber *)externalTemperature {
     if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
     } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
+        [parameters removeObjectForKey:SDLNameExternalTemperature];
     }
 }
 
 - (NSNumber *)externalTemperature {
-    return [parameters objectForKey:NAMES_externalTemperature];
+    return [parameters objectForKey:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(NSString *)vin {
     if (vin != nil) {
-        [parameters setObject:vin forKey:NAMES_vin];
+        [parameters setObject:vin forKey:SDLNameVIN];
     } else {
-        [parameters removeObjectForKey:NAMES_vin];
+        [parameters removeObjectForKey:SDLNameVIN];
     }
 }
 
 - (NSString *)vin {
-    return [parameters objectForKey:NAMES_vin];
+    return [parameters objectForKey:SDLNameVIN];
 }
 
 - (void)setPrndl:(SDLPRNDL *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:NAMES_prndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLPRNDL *)prndl {
-    NSObject *obj = [parameters objectForKey:NAMES_prndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) {
         return (SDLPRNDL *)obj;
     } else {
@@ -160,14 +160,14 @@
 
 - (void)setTirePressure:(SDLTireStatus *)tirePressure {
     if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
     } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
+        [parameters removeObjectForKey:SDLNameTirePressure];
     }
 }
 
 - (SDLTireStatus *)tirePressure {
-    NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
+    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
     if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) {
         return (SDLTireStatus *)obj;
     } else {
@@ -177,26 +177,26 @@
 
 - (void)setOdometer:(NSNumber *)odometer {
     if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
+        [parameters setObject:odometer forKey:SDLNameOdometer];
     } else {
-        [parameters removeObjectForKey:NAMES_odometer];
+        [parameters removeObjectForKey:SDLNameOdometer];
     }
 }
 
 - (NSNumber *)odometer {
-    return [parameters objectForKey:NAMES_odometer];
+    return [parameters objectForKey:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(SDLBeltStatus *)beltStatus {
     if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
+        [parameters removeObjectForKey:SDLNameBeltStatus];
     }
 }
 
 - (SDLBeltStatus *)beltStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
     if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) {
         return (SDLBeltStatus *)obj;
     } else {
@@ -206,14 +206,14 @@
 
 - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation {
     if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
     } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
+        [parameters removeObjectForKey:SDLNameBodyInformation];
     }
 }
 
 - (SDLBodyInformation *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
+    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
     if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) {
         return (SDLBodyInformation *)obj;
     } else {
@@ -223,14 +223,14 @@
 
 - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus {
     if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
+        [parameters removeObjectForKey:SDLNameDeviceStatus];
     }
 }
 
 - (SDLDeviceStatus *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
     if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) {
         return (SDLDeviceStatus *)obj;
     } else {
@@ -240,14 +240,14 @@
 
 - (void)setDriverBraking:(SDLVehicleDataEventStatus *)driverBraking {
     if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
     } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
+        [parameters removeObjectForKey:SDLNameDriverBraking];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverBraking {
-    NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
+    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -257,14 +257,14 @@
 
 - (void)setWiperStatus:(SDLWiperStatus *)wiperStatus {
     if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
+        [parameters removeObjectForKey:SDLNameWiperStatus];
     }
 }
 
 - (SDLWiperStatus *)wiperStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
     if (obj == nil || [obj isKindOfClass:SDLWiperStatus.class]) {
         return (SDLWiperStatus *)obj;
     } else {
@@ -274,14 +274,14 @@
 
 - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus {
     if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
+        [parameters removeObjectForKey:SDLNameHeadLampStatus];
     }
 }
 
 - (SDLHeadLampStatus *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
     if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) {
         return (SDLHeadLampStatus *)obj;
     } else {
@@ -291,50 +291,50 @@
 
 - (void)setEngineTorque:(NSNumber *)engineTorque {
     if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
     } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
+        [parameters removeObjectForKey:SDLNameEngineTorque];
     }
 }
 
 - (NSNumber *)engineTorque {
-    return [parameters objectForKey:NAMES_engineTorque];
+    return [parameters objectForKey:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:NAMES_accPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
     if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
     } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
     }
 }
 
 - (NSNumber *)steeringWheelAngle {
-    return [parameters objectForKey:NAMES_steeringWheelAngle];
+    return [parameters objectForKey:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(SDLECallInfo *)eCallInfo {
     if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
+        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
+        [parameters removeObjectForKey:SDLNameECallInfo];
     }
 }
 
 - (SDLECallInfo *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
+    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
     if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) {
         return (SDLECallInfo *)obj;
     } else {
@@ -344,14 +344,14 @@
 
 - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus {
     if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
+        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
+        [parameters removeObjectForKey:SDLNameAirbagStatus];
     }
 }
 
 - (SDLAirbagStatus *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
     if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) {
         return (SDLAirbagStatus *)obj;
     } else {
@@ -361,14 +361,14 @@
 
 - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent {
     if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
+        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
+        [parameters removeObjectForKey:SDLNameEmergencyEvent];
     }
 }
 
 - (SDLEmergencyEvent *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
+    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
     if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) {
         return (SDLEmergencyEvent *)obj;
     } else {
@@ -378,14 +378,14 @@
 
 - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus {
     if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus];
+        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_clusterModeStatus];
+        [parameters removeObjectForKey:SDLNameClusterModeStatus];
     }
 }
 
 - (SDLClusterModeStatus *)clusterModeStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus];
     if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) {
         return (SDLClusterModeStatus *)obj;
     } else {
@@ -395,14 +395,14 @@
 
 - (void)setMyKey:(SDLMyKey *)myKey {
     if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
+        [parameters setObject:myKey forKey:SDLNameMyKey];
     } else {
-        [parameters removeObjectForKey:NAMES_myKey];
+        [parameters removeObjectForKey:SDLNameMyKey];
     }
 }
 
 - (SDLMyKey *)myKey {
-    NSObject *obj = [parameters objectForKey:NAMES_myKey];
+    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
     if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) {
         return (SDLMyKey *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m
index 244af00f5..ec1684ff2 100644
--- a/SmartDeviceLink/SDLParameterPermissions.m
+++ b/SmartDeviceLink/SDLParameterPermissions.m
@@ -22,26 +22,26 @@
 
 - (void)setAllowed:(NSMutableArray<NSString*> *)allowed {
     if (allowed != nil) {
-        [store setObject:allowed forKey:NAMES_allowed];
+        [store setObject:allowed forKey:SDLNameAllowed];
     } else {
-        [store removeObjectForKey:NAMES_allowed];
+        [store removeObjectForKey:SDLNameAllowed];
     }
 }
 
 - (NSMutableArray<NSString*> *)allowed {
-    return [store objectForKey:NAMES_allowed];
+    return [store objectForKey:SDLNameAllowed];
 }
 
 - (void)setUserDisallowed:(NSMutableArray<NSString*> *)userDisallowed {
     if (userDisallowed != nil) {
-        [store setObject:userDisallowed forKey:NAMES_userDisallowed];
+        [store setObject:userDisallowed forKey:SDLNameUserDisallowed];
     } else {
-        [store removeObjectForKey:NAMES_userDisallowed];
+        [store removeObjectForKey:SDLNameUserDisallowed];
     }
 }
 
 - (NSMutableArray<NSString*> *)userDisallowed {
-    return [store objectForKey:NAMES_userDisallowed];
+    return [store objectForKey:SDLNameUserDisallowed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m
index 481edcf9d..af6c93708 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -10,11 +10,10 @@
 #import "SDLSamplingRate.h"
 #import "SDLTTSChunk.h"
 
-
 @implementation SDLPerformAudioPassThru
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_PerformAudioPassThru]) {
+    if (self = [super initWithName:SDLNamePerformAudioPassThru]) {
     }
     return self;
 }
@@ -27,14 +26,14 @@
 
 - (void)setInitialPrompt:(NSMutableArray<SDLTTSChunk *> *)initialPrompt {
     if (initialPrompt != nil) {
-        [parameters setObject:initialPrompt forKey:NAMES_initialPrompt];
+        [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_initialPrompt];
+        [parameters removeObjectForKey:SDLNameInitialPrompt];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_initialPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameInitialPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -48,38 +47,38 @@
 
 - (void)setAudioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 {
     if (audioPassThruDisplayText1 != nil) {
-        [parameters setObject:audioPassThruDisplayText1 forKey:NAMES_audioPassThruDisplayText1];
+        [parameters setObject:audioPassThruDisplayText1 forKey:SDLNameAudioPassThruDisplayText1];
     } else {
-        [parameters removeObjectForKey:NAMES_audioPassThruDisplayText1];
+        [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText1];
     }
 }
 
 - (NSString *)audioPassThruDisplayText1 {
-    return [parameters objectForKey:NAMES_audioPassThruDisplayText1];
+    return [parameters objectForKey:SDLNameAudioPassThruDisplayText1];
 }
 
 - (void)setAudioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 {
     if (audioPassThruDisplayText2 != nil) {
-        [parameters setObject:audioPassThruDisplayText2 forKey:NAMES_audioPassThruDisplayText2];
+        [parameters setObject:audioPassThruDisplayText2 forKey:SDLNameAudioPassThruDisplayText2];
     } else {
-        [parameters removeObjectForKey:NAMES_audioPassThruDisplayText2];
+        [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText2];
     }
 }
 
 - (NSString *)audioPassThruDisplayText2 {
-    return [parameters objectForKey:NAMES_audioPassThruDisplayText2];
+    return [parameters objectForKey:SDLNameAudioPassThruDisplayText2];
 }
 
 - (void)setSamplingRate:(SDLSamplingRate *)samplingRate {
     if (samplingRate != nil) {
-        [parameters setObject:samplingRate forKey:NAMES_samplingRate];
+        [parameters setObject:samplingRate forKey:SDLNameSamplingRate];
     } else {
-        [parameters removeObjectForKey:NAMES_samplingRate];
+        [parameters removeObjectForKey:SDLNameSamplingRate];
     }
 }
 
 - (SDLSamplingRate *)samplingRate {
-    NSObject *obj = [parameters objectForKey:NAMES_samplingRate];
+    NSObject *obj = [parameters objectForKey:SDLNameSamplingRate];
     if (obj == nil || [obj isKindOfClass:SDLSamplingRate.class]) {
         return (SDLSamplingRate *)obj;
     } else {
@@ -89,26 +88,26 @@
 
 - (void)setMaxDuration:(NSNumber *)maxDuration {
     if (maxDuration != nil) {
-        [parameters setObject:maxDuration forKey:NAMES_maxDuration];
+        [parameters setObject:maxDuration forKey:SDLNameMaxDuration];
     } else {
-        [parameters removeObjectForKey:NAMES_maxDuration];
+        [parameters removeObjectForKey:SDLNameMaxDuration];
     }
 }
 
 - (NSNumber *)maxDuration {
-    return [parameters objectForKey:NAMES_maxDuration];
+    return [parameters objectForKey:SDLNameMaxDuration];
 }
 
 - (void)setBitsPerSample:(SDLBitsPerSample *)bitsPerSample {
     if (bitsPerSample != nil) {
-        [parameters setObject:bitsPerSample forKey:NAMES_bitsPerSample];
+        [parameters setObject:bitsPerSample forKey:SDLNameBitsPerSample];
     } else {
-        [parameters removeObjectForKey:NAMES_bitsPerSample];
+        [parameters removeObjectForKey:SDLNameBitsPerSample];
     }
 }
 
 - (SDLBitsPerSample *)bitsPerSample {
-    NSObject *obj = [parameters objectForKey:NAMES_bitsPerSample];
+    NSObject *obj = [parameters objectForKey:SDLNameBitsPerSample];
     if (obj == nil || [obj isKindOfClass:SDLBitsPerSample.class]) {
         return (SDLBitsPerSample *)obj;
     } else {
@@ -118,14 +117,14 @@
 
 - (void)setAudioType:(SDLAudioType *)audioType {
     if (audioType != nil) {
-        [parameters setObject:audioType forKey:NAMES_audioType];
+        [parameters setObject:audioType forKey:SDLNameAudioType];
     } else {
-        [parameters removeObjectForKey:NAMES_audioType];
+        [parameters removeObjectForKey:SDLNameAudioType];
     }
 }
 
 - (SDLAudioType *)audioType {
-    NSObject *obj = [parameters objectForKey:NAMES_audioType];
+    NSObject *obj = [parameters objectForKey:SDLNameAudioType];
     if (obj == nil || [obj isKindOfClass:SDLAudioType.class]) {
         return (SDLAudioType *)obj;
     } else {
@@ -135,14 +134,14 @@
 
 - (void)setMuteAudio:(NSNumber *)muteAudio {
     if (muteAudio != nil) {
-        [parameters setObject:muteAudio forKey:NAMES_muteAudio];
+        [parameters setObject:muteAudio forKey:SDLNameMuteAudio];
     } else {
-        [parameters removeObjectForKey:NAMES_muteAudio];
+        [parameters removeObjectForKey:SDLNameMuteAudio];
     }
 }
 
 - (NSNumber *)muteAudio {
-    return [parameters objectForKey:NAMES_muteAudio];
+    return [parameters objectForKey:SDLNameMuteAudio];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
index 847150d86..04134f6bb 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLPerformAudioPassThruResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_PerformAudioPassThru]) {
+    if (self = [super initWithName:SDLNamePerformAudioPassThru]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index 2079d667d..12d9f2c89 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -13,7 +13,7 @@
 @implementation SDLPerformInteraction
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_PerformInteraction]) {
+    if (self = [super initWithName:SDLNamePerformInteraction]) {
     }
     return self;
 }
@@ -26,26 +26,26 @@
 
 - (void)setInitialText:(NSString *)initialText {
     if (initialText != nil) {
-        [parameters setObject:initialText forKey:NAMES_initialText];
+        [parameters setObject:initialText forKey:SDLNameInitialText];
     } else {
-        [parameters removeObjectForKey:NAMES_initialText];
+        [parameters removeObjectForKey:SDLNameInitialText];
     }
 }
 
 - (NSString *)initialText {
-    return [parameters objectForKey:NAMES_initialText];
+    return [parameters objectForKey:SDLNameInitialText];
 }
 
 - (void)setInitialPrompt:(NSMutableArray<SDLTTSChunk *> *)initialPrompt {
     if (initialPrompt != nil) {
-        [parameters setObject:initialPrompt forKey:NAMES_initialPrompt];
+        [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_initialPrompt];
+        [parameters removeObjectForKey:SDLNameInitialPrompt];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_initialPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameInitialPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -59,14 +59,14 @@
 
 - (void)setInteractionMode:(SDLInteractionMode *)interactionMode {
     if (interactionMode != nil) {
-        [parameters setObject:interactionMode forKey:NAMES_interactionMode];
+        [parameters setObject:interactionMode forKey:SDLNameInteractionMode];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionMode];
+        [parameters removeObjectForKey:SDLNameInteractionMode];
     }
 }
 
 - (SDLInteractionMode *)interactionMode {
-    NSObject *obj = [parameters objectForKey:NAMES_interactionMode];
+    NSObject *obj = [parameters objectForKey:SDLNameInteractionMode];
     if (obj == nil || [obj isKindOfClass:SDLInteractionMode.class]) {
         return (SDLInteractionMode *)obj;
     } else {
@@ -76,26 +76,26 @@
 
 - (void)setInteractionChoiceSetIDList:(NSMutableArray<NSNumber *> *)interactionChoiceSetIDList {
     if (interactionChoiceSetIDList != nil) {
-        [parameters setObject:interactionChoiceSetIDList forKey:NAMES_interactionChoiceSetIDList];
+        [parameters setObject:interactionChoiceSetIDList forKey:SDLNameInteractionChoiceSetIdList];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionChoiceSetIDList];
+        [parameters removeObjectForKey:SDLNameInteractionChoiceSetIdList];
     }
 }
 
 - (NSMutableArray<NSNumber *> *)interactionChoiceSetIDList {
-    return [parameters objectForKey:NAMES_interactionChoiceSetIDList];
+    return [parameters objectForKey:SDLNameInteractionChoiceSetIdList];
 }
 
 - (void)setHelpPrompt:(NSMutableArray<SDLTTSChunk *> *)helpPrompt {
     if (helpPrompt != nil) {
-        [parameters setObject:helpPrompt forKey:NAMES_helpPrompt];
+        [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_helpPrompt];
+        [parameters removeObjectForKey:SDLNameHelpPrompt];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_helpPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameHelpPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -109,14 +109,14 @@
 
 - (void)setTimeoutPrompt:(NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
     if (timeoutPrompt != nil) {
-        [parameters setObject:timeoutPrompt forKey:NAMES_timeoutPrompt];
+        [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_timeoutPrompt];
+        [parameters removeObjectForKey:SDLNameTimeoutPrompt];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_timeoutPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTimeoutPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -130,26 +130,26 @@
 
 - (void)setTimeout:(NSNumber *)timeout {
     if (timeout != nil) {
-        [parameters setObject:timeout forKey:NAMES_timeout];
+        [parameters setObject:timeout forKey:SDLNameTimeout];
     } else {
-        [parameters removeObjectForKey:NAMES_timeout];
+        [parameters removeObjectForKey:SDLNameTimeout];
     }
 }
 
 - (NSNumber *)timeout {
-    return [parameters objectForKey:NAMES_timeout];
+    return [parameters objectForKey:SDLNameTimeout];
 }
 
 - (void)setVrHelp:(NSMutableArray<SDLVRHelpItem *> *)vrHelp {
     if (vrHelp != nil) {
-        [parameters setObject:vrHelp forKey:NAMES_vrHelp];
+        [parameters setObject:vrHelp forKey:SDLNameVRHelp];
     } else {
-        [parameters removeObjectForKey:NAMES_vrHelp];
+        [parameters removeObjectForKey:SDLNameVRHelp];
     }
 }
 
 - (NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:NAMES_vrHelp];
+    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:SDLNameVRHelp];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
         return array;
     } else {
@@ -163,14 +163,14 @@
 
 - (void)setInteractionLayout:(SDLLayoutMode *)interactionLayout {
     if (interactionLayout != nil) {
-        [parameters setObject:interactionLayout forKey:NAMES_interactionLayout];
+        [parameters setObject:interactionLayout forKey:SDLNameInteractionLayout];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionLayout];
+        [parameters removeObjectForKey:SDLNameInteractionLayout];
     }
 }
 
 - (SDLLayoutMode *)interactionLayout {
-    NSObject *obj = [parameters objectForKey:NAMES_interactionLayout];
+    NSObject *obj = [parameters objectForKey:SDLNameInteractionLayout];
     if (obj == nil || [obj isKindOfClass:SDLLayoutMode.class]) {
         return (SDLLayoutMode *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m
index 350b737db..e838c2a01 100644
--- a/SmartDeviceLink/SDLPerformInteractionResponse.m
+++ b/SmartDeviceLink/SDLPerformInteractionResponse.m
@@ -7,11 +7,10 @@
 #import "SDLNames.h"
 #import "SDLTriggerSource.h"
 
-
 @implementation SDLPerformInteractionResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_PerformInteraction]) {
+    if (self = [super initWithName:SDLNamePerformInteraction]) {
     }
     return self;
 }
@@ -24,38 +23,38 @@
 
 - (void)setChoiceID:(NSNumber *)choiceID {
     if (choiceID != nil) {
-        [parameters setObject:choiceID forKey:NAMES_choiceID];
+        [parameters setObject:choiceID forKey:SDLNameChoiceId];
     } else {
-        [parameters removeObjectForKey:NAMES_choiceID];
+        [parameters removeObjectForKey:SDLNameChoiceId];
     }
 }
 
 - (NSNumber *)choiceID {
-    return [parameters objectForKey:NAMES_choiceID];
+    return [parameters objectForKey:SDLNameChoiceId];
 }
 
 - (void)setManualTextEntry:(NSString *)manualTextEntry {
     if (manualTextEntry != nil) {
-        [parameters setObject:manualTextEntry forKey:NAMES_manualTextEntry];
+        [parameters setObject:manualTextEntry forKey:SDLNameManualTextEntry];
     } else {
-        [parameters removeObjectForKey:NAMES_manualTextEntry];
+        [parameters removeObjectForKey:SDLNameManualTextEntry];
     }
 }
 
 - (NSString *)manualTextEntry {
-    return [parameters objectForKey:NAMES_manualTextEntry];
+    return [parameters objectForKey:SDLNameManualTextEntry];
 }
 
 - (void)setTriggerSource:(SDLTriggerSource *)triggerSource {
     if (triggerSource != nil) {
-        [parameters setObject:triggerSource forKey:NAMES_triggerSource];
+        [parameters setObject:triggerSource forKey:SDLNameTriggerSource];
     } else {
-        [parameters removeObjectForKey:NAMES_triggerSource];
+        [parameters removeObjectForKey:SDLNameTriggerSource];
     }
 }
 
 - (SDLTriggerSource *)triggerSource {
-    NSObject *obj = [parameters objectForKey:NAMES_triggerSource];
+    NSObject *obj = [parameters objectForKey:SDLNameTriggerSource];
     if (obj == nil || [obj isKindOfClass:SDLTriggerSource.class]) {
         return (SDLTriggerSource *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m
index a31b7b2ff..a832ed8e8 100644
--- a/SmartDeviceLink/SDLPermissionItem.m
+++ b/SmartDeviceLink/SDLPermissionItem.m
@@ -7,7 +7,6 @@
 #import "SDLNames.h"
 #import "SDLParameterPermissions.h"
 
-
 @implementation SDLPermissionItem
 
 - (instancetype)init {
@@ -24,26 +23,26 @@
 
 - (void)setRpcName:(NSString *)rpcName {
     if (rpcName != nil) {
-        [store setObject:rpcName forKey:NAMES_rpcName];
+        [store setObject:rpcName forKey:SDLNameRPCName];
     } else {
-        [store removeObjectForKey:NAMES_rpcName];
+        [store removeObjectForKey:SDLNameRPCName];
     }
 }
 
 - (NSString *)rpcName {
-    return [store objectForKey:NAMES_rpcName];
+    return [store objectForKey:SDLNameRPCName];
 }
 
 - (void)setHmiPermissions:(SDLHMIPermissions *)hmiPermissions {
     if (hmiPermissions != nil) {
-        [store setObject:hmiPermissions forKey:NAMES_hmiPermissions];
+        [store setObject:hmiPermissions forKey:SDLNameHMIPermissions];
     } else {
-        [store removeObjectForKey:NAMES_hmiPermissions];
+        [store removeObjectForKey:SDLNameHMIPermissions];
     }
 }
 
 - (SDLHMIPermissions *)hmiPermissions {
-    NSObject *obj = [store objectForKey:NAMES_hmiPermissions];
+    NSObject *obj = [store objectForKey:SDLNameHMIPermissions];
     if (obj == nil || [obj isKindOfClass:SDLHMIPermissions.class]) {
         return (SDLHMIPermissions *)obj;
     } else {
@@ -53,14 +52,14 @@
 
 - (void)setParameterPermissions:(SDLParameterPermissions *)parameterPermissions {
     if (parameterPermissions != nil) {
-        [store setObject:parameterPermissions forKey:NAMES_parameterPermissions];
+        [store setObject:parameterPermissions forKey:SDLNameParameterPermissions];
     } else {
-        [store removeObjectForKey:NAMES_parameterPermissions];
+        [store removeObjectForKey:SDLNameParameterPermissions];
     }
 }
 
 - (SDLParameterPermissions *)parameterPermissions {
-    NSObject *obj = [store objectForKey:NAMES_parameterPermissions];
+    NSObject *obj = [store objectForKey:SDLNameParameterPermissions];
     if (obj == nil || [obj isKindOfClass:SDLParameterPermissions.class]) {
         return (SDLParameterPermissions *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m
index 0add975ce..c196231ca 100644
--- a/SmartDeviceLink/SDLPresetBankCapabilities.m
+++ b/SmartDeviceLink/SDLPresetBankCapabilities.m
@@ -22,14 +22,14 @@
 
 - (void)setOnScreenPresetsAvailable:(NSNumber *)onScreenPresetsAvailable {
     if (onScreenPresetsAvailable != nil) {
-        [store setObject:onScreenPresetsAvailable forKey:NAMES_onScreenPresetsAvailable];
+        [store setObject:onScreenPresetsAvailable forKey:SDLNameOnScreenPresetsAvailable];
     } else {
-        [store removeObjectForKey:NAMES_onScreenPresetsAvailable];
+        [store removeObjectForKey:SDLNameOnScreenPresetsAvailable];
     }
 }
 
 - (NSNumber *)onScreenPresetsAvailable {
-    return [store objectForKey:NAMES_onScreenPresetsAvailable];
+    return [store objectForKey:SDLNameOnScreenPresetsAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLProtocol.m b/SmartDeviceLink/SDLProtocol.m
index a7f54b7bc..44b7350a0 100644
--- a/SmartDeviceLink/SDLProtocol.m
+++ b/SmartDeviceLink/SDLProtocol.m
@@ -203,7 +203,7 @@ typedef NSNumber SDLServiceTypeBox;
             // Build a binary header
             // Serialize the RPC data into an NSData
             SDLRPCPayload *rpcPayload = [[SDLRPCPayload alloc] init];
-            rpcPayload.functionID = [[[[SDLFunctionID alloc] init] getFunctionID:[message getFunctionName]] intValue];
+            rpcPayload.functionID = [[[SDLFunctionID sharedInstance] functionIdForName:[message getFunctionName]] intValue];
             rpcPayload.jsonData = jsonData;
             rpcPayload.binaryData = message.bulkData;
 
diff --git a/SmartDeviceLink/SDLProtocolMessage.h b/SmartDeviceLink/SDLProtocolMessage.h
index 62abd6226..782618f3e 100644
--- a/SmartDeviceLink/SDLProtocolMessage.h
+++ b/SmartDeviceLink/SDLProtocolMessage.h
@@ -2,8 +2,8 @@
 //
 
 #import <Foundation/Foundation.h>
-@class SDLProtocolHeader;
 
+@class SDLProtocolHeader;
 
 @interface SDLProtocolMessage : NSObject
 
diff --git a/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink/SDLProtocolMessage.m
index f90e1d513..acfeb90e1 100644
--- a/SmartDeviceLink/SDLProtocolMessage.m
+++ b/SmartDeviceLink/SDLProtocolMessage.m
@@ -4,6 +4,7 @@
 
 #import "SDLProtocolMessage.h"
 #import "SDLFunctionID.h"
+#import "SDLNames.h"
 #import "SDLProtocolHeader.h"
 #import "SDLRPCPayload.h"
 #import "SDLV1ProtocolMessage.h"
@@ -60,7 +61,7 @@
         if (self.header.version >= 2) {
             SDLRPCPayload *rpcPayload = [SDLRPCPayload rpcPayloadWithData:self.payload];
             if (rpcPayload) {
-                NSString *functionName = [[[SDLFunctionID alloc] init] getFunctionName:rpcPayload.functionID];
+                SDLName functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID];
 
                 UInt8 rpcType = rpcPayload.rpcType;
                 NSArray<NSString *> *rpcTypeNames = @[@"Request", @"Response", @"Notification"];
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index e52635643..189fd2189 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -19,7 +19,7 @@
 #import "SDLLanguage.h"
 #import "SDLLayoutMode.h"
 #import "SDLLockScreenStatusManager.h"
-#import "SDLNames.h"
+
 #import "SDLOnHMIStatus.h"
 #import "SDLOnSystemRequest.h"
 #import "SDLPolicyDataParser.h"
@@ -308,7 +308,7 @@ const int POLICIES_CORRELATION_ID = 65535;
     NSString *messageType = [message messageType];
 
     // If it's a response, append response
-    if ([messageType isEqualToString:NAMES_response]) {
+    if ([messageType isEqualToString:SDLNameResponse]) {
         BOOL notGenericResponseMessage = ![functionName isEqualToString:@"GenericResponse"];
         if (notGenericResponseMessage) {
             functionName = [NSString stringWithFormat:@"%@Response", functionName];
@@ -324,7 +324,7 @@ const int POLICIES_CORRELATION_ID = 65535;
     [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName];
 
     // Intercept and handle several messages ourselves
-    if ([functionName isEqualToString:NAMES_OnAppInterfaceUnregistered] || [functionName isEqualToString:NAMES_UnregisterAppInterface]) {
+    if ([functionName isEqualToString:SDLNameOnAppInterfaceUnregistered] || [functionName isEqualToString:SDLNameUnregisterAppInterface]) {
         [self handleRPCUnregistered:dict];
     }
 
@@ -436,7 +436,7 @@ const int POLICIES_CORRELATION_ID = 65535;
 
 #pragma mark Handle Post-Invoke of Delegate Methods
 - (void)handleAfterHMIStatus:(SDLRPCMessage *)message {
-    NSString *statusString = (NSString *)[message getParameters:NAMES_hmiLevel];
+    NSString *statusString = (NSString *)[message getParameters:SDLNameHMILevel];
     SDLHMILevel *hmiLevel = [SDLHMILevel valueOf:statusString];
     _lsm.hmiLevel = hmiLevel;
 
@@ -445,7 +445,7 @@ const int POLICIES_CORRELATION_ID = 65535;
 }
 
 - (void)handleAfterDriverDistraction:(SDLRPCMessage *)message {
-    NSString *stateString = (NSString *)[message getParameters:NAMES_state];
+    NSString *stateString = (NSString *)[message getParameters:SDLNameState];
     BOOL state = [stateString isEqualToString:@"DD_ON"] ? YES : NO;
     _lsm.driverDistracted = state;
 
diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m
index dc162766f..bae513946 100644
--- a/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink/SDLPutFile.m
@@ -6,11 +6,10 @@
 #import "SDLFileType.h"
 #import "SDLNames.h"
 
-
 @implementation SDLPutFile
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_PutFile]) {
+    if (self = [super initWithName:SDLNamePutFile]) {
     }
     return self;
 }
@@ -23,26 +22,26 @@
 
 - (void)setSyncFileName:(NSString *)syncFileName {
     if (syncFileName != nil) {
-        [parameters setObject:syncFileName forKey:NAMES_syncFileName];
+        [parameters setObject:syncFileName forKey:SDLNameSyncFileName];
     } else {
-        [parameters removeObjectForKey:NAMES_syncFileName];
+        [parameters removeObjectForKey:SDLNameSyncFileName];
     }
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:NAMES_syncFileName];
+    return [parameters objectForKey:SDLNameSyncFileName];
 }
 
 - (void)setFileType:(SDLFileType *)fileType {
     if (fileType != nil) {
-        [parameters setObject:fileType forKey:NAMES_fileType];
+        [parameters setObject:fileType forKey:SDLNameFileType];
     } else {
-        [parameters removeObjectForKey:NAMES_fileType];
+        [parameters removeObjectForKey:SDLNameFileType];
     }
 }
 
 - (SDLFileType *)fileType {
-    NSObject *obj = [parameters objectForKey:NAMES_fileType];
+    NSObject *obj = [parameters objectForKey:SDLNameFileType];
     if (obj == nil || [obj isKindOfClass:SDLFileType.class]) {
         return (SDLFileType *)obj;
     } else {
@@ -52,50 +51,50 @@
 
 - (void)setPersistentFile:(NSNumber *)persistentFile {
     if (persistentFile != nil) {
-        [parameters setObject:persistentFile forKey:NAMES_persistentFile];
+        [parameters setObject:persistentFile forKey:SDLNamePersistentFile];
     } else {
-        [parameters removeObjectForKey:NAMES_persistentFile];
+        [parameters removeObjectForKey:SDLNamePersistentFile];
     }
 }
 
 - (NSNumber *)persistentFile {
-    return [parameters objectForKey:NAMES_persistentFile];
+    return [parameters objectForKey:SDLNamePersistentFile];
 }
 
 - (void)setSystemFile:(NSNumber *)systemFile {
     if (systemFile != nil) {
-        [parameters setObject:systemFile forKey:NAMES_systemFile];
+        [parameters setObject:systemFile forKey:SDLNameSystemFile];
     } else {
-        [parameters removeObjectForKey:NAMES_systemFile];
+        [parameters removeObjectForKey:SDLNameSystemFile];
     }
 }
 
 - (NSNumber *)systemFile {
-    return [parameters objectForKey:NAMES_systemFile];
+    return [parameters objectForKey:SDLNameSystemFile];
 }
 
 - (void)setOffset:(NSNumber *)offset {
     if (offset != nil) {
-        [parameters setObject:offset forKey:NAMES_offset];
+        [parameters setObject:offset forKey:SDLNameOffset];
     } else {
-        [parameters removeObjectForKey:NAMES_offset];
+        [parameters removeObjectForKey:SDLNameOffset];
     }
 }
 
 - (NSNumber *)offset {
-    return [parameters objectForKey:NAMES_offset];
+    return [parameters objectForKey:SDLNameOffset];
 }
 
 - (void)setLength:(NSNumber *)length {
     if (length != nil) {
-        [parameters setObject:length forKey:NAMES_length];
+        [parameters setObject:length forKey:SDLNameLength];
     } else {
-        [parameters removeObjectForKey:NAMES_length];
+        [parameters removeObjectForKey:SDLNameLength];
     }
 }
 
 - (NSNumber *)length {
-    return [parameters objectForKey:NAMES_length];
+    return [parameters objectForKey:SDLNameLength];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m
index fb4a07f23..dc0b2c49f 100644
--- a/SmartDeviceLink/SDLPutFileResponse.m
+++ b/SmartDeviceLink/SDLPutFileResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLPutFileResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_PutFile]) {
+    if (self = [super initWithName:SDLNamePutFile]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setSpaceAvailable:(NSNumber *)spaceAvailable {
     if (spaceAvailable != nil) {
-        [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable];
+        [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable];
     } else {
-        [parameters removeObjectForKey:NAMES_spaceAvailable];
+        [parameters removeObjectForKey:SDLNameSpaceAvailable];
     }
 }
 
 - (NSNumber *)spaceAvailable {
-    return [parameters objectForKey:NAMES_spaceAvailable];
+    return [parameters objectForKey:SDLNameSpaceAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m
index 9df45c188..c5a461600 100644
--- a/SmartDeviceLink/SDLRPCMessage.m
+++ b/SmartDeviceLink/SDLRPCMessage.m
@@ -6,7 +6,6 @@
 
 #import "SDLNames.h"
 
-
 @implementation SDLRPCMessage
 
 @synthesize messageType;
@@ -15,10 +14,10 @@
     if (self = [super init]) {
         function = [[NSMutableDictionary alloc] initWithCapacity:3];
         parameters = [[NSMutableDictionary alloc] init];
-        messageType = NAMES_request;
+        messageType = SDLNameRequest;
         [store setObject:function forKey:messageType];
-        [function setObject:parameters forKey:NAMES_parameters];
-        [function setObject:name forKey:NAMES_operation_name];
+        [function setObject:parameters forKey:SDLNameParameters];
+        [function setObject:name forKey:SDLNameOperationName];
     }
     return self;
 }
@@ -27,27 +26,27 @@
     if (self = [super initWithDictionary:dict]) {
         NSEnumerator *enumerator = [store keyEnumerator];
         while (messageType = [enumerator nextObject]) {
-            if ([messageType isEqualToString:@"bulkData"] == FALSE) {
+            if ([messageType isEqualToString:SDLNameBulkData] == FALSE) {
                 break;
             }
         }
 
         function = [store objectForKey:messageType];
-        parameters = [function objectForKey:NAMES_parameters];
-        self.bulkData = [dict objectForKey:@"bulkData"];
+        parameters = [function objectForKey:SDLNameParameters];
+        self.bulkData = [dict objectForKey:SDLNameBulkData];
     }
     return self;
 }
 
 - (NSString *)getFunctionName {
-    return [function objectForKey:NAMES_operation_name];
+    return [function objectForKey:SDLNameOperationName];
 }
 
 - (void)setFunctionName:(NSString *)functionName {
     if (functionName != nil) {
-        [function setObject:functionName forKey:NAMES_operation_name];
+        [function setObject:functionName forKey:SDLNameOperationName];
     } else {
-        [function removeObjectForKey:NAMES_operation_name];
+        [function removeObjectForKey:SDLNameOperationName];
     }
 }
 
@@ -69,7 +68,7 @@
 }
 
 - (NSString *)name {
-    return [function objectForKey:NAMES_operation_name];
+    return [function objectForKey:SDLNameOperationName];
 }
 
 - (NSString *)description {
diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m
index 80c7b1973..3957f1a0d 100644
--- a/SmartDeviceLink/SDLRPCNotification.m
+++ b/SmartDeviceLink/SDLRPCNotification.m
@@ -14,7 +14,7 @@
         return nil;
     }
 
-    messageType = NAMES_notification;
+    messageType = SDLNameNotification;
     [store setObject:function forKey:messageType];
 
     return self;
@@ -26,7 +26,7 @@
         return nil;
     }
 
-    messageType = NAMES_notification;
+    messageType = SDLNameNotification;
     [store setObject:function forKey:messageType];
 
     return self;
diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m
index 48c568c9d..7f4f10c76 100644
--- a/SmartDeviceLink/SDLRPCRequest.m
+++ b/SmartDeviceLink/SDLRPCRequest.m
@@ -9,14 +9,14 @@
 @implementation SDLRPCRequest
 
 - (NSNumber *)correlationID {
-    return [function objectForKey:NAMES_correlationID];
+    return [function objectForKey:SDLNameCorrelationId];
 }
 
 - (void)setCorrelationID:(NSNumber *)corrID {
     if (corrID != nil) {
-        [function setObject:corrID forKey:NAMES_correlationID];
+        [function setObject:corrID forKey:SDLNameCorrelationId];
     } else {
-        [function removeObjectForKey:NAMES_correlationID];
+        [function removeObjectForKey:SDLNameCorrelationId];
     }
 }
 
diff --git a/SmartDeviceLink/SDLRPCRequestFactory.h b/SmartDeviceLink/SDLRPCRequestFactory.h
index 22ec6ec3b..d34f6dbb7 100644
--- a/SmartDeviceLink/SDLRPCRequestFactory.h
+++ b/SmartDeviceLink/SDLRPCRequestFactory.h
@@ -4,6 +4,7 @@
 #import <Foundation/Foundation.h>
 
 #import "SDLNotificationConstants.h"
+#import "SDLVRHelpItem.h"
 
 @class SDLAddCommand;
 @class SDLAddSubMenu;
@@ -138,12 +139,12 @@
 
 
 //***** PerformInteraction *****
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID;
++ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID;
 
 //***
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID;
++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID;
 
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID;
++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID;
 
 + (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID;
 
@@ -175,7 +176,7 @@
 
 
 //***** SetGlobalProperties *****
-+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID;
++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID;
 
 + (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(NSNumber *)correlationID;
 //*****
diff --git a/SmartDeviceLink/SDLRPCRequestFactory.m b/SmartDeviceLink/SDLRPCRequestFactory.m
index 752549ad5..8319ea235 100644
--- a/SmartDeviceLink/SDLRPCRequestFactory.m
+++ b/SmartDeviceLink/SDLRPCRequestFactory.m
@@ -332,7 +332,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt
 
 
 //***** PerformInteraction *****
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID {
++ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID {
     SDLPerformInteraction *msg = [[SDLPerformInteraction alloc] init];
     msg.initialPrompt = [initialChunks mutableCopy];
     msg.initialText = initialText;
@@ -348,7 +348,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt
 }
 
 //***
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID {
++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID {
     NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
     NSArray<SDLTTSChunk *> *helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt];
     NSArray<SDLTTSChunk *> *timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt];
@@ -356,7 +356,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt
     return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp correlationID:correlationID];
 }
 
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID {
++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID {
     NSArray<NSNumber *> *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID];
     NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
 
@@ -501,7 +501,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt
 
 
 //***** SetGlobalProperties *****
-+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<NSString *> *)vrHelp correlationID:(NSNumber *)correlationID {
++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID {
     SDLSetGlobalProperties *msg = [[SDLSetGlobalProperties alloc] init];
     msg.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpText];
     msg.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutText];
diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m
index 713ea8ab0..e96e05446 100644
--- a/SmartDeviceLink/SDLRPCResponse.m
+++ b/SmartDeviceLink/SDLRPCResponse.m
@@ -15,7 +15,7 @@
         return nil;
     }
 
-    messageType = NAMES_response;
+    messageType = SDLNameResponse;
     [store setObject:function forKey:messageType];
 
     return self;
@@ -27,46 +27,46 @@
         return nil;
     }
 
-    messageType = NAMES_response;
+    messageType = SDLNameResponse;
     [store setObject:function forKey:messageType];
 
     return self;
 }
 
 - (NSNumber *)correlationID {
-    return [function objectForKey:NAMES_correlationID];
+    return [function objectForKey:SDLNameCorrelationId];
 }
 
 - (void)setCorrelationID:(NSNumber *)corrID {
     if (corrID != nil) {
-        [function setObject:corrID forKey:NAMES_correlationID];
+        [function setObject:corrID forKey:SDLNameCorrelationId];
     } else {
-        [function removeObjectForKey:NAMES_correlationID];
+        [function removeObjectForKey:SDLNameCorrelationId];
     }
 }
 
 - (void)setSuccess:(NSNumber *)success {
     if (success != nil) {
-        [parameters setObject:success forKey:NAMES_success];
+        [parameters setObject:success forKey:SDLNameSuccess];
     } else {
-        [parameters removeObjectForKey:NAMES_success];
+        [parameters removeObjectForKey:SDLNameSuccess];
     }
 }
 
 - (NSNumber *)success {
-    return [parameters objectForKey:NAMES_success];
+    return [parameters objectForKey:SDLNameSuccess];
 }
 
 - (void)setResultCode:(SDLResult *)resultCode {
     if (resultCode != nil) {
-        [parameters setObject:resultCode forKey:NAMES_resultCode];
+        [parameters setObject:resultCode forKey:SDLNameResultCode];
     } else {
-        [parameters removeObjectForKey:NAMES_resultCode];
+        [parameters removeObjectForKey:SDLNameResultCode];
     }
 }
 
 - (SDLResult *)resultCode {
-    NSObject *obj = [parameters objectForKey:NAMES_resultCode];
+    NSObject *obj = [parameters objectForKey:SDLNameResultCode];
     if (obj == nil || [obj isKindOfClass:SDLResult.class]) {
         return (SDLResult *)obj;
     } else {
@@ -76,14 +76,14 @@
 
 - (void)setInfo:(NSString *)info {
     if (info != nil) {
-        [parameters setObject:info forKey:NAMES_info];
+        [parameters setObject:info forKey:SDLNameInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_info];
+        [parameters removeObjectForKey:SDLNameInfo];
     }
 }
 
 - (NSString *)info {
-    return [parameters objectForKey:NAMES_info];
+    return [parameters objectForKey:SDLNameInfo];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink/SDLRPCStruct.m
index 491df0c6b..03611f030 100644
--- a/SmartDeviceLink/SDLRPCStruct.m
+++ b/SmartDeviceLink/SDLRPCStruct.m
@@ -7,7 +7,6 @@
 #import "SDLEnum.h"
 #import "SDLNames.h"
 
-
 @implementation SDLRPCStruct
 
 - (id)initWithDictionary:(NSMutableDictionary<NSString *, id> *)dict {
@@ -68,7 +67,7 @@
         NSString *messageType = [[store keyEnumerator] nextObject];
         NSMutableDictionary<NSString *, id> *function = [store objectForKey:messageType];
         if ([function isKindOfClass:NSMutableDictionary.class]) {
-            NSMutableDictionary<NSString *, id> *parameters = [function objectForKey:NAMES_parameters];
+            NSMutableDictionary<NSString *, id> *parameters = [function objectForKey:SDLNameParameters];
             return [self serializeDictionary:parameters version:version];
         } else {
             return [self serializeDictionary:store version:version];
diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m
index c7162598e..2c3bb3f65 100644
--- a/SmartDeviceLink/SDLReadDID.m
+++ b/SmartDeviceLink/SDLReadDID.m
@@ -9,7 +9,7 @@
 @implementation SDLReadDID
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ReadDID]) {
+    if (self = [super initWithName:SDLNameReadDID]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setEcuName:(NSNumber *)ecuName {
     if (ecuName != nil) {
-        [parameters setObject:ecuName forKey:NAMES_ecuName];
+        [parameters setObject:ecuName forKey:SDLNameECUName];
     } else {
-        [parameters removeObjectForKey:NAMES_ecuName];
+        [parameters removeObjectForKey:SDLNameECUName];
     }
 }
 
 - (NSNumber *)ecuName {
-    return [parameters objectForKey:NAMES_ecuName];
+    return [parameters objectForKey:SDLNameECUName];
 }
 
 - (void)setDidLocation:(NSMutableArray<NSNumber *> *)didLocation {
     if (didLocation != nil) {
-        [parameters setObject:didLocation forKey:NAMES_didLocation];
+        [parameters setObject:didLocation forKey:SDLNameDIDLocation];
     } else {
-        [parameters removeObjectForKey:NAMES_didLocation];
+        [parameters removeObjectForKey:SDLNameDIDLocation];
     }
 }
 
 - (NSMutableArray<NSNumber *> *)didLocation {
-    return [parameters objectForKey:NAMES_didLocation];
+    return [parameters objectForKey:SDLNameDIDLocation];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m
index 9f708e13c..68f822d9e 100644
--- a/SmartDeviceLink/SDLReadDIDResponse.m
+++ b/SmartDeviceLink/SDLReadDIDResponse.m
@@ -10,7 +10,7 @@
 @implementation SDLReadDIDResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ReadDID]) {
+    if (self = [super initWithName:SDLNameReadDID]) {
     }
     return self;
 }
@@ -23,14 +23,14 @@
 
 - (void)setDidResult:(NSMutableArray<NSNumber *> *)didResult {
     if (didResult != nil) {
-        [parameters setObject:didResult forKey:NAMES_didResult];
+        [parameters setObject:didResult forKey:SDLNameDIDResult];
     } else {
-        [parameters removeObjectForKey:NAMES_didResult];
+        [parameters removeObjectForKey:SDLNameDIDResult];
     }
 }
 
 - (NSMutableArray<SDLDIDResult *> *)didResult {
-    NSMutableArray<SDLDIDResult *> *array = [parameters objectForKey:NAMES_didResult];
+    NSMutableArray<SDLDIDResult *> *array = [parameters objectForKey:SDLNameDIDResult];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLDIDResult.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m
index 02ebe9006..a3051a617 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -16,7 +16,7 @@
 @implementation SDLRegisterAppInterface
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_RegisterAppInterface]) {
+    if (self = [super initWithName:SDLNameRegisterAppInterface]) {
     }
     return self;
 }
@@ -29,14 +29,14 @@
 
 - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion {
     if (syncMsgVersion != nil) {
-        [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion];
+        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion];
     } else {
-        [parameters removeObjectForKey:NAMES_syncMsgVersion];
+        [parameters removeObjectForKey:SDLNameSyncMessageVersion];
     }
 }
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
-    NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion];
+    NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion];
     if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) {
         return (SDLSyncMsgVersion *)obj;
     } else {
@@ -46,26 +46,26 @@
 
 - (void)setAppName:(NSString *)appName {
     if (appName != nil) {
-        [parameters setObject:appName forKey:NAMES_appName];
+        [parameters setObject:appName forKey:SDLNameAppName];
     } else {
-        [parameters removeObjectForKey:NAMES_appName];
+        [parameters removeObjectForKey:SDLNameAppName];
     }
 }
 
 - (NSString *)appName {
-    return [parameters objectForKey:NAMES_appName];
+    return [parameters objectForKey:SDLNameAppName];
 }
 
 - (void)setTtsName:(NSMutableArray<SDLTTSChunk *> *)ttsName {
     if (ttsName != nil) {
-        [parameters setObject:ttsName forKey:NAMES_ttsName];
+        [parameters setObject:ttsName forKey:SDLNameTTSName];
     } else {
-        [parameters removeObjectForKey:NAMES_ttsName];
+        [parameters removeObjectForKey:SDLNameTTSName];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsName {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_ttsName];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSName];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -79,50 +79,50 @@
 
 - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName {
     if (ngnMediaScreenAppName != nil) {
-        [parameters setObject:ngnMediaScreenAppName forKey:NAMES_ngnMediaScreenAppName];
+        [parameters setObject:ngnMediaScreenAppName forKey:SDLNameNGNMediaScreenAppName];
     } else {
-        [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName];
+        [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName];
     }
 }
 
 - (NSString *)ngnMediaScreenAppName {
-    return [parameters objectForKey:NAMES_ngnMediaScreenAppName];
+    return [parameters objectForKey:SDLNameNGNMediaScreenAppName];
 }
 
 - (void)setVrSynonyms:(NSMutableArray<NSString *> *)vrSynonyms {
     if (vrSynonyms != nil) {
-        [parameters setObject:vrSynonyms forKey:NAMES_vrSynonyms];
+        [parameters setObject:vrSynonyms forKey:SDLNameVRSynonyms];
     } else {
-        [parameters removeObjectForKey:NAMES_vrSynonyms];
+        [parameters removeObjectForKey:SDLNameVRSynonyms];
     }
 }
 
 - (NSMutableArray<NSString *> *)vrSynonyms {
-    return [parameters objectForKey:NAMES_vrSynonyms];
+    return [parameters objectForKey:SDLNameVRSynonyms];
 }
 
 - (void)setIsMediaApplication:(NSNumber *)isMediaApplication {
     if (isMediaApplication != nil) {
-        [parameters setObject:isMediaApplication forKey:NAMES_isMediaApplication];
+        [parameters setObject:isMediaApplication forKey:SDLNameIsMediaApplication];
     } else {
-        [parameters removeObjectForKey:NAMES_isMediaApplication];
+        [parameters removeObjectForKey:SDLNameIsMediaApplication];
     }
 }
 
 - (NSNumber *)isMediaApplication {
-    return [parameters objectForKey:NAMES_isMediaApplication];
+    return [parameters objectForKey:SDLNameIsMediaApplication];
 }
 
 - (void)setLanguageDesired:(SDLLanguage *)languageDesired {
     if (languageDesired != nil) {
-        [parameters setObject:languageDesired forKey:NAMES_languageDesired];
+        [parameters setObject:languageDesired forKey:SDLNameLanguageDesired];
     } else {
-        [parameters removeObjectForKey:NAMES_languageDesired];
+        [parameters removeObjectForKey:SDLNameLanguageDesired];
     }
 }
 
 - (SDLLanguage *)languageDesired {
-    NSObject *obj = [parameters objectForKey:NAMES_languageDesired];
+    NSObject *obj = [parameters objectForKey:SDLNameLanguageDesired];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -132,14 +132,14 @@
 
 - (void)setHmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired {
     if (hmiDisplayLanguageDesired != nil) {
-        [parameters setObject:hmiDisplayLanguageDesired forKey:NAMES_hmiDisplayLanguageDesired];
+        [parameters setObject:hmiDisplayLanguageDesired forKey:SDLNameHMIDisplayLanguageDesired];
     } else {
-        [parameters removeObjectForKey:NAMES_hmiDisplayLanguageDesired];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguageDesired];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguageDesired {
-    NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguageDesired];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguageDesired];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -149,14 +149,14 @@
 
 - (void)setAppHMIType:(NSMutableArray<SDLAppHMIType *> *)appHMIType {
     if (appHMIType != nil) {
-        [parameters setObject:appHMIType forKey:NAMES_appHMIType];
+        [parameters setObject:appHMIType forKey:SDLNameAppHMIType];
     } else {
-        [parameters removeObjectForKey:NAMES_appHMIType];
+        [parameters removeObjectForKey:SDLNameAppHMIType];
     }
 }
 
 - (NSMutableArray<SDLAppHMIType *> *)appHMIType {
-    NSMutableArray<SDLAppHMIType *> *array = [parameters objectForKey:NAMES_appHMIType];
+    NSMutableArray<SDLAppHMIType *> *array = [parameters objectForKey:SDLNameAppHMIType];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAppHMIType.class]) {
         return array;
     } else {
@@ -170,26 +170,26 @@
 
 - (void)setHashID:(NSString *)hashID {
     if (hashID != nil) {
-        [parameters setObject:hashID forKey:NAMES_hashID];
+        [parameters setObject:hashID forKey:SDLNameHashId];
     } else {
-        [parameters removeObjectForKey:NAMES_hashID];
+        [parameters removeObjectForKey:SDLNameHashId];
     }
 }
 
 - (NSString *)hashID {
-    return [parameters objectForKey:NAMES_hashID];
+    return [parameters objectForKey:SDLNameHashId];
 }
 
 - (void)setDeviceInfo:(SDLDeviceInfo *)deviceInfo {
     if (deviceInfo != nil) {
-        [parameters setObject:deviceInfo forKey:NAMES_deviceInfo];
+        [parameters setObject:deviceInfo forKey:SDLNameDeviceInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceInfo];
+        [parameters removeObjectForKey:SDLNameDeviceInfo];
     }
 }
 
 - (SDLDeviceInfo *)deviceInfo {
-    NSObject *obj = [parameters objectForKey:NAMES_deviceInfo];
+    NSObject *obj = [parameters objectForKey:SDLNameDeviceInfo];
     if (obj == nil || [obj isKindOfClass:SDLDeviceInfo.class]) {
         return (SDLDeviceInfo *)obj;
     } else {
@@ -199,26 +199,26 @@
 
 - (void)setAppID:(NSString *)appID {
     if (appID != nil) {
-        [parameters setObject:appID forKey:NAMES_appID];
+        [parameters setObject:appID forKey:SDLNameAppId];
     } else {
-        [parameters removeObjectForKey:NAMES_appID];
+        [parameters removeObjectForKey:SDLNameAppId];
     }
 }
 
 - (NSString *)appID {
-    return [parameters objectForKey:NAMES_appID];
+    return [parameters objectForKey:SDLNameAppId];
 }
 
 - (void)setAppInfo:(SDLAppInfo *)appInfo {
     if (appInfo != nil) {
-        [parameters setObject:appInfo forKey:NAMES_appInfo];
+        [parameters setObject:appInfo forKey:SDLNameAppInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_appInfo];
+        [parameters removeObjectForKey:SDLNameAppInfo];
     }
 }
 
 - (SDLAppInfo *)appInfo {
-    NSObject *obj = [parameters objectForKey:NAMES_appInfo];
+    NSObject *obj = [parameters objectForKey:SDLNameAppInfo];
     if (obj == nil || [obj isKindOfClass:SDLAppInfo.class]) {
         return (SDLAppInfo *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index 8934789a5..359eed05e 100644
--- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -19,11 +19,10 @@
 #import "SDLVRCapabilities.h"
 #import "SDLVehicleType.h"
 
-
 @implementation SDLRegisterAppInterfaceResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_RegisterAppInterface]) {
+    if (self = [super initWithName:SDLNameRegisterAppInterface]) {
     }
     return self;
 }
@@ -36,14 +35,14 @@
 
 - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion {
     if (syncMsgVersion != nil) {
-        [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion];
+        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion];
     } else {
-        [parameters removeObjectForKey:NAMES_syncMsgVersion];
+        [parameters removeObjectForKey:SDLNameSyncMessageVersion];
     }
 }
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
-    NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion];
+    NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion];
     if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) {
         return (SDLSyncMsgVersion *)obj;
     } else {
@@ -53,14 +52,14 @@
 
 - (void)setLanguage:(SDLLanguage *)language {
     if (language != nil) {
-        [parameters setObject:language forKey:NAMES_language];
+        [parameters setObject:language forKey:SDLNameLanguage];
     } else {
-        [parameters removeObjectForKey:NAMES_language];
+        [parameters removeObjectForKey:SDLNameLanguage];
     }
 }
 
 - (SDLLanguage *)language {
-    NSObject *obj = [parameters objectForKey:NAMES_language];
+    NSObject *obj = [parameters objectForKey:SDLNameLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -70,14 +69,14 @@
 
 - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage {
     if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
+        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
     } else {
-        [parameters removeObjectForKey:NAMES_hmiDisplayLanguage];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -87,14 +86,14 @@
 
 - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities {
     if (displayCapabilities != nil) {
-        [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities];
+        [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_displayCapabilities];
+        [parameters removeObjectForKey:SDLNameDisplayCapabilities];
     }
 }
 
 - (SDLDisplayCapabilities *)displayCapabilities {
-    NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities];
+    NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities];
     if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) {
         return (SDLDisplayCapabilities *)obj;
     } else {
@@ -104,14 +103,14 @@
 
 - (void)setButtonCapabilities:(NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
     if (buttonCapabilities != nil) {
-        [parameters setObject:buttonCapabilities forKey:NAMES_buttonCapabilities];
+        [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonCapabilities];
+        [parameters removeObjectForKey:SDLNameButtonCapabilities];
     }
 }
 
 - (NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    NSMutableArray<SDLButtonCapabilities *> *array = [parameters objectForKey:NAMES_buttonCapabilities];
+    NSMutableArray<SDLButtonCapabilities *> *array = [parameters objectForKey:SDLNameButtonCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) {
         return array;
     } else {
@@ -125,14 +124,14 @@
 
 - (void)setSoftButtonCapabilities:(NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
     if (softButtonCapabilities != nil) {
-        [parameters setObject:softButtonCapabilities forKey:NAMES_softButtonCapabilities];
+        [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtonCapabilities];
+        [parameters removeObjectForKey:SDLNameSoftButtonCapabilities];
     }
 }
 
 - (NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    NSMutableArray<SDLSoftButtonCapabilities *> *array = [parameters objectForKey:NAMES_softButtonCapabilities];
+    NSMutableArray<SDLSoftButtonCapabilities *> *array = [parameters objectForKey:SDLNameSoftButtonCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) {
         return array;
     } else {
@@ -146,14 +145,14 @@
 
 - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities {
     if (presetBankCapabilities != nil) {
-        [parameters setObject:presetBankCapabilities forKey:NAMES_presetBankCapabilities];
+        [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_presetBankCapabilities];
+        [parameters removeObjectForKey:SDLNamePresetBankCapabilities];
     }
 }
 
 - (SDLPresetBankCapabilities *)presetBankCapabilities {
-    NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities];
+    NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities];
     if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) {
         return (SDLPresetBankCapabilities *)obj;
     } else {
@@ -163,14 +162,14 @@
 
 - (void)setHmiZoneCapabilities:(NSMutableArray<SDLHMIZoneCapabilities *> *)hmiZoneCapabilities {
     if (hmiZoneCapabilities != nil) {
-        [parameters setObject:hmiZoneCapabilities forKey:NAMES_hmiZoneCapabilities];
+        [parameters setObject:hmiZoneCapabilities forKey:SDLNameHMIZoneCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_hmiZoneCapabilities];
+        [parameters removeObjectForKey:SDLNameHMIZoneCapabilities];
     }
 }
 
 - (NSMutableArray<SDLHMIZoneCapabilities *> *)hmiZoneCapabilities {
-    NSMutableArray<SDLHMIZoneCapabilities *> *array = [parameters objectForKey:NAMES_hmiZoneCapabilities];
+    NSMutableArray<SDLHMIZoneCapabilities *> *array = [parameters objectForKey:SDLNameHMIZoneCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMIZoneCapabilities.class]) {
         return array;
     } else {
@@ -184,14 +183,14 @@
 
 - (void)setSpeechCapabilities:(NSMutableArray<SDLSpeechCapabilities *> *)speechCapabilities {
     if (speechCapabilities != nil) {
-        [parameters setObject:speechCapabilities forKey:NAMES_speechCapabilities];
+        [parameters setObject:speechCapabilities forKey:SDLNameSpeechCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_speechCapabilities];
+        [parameters removeObjectForKey:SDLNameSpeechCapabilities];
     }
 }
 
 - (NSMutableArray<SDLSpeechCapabilities *> *)speechCapabilities {
-    NSMutableArray<SDLSpeechCapabilities *> *array = [parameters objectForKey:NAMES_speechCapabilities];
+    NSMutableArray<SDLSpeechCapabilities *> *array = [parameters objectForKey:SDLNameSpeechCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSpeechCapabilities.class]) {
         return array;
     } else {
@@ -205,14 +204,14 @@
 
 - (void)setPrerecordedSpeech:(NSMutableArray<SDLPrerecordedSpeech *> *)prerecordedSpeech {
     if (prerecordedSpeech != nil) {
-        [parameters setObject:prerecordedSpeech forKey:NAMES_prerecordedSpeech];
+        [parameters setObject:prerecordedSpeech forKey:SDLNamePrerecordedSpeech];
     } else {
-        [parameters removeObjectForKey:NAMES_prerecordedSpeech];
+        [parameters removeObjectForKey:SDLNamePrerecordedSpeech];
     }
 }
 
 - (NSMutableArray<SDLPrerecordedSpeech *> *)prerecordedSpeech {
-    NSMutableArray<SDLPrerecordedSpeech *> *array = [parameters objectForKey:NAMES_prerecordedSpeech];
+    NSMutableArray<SDLPrerecordedSpeech *> *array = [parameters objectForKey:SDLNamePrerecordedSpeech];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLPrerecordedSpeech.class]) {
         return array;
     } else {
@@ -226,14 +225,14 @@
 
 - (void)setVrCapabilities:(NSMutableArray<SDLVRCapabilities *> *)vrCapabilities {
     if (vrCapabilities != nil) {
-        [parameters setObject:vrCapabilities forKey:NAMES_vrCapabilities];
+        [parameters setObject:vrCapabilities forKey:SDLNameVRCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_vrCapabilities];
+        [parameters removeObjectForKey:SDLNameVRCapabilities];
     }
 }
 
 - (NSMutableArray<SDLVRCapabilities *> *)vrCapabilities {
-    NSMutableArray<SDLVRCapabilities *> *array = [parameters objectForKey:NAMES_vrCapabilities];
+    NSMutableArray<SDLVRCapabilities *> *array = [parameters objectForKey:SDLNameVRCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRCapabilities.class]) {
         return array;
     } else {
@@ -247,14 +246,14 @@
 
 - (void)setAudioPassThruCapabilities:(NSMutableArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities {
     if (audioPassThruCapabilities != nil) {
-        [parameters setObject:audioPassThruCapabilities forKey:NAMES_audioPassThruCapabilities];
+        [parameters setObject:audioPassThruCapabilities forKey:SDLNameAudioPassThruCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_audioPassThruCapabilities];
+        [parameters removeObjectForKey:SDLNameAudioPassThruCapabilities];
     }
 }
 
 - (NSMutableArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities {
-    NSMutableArray<SDLAudioPassThruCapabilities *> *array = [parameters objectForKey:NAMES_audioPassThruCapabilities];
+    NSMutableArray<SDLAudioPassThruCapabilities *> *array = [parameters objectForKey:SDLNameAudioPassThruCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAudioPassThruCapabilities.class]) {
         return array;
     } else {
@@ -268,14 +267,14 @@
 
 - (void)setVehicleType:(SDLVehicleType *)vehicleType {
     if (vehicleType != nil) {
-        [parameters setObject:vehicleType forKey:NAMES_vehicleType];
+        [parameters setObject:vehicleType forKey:SDLNameVehicleType];
     } else {
-        [parameters removeObjectForKey:NAMES_vehicleType];
+        [parameters removeObjectForKey:SDLNameVehicleType];
     }
 }
 
 - (SDLVehicleType *)vehicleType {
-    NSObject *obj = [parameters objectForKey:NAMES_vehicleType];
+    NSObject *obj = [parameters objectForKey:SDLNameVehicleType];
     if (obj == nil || [obj isKindOfClass:SDLVehicleType.class]) {
         return (SDLVehicleType *)obj;
     } else {
@@ -285,26 +284,26 @@
 
 - (void)setSupportedDiagModes:(NSMutableArray<NSNumber *> *)supportedDiagModes {
     if (supportedDiagModes != nil) {
-        [parameters setObject:supportedDiagModes forKey:NAMES_supportedDiagModes];
+        [parameters setObject:supportedDiagModes forKey:SDLNameSupportedDiagnosticModes];
     } else {
-        [parameters removeObjectForKey:NAMES_supportedDiagModes];
+        [parameters removeObjectForKey:SDLNameSupportedDiagnosticModes];
     }
 }
 
 - (NSMutableArray<NSNumber *> *)supportedDiagModes {
-    return [parameters objectForKey:NAMES_supportedDiagModes];
+    return [parameters objectForKey:SDLNameSupportedDiagnosticModes];
 }
 
 - (void)setHmiCapabilities:(SDLHMICapabilities *)hmiCapabilities {
     if (hmiCapabilities != nil) {
-        [parameters setObject:hmiCapabilities forKey:NAMES_hmiCapabilities];
+        [parameters setObject:hmiCapabilities forKey:SDLNameHMICapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_hmiCapabilities];
+        [parameters removeObjectForKey:SDLNameHMICapabilities];
     }
 }
 
 - (SDLHMICapabilities *)hmiCapabilities {
-    NSObject *obj = [parameters objectForKey:NAMES_hmiCapabilities];
+    NSObject *obj = [parameters objectForKey:SDLNameHMICapabilities];
     if (obj == nil || [obj isKindOfClass:[SDLHMICapabilities class]]) {
         return (SDLHMICapabilities *)obj;
     } else {
@@ -314,26 +313,26 @@
 
 - (void)setSdlVersion:(NSString *)sdlVersion {
     if (sdlVersion != nil) {
-        parameters[NAMES_sdlVersion] = sdlVersion;
+        parameters[SDLNameSDLVersion] = sdlVersion;
     } else {
-        [parameters removeObjectForKey:NAMES_sdlVersion];
+        [parameters removeObjectForKey:SDLNameSDLVersion];
     }
 }
 
 - (NSString *)sdlVersion {
-    return parameters[NAMES_sdlVersion];
+    return parameters[SDLNameSDLVersion];
 }
 
 - (void)setSystemSoftwareVersion:(NSString *)systemSoftwareVersion {
     if (systemSoftwareVersion != nil) {
-        parameters[NAMES_systemSoftwareVersion] = systemSoftwareVersion;
+        parameters[SDLNameSystemSoftwareVersion] = systemSoftwareVersion;
     } else {
-        [parameters removeObjectForKey:NAMES_systemSoftwareVersion];
+        [parameters removeObjectForKey:SDLNameSystemSoftwareVersion];
     }
 }
 
 - (NSString *)systemSoftwareVersion {
-    return parameters[NAMES_systemSoftwareVersion];
+    return parameters[SDLNameSystemSoftwareVersion];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m
index aaba493b3..094768ba4 100644
--- a/SmartDeviceLink/SDLResetGlobalProperties.m
+++ b/SmartDeviceLink/SDLResetGlobalProperties.m
@@ -10,7 +10,7 @@
 @implementation SDLResetGlobalProperties
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ResetGlobalProperties]) {
+    if (self = [super initWithName:SDLNameResetGlobalProperties]) {
     }
     return self;
 }
@@ -23,14 +23,14 @@
 
 - (void)setProperties:(NSMutableArray<SDLGlobalProperty *> *)properties {
     if (properties != nil) {
-        [parameters setObject:properties forKey:NAMES_properties];
+        [parameters setObject:properties forKey:SDLNameProperties];
     } else {
-        [parameters removeObjectForKey:NAMES_properties];
+        [parameters removeObjectForKey:SDLNameProperties];
     }
 }
 
 - (NSMutableArray<SDLGlobalProperty *> *)properties {
-    NSMutableArray<SDLGlobalProperty *> *array = [parameters objectForKey:NAMES_properties];
+    NSMutableArray<SDLGlobalProperty *> *array = [parameters objectForKey:SDLNameProperties];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLGlobalProperty.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
index 8fc4293d4..8d85570ed 100644
--- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLResetGlobalPropertiesResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ResetGlobalProperties]) {
+    if (self = [super initWithName:SDLNameResetGlobalProperties]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m
index fc6cc76f6..d44277954 100644
--- a/SmartDeviceLink/SDLScreenParams.m
+++ b/SmartDeviceLink/SDLScreenParams.m
@@ -7,7 +7,6 @@
 #import "SDLNames.h"
 #import "SDLTouchEventCapabilities.h"
 
-
 @implementation SDLScreenParams
 
 - (instancetype)init {
@@ -24,14 +23,14 @@
 
 - (void)setResolution:(SDLImageResolution *)resolution {
     if (resolution != nil) {
-        [store setObject:resolution forKey:NAMES_resolution];
+        [store setObject:resolution forKey:SDLNameResolution];
     } else {
-        [store removeObjectForKey:NAMES_resolution];
+        [store removeObjectForKey:SDLNameResolution];
     }
 }
 
 - (SDLImageResolution *)resolution {
-    NSObject *obj = [store objectForKey:NAMES_resolution];
+    NSObject *obj = [store objectForKey:SDLNameResolution];
     if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) {
         return (SDLImageResolution *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setTouchEventAvailable:(SDLTouchEventCapabilities *)touchEventAvailable {
     if (touchEventAvailable != nil) {
-        [store setObject:touchEventAvailable forKey:NAMES_touchEventAvailable];
+        [store setObject:touchEventAvailable forKey:SDLNameTouchEventAvailable];
     } else {
-        [store removeObjectForKey:NAMES_touchEventAvailable];
+        [store removeObjectForKey:SDLNameTouchEventAvailable];
     }
 }
 
 - (SDLTouchEventCapabilities *)touchEventAvailable {
-    NSObject *obj = [store objectForKey:NAMES_touchEventAvailable];
+    NSObject *obj = [store objectForKey:SDLNameTouchEventAvailable];
     if (obj == nil || [obj isKindOfClass:SDLTouchEventCapabilities.class]) {
         return (SDLTouchEventCapabilities *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m
index 8126b3ca6..0d9fad427 100644
--- a/SmartDeviceLink/SDLScrollableMessage.m
+++ b/SmartDeviceLink/SDLScrollableMessage.m
@@ -10,7 +10,7 @@
 @implementation SDLScrollableMessage
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ScrollableMessage]) {
+    if (self = [super initWithName:SDLNameScrollableMessage]) {
     }
     return self;
 }
@@ -23,38 +23,38 @@
 
 - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody {
     if (scrollableMessageBody != nil) {
-        [parameters setObject:scrollableMessageBody forKey:NAMES_scrollableMessageBody];
+        [parameters setObject:scrollableMessageBody forKey:SDLNameScrollableMessageBody];
     } else {
-        [parameters removeObjectForKey:NAMES_scrollableMessageBody];
+        [parameters removeObjectForKey:SDLNameScrollableMessageBody];
     }
 }
 
 - (NSString *)scrollableMessageBody {
-    return [parameters objectForKey:NAMES_scrollableMessageBody];
+    return [parameters objectForKey:SDLNameScrollableMessageBody];
 }
 
 - (void)setTimeout:(NSNumber *)timeout {
     if (timeout != nil) {
-        [parameters setObject:timeout forKey:NAMES_timeout];
+        [parameters setObject:timeout forKey:SDLNameTimeout];
     } else {
-        [parameters removeObjectForKey:NAMES_timeout];
+        [parameters removeObjectForKey:SDLNameTimeout];
     }
 }
 
 - (NSNumber *)timeout {
-    return [parameters objectForKey:NAMES_timeout];
+    return [parameters objectForKey:SDLNameTimeout];
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m
index cb82e21c2..cf8c25f89 100644
--- a/SmartDeviceLink/SDLScrollableMessageResponse.m
+++ b/SmartDeviceLink/SDLScrollableMessageResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLScrollableMessageResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ScrollableMessage]) {
+    if (self = [super initWithName:SDLNameScrollableMessage]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m
index af9a6bf6d..de3fef9e5 100644
--- a/SmartDeviceLink/SDLSendLocation.m
+++ b/SmartDeviceLink/SDLSendLocation.m
@@ -6,11 +6,10 @@
 
 #import "SDLNames.h"
 
-
 @implementation SDLSendLocation
 
 - (instancetype)init {
-    self = [super initWithName:NAMES_SendLocation];
+    self = [super initWithName:SDLNameSendLocation];
     if (!self) {
         return nil;
     }
@@ -29,86 +28,86 @@
 
 - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees {
     if (longitudeDegrees != nil) {
-        parameters[NAMES_longitudeDegrees] = longitudeDegrees;
+        parameters[SDLNameLongitudeDegrees] = longitudeDegrees;
     } else {
-        [parameters removeObjectForKey:NAMES_longitudeDegrees];
+        [parameters removeObjectForKey:SDLNameLongitudeDegrees];
     }
 }
 
 - (NSNumber *)longitudeDegrees {
-    return parameters[NAMES_longitudeDegrees];
+    return parameters[SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees {
     if (latitudeDegrees != nil) {
-        parameters[NAMES_latitudeDegrees] = latitudeDegrees;
+        parameters[SDLNameLatitudeDegrees] = latitudeDegrees;
     } else {
-        [parameters removeObjectForKey:NAMES_latitudeDegrees];
+        [parameters removeObjectForKey:SDLNameLatitudeDegrees];
     }
 }
 
 - (NSNumber *)latitudeDegrees {
-    return parameters[NAMES_latitudeDegrees];
+    return parameters[SDLNameLatitudeDegrees];
 }
 
 - (void)setLocationName:(NSString *)locationName {
     if (locationName != nil) {
-        parameters[NAMES_locationName] = locationName;
+        parameters[SDLNameLocationName] = locationName;
     } else {
-        [parameters removeObjectForKey:NAMES_locationName];
+        [parameters removeObjectForKey:SDLNameLocationName];
     }
 }
 
 - (NSString *)locationName {
-    return parameters[NAMES_locationName];
+    return parameters[SDLNameLocationName];
 }
 
 - (void)setAddressLines:(NSArray<NSString *> *)addressLines {
     if (addressLines != nil) {
-        parameters[NAMES_addressLines] = addressLines;
+        parameters[SDLNameAddressLines] = addressLines;
     } else {
-        [parameters removeObjectForKey:NAMES_addressLines];
+        [parameters removeObjectForKey:SDLNameAddressLines];
     }
 }
 
 - (NSArray<NSString *> *)addressLines {
-    return parameters[NAMES_addressLines];
+    return parameters[SDLNameAddressLines];
 }
 
 - (NSString *)locationDescription {
-    return parameters[NAMES_locationDescription];
+    return parameters[SDLNameLocationDescription];
 }
 
 - (void)setLocationDescription:(NSString *)locationDescription {
     if (locationDescription != nil) {
-        parameters[NAMES_locationDescription] = locationDescription;
+        parameters[SDLNameLocationDescription] = locationDescription;
     } else {
-        [parameters removeObjectForKey:NAMES_locationDescription];
+        [parameters removeObjectForKey:SDLNameLocationDescription];
     }
 }
 
 - (void)setPhoneNumber:(NSString *)phoneNumber {
     if (phoneNumber != nil) {
-        parameters[NAMES_phoneNumber] = phoneNumber;
+        parameters[SDLNamePhoneNumber] = phoneNumber;
     } else {
-        [parameters removeObjectForKey:NAMES_phoneNumber];
+        [parameters removeObjectForKey:SDLNamePhoneNumber];
     }
 }
 
 - (NSString *)phoneNumber {
-    return parameters[NAMES_phoneNumber];
+    return parameters[SDLNamePhoneNumber];
 }
 
 - (void)setLocationImage:(SDLImage *)locationImage {
     if (locationImage != nil) {
-        parameters[NAMES_locationImage] = locationImage;
+        parameters[SDLNameLocationImage] = locationImage;
     } else {
-        [parameters removeObjectForKey:NAMES_locationImage];
+        [parameters removeObjectForKey:SDLNameLocationImage];
     }
 }
 
 - (SDLImage *)locationImage {
-    id obj = parameters[NAMES_locationImage];
+    id obj = parameters[SDLNameLocationImage];
     if (obj == nil || [obj isKindOfClass:[SDLImage class]]) {
         return (SDLImage *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m
index 99f57f917..4cd03c96c 100644
--- a/SmartDeviceLink/SDLSendLocationResponse.m
+++ b/SmartDeviceLink/SDLSendLocationResponse.m
@@ -6,11 +6,10 @@
 
 #import "SDLNames.h"
 
-
 @implementation SDLSendLocationResponse
 
 - (instancetype)init {
-    self = [super initWithName:NAMES_SendLocation];
+    self = [super initWithName:SDLNameSendLocation];
     if (!self) {
         return nil;
     }
diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m
index 35384f9de..61dc80f4a 100644
--- a/SmartDeviceLink/SDLSetAppIcon.m
+++ b/SmartDeviceLink/SDLSetAppIcon.m
@@ -9,7 +9,7 @@
 @implementation SDLSetAppIcon
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetAppIcon]) {
+    if (self = [super initWithName:SDLNameSetAppIcon]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setSyncFileName:(NSString *)syncFileName {
     if (syncFileName != nil) {
-        [parameters setObject:syncFileName forKey:NAMES_syncFileName];
+        [parameters setObject:syncFileName forKey:SDLNameSyncFileName];
     } else {
-        [parameters removeObjectForKey:NAMES_syncFileName];
+        [parameters removeObjectForKey:SDLNameSyncFileName];
     }
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:NAMES_syncFileName];
+    return [parameters objectForKey:SDLNameSyncFileName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m
index d77b000df..29de12004 100644
--- a/SmartDeviceLink/SDLSetAppIconResponse.m
+++ b/SmartDeviceLink/SDLSetAppIconResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSetAppIconResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetAppIcon]) {
+    if (self = [super initWithName:SDLNameSetAppIcon]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m
index 48db6226b..60be5bdc7 100644
--- a/SmartDeviceLink/SDLSetDisplayLayout.m
+++ b/SmartDeviceLink/SDLSetDisplayLayout.m
@@ -9,7 +9,7 @@
 @implementation SDLSetDisplayLayout
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetDisplayLayout]) {
+    if (self = [super initWithName:SDLNameSetDisplayLayout]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setDisplayLayout:(NSString *)displayLayout {
     if (displayLayout != nil) {
-        [parameters setObject:displayLayout forKey:NAMES_displayLayout];
+        [parameters setObject:displayLayout forKey:SDLNameDisplayLayout];
     } else {
-        [parameters removeObjectForKey:NAMES_displayLayout];
+        [parameters removeObjectForKey:SDLNameDisplayLayout];
     }
 }
 
 - (NSString *)displayLayout {
-    return [parameters objectForKey:NAMES_displayLayout];
+    return [parameters objectForKey:SDLNameDisplayLayout];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
index 27cd27615..5cd64ffd4 100644
--- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
+++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
@@ -10,11 +10,10 @@
 #import "SDLPresetBankCapabilities.h"
 #import "SDLSoftButtonCapabilities.h"
 
-
 @implementation SDLSetDisplayLayoutResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetDisplayLayout]) {
+    if (self = [super initWithName:SDLNameSetDisplayLayout]) {
     }
     return self;
 }
@@ -27,14 +26,14 @@
 
 - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities {
     if (displayCapabilities != nil) {
-        [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities];
+        [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_displayCapabilities];
+        [parameters removeObjectForKey:SDLNameDisplayCapabilities];
     }
 }
 
 - (SDLDisplayCapabilities *)displayCapabilities {
-    NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities];
+    NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities];
     if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) {
         return (SDLDisplayCapabilities *)obj;
     } else {
@@ -44,14 +43,14 @@
 
 - (void)setButtonCapabilities:(NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
     if (buttonCapabilities != nil) {
-        [parameters setObject:buttonCapabilities forKey:NAMES_buttonCapabilities];
+        [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonCapabilities];
+        [parameters removeObjectForKey:SDLNameButtonCapabilities];
     }
 }
 
 - (NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    NSMutableArray<SDLButtonCapabilities *> *array = [parameters objectForKey:NAMES_buttonCapabilities];
+    NSMutableArray<SDLButtonCapabilities *> *array = [parameters objectForKey:SDLNameButtonCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) {
         return array;
     } else {
@@ -65,14 +64,14 @@
 
 - (void)setSoftButtonCapabilities:(NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
     if (softButtonCapabilities != nil) {
-        [parameters setObject:softButtonCapabilities forKey:NAMES_softButtonCapabilities];
+        [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtonCapabilities];
+        [parameters removeObjectForKey:SDLNameSoftButtonCapabilities];
     }
 }
 
 - (NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    NSMutableArray<SDLSoftButtonCapabilities *> *array = [parameters objectForKey:NAMES_softButtonCapabilities];
+    NSMutableArray<SDLSoftButtonCapabilities *> *array = [parameters objectForKey:SDLNameSoftButtonCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) {
         return array;
     } else {
@@ -86,14 +85,14 @@
 
 - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities {
     if (presetBankCapabilities != nil) {
-        [parameters setObject:presetBankCapabilities forKey:NAMES_presetBankCapabilities];
+        [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities];
     } else {
-        [parameters removeObjectForKey:NAMES_presetBankCapabilities];
+        [parameters removeObjectForKey:SDLNamePresetBankCapabilities];
     }
 }
 
 - (SDLPresetBankCapabilities *)presetBankCapabilities {
-    NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities];
+    NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities];
     if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) {
         return (SDLPresetBankCapabilities *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m
index 93b458b62..53aadc893 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -14,7 +14,7 @@
 @implementation SDLSetGlobalProperties
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetGlobalProperties]) {
+    if (self = [super initWithName:SDLNameSetGlobalProperties]) {
     }
     return self;
 }
@@ -27,14 +27,14 @@
 
 - (void)setHelpPrompt:(NSMutableArray<SDLTTSChunk *> *)helpPrompt {
     if (helpPrompt != nil) {
-        [parameters setObject:helpPrompt forKey:NAMES_helpPrompt];
+        [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_helpPrompt];
+        [parameters removeObjectForKey:SDLNameHelpPrompt];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_helpPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameHelpPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -48,14 +48,14 @@
 
 - (void)setTimeoutPrompt:(NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
     if (timeoutPrompt != nil) {
-        [parameters setObject:timeoutPrompt forKey:NAMES_timeoutPrompt];
+        [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt];
     } else {
-        [parameters removeObjectForKey:NAMES_timeoutPrompt];
+        [parameters removeObjectForKey:SDLNameTimeoutPrompt];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_timeoutPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTimeoutPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -69,26 +69,26 @@
 
 - (void)setVrHelpTitle:(NSString *)vrHelpTitle {
     if (vrHelpTitle != nil) {
-        [parameters setObject:vrHelpTitle forKey:NAMES_vrHelpTitle];
+        [parameters setObject:vrHelpTitle forKey:SDLNameVRHelpTitle];
     } else {
-        [parameters removeObjectForKey:NAMES_vrHelpTitle];
+        [parameters removeObjectForKey:SDLNameVRHelpTitle];
     }
 }
 
 - (NSString *)vrHelpTitle {
-    return [parameters objectForKey:NAMES_vrHelpTitle];
+    return [parameters objectForKey:SDLNameVRHelpTitle];
 }
 
 - (void)setVrHelp:(NSMutableArray<SDLVRHelpItem *> *)vrHelp {
     if (vrHelp != nil) {
-        [parameters setObject:vrHelp forKey:NAMES_vrHelp];
+        [parameters setObject:vrHelp forKey:SDLNameVRHelp];
     } else {
-        [parameters removeObjectForKey:NAMES_vrHelp];
+        [parameters removeObjectForKey:SDLNameVRHelp];
     }
 }
 
 - (NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:NAMES_vrHelp];
+    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:SDLNameVRHelp];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
         return array;
     } else {
@@ -102,26 +102,26 @@
 
 - (void)setMenuTitle:(NSString *)menuTitle {
     if (menuTitle != nil) {
-        [parameters setObject:menuTitle forKey:NAMES_menuTitle];
+        [parameters setObject:menuTitle forKey:SDLNameMenuTitle];
     } else {
-        [parameters removeObjectForKey:NAMES_menuTitle];
+        [parameters removeObjectForKey:SDLNameMenuTitle];
     }
 }
 
 - (NSString *)menuTitle {
-    return [parameters objectForKey:NAMES_menuTitle];
+    return [parameters objectForKey:SDLNameMenuTitle];
 }
 
 - (void)setMenuIcon:(SDLImage *)menuIcon {
     if (menuIcon != nil) {
-        [parameters setObject:menuIcon forKey:NAMES_menuIcon];
+        [parameters setObject:menuIcon forKey:SDLNameMenuIcon];
     } else {
-        [parameters removeObjectForKey:NAMES_menuIcon];
+        [parameters removeObjectForKey:SDLNameMenuIcon];
     }
 }
 
 - (SDLImage *)menuIcon {
-    NSObject *obj = [parameters objectForKey:NAMES_menuIcon];
+    NSObject *obj = [parameters objectForKey:SDLNameMenuIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -131,14 +131,14 @@
 
 - (void)setKeyboardProperties:(SDLKeyboardProperties *)keyboardProperties {
     if (keyboardProperties != nil) {
-        [parameters setObject:keyboardProperties forKey:NAMES_keyboardProperties];
+        [parameters setObject:keyboardProperties forKey:SDLNameKeyboardProperties];
     } else {
-        [parameters removeObjectForKey:NAMES_keyboardProperties];
+        [parameters removeObjectForKey:SDLNameKeyboardProperties];
     }
 }
 
 - (SDLKeyboardProperties *)keyboardProperties {
-    NSObject *obj = [parameters objectForKey:NAMES_keyboardProperties];
+    NSObject *obj = [parameters objectForKey:SDLNameKeyboardProperties];
     if (obj == nil || [obj isKindOfClass:SDLKeyboardProperties.class]) {
         return (SDLKeyboardProperties *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
index a798a3587..6f801e35b 100644
--- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSetGlobalPropertiesResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetGlobalProperties]) {
+    if (self = [super initWithName:SDLNameSetGlobalProperties]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index dfb36ea3e..c20ef2ad7 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -8,11 +8,10 @@
 #import "SDLStartTime.h"
 #import "SDLUpdateMode.h"
 
-
 @implementation SDLSetMediaClockTimer
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetMediaClockTimer]) {
+    if (self = [super initWithName:SDLNameSetMediaClockTimer]) {
     }
     return self;
 }
@@ -25,14 +24,14 @@
 
 - (void)setStartTime:(SDLStartTime *)startTime {
     if (startTime != nil) {
-        [parameters setObject:startTime forKey:NAMES_startTime];
+        [parameters setObject:startTime forKey:SDLNameStartTime];
     } else {
-        [parameters removeObjectForKey:NAMES_startTime];
+        [parameters removeObjectForKey:SDLNameStartTime];
     }
 }
 
 - (SDLStartTime *)startTime {
-    NSObject *obj = [parameters objectForKey:NAMES_startTime];
+    NSObject *obj = [parameters objectForKey:SDLNameStartTime];
     if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
@@ -42,14 +41,14 @@
 
 - (void)setEndTime:(SDLStartTime *)endTime {
     if (endTime != nil) {
-        [parameters setObject:endTime forKey:NAMES_endTime];
+        [parameters setObject:endTime forKey:SDLNameEndTime];
     } else {
-        [parameters removeObjectForKey:NAMES_endTime];
+        [parameters removeObjectForKey:SDLNameEndTime];
     }
 }
 
 - (SDLStartTime *)endTime {
-    NSObject *obj = [parameters objectForKey:NAMES_endTime];
+    NSObject *obj = [parameters objectForKey:SDLNameEndTime];
     if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
@@ -59,14 +58,14 @@
 
 - (void)setUpdateMode:(SDLUpdateMode *)updateMode {
     if (updateMode != nil) {
-        [parameters setObject:updateMode forKey:NAMES_updateMode];
+        [parameters setObject:updateMode forKey:SDLNameUpdateMode];
     } else {
-        [parameters removeObjectForKey:NAMES_updateMode];
+        [parameters removeObjectForKey:SDLNameUpdateMode];
     }
 }
 
 - (SDLUpdateMode *)updateMode {
-    NSObject *obj = [parameters objectForKey:NAMES_updateMode];
+    NSObject *obj = [parameters objectForKey:SDLNameUpdateMode];
     if (obj == nil || [obj isKindOfClass:SDLUpdateMode.class]) {
         return (SDLUpdateMode *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
index 2b701ee24..4eb42bfba 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSetMediaClockTimerResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetMediaClockTimer]) {
+    if (self = [super initWithName:SDLNameSetMediaClockTimer]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index c7685ca4c..ca8ed2cdf 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -13,7 +13,7 @@
 @implementation SDLShow
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Show]) {
+    if (self = [super initWithName:SDLNameShow]) {
     }
     return self;
 }
@@ -26,62 +26,62 @@
 
 - (void)setMainField1:(NSString *)mainField1 {
     if (mainField1 != nil) {
-        [parameters setObject:mainField1 forKey:NAMES_mainField1];
+        [parameters setObject:mainField1 forKey:SDLNameMainField1];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField1];
+        [parameters removeObjectForKey:SDLNameMainField1];
     }
 }
 
 - (NSString *)mainField1 {
-    return [parameters objectForKey:NAMES_mainField1];
+    return [parameters objectForKey:SDLNameMainField1];
 }
 
 - (void)setMainField2:(NSString *)mainField2 {
     if (mainField2 != nil) {
-        [parameters setObject:mainField2 forKey:NAMES_mainField2];
+        [parameters setObject:mainField2 forKey:SDLNameMainField2];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField2];
+        [parameters removeObjectForKey:SDLNameMainField2];
     }
 }
 
 - (NSString *)mainField2 {
-    return [parameters objectForKey:NAMES_mainField2];
+    return [parameters objectForKey:SDLNameMainField2];
 }
 
 - (void)setMainField3:(NSString *)mainField3 {
     if (mainField3 != nil) {
-        [parameters setObject:mainField3 forKey:NAMES_mainField3];
+        [parameters setObject:mainField3 forKey:SDLNameMainField3];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField3];
+        [parameters removeObjectForKey:SDLNameMainField3];
     }
 }
 
 - (NSString *)mainField3 {
-    return [parameters objectForKey:NAMES_mainField3];
+    return [parameters objectForKey:SDLNameMainField3];
 }
 
 - (void)setMainField4:(NSString *)mainField4 {
     if (mainField4 != nil) {
-        [parameters setObject:mainField4 forKey:NAMES_mainField4];
+        [parameters setObject:mainField4 forKey:SDLNameMainField4];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField4];
+        [parameters removeObjectForKey:SDLNameMainField4];
     }
 }
 
 - (NSString *)mainField4 {
-    return [parameters objectForKey:NAMES_mainField4];
+    return [parameters objectForKey:SDLNameMainField4];
 }
 
 - (void)setAlignment:(SDLTextAlignment *)alignment {
     if (alignment != nil) {
-        [parameters setObject:alignment forKey:NAMES_alignment];
+        [parameters setObject:alignment forKey:SDLNameAlignment];
     } else {
-        [parameters removeObjectForKey:NAMES_alignment];
+        [parameters removeObjectForKey:SDLNameAlignment];
     }
 }
 
 - (SDLTextAlignment *)alignment {
-    NSObject *obj = [parameters objectForKey:NAMES_alignment];
+    NSObject *obj = [parameters objectForKey:SDLNameAlignment];
     if (obj == nil || [obj isKindOfClass:SDLTextAlignment.class]) {
         return (SDLTextAlignment *)obj;
     } else {
@@ -91,50 +91,50 @@
 
 - (void)setStatusBar:(NSString *)statusBar {
     if (statusBar != nil) {
-        [parameters setObject:statusBar forKey:NAMES_statusBar];
+        [parameters setObject:statusBar forKey:SDLNameStatusBar];
     } else {
-        [parameters removeObjectForKey:NAMES_statusBar];
+        [parameters removeObjectForKey:SDLNameStatusBar];
     }
 }
 
 - (NSString *)statusBar {
-    return [parameters objectForKey:NAMES_statusBar];
+    return [parameters objectForKey:SDLNameStatusBar];
 }
 
 - (void)setMediaClock:(NSString *)mediaClock {
     if (mediaClock != nil) {
-        [parameters setObject:mediaClock forKey:NAMES_mediaClock];
+        [parameters setObject:mediaClock forKey:SDLNameMediaClock];
     } else {
-        [parameters removeObjectForKey:NAMES_mediaClock];
+        [parameters removeObjectForKey:SDLNameMediaClock];
     }
 }
 
 - (NSString *)mediaClock {
-    return [parameters objectForKey:NAMES_mediaClock];
+    return [parameters objectForKey:SDLNameMediaClock];
 }
 
 - (void)setMediaTrack:(NSString *)mediaTrack {
     if (mediaTrack != nil) {
-        [parameters setObject:mediaTrack forKey:NAMES_mediaTrack];
+        [parameters setObject:mediaTrack forKey:SDLNameMediaTrack];
     } else {
-        [parameters removeObjectForKey:NAMES_mediaTrack];
+        [parameters removeObjectForKey:SDLNameMediaTrack];
     }
 }
 
 - (NSString *)mediaTrack {
-    return [parameters objectForKey:NAMES_mediaTrack];
+    return [parameters objectForKey:SDLNameMediaTrack];
 }
 
 - (void)setGraphic:(SDLImage *)graphic {
     if (graphic != nil) {
-        [parameters setObject:graphic forKey:NAMES_graphic];
+        [parameters setObject:graphic forKey:SDLNameGraphic];
     } else {
-        [parameters removeObjectForKey:NAMES_graphic];
+        [parameters removeObjectForKey:SDLNameGraphic];
     }
 }
 
 - (SDLImage *)graphic {
-    NSObject *obj = [parameters objectForKey:NAMES_graphic];
+    NSObject *obj = [parameters objectForKey:SDLNameGraphic];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -144,14 +144,14 @@
 
 - (void)setSecondaryGraphic:(SDLImage *)secondaryGraphic {
     if (secondaryGraphic != nil) {
-        [parameters setObject:secondaryGraphic forKey:NAMES_secondaryGraphic];
+        [parameters setObject:secondaryGraphic forKey:SDLNameSecondaryGraphic];
     } else {
-        [parameters removeObjectForKey:NAMES_secondaryGraphic];
+        [parameters removeObjectForKey:SDLNameSecondaryGraphic];
     }
 }
 
 - (SDLImage *)secondaryGraphic {
-    NSObject *obj = [parameters objectForKey:NAMES_secondaryGraphic];
+    NSObject *obj = [parameters objectForKey:SDLNameSecondaryGraphic];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -161,14 +161,14 @@
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
@@ -182,14 +182,14 @@
 
 - (void)setCustomPresets:(NSMutableArray<NSString *> *)customPresets {
     if (customPresets != nil) {
-        [parameters setObject:customPresets forKey:NAMES_customPresets];
+        [parameters setObject:customPresets forKey:SDLNameCustomPresets];
     } else {
-        [parameters removeObjectForKey:NAMES_customPresets];
+        [parameters removeObjectForKey:SDLNameCustomPresets];
     }
 }
 
 - (NSMutableArray<NSString *> *)customPresets {
-    return [parameters objectForKey:NAMES_customPresets];
+    return [parameters objectForKey:SDLNameCustomPresets];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index df6a1bbb3..fa1f61e3b 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -8,11 +8,10 @@
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 
-
 @implementation SDLShowConstantTBT
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ShowConstantTBT]) {
+    if (self = [super initWithName:SDLNameShowConstantTBT]) {
     }
     return self;
 }
@@ -25,74 +24,74 @@
 
 - (void)setNavigationText1:(NSString *)navigationText1 {
     if (navigationText1 != nil) {
-        [parameters setObject:navigationText1 forKey:NAMES_navigationText1];
+        [parameters setObject:navigationText1 forKey:SDLNameNavigationText1];
     } else {
-        [parameters removeObjectForKey:NAMES_navigationText1];
+        [parameters removeObjectForKey:SDLNameNavigationText1];
     }
 }
 
 - (NSString *)navigationText1 {
-    return [parameters objectForKey:NAMES_navigationText1];
+    return [parameters objectForKey:SDLNameNavigationText1];
 }
 
 - (void)setNavigationText2:(NSString *)navigationText2 {
     if (navigationText2 != nil) {
-        [parameters setObject:navigationText2 forKey:NAMES_navigationText2];
+        [parameters setObject:navigationText2 forKey:SDLNameNavigationText2];
     } else {
-        [parameters removeObjectForKey:NAMES_navigationText2];
+        [parameters removeObjectForKey:SDLNameNavigationText2];
     }
 }
 
 - (NSString *)navigationText2 {
-    return [parameters objectForKey:NAMES_navigationText2];
+    return [parameters objectForKey:SDLNameNavigationText2];
 }
 
 - (void)setEta:(NSString *)eta {
     if (eta != nil) {
-        [parameters setObject:eta forKey:NAMES_eta];
+        [parameters setObject:eta forKey:SDLNameETA];
     } else {
-        [parameters removeObjectForKey:NAMES_eta];
+        [parameters removeObjectForKey:SDLNameETA];
     }
 }
 
 - (NSString *)eta {
-    return [parameters objectForKey:NAMES_eta];
+    return [parameters objectForKey:SDLNameETA];
 }
 
 - (void)setTimeToDestination:(NSString *)timeToDestination {
     if (timeToDestination != nil) {
-        [parameters setObject:timeToDestination forKey:NAMES_timeToDestination];
+        [parameters setObject:timeToDestination forKey:SDLNameTimeToDestination];
     } else {
-        [parameters removeObjectForKey:NAMES_timeToDestination];
+        [parameters removeObjectForKey:SDLNameTimeToDestination];
     }
 }
 
 - (NSString *)timeToDestination {
-    return [parameters objectForKey:NAMES_timeToDestination];
+    return [parameters objectForKey:SDLNameTimeToDestination];
 }
 
 - (void)setTotalDistance:(NSString *)totalDistance {
     if (totalDistance != nil) {
-        [parameters setObject:totalDistance forKey:NAMES_totalDistance];
+        [parameters setObject:totalDistance forKey:SDLNameTotalDistance];
     } else {
-        [parameters removeObjectForKey:NAMES_totalDistance];
+        [parameters removeObjectForKey:SDLNameTotalDistance];
     }
 }
 
 - (NSString *)totalDistance {
-    return [parameters objectForKey:NAMES_totalDistance];
+    return [parameters objectForKey:SDLNameTotalDistance];
 }
 
 - (void)setTurnIcon:(SDLImage *)turnIcon {
     if (turnIcon != nil) {
-        [parameters setObject:turnIcon forKey:NAMES_turnIcon];
+        [parameters setObject:turnIcon forKey:SDLNameTurnIcon];
     } else {
-        [parameters removeObjectForKey:NAMES_turnIcon];
+        [parameters removeObjectForKey:SDLNameTurnIcon];
     }
 }
 
 - (SDLImage *)turnIcon {
-    NSObject *obj = [parameters objectForKey:NAMES_turnIcon];
+    NSObject *obj = [parameters objectForKey:SDLNameTurnIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -102,14 +101,14 @@
 
 - (void)setNextTurnIcon:(SDLImage *)nextTurnIcon {
     if (nextTurnIcon != nil) {
-        [parameters setObject:nextTurnIcon forKey:NAMES_nextTurnIcon];
+        [parameters setObject:nextTurnIcon forKey:SDLNameNextTurnIcon];
     } else {
-        [parameters removeObjectForKey:NAMES_nextTurnIcon];
+        [parameters removeObjectForKey:SDLNameNextTurnIcon];
     }
 }
 
 - (SDLImage *)nextTurnIcon {
-    NSObject *obj = [parameters objectForKey:NAMES_nextTurnIcon];
+    NSObject *obj = [parameters objectForKey:SDLNameNextTurnIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -119,50 +118,50 @@
 
 - (void)setDistanceToManeuver:(NSNumber *)distanceToManeuver {
     if (distanceToManeuver != nil) {
-        [parameters setObject:distanceToManeuver forKey:NAMES_distanceToManeuver];
+        [parameters setObject:distanceToManeuver forKey:SDLNameDistanceToManeuver];
     } else {
-        [parameters removeObjectForKey:NAMES_distanceToManeuver];
+        [parameters removeObjectForKey:SDLNameDistanceToManeuver];
     }
 }
 
 - (NSNumber *)distanceToManeuver {
-    return [parameters objectForKey:NAMES_distanceToManeuver];
+    return [parameters objectForKey:SDLNameDistanceToManeuver];
 }
 
 - (void)setDistanceToManeuverScale:(NSNumber *)distanceToManeuverScale {
     if (distanceToManeuverScale != nil) {
-        [parameters setObject:distanceToManeuverScale forKey:NAMES_distanceToManeuverScale];
+        [parameters setObject:distanceToManeuverScale forKey:SDLNameDistanceToManeuverScale];
     } else {
-        [parameters removeObjectForKey:NAMES_distanceToManeuverScale];
+        [parameters removeObjectForKey:SDLNameDistanceToManeuverScale];
     }
 }
 
 - (NSNumber *)distanceToManeuverScale {
-    return [parameters objectForKey:NAMES_distanceToManeuverScale];
+    return [parameters objectForKey:SDLNameDistanceToManeuverScale];
 }
 
 - (void)setManeuverComplete:(NSNumber *)maneuverComplete {
     if (maneuverComplete != nil) {
-        [parameters setObject:maneuverComplete forKey:NAMES_maneuverComplete];
+        [parameters setObject:maneuverComplete forKey:SDLNameManeuverComplete];
     } else {
-        [parameters removeObjectForKey:NAMES_maneuverComplete];
+        [parameters removeObjectForKey:SDLNameManeuverComplete];
     }
 }
 
 - (NSNumber *)maneuverComplete {
-    return [parameters objectForKey:NAMES_maneuverComplete];
+    return [parameters objectForKey:SDLNameManeuverComplete];
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m
index 0d4dfb334..87ca6959c 100644
--- a/SmartDeviceLink/SDLShowConstantTBTResponse.m
+++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m
@@ -3,13 +3,12 @@
 
 
 #import "SDLShowConstantTBTResponse.h"
-
 #import "SDLNames.h"
 
 @implementation SDLShowConstantTBTResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ShowConstantTBT]) {
+    if (self = [super initWithName:SDLNameShowConstantTBT]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m
index dfe483dee..e33803a26 100644
--- a/SmartDeviceLink/SDLShowResponse.m
+++ b/SmartDeviceLink/SDLShowResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLShowResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Show]) {
+    if (self = [super initWithName:SDLNameShow]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m
index b6a9f64e8..63b781c27 100644
--- a/SmartDeviceLink/SDLSingleTireStatus.m
+++ b/SmartDeviceLink/SDLSingleTireStatus.m
@@ -6,7 +6,6 @@
 #import "SDLComponentVolumeStatus.h"
 #import "SDLNames.h"
 
-
 @implementation SDLSingleTireStatus
 
 - (instancetype)init {
@@ -23,14 +22,14 @@
 
 - (void)setStatus:(SDLComponentVolumeStatus *)status {
     if (status != nil) {
-        [store setObject:status forKey:NAMES_status];
+        [store setObject:status forKey:SDLNameStatus];
     } else {
-        [store removeObjectForKey:NAMES_status];
+        [store removeObjectForKey:SDLNameStatus];
     }
 }
 
 - (SDLComponentVolumeStatus *)status {
-    NSObject *obj = [store objectForKey:NAMES_status];
+    NSObject *obj = [store objectForKey:SDLNameStatus];
     if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) {
         return (SDLComponentVolumeStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m
index bb5418ac1..0de93b0e6 100644
--- a/SmartDeviceLink/SDLSlider.m
+++ b/SmartDeviceLink/SDLSlider.m
@@ -9,7 +9,7 @@
 @implementation SDLSlider
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Slider]) {
+    if (self = [super initWithName:SDLNameSlider]) {
     }
     return self;
 }
@@ -22,62 +22,62 @@
 
 - (void)setNumTicks:(NSNumber *)numTicks {
     if (numTicks != nil) {
-        [parameters setObject:numTicks forKey:NAMES_numTicks];
+        [parameters setObject:numTicks forKey:SDLNameNumberTicks];
     } else {
-        [parameters removeObjectForKey:NAMES_numTicks];
+        [parameters removeObjectForKey:SDLNameNumberTicks];
     }
 }
 
 - (NSNumber *)numTicks {
-    return [parameters objectForKey:NAMES_numTicks];
+    return [parameters objectForKey:SDLNameNumberTicks];
 }
 
 - (void)setPosition:(NSNumber *)position {
     if (position != nil) {
-        [parameters setObject:position forKey:NAMES_position];
+        [parameters setObject:position forKey:SDLNamePosition];
     } else {
-        [parameters removeObjectForKey:NAMES_position];
+        [parameters removeObjectForKey:SDLNamePosition];
     }
 }
 
 - (NSNumber *)position {
-    return [parameters objectForKey:NAMES_position];
+    return [parameters objectForKey:SDLNamePosition];
 }
 
 - (void)setSliderHeader:(NSString *)sliderHeader {
     if (sliderHeader != nil) {
-        [parameters setObject:sliderHeader forKey:NAMES_sliderHeader];
+        [parameters setObject:sliderHeader forKey:SDLNameSliderHeader];
     } else {
-        [parameters removeObjectForKey:NAMES_sliderHeader];
+        [parameters removeObjectForKey:SDLNameSliderHeader];
     }
 }
 
 - (NSString *)sliderHeader {
-    return [parameters objectForKey:NAMES_sliderHeader];
+    return [parameters objectForKey:SDLNameSliderHeader];
 }
 
 - (void)setSliderFooter:(NSMutableArray<NSString *> *)sliderFooter {
     if (sliderFooter != nil) {
-        [parameters setObject:sliderFooter forKey:NAMES_sliderFooter];
+        [parameters setObject:sliderFooter forKey:SDLNameSliderFooter];
     } else {
-        [parameters removeObjectForKey:NAMES_sliderFooter];
+        [parameters removeObjectForKey:SDLNameSliderFooter];
     }
 }
 
 - (NSMutableArray<NSString *> *)sliderFooter {
-    return [parameters objectForKey:NAMES_sliderFooter];
+    return [parameters objectForKey:SDLNameSliderFooter];
 }
 
 - (void)setTimeout:(NSNumber *)timeout {
     if (timeout != nil) {
-        [parameters setObject:timeout forKey:NAMES_timeout];
+        [parameters setObject:timeout forKey:SDLNameTimeout];
     } else {
-        [parameters removeObjectForKey:NAMES_timeout];
+        [parameters removeObjectForKey:SDLNameTimeout];
     }
 }
 
 - (NSNumber *)timeout {
-    return [parameters objectForKey:NAMES_timeout];
+    return [parameters objectForKey:SDLNameTimeout];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m
index 0004093fa..92bdfc3d2 100644
--- a/SmartDeviceLink/SDLSliderResponse.m
+++ b/SmartDeviceLink/SDLSliderResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSliderResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Slider]) {
+    if (self = [super initWithName:SDLNameSlider]) {
     }
     return self;
 }
@@ -22,14 +22,14 @@
 
 - (void)setSliderPosition:(NSNumber *)sliderPosition {
     if (sliderPosition != nil) {
-        [parameters setObject:sliderPosition forKey:NAMES_sliderPosition];
+        [parameters setObject:sliderPosition forKey:SDLNameSliderPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_sliderPosition];
+        [parameters removeObjectForKey:SDLNameSliderPosition];
     }
 }
 
 - (NSNumber *)sliderPosition {
-    return [parameters objectForKey:NAMES_sliderPosition];
+    return [parameters objectForKey:SDLNameSliderPosition];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m
index d40c757da..e38afacdb 100644
--- a/SmartDeviceLink/SDLSoftButton.m
+++ b/SmartDeviceLink/SDLSoftButton.m
@@ -8,7 +8,6 @@
 #import "SDLSoftButtonType.h"
 #import "SDLSystemAction.h"
 
-
 @implementation SDLSoftButton
 
 - (instancetype)init {
@@ -36,14 +35,14 @@
 
 - (void)setType:(SDLSoftButtonType *)type {
     if (type != nil) {
-        [store setObject:type forKey:NAMES_type];
+        [store setObject:type forKey:SDLNameType];
     } else {
-        [store removeObjectForKey:NAMES_type];
+        [store removeObjectForKey:SDLNameType];
     }
 }
 
 - (SDLSoftButtonType *)type {
-    NSObject *obj = [store objectForKey:NAMES_type];
+    NSObject *obj = [store objectForKey:SDLNameType];
     if (obj == nil || [obj isKindOfClass:SDLSoftButtonType.class]) {
         return (SDLSoftButtonType *)obj;
     } else {
@@ -53,26 +52,26 @@
 
 - (void)setText:(NSString *)text {
     if (text != nil) {
-        [store setObject:text forKey:NAMES_text];
+        [store setObject:text forKey:SDLNameText];
     } else {
-        [store removeObjectForKey:NAMES_text];
+        [store removeObjectForKey:SDLNameText];
     }
 }
 
 - (NSString *)text {
-    return [store objectForKey:NAMES_text];
+    return [store objectForKey:SDLNameText];
 }
 
 - (void)setImage:(SDLImage *)image {
     if (image != nil) {
-        [store setObject:image forKey:NAMES_image];
+        [store setObject:image forKey:SDLNameImage];
     } else {
-        [store removeObjectForKey:NAMES_image];
+        [store removeObjectForKey:SDLNameImage];
     }
 }
 
 - (SDLImage *)image {
-    NSObject *obj = [store objectForKey:NAMES_image];
+    NSObject *obj = [store objectForKey:SDLNameImage];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -82,38 +81,38 @@
 
 - (void)setIsHighlighted:(NSNumber *)isHighlighted {
     if (isHighlighted != nil) {
-        [store setObject:isHighlighted forKey:NAMES_isHighlighted];
+        [store setObject:isHighlighted forKey:SDLNameIsHighlighted];
     } else {
-        [store removeObjectForKey:NAMES_isHighlighted];
+        [store removeObjectForKey:SDLNameIsHighlighted];
     }
 }
 
 - (NSNumber *)isHighlighted {
-    return [store objectForKey:NAMES_isHighlighted];
+    return [store objectForKey:SDLNameIsHighlighted];
 }
 
 - (void)setSoftButtonID:(NSNumber *)softButtonID {
     if (softButtonID != nil) {
-        [store setObject:softButtonID forKey:NAMES_softButtonID];
+        [store setObject:softButtonID forKey:SDLNameSoftButtonId];
     } else {
-        [store removeObjectForKey:NAMES_softButtonID];
+        [store removeObjectForKey:SDLNameSoftButtonId];
     }
 }
 
 - (NSNumber *)softButtonID {
-    return [store objectForKey:NAMES_softButtonID];
+    return [store objectForKey:SDLNameSoftButtonId];
 }
 
 - (void)setSystemAction:(SDLSystemAction *)systemAction {
     if (systemAction != nil) {
-        [store setObject:systemAction forKey:NAMES_systemAction];
+        [store setObject:systemAction forKey:SDLNameSystemAction];
     } else {
-        [store removeObjectForKey:NAMES_systemAction];
+        [store removeObjectForKey:SDLNameSystemAction];
     }
 }
 
 - (SDLSystemAction *)systemAction {
-    NSObject *obj = [store objectForKey:NAMES_systemAction];
+    NSObject *obj = [store objectForKey:SDLNameSystemAction];
     if (obj == nil || [obj isKindOfClass:SDLSystemAction.class]) {
         return (SDLSystemAction *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m
index 1b495455e..f9ba8621b 100644
--- a/SmartDeviceLink/SDLSoftButtonCapabilities.m
+++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m
@@ -22,50 +22,50 @@
 
 - (void)setShortPressAvailable:(NSNumber *)shortPressAvailable {
     if (shortPressAvailable != nil) {
-        [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable];
+        [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable];
     } else {
-        [store removeObjectForKey:NAMES_shortPressAvailable];
+        [store removeObjectForKey:SDLNameShortPressAvailable];
     }
 }
 
 - (NSNumber *)shortPressAvailable {
-    return [store objectForKey:NAMES_shortPressAvailable];
+    return [store objectForKey:SDLNameShortPressAvailable];
 }
 
 - (void)setLongPressAvailable:(NSNumber *)longPressAvailable {
     if (longPressAvailable != nil) {
-        [store setObject:longPressAvailable forKey:NAMES_longPressAvailable];
+        [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable];
     } else {
-        [store removeObjectForKey:NAMES_longPressAvailable];
+        [store removeObjectForKey:SDLNameLongPressAvailable];
     }
 }
 
 - (NSNumber *)longPressAvailable {
-    return [store objectForKey:NAMES_longPressAvailable];
+    return [store objectForKey:SDLNameLongPressAvailable];
 }
 
 - (void)setUpDownAvailable:(NSNumber *)upDownAvailable {
     if (upDownAvailable != nil) {
-        [store setObject:upDownAvailable forKey:NAMES_upDownAvailable];
+        [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable];
     } else {
-        [store removeObjectForKey:NAMES_upDownAvailable];
+        [store removeObjectForKey:SDLNameUpDownAvailable];
     }
 }
 
 - (NSNumber *)upDownAvailable {
-    return [store objectForKey:NAMES_upDownAvailable];
+    return [store objectForKey:SDLNameUpDownAvailable];
 }
 
 - (void)setImageSupported:(NSNumber *)imageSupported {
     if (imageSupported != nil) {
-        [store setObject:imageSupported forKey:NAMES_imageSupported];
+        [store setObject:imageSupported forKey:SDLNameImageSupported];
     } else {
-        [store removeObjectForKey:NAMES_imageSupported];
+        [store removeObjectForKey:SDLNameImageSupported];
     }
 }
 
 - (NSNumber *)imageSupported {
-    return [store objectForKey:NAMES_imageSupported];
+    return [store objectForKey:SDLNameImageSupported];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index 7d0a4e251..b2b98cbaa 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -10,7 +10,7 @@
 @implementation SDLSpeak
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Speak]) {
+    if (self = [super initWithName:SDLNameSpeak]) {
     }
     return self;
 }
@@ -23,14 +23,14 @@
 
 - (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks {
     if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:NAMES_ttsChunks];
+        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
     } else {
-        [parameters removeObjectForKey:NAMES_ttsChunks];
+        [parameters removeObjectForKey:SDLNameTTSChunks];
     }
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:NAMES_ttsChunks];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m
index fdf5955fd..1401ef276 100644
--- a/SmartDeviceLink/SDLSpeakResponse.m
+++ b/SmartDeviceLink/SDLSpeakResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSpeakResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Speak]) {
+    if (self = [super initWithName:SDLNameSpeak]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m
index 6bfa44d11..88be22f71 100644
--- a/SmartDeviceLink/SDLStartTime.m
+++ b/SmartDeviceLink/SDLStartTime.m
@@ -22,38 +22,38 @@
 
 - (void)setHours:(NSNumber *)hours {
     if (hours != nil) {
-        [store setObject:hours forKey:NAMES_hours];
+        [store setObject:hours forKey:SDLNameHours];
     } else {
-        [store removeObjectForKey:NAMES_hours];
+        [store removeObjectForKey:SDLNameHours];
     }
 }
 
 - (NSNumber *)hours {
-    return [store objectForKey:NAMES_hours];
+    return [store objectForKey:SDLNameHours];
 }
 
 - (void)setMinutes:(NSNumber *)minutes {
     if (minutes != nil) {
-        [store setObject:minutes forKey:NAMES_minutes];
+        [store setObject:minutes forKey:SDLNameMinutes];
     } else {
-        [store removeObjectForKey:NAMES_minutes];
+        [store removeObjectForKey:SDLNameMinutes];
     }
 }
 
 - (NSNumber *)minutes {
-    return [store objectForKey:NAMES_minutes];
+    return [store objectForKey:SDLNameMinutes];
 }
 
 - (void)setSeconds:(NSNumber *)seconds {
     if (seconds != nil) {
-        [store setObject:seconds forKey:NAMES_seconds];
+        [store setObject:seconds forKey:SDLNameSeconds];
     } else {
-        [store removeObjectForKey:NAMES_seconds];
+        [store removeObjectForKey:SDLNameSeconds];
     }
 }
 
 - (NSNumber *)seconds {
-    return [store objectForKey:NAMES_seconds];
+    return [store objectForKey:SDLNameSeconds];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m
index 3db4988ae..4270e1e7f 100644
--- a/SmartDeviceLink/SDLSubscribeButton.m
+++ b/SmartDeviceLink/SDLSubscribeButton.m
@@ -7,11 +7,10 @@
 #import "SDLButtonName.h"
 #import "SDLNames.h"
 
-
 @implementation SDLSubscribeButton
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SubscribeButton]) {
+    if (self = [super initWithName:SDLNameSubscribeButton]) {
     }
     return self;
 }
@@ -35,14 +34,14 @@
 
 - (void)setButtonName:(SDLButtonName *)buttonName {
     if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:NAMES_buttonName];
+        [parameters setObject:buttonName forKey:SDLNameButtonName];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonName];
+        [parameters removeObjectForKey:SDLNameButtonName];
     }
 }
 
 - (SDLButtonName *)buttonName {
-    NSObject *obj = [parameters objectForKey:NAMES_buttonName];
+    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
     if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m
index a188d8eea..c38d08fc8 100644
--- a/SmartDeviceLink/SDLSubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSubscribeButtonResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SubscribeButton]) {
+    if (self = [super initWithName:SDLNameSubscribeButton]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m
index 62ca5dbe1..9d6fc65cc 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -9,7 +9,7 @@
 @implementation SDLSubscribeVehicleData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SubscribeVehicleData]) {
+    if (self = [super initWithName:SDLNameSubscribeVehicleData]) {
     }
     return self;
 }
@@ -22,290 +22,290 @@
 
 - (void)setGps:(NSNumber *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:NAMES_gps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (NSNumber *)gps {
-    return [parameters objectForKey:NAMES_gps];
+    return [parameters objectForKey:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber *)speed {
     if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
+        [parameters setObject:speed forKey:SDLNameSpeed];
     } else {
-        [parameters removeObjectForKey:NAMES_speed];
+        [parameters removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (NSNumber *)speed {
-    return [parameters objectForKey:NAMES_speed];
+    return [parameters objectForKey:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:NAMES_rpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:NAMES_rpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
     if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
+        [parameters removeObjectForKey:SDLNameFuelLevel];
     }
 }
 
 - (NSNumber *)fuelLevel {
-    return [parameters objectForKey:NAMES_fuelLevel];
+    return [parameters objectForKey:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State {
     if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
+        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
+        [parameters removeObjectForKey:SDLNameFuelLevelState];
     }
 }
 
 - (NSNumber *)fuelLevel_State {
-    return [parameters objectForKey:NAMES_fuelLevel_State];
+    return [parameters objectForKey:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption {
     if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
     } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
     }
 }
 
 - (NSNumber *)instantFuelConsumption {
-    return [parameters objectForKey:NAMES_instantFuelConsumption];
+    return [parameters objectForKey:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber *)externalTemperature {
     if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
     } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
+        [parameters removeObjectForKey:SDLNameExternalTemperature];
     }
 }
 
 - (NSNumber *)externalTemperature {
-    return [parameters objectForKey:NAMES_externalTemperature];
+    return [parameters objectForKey:SDLNameExternalTemperature];
 }
 
 - (void)setPrndl:(NSNumber *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:NAMES_prndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (NSNumber *)prndl {
-    return [parameters objectForKey:NAMES_prndl];
+    return [parameters objectForKey:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber *)tirePressure {
     if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
     } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
+        [parameters removeObjectForKey:SDLNameTirePressure];
     }
 }
 
 - (NSNumber *)tirePressure {
-    return [parameters objectForKey:NAMES_tirePressure];
+    return [parameters objectForKey:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(NSNumber *)odometer {
     if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
+        [parameters setObject:odometer forKey:SDLNameOdometer];
     } else {
-        [parameters removeObjectForKey:NAMES_odometer];
+        [parameters removeObjectForKey:SDLNameOdometer];
     }
 }
 
 - (NSNumber *)odometer {
-    return [parameters objectForKey:NAMES_odometer];
+    return [parameters objectForKey:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(NSNumber *)beltStatus {
     if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
+        [parameters removeObjectForKey:SDLNameBeltStatus];
     }
 }
 
 - (NSNumber *)beltStatus {
-    return [parameters objectForKey:NAMES_beltStatus];
+    return [parameters objectForKey:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(NSNumber *)bodyInformation {
     if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
     } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
+        [parameters removeObjectForKey:SDLNameBodyInformation];
     }
 }
 
 - (NSNumber *)bodyInformation {
-    return [parameters objectForKey:NAMES_bodyInformation];
+    return [parameters objectForKey:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(NSNumber *)deviceStatus {
     if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
+        [parameters removeObjectForKey:SDLNameDeviceStatus];
     }
 }
 
 - (NSNumber *)deviceStatus {
-    return [parameters objectForKey:NAMES_deviceStatus];
+    return [parameters objectForKey:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(NSNumber *)driverBraking {
     if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
     } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
+        [parameters removeObjectForKey:SDLNameDriverBraking];
     }
 }
 
 - (NSNumber *)driverBraking {
-    return [parameters objectForKey:NAMES_driverBraking];
+    return [parameters objectForKey:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(NSNumber *)wiperStatus {
     if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
+        [parameters removeObjectForKey:SDLNameWiperStatus];
     }
 }
 
 - (NSNumber *)wiperStatus {
-    return [parameters objectForKey:NAMES_wiperStatus];
+    return [parameters objectForKey:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(NSNumber *)headLampStatus {
     if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
+        [parameters removeObjectForKey:SDLNameHeadLampStatus];
     }
 }
 
 - (NSNumber *)headLampStatus {
-    return [parameters objectForKey:NAMES_headLampStatus];
+    return [parameters objectForKey:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(NSNumber *)engineTorque {
     if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
     } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
+        [parameters removeObjectForKey:SDLNameEngineTorque];
     }
 }
 
 - (NSNumber *)engineTorque {
-    return [parameters objectForKey:NAMES_engineTorque];
+    return [parameters objectForKey:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:NAMES_accPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
     if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
     } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
     }
 }
 
 - (NSNumber *)steeringWheelAngle {
-    return [parameters objectForKey:NAMES_steeringWheelAngle];
+    return [parameters objectForKey:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(NSNumber *)eCallInfo {
     if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
+        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
+        [parameters removeObjectForKey:SDLNameECallInfo];
     }
 }
 
 - (NSNumber *)eCallInfo {
-    return [parameters objectForKey:NAMES_eCallInfo];
+    return [parameters objectForKey:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(NSNumber *)airbagStatus {
     if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
+        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
+        [parameters removeObjectForKey:SDLNameAirbagStatus];
     }
 }
 
 - (NSNumber *)airbagStatus {
-    return [parameters objectForKey:NAMES_airbagStatus];
+    return [parameters objectForKey:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(NSNumber *)emergencyEvent {
     if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
+        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
+        [parameters removeObjectForKey:SDLNameEmergencyEvent];
     }
 }
 
 - (NSNumber *)emergencyEvent {
-    return [parameters objectForKey:NAMES_emergencyEvent];
+    return [parameters objectForKey:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus {
     if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus];
+        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_clusterModeStatus];
+        [parameters removeObjectForKey:SDLNameClusterModeStatus];
     }
 }
 
 - (NSNumber *)clusterModeStatus {
-    return [parameters objectForKey:NAMES_clusterModeStatus];
+    return [parameters objectForKey:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(NSNumber *)myKey {
     if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
+        [parameters setObject:myKey forKey:SDLNameMyKey];
     } else {
-        [parameters removeObjectForKey:NAMES_myKey];
+        [parameters removeObjectForKey:SDLNameMyKey];
     }
 }
 
 - (NSNumber *)myKey {
-    return [parameters objectForKey:NAMES_myKey];
+    return [parameters objectForKey:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
index 12c1fc62f..f159420a6 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -7,11 +7,10 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataResult.h"
 
-
 @implementation SDLSubscribeVehicleDataResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SubscribeVehicleData]) {
+    if (self = [super initWithName:SDLNameSubscribeVehicleData]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setGps:(SDLVehicleDataResult *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:NAMES_gps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLVehicleDataResult *)gps {
-    NSObject *obj = [parameters objectForKey:NAMES_gps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setSpeed:(SDLVehicleDataResult *)speed {
     if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
+        [parameters setObject:speed forKey:SDLNameSpeed];
     } else {
-        [parameters removeObjectForKey:NAMES_speed];
+        [parameters removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (SDLVehicleDataResult *)speed {
-    NSObject *obj = [parameters objectForKey:NAMES_speed];
+    NSObject *obj = [parameters objectForKey:SDLNameSpeed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -58,14 +57,14 @@
 
 - (void)setRpm:(SDLVehicleDataResult *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:NAMES_rpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (SDLVehicleDataResult *)rpm {
-    NSObject *obj = [parameters objectForKey:NAMES_rpm];
+    NSObject *obj = [parameters objectForKey:SDLNameRPM];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -75,14 +74,14 @@
 
 - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel {
     if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
+        [parameters removeObjectForKey:SDLNameFuelLevel];
     }
 }
 
 - (SDLVehicleDataResult *)fuelLevel {
-    NSObject *obj = [parameters objectForKey:NAMES_fuelLevel];
+    NSObject *obj = [parameters objectForKey:SDLNameFuelLevel];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -92,14 +91,14 @@
 
 - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State {
     if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
+        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
+        [parameters removeObjectForKey:SDLNameFuelLevelState];
     }
 }
 
 - (SDLVehicleDataResult *)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
+    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -109,14 +108,14 @@
 
 - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption {
     if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
     } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
     }
 }
 
 - (SDLVehicleDataResult *)instantFuelConsumption {
-    NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption];
+    NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -126,14 +125,14 @@
 
 - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature {
     if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
     } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
+        [parameters removeObjectForKey:SDLNameExternalTemperature];
     }
 }
 
 - (SDLVehicleDataResult *)externalTemperature {
-    NSObject *obj = [parameters objectForKey:NAMES_externalTemperature];
+    NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -143,14 +142,14 @@
 
 - (void)setPrndl:(SDLVehicleDataResult *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:NAMES_prndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLVehicleDataResult *)prndl {
-    NSObject *obj = [parameters objectForKey:NAMES_prndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -160,14 +159,14 @@
 
 - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure {
     if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
     } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
+        [parameters removeObjectForKey:SDLNameTirePressure];
     }
 }
 
 - (SDLVehicleDataResult *)tirePressure {
-    NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
+    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -177,14 +176,14 @@
 
 - (void)setOdometer:(SDLVehicleDataResult *)odometer {
     if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
+        [parameters setObject:odometer forKey:SDLNameOdometer];
     } else {
-        [parameters removeObjectForKey:NAMES_odometer];
+        [parameters removeObjectForKey:SDLNameOdometer];
     }
 }
 
 - (SDLVehicleDataResult *)odometer {
-    NSObject *obj = [parameters objectForKey:NAMES_odometer];
+    NSObject *obj = [parameters objectForKey:SDLNameOdometer];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -194,14 +193,14 @@
 
 - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus {
     if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
+        [parameters removeObjectForKey:SDLNameBeltStatus];
     }
 }
 
 - (SDLVehicleDataResult *)beltStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -211,14 +210,14 @@
 
 - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation {
     if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
     } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
+        [parameters removeObjectForKey:SDLNameBodyInformation];
     }
 }
 
 - (SDLVehicleDataResult *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
+    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -228,14 +227,14 @@
 
 - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus {
     if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
+        [parameters removeObjectForKey:SDLNameDeviceStatus];
     }
 }
 
 - (SDLVehicleDataResult *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -245,14 +244,14 @@
 
 - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking {
     if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
     } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
+        [parameters removeObjectForKey:SDLNameDriverBraking];
     }
 }
 
 - (SDLVehicleDataResult *)driverBraking {
-    NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
+    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -262,14 +261,14 @@
 
 - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus {
     if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
+        [parameters removeObjectForKey:SDLNameWiperStatus];
     }
 }
 
 - (SDLVehicleDataResult *)wiperStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -279,14 +278,14 @@
 
 - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus {
     if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
+        [parameters removeObjectForKey:SDLNameHeadLampStatus];
     }
 }
 
 - (SDLVehicleDataResult *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -296,14 +295,14 @@
 
 - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque {
     if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
     } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
+        [parameters removeObjectForKey:SDLNameEngineTorque];
     }
 }
 
 - (SDLVehicleDataResult *)engineTorque {
-    NSObject *obj = [parameters objectForKey:NAMES_engineTorque];
+    NSObject *obj = [parameters objectForKey:SDLNameEngineTorque];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -313,14 +312,14 @@
 
 - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (SDLVehicleDataResult *)accPedalPosition {
-    NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition];
+    NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -330,14 +329,14 @@
 
 - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle {
     if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
     } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
     }
 }
 
 - (SDLVehicleDataResult *)steeringWheelAngle {
-    NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle];
+    NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -347,14 +346,14 @@
 
 - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo {
     if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
+        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
+        [parameters removeObjectForKey:SDLNameECallInfo];
     }
 }
 
 - (SDLVehicleDataResult *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
+    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -364,14 +363,14 @@
 
 - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus {
     if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
+        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
+        [parameters removeObjectForKey:SDLNameAirbagStatus];
     }
 }
 
 - (SDLVehicleDataResult *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -381,14 +380,14 @@
 
 - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent {
     if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
+        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
+        [parameters removeObjectForKey:SDLNameEmergencyEvent];
     }
 }
 
 - (SDLVehicleDataResult *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
+    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -398,14 +397,14 @@
 
 - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes {
     if (clusterModes != nil) {
-        [parameters setObject:clusterModes forKey:NAMES_clusterModes];
+        [parameters setObject:clusterModes forKey:SDLNameClusterModes];
     } else {
-        [parameters removeObjectForKey:NAMES_clusterModes];
+        [parameters removeObjectForKey:SDLNameClusterModes];
     }
 }
 
 - (SDLVehicleDataResult *)clusterModes {
-    NSObject *obj = [parameters objectForKey:NAMES_clusterModes];
+    NSObject *obj = [parameters objectForKey:SDLNameClusterModes];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -415,14 +414,14 @@
 
 - (void)setMyKey:(SDLVehicleDataResult *)myKey {
     if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
+        [parameters setObject:myKey forKey:SDLNameMyKey];
     } else {
-        [parameters removeObjectForKey:NAMES_myKey];
+        [parameters removeObjectForKey:SDLNameMyKey];
     }
 }
 
 - (SDLVehicleDataResult *)myKey {
-    NSObject *obj = [parameters objectForKey:NAMES_myKey];
+    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m
index 0ce5cd3e7..6bc7b26ad 100644
--- a/SmartDeviceLink/SDLSyncMsgVersion.m
+++ b/SmartDeviceLink/SDLSyncMsgVersion.m
@@ -22,26 +22,26 @@
 
 - (void)setMajorVersion:(NSNumber *)majorVersion {
     if (majorVersion != nil) {
-        [store setObject:majorVersion forKey:NAMES_majorVersion];
+        [store setObject:majorVersion forKey:SDLNameMajorVersion];
     } else {
-        [store removeObjectForKey:NAMES_majorVersion];
+        [store removeObjectForKey:SDLNameMajorVersion];
     }
 }
 
 - (NSNumber *)majorVersion {
-    return [store objectForKey:NAMES_majorVersion];
+    return [store objectForKey:SDLNameMajorVersion];
 }
 
 - (void)setMinorVersion:(NSNumber *)minorVersion {
     if (minorVersion != nil) {
-        [store setObject:minorVersion forKey:NAMES_minorVersion];
+        [store setObject:minorVersion forKey:SDLNameMinorVersion];
     } else {
-        [store removeObjectForKey:NAMES_minorVersion];
+        [store removeObjectForKey:SDLNameMinorVersion];
     }
 }
 
 - (NSNumber *)minorVersion {
-    return [store objectForKey:NAMES_minorVersion];
+    return [store objectForKey:SDLNameMinorVersion];
 }
 
 - (NSString *)description {
diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m
index 30d0a396f..c8c032234 100644
--- a/SmartDeviceLink/SDLSyncPData.m
+++ b/SmartDeviceLink/SDLSyncPData.m
@@ -9,7 +9,7 @@
 @implementation SDLSyncPData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SyncPData]) {
+    if (self = [super initWithName:SDLNameSyncPData]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m
index 86598d628..4a92d8d5c 100644
--- a/SmartDeviceLink/SDLSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLSyncPDataResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSyncPDataResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SyncPData]) {
+    if (self = [super initWithName:SDLNameSyncPData]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m
index 44fd263ea..74cfd99cc 100644
--- a/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink/SDLSystemRequest.m
@@ -7,11 +7,10 @@
 #import "SDLNames.h"
 #import "SDLRequestType.h"
 
-
 @implementation SDLSystemRequest
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SystemRequest]) {
+    if (self = [super initWithName:SDLNameSystemRequest]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setRequestType:(SDLRequestType *)requestType {
     if (requestType != nil) {
-        [parameters setObject:requestType forKey:NAMES_requestType];
+        [parameters setObject:requestType forKey:SDLNameRequestType];
     } else {
-        [parameters removeObjectForKey:NAMES_requestType];
+        [parameters removeObjectForKey:SDLNameRequestType];
     }
 }
 
 - (SDLRequestType *)requestType {
-    NSObject *obj = [parameters objectForKey:NAMES_requestType];
+    NSObject *obj = [parameters objectForKey:SDLNameRequestType];
     if (obj == nil || [obj isKindOfClass:SDLRequestType.class]) {
         return (SDLRequestType *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setFileName:(NSString *)fileName {
     if (fileName != nil) {
-        [parameters setObject:fileName forKey:NAMES_fileName];
+        [parameters setObject:fileName forKey:SDLNameFilename];
     } else {
-        [parameters removeObjectForKey:NAMES_fileName];
+        [parameters removeObjectForKey:SDLNameFilename];
     }
 }
 
 - (NSString *)fileName {
-    return [parameters objectForKey:NAMES_fileName];
+    return [parameters objectForKey:SDLNameFilename];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m
index 64c5ba261..d9fa4612b 100644
--- a/SmartDeviceLink/SDLSystemRequestResponse.m
+++ b/SmartDeviceLink/SDLSystemRequestResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLSystemRequestResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SystemRequest]) {
+    if (self = [super initWithName:SDLNameSystemRequest]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m
index dfec47eab..6bb8a9e0e 100644
--- a/SmartDeviceLink/SDLTTSChunk.m
+++ b/SmartDeviceLink/SDLTTSChunk.m
@@ -6,7 +6,6 @@
 #import "SDLNames.h"
 #import "SDLSpeechCapabilities.h"
 
-
 @implementation SDLTTSChunk
 
 - (instancetype)init {
@@ -23,26 +22,26 @@
 
 - (void)setText:(NSString *)text {
     if (text != nil) {
-        [store setObject:text forKey:NAMES_text];
+        [store setObject:text forKey:SDLNameText];
     } else {
-        [store removeObjectForKey:NAMES_text];
+        [store removeObjectForKey:SDLNameText];
     }
 }
 
 - (NSString *)text {
-    return [store objectForKey:NAMES_text];
+    return [store objectForKey:SDLNameText];
 }
 
 - (void)setType:(SDLSpeechCapabilities *)type {
     if (type != nil) {
-        [store setObject:type forKey:NAMES_type];
+        [store setObject:type forKey:SDLNameType];
     } else {
-        [store removeObjectForKey:NAMES_type];
+        [store removeObjectForKey:SDLNameType];
     }
 }
 
 - (SDLSpeechCapabilities *)type {
-    NSObject *obj = [store objectForKey:NAMES_type];
+    NSObject *obj = [store objectForKey:SDLNameType];
     if (obj == nil || [obj isKindOfClass:SDLSpeechCapabilities.class]) {
         return (SDLSpeechCapabilities *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m
index 1af3f6e0d..eceed6389 100644
--- a/SmartDeviceLink/SDLTextField.m
+++ b/SmartDeviceLink/SDLTextField.m
@@ -24,14 +24,14 @@
 
 - (void)setName:(SDLTextFieldName *)name {
     if (name != nil) {
-        [store setObject:name forKey:NAMES_name];
+        [store setObject:name forKey:SDLNameName];
     } else {
-        [store removeObjectForKey:NAMES_name];
+        [store removeObjectForKey:SDLNameName];
     }
 }
 
 - (SDLTextFieldName *)name {
-    NSObject *obj = [store objectForKey:NAMES_name];
+    NSObject *obj = [store objectForKey:SDLNameName];
     if (obj == nil || [obj isKindOfClass:SDLTextFieldName.class]) {
         return (SDLTextFieldName *)obj;
     } else {
@@ -41,14 +41,14 @@
 
 - (void)setCharacterSet:(SDLCharacterSet *)characterSet {
     if (characterSet != nil) {
-        [store setObject:characterSet forKey:NAMES_characterSet];
+        [store setObject:characterSet forKey:SDLNameCharacterSet];
     } else {
-        [store removeObjectForKey:NAMES_characterSet];
+        [store removeObjectForKey:SDLNameCharacterSet];
     }
 }
 
 - (SDLCharacterSet *)characterSet {
-    NSObject *obj = [store objectForKey:NAMES_characterSet];
+    NSObject *obj = [store objectForKey:SDLNameCharacterSet];
     if (obj == nil || [obj isKindOfClass:SDLCharacterSet.class]) {
         return (SDLCharacterSet *)obj;
     } else {
@@ -58,26 +58,26 @@
 
 - (void)setWidth:(NSNumber *)width {
     if (width != nil) {
-        [store setObject:width forKey:NAMES_width];
+        [store setObject:width forKey:SDLNameWidth];
     } else {
-        [store removeObjectForKey:NAMES_width];
+        [store removeObjectForKey:SDLNameWidth];
     }
 }
 
 - (NSNumber *)width {
-    return [store objectForKey:NAMES_width];
+    return [store objectForKey:SDLNameWidth];
 }
 
 - (void)setRows:(NSNumber *)rows {
     if (rows != nil) {
-        [store setObject:rows forKey:NAMES_rows];
+        [store setObject:rows forKey:SDLNameRows];
     } else {
-        [store removeObjectForKey:NAMES_rows];
+        [store removeObjectForKey:SDLNameRows];
     }
 }
 
 - (NSNumber *)rows {
-    return [store objectForKey:NAMES_rows];
+    return [store objectForKey:SDLNameRows];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m
index 36f00267d..5ff104995 100644
--- a/SmartDeviceLink/SDLTireStatus.m
+++ b/SmartDeviceLink/SDLTireStatus.m
@@ -7,7 +7,6 @@
 #import "SDLSingleTireStatus.h"
 #import "SDLWarningLightStatus.h"
 
-
 @implementation SDLTireStatus
 
 - (instancetype)init {
@@ -24,14 +23,14 @@
 
 - (void)setPressureTelltale:(SDLWarningLightStatus *)pressureTelltale {
     if (pressureTelltale != nil) {
-        [store setObject:pressureTelltale forKey:NAMES_pressureTelltale];
+        [store setObject:pressureTelltale forKey:SDLNamePressureTelltale];
     } else {
-        [store removeObjectForKey:NAMES_pressureTelltale];
+        [store removeObjectForKey:SDLNamePressureTelltale];
     }
 }
 
 - (SDLWarningLightStatus *)pressureTelltale {
-    NSObject *obj = [store objectForKey:NAMES_pressureTelltale];
+    NSObject *obj = [store objectForKey:SDLNamePressureTelltale];
     if (obj == nil || [obj isKindOfClass:SDLWarningLightStatus.class]) {
         return (SDLWarningLightStatus *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setLeftFront:(SDLSingleTireStatus *)leftFront {
     if (leftFront != nil) {
-        [store setObject:leftFront forKey:NAMES_leftFront];
+        [store setObject:leftFront forKey:SDLNameLeftFront];
     } else {
-        [store removeObjectForKey:NAMES_leftFront];
+        [store removeObjectForKey:SDLNameLeftFront];
     }
 }
 
 - (SDLSingleTireStatus *)leftFront {
-    NSObject *obj = [store objectForKey:NAMES_leftFront];
+    NSObject *obj = [store objectForKey:SDLNameLeftFront];
     if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
@@ -58,14 +57,14 @@
 
 - (void)setRightFront:(SDLSingleTireStatus *)rightFront {
     if (rightFront != nil) {
-        [store setObject:rightFront forKey:NAMES_rightFront];
+        [store setObject:rightFront forKey:SDLNameRightFront];
     } else {
-        [store removeObjectForKey:NAMES_rightFront];
+        [store removeObjectForKey:SDLNameRightFront];
     }
 }
 
 - (SDLSingleTireStatus *)rightFront {
-    NSObject *obj = [store objectForKey:NAMES_rightFront];
+    NSObject *obj = [store objectForKey:SDLNameRightFront];
     if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
@@ -75,14 +74,14 @@
 
 - (void)setLeftRear:(SDLSingleTireStatus *)leftRear {
     if (leftRear != nil) {
-        [store setObject:leftRear forKey:NAMES_leftRear];
+        [store setObject:leftRear forKey:SDLNameLeftRear];
     } else {
-        [store removeObjectForKey:NAMES_leftRear];
+        [store removeObjectForKey:SDLNameLeftRear];
     }
 }
 
 - (SDLSingleTireStatus *)leftRear {
-    NSObject *obj = [store objectForKey:NAMES_leftRear];
+    NSObject *obj = [store objectForKey:SDLNameLeftRear];
     if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
@@ -92,14 +91,14 @@
 
 - (void)setRightRear:(SDLSingleTireStatus *)rightRear {
     if (rightRear != nil) {
-        [store setObject:rightRear forKey:NAMES_rightRear];
+        [store setObject:rightRear forKey:SDLNameRightRear];
     } else {
-        [store removeObjectForKey:NAMES_rightRear];
+        [store removeObjectForKey:SDLNameRightRear];
     }
 }
 
 - (SDLSingleTireStatus *)rightRear {
-    NSObject *obj = [store objectForKey:NAMES_rightRear];
+    NSObject *obj = [store objectForKey:SDLNameRightRear];
     if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
@@ -109,14 +108,14 @@
 
 - (void)setInnerLeftRear:(SDLSingleTireStatus *)innerLeftRear {
     if (innerLeftRear != nil) {
-        [store setObject:innerLeftRear forKey:NAMES_innerLeftRear];
+        [store setObject:innerLeftRear forKey:SDLNameInnerLeftRear];
     } else {
-        [store removeObjectForKey:NAMES_innerLeftRear];
+        [store removeObjectForKey:SDLNameInnerLeftRear];
     }
 }
 
 - (SDLSingleTireStatus *)innerLeftRear {
-    NSObject *obj = [store objectForKey:NAMES_innerLeftRear];
+    NSObject *obj = [store objectForKey:SDLNameInnerLeftRear];
     if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
@@ -126,14 +125,14 @@
 
 - (void)setInnerRightRear:(SDLSingleTireStatus *)innerRightRear {
     if (innerRightRear != nil) {
-        [store setObject:innerRightRear forKey:NAMES_innerRightRear];
+        [store setObject:innerRightRear forKey:SDLNameInnerRightRear];
     } else {
-        [store removeObjectForKey:NAMES_innerRightRear];
+        [store removeObjectForKey:SDLNameInnerRightRear];
     }
 }
 
 - (SDLSingleTireStatus *)innerRightRear {
-    NSObject *obj = [store objectForKey:NAMES_innerRightRear];
+    NSObject *obj = [store objectForKey:SDLNameInnerRightRear];
     if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m
index 805b42ab3..525848249 100644
--- a/SmartDeviceLink/SDLTouchCoord.m
+++ b/SmartDeviceLink/SDLTouchCoord.m
@@ -22,26 +22,26 @@
 
 - (void)setX:(NSNumber *)x {
     if (x != nil) {
-        [store setObject:x forKey:NAMES_x];
+        [store setObject:x forKey:SDLNameX];
     } else {
-        [store removeObjectForKey:NAMES_x];
+        [store removeObjectForKey:SDLNameX];
     }
 }
 
 - (NSNumber *)x {
-    return [store objectForKey:NAMES_x];
+    return [store objectForKey:SDLNameX];
 }
 
 - (void)setY:(NSNumber *)y {
     if (y != nil) {
-        [store setObject:y forKey:NAMES_y];
+        [store setObject:y forKey:SDLNameY];
     } else {
-        [store removeObjectForKey:NAMES_y];
+        [store removeObjectForKey:SDLNameY];
     }
 }
 
 - (NSNumber *)y {
-    return [store objectForKey:NAMES_y];
+    return [store objectForKey:SDLNameY];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m
index 1094b9a0e..a831011c2 100644
--- a/SmartDeviceLink/SDLTouchEvent.m
+++ b/SmartDeviceLink/SDLTouchEvent.m
@@ -23,38 +23,38 @@
 
 - (void)setTouchEventId:(NSNumber *)touchEventId {
     if (touchEventId != nil) {
-        [store setObject:touchEventId forKey:NAMES_id];
+        [store setObject:touchEventId forKey:SDLNameId];
     } else {
-        [store removeObjectForKey:NAMES_id];
+        [store removeObjectForKey:SDLNameId];
     }
 }
 
 - (NSNumber *)touchEventId {
-    return [store objectForKey:NAMES_id];
+    return [store objectForKey:SDLNameId];
 }
 
 - (void)setTimeStamp:(NSMutableArray<NSNumber *> *)timeStamp {
     if (timeStamp != nil) {
-        [store setObject:timeStamp forKey:NAMES_ts];
+        [store setObject:timeStamp forKey:SDLNameTimestamp];
     } else {
-        [store removeObjectForKey:NAMES_ts];
+        [store removeObjectForKey:SDLNameTimestamp];
     }
 }
 
 - (NSMutableArray<NSNumber *> *)timeStamp {
-    return [store objectForKey:NAMES_ts];
+    return [store objectForKey:SDLNameTimestamp];
 }
 
 - (void)setCoord:(NSMutableArray<SDLTouchCoord *> *)coord {
     if (coord != nil) {
-        [store setObject:coord forKey:NAMES_c];
+        [store setObject:coord forKey:SDLNameCoordinate];
     } else {
-        [store removeObjectForKey:NAMES_c];
+        [store removeObjectForKey:SDLNameCoordinate];
     }
 }
 
 - (NSMutableArray<SDLTouchCoord *> *)coord {
-    NSMutableArray<SDLTouchCoord *> *array = [store objectForKey:NAMES_c];
+    NSMutableArray<SDLTouchCoord *> *array = [store objectForKey:SDLNameCoordinate];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchCoord.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m
index 4200f62f8..63de5ecf1 100644
--- a/SmartDeviceLink/SDLTouchEventCapabilities.m
+++ b/SmartDeviceLink/SDLTouchEventCapabilities.m
@@ -22,38 +22,38 @@
 
 - (void)setPressAvailable:(NSNumber *)pressAvailable {
     if (pressAvailable != nil) {
-        [store setObject:pressAvailable forKey:NAMES_pressAvailable];
+        [store setObject:pressAvailable forKey:SDLNamePressAvailable];
     } else {
-        [store removeObjectForKey:NAMES_pressAvailable];
+        [store removeObjectForKey:SDLNamePressAvailable];
     }
 }
 
 - (NSNumber *)pressAvailable {
-    return [store objectForKey:NAMES_pressAvailable];
+    return [store objectForKey:SDLNamePressAvailable];
 }
 
 - (void)setMultiTouchAvailable:(NSNumber *)multiTouchAvailable {
     if (multiTouchAvailable != nil) {
-        [store setObject:multiTouchAvailable forKey:NAMES_multiTouchAvailable];
+        [store setObject:multiTouchAvailable forKey:SDLNameMultiTouchAvailable];
     } else {
-        [store removeObjectForKey:NAMES_multiTouchAvailable];
+        [store removeObjectForKey:SDLNameMultiTouchAvailable];
     }
 }
 
 - (NSNumber *)multiTouchAvailable {
-    return [store objectForKey:NAMES_multiTouchAvailable];
+    return [store objectForKey:SDLNameMultiTouchAvailable];
 }
 
 - (void)setDoublePressAvailable:(NSNumber *)doublePressAvailable {
     if (doublePressAvailable != nil) {
-        [store setObject:doublePressAvailable forKey:NAMES_doublePressAvailable];
+        [store setObject:doublePressAvailable forKey:SDLNameDoublePressAvailable];
     } else {
-        [store removeObjectForKey:NAMES_doublePressAvailable];
+        [store removeObjectForKey:SDLNameDoublePressAvailable];
     }
 }
 
 - (NSNumber *)doublePressAvailable {
-    return [store objectForKey:NAMES_doublePressAvailable];
+    return [store objectForKey:SDLNameDoublePressAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m
index 6726531c3..53d462c92 100644
--- a/SmartDeviceLink/SDLTurn.m
+++ b/SmartDeviceLink/SDLTurn.m
@@ -6,7 +6,6 @@
 #import "SDLImage.h"
 #import "SDLNames.h"
 
-
 @implementation SDLTurn
 
 - (instancetype)init {
@@ -23,26 +22,26 @@
 
 - (void)setNavigationText:(NSString *)navigationText {
     if (navigationText != nil) {
-        [store setObject:navigationText forKey:NAMES_navigationText];
+        [store setObject:navigationText forKey:SDLNameNavigationText];
     } else {
-        [store removeObjectForKey:NAMES_navigationText];
+        [store removeObjectForKey:SDLNameNavigationText];
     }
 }
 
 - (NSString *)navigationText {
-    return [store objectForKey:NAMES_navigationText];
+    return [store objectForKey:SDLNameNavigationText];
 }
 
 - (void)setTurnIcon:(SDLImage *)turnIcon {
     if (turnIcon != nil) {
-        [store setObject:turnIcon forKey:NAMES_turnIcon];
+        [store setObject:turnIcon forKey:SDLNameTurnIcon];
     } else {
-        [store removeObjectForKey:NAMES_turnIcon];
+        [store removeObjectForKey:SDLNameTurnIcon];
     }
 }
 
 - (SDLImage *)turnIcon {
-    NSObject *obj = [store objectForKey:NAMES_turnIcon];
+    NSObject *obj = [store objectForKey:SDLNameTurnIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m
index 8f25f5d0b..1791f592e 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterface.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterface.m
@@ -9,7 +9,7 @@
 @implementation SDLUnregisterAppInterface
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UnregisterAppInterface]) {
+    if (self = [super initWithName:SDLNameUnregisterAppInterface]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
index 10c087079..84c1e8a07 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLUnregisterAppInterfaceResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UnregisterAppInterface]) {
+    if (self = [super initWithName:SDLNameUnregisterAppInterface]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m
index d373b7667..1b627b3fe 100644
--- a/SmartDeviceLink/SDLUnsubscribeButton.m
+++ b/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -7,11 +7,10 @@
 #import "SDLButtonName.h"
 #import "SDLNames.h"
 
-
 @implementation SDLUnsubscribeButton
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UnsubscribeButton]) {
+    if (self = [super initWithName:SDLNameUnsubscribeButton]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setButtonName:(SDLButtonName *)buttonName {
     if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:NAMES_buttonName];
+        [parameters setObject:buttonName forKey:SDLNameButtonName];
     } else {
-        [parameters removeObjectForKey:NAMES_buttonName];
+        [parameters removeObjectForKey:SDLNameButtonName];
     }
 }
 
 - (SDLButtonName *)buttonName {
-    NSObject *obj = [parameters objectForKey:NAMES_buttonName];
+    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
     if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
index 70e71c649..ae44358a2 100644
--- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLUnsubscribeButtonResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UnsubscribeButton]) {
+    if (self = [super initWithName:SDLNameUnsubscribeButton]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
index 61167879f..792589ffd 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -9,7 +9,7 @@
 @implementation SDLUnsubscribeVehicleData
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) {
+    if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) {
     }
     return self;
 }
@@ -22,290 +22,290 @@
 
 - (void)setGps:(NSNumber *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:NAMES_gps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (NSNumber *)gps {
-    return [parameters objectForKey:NAMES_gps];
+    return [parameters objectForKey:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber *)speed {
     if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
+        [parameters setObject:speed forKey:SDLNameSpeed];
     } else {
-        [parameters removeObjectForKey:NAMES_speed];
+        [parameters removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (NSNumber *)speed {
-    return [parameters objectForKey:NAMES_speed];
+    return [parameters objectForKey:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:NAMES_rpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:NAMES_rpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
     if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
+        [parameters removeObjectForKey:SDLNameFuelLevel];
     }
 }
 
 - (NSNumber *)fuelLevel {
-    return [parameters objectForKey:NAMES_fuelLevel];
+    return [parameters objectForKey:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State {
     if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
+        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
+        [parameters removeObjectForKey:SDLNameFuelLevelState];
     }
 }
 
 - (NSNumber *)fuelLevel_State {
-    return [parameters objectForKey:NAMES_fuelLevel_State];
+    return [parameters objectForKey:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption {
     if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
     } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
     }
 }
 
 - (NSNumber *)instantFuelConsumption {
-    return [parameters objectForKey:NAMES_instantFuelConsumption];
+    return [parameters objectForKey:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber *)externalTemperature {
     if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
     } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
+        [parameters removeObjectForKey:SDLNameExternalTemperature];
     }
 }
 
 - (NSNumber *)externalTemperature {
-    return [parameters objectForKey:NAMES_externalTemperature];
+    return [parameters objectForKey:SDLNameExternalTemperature];
 }
 
 - (void)setPrndl:(NSNumber *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:NAMES_prndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (NSNumber *)prndl {
-    return [parameters objectForKey:NAMES_prndl];
+    return [parameters objectForKey:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber *)tirePressure {
     if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
     } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
+        [parameters removeObjectForKey:SDLNameTirePressure];
     }
 }
 
 - (NSNumber *)tirePressure {
-    return [parameters objectForKey:NAMES_tirePressure];
+    return [parameters objectForKey:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(NSNumber *)odometer {
     if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
+        [parameters setObject:odometer forKey:SDLNameOdometer];
     } else {
-        [parameters removeObjectForKey:NAMES_odometer];
+        [parameters removeObjectForKey:SDLNameOdometer];
     }
 }
 
 - (NSNumber *)odometer {
-    return [parameters objectForKey:NAMES_odometer];
+    return [parameters objectForKey:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(NSNumber *)beltStatus {
     if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
+        [parameters removeObjectForKey:SDLNameBeltStatus];
     }
 }
 
 - (NSNumber *)beltStatus {
-    return [parameters objectForKey:NAMES_beltStatus];
+    return [parameters objectForKey:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(NSNumber *)bodyInformation {
     if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
     } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
+        [parameters removeObjectForKey:SDLNameBodyInformation];
     }
 }
 
 - (NSNumber *)bodyInformation {
-    return [parameters objectForKey:NAMES_bodyInformation];
+    return [parameters objectForKey:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(NSNumber *)deviceStatus {
     if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
+        [parameters removeObjectForKey:SDLNameDeviceStatus];
     }
 }
 
 - (NSNumber *)deviceStatus {
-    return [parameters objectForKey:NAMES_deviceStatus];
+    return [parameters objectForKey:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(NSNumber *)driverBraking {
     if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
     } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
+        [parameters removeObjectForKey:SDLNameDriverBraking];
     }
 }
 
 - (NSNumber *)driverBraking {
-    return [parameters objectForKey:NAMES_driverBraking];
+    return [parameters objectForKey:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(NSNumber *)wiperStatus {
     if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
+        [parameters removeObjectForKey:SDLNameWiperStatus];
     }
 }
 
 - (NSNumber *)wiperStatus {
-    return [parameters objectForKey:NAMES_wiperStatus];
+    return [parameters objectForKey:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(NSNumber *)headLampStatus {
     if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
+        [parameters removeObjectForKey:SDLNameHeadLampStatus];
     }
 }
 
 - (NSNumber *)headLampStatus {
-    return [parameters objectForKey:NAMES_headLampStatus];
+    return [parameters objectForKey:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(NSNumber *)engineTorque {
     if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
     } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
+        [parameters removeObjectForKey:SDLNameEngineTorque];
     }
 }
 
 - (NSNumber *)engineTorque {
-    return [parameters objectForKey:NAMES_engineTorque];
+    return [parameters objectForKey:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:NAMES_accPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
     if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
     } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
     }
 }
 
 - (NSNumber *)steeringWheelAngle {
-    return [parameters objectForKey:NAMES_steeringWheelAngle];
+    return [parameters objectForKey:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(NSNumber *)eCallInfo {
     if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
+        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
+        [parameters removeObjectForKey:SDLNameECallInfo];
     }
 }
 
 - (NSNumber *)eCallInfo {
-    return [parameters objectForKey:NAMES_eCallInfo];
+    return [parameters objectForKey:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(NSNumber *)airbagStatus {
     if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
+        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
+        [parameters removeObjectForKey:SDLNameAirbagStatus];
     }
 }
 
 - (NSNumber *)airbagStatus {
-    return [parameters objectForKey:NAMES_airbagStatus];
+    return [parameters objectForKey:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(NSNumber *)emergencyEvent {
     if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
+        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
+        [parameters removeObjectForKey:SDLNameEmergencyEvent];
     }
 }
 
 - (NSNumber *)emergencyEvent {
-    return [parameters objectForKey:NAMES_emergencyEvent];
+    return [parameters objectForKey:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus {
     if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus];
+        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_clusterModeStatus];
+        [parameters removeObjectForKey:SDLNameClusterModeStatus];
     }
 }
 
 - (NSNumber *)clusterModeStatus {
-    return [parameters objectForKey:NAMES_clusterModeStatus];
+    return [parameters objectForKey:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(NSNumber *)myKey {
     if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
+        [parameters setObject:myKey forKey:SDLNameMyKey];
     } else {
-        [parameters removeObjectForKey:NAMES_myKey];
+        [parameters removeObjectForKey:SDLNameMyKey];
     }
 }
 
 - (NSNumber *)myKey {
-    return [parameters objectForKey:NAMES_myKey];
+    return [parameters objectForKey:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index cf67e405b..8b58a72b1 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -7,11 +7,10 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataResult.h"
 
-
 @implementation SDLUnsubscribeVehicleDataResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) {
+    if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) {
     }
     return self;
 }
@@ -24,14 +23,14 @@
 
 - (void)setGps:(SDLVehicleDataResult *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:NAMES_gps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLVehicleDataResult *)gps {
-    NSObject *obj = [parameters objectForKey:NAMES_gps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setSpeed:(SDLVehicleDataResult *)speed {
     if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
+        [parameters setObject:speed forKey:SDLNameSpeed];
     } else {
-        [parameters removeObjectForKey:NAMES_speed];
+        [parameters removeObjectForKey:SDLNameSpeed];
     }
 }
 
 - (SDLVehicleDataResult *)speed {
-    NSObject *obj = [parameters objectForKey:NAMES_speed];
+    NSObject *obj = [parameters objectForKey:SDLNameSpeed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -58,14 +57,14 @@
 
 - (void)setRpm:(SDLVehicleDataResult *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:NAMES_rpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (SDLVehicleDataResult *)rpm {
-    NSObject *obj = [parameters objectForKey:NAMES_rpm];
+    NSObject *obj = [parameters objectForKey:SDLNameRPM];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -75,14 +74,14 @@
 
 - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel {
     if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
+        [parameters removeObjectForKey:SDLNameFuelLevel];
     }
 }
 
 - (SDLVehicleDataResult *)fuelLevel {
-    NSObject *obj = [parameters objectForKey:NAMES_fuelLevel];
+    NSObject *obj = [parameters objectForKey:SDLNameFuelLevel];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -92,14 +91,14 @@
 
 - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State {
     if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
+        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
     } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
+        [parameters removeObjectForKey:SDLNameFuelLevelState];
     }
 }
 
 - (SDLVehicleDataResult *)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
+    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -109,14 +108,14 @@
 
 - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption {
     if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
     } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
     }
 }
 
 - (SDLVehicleDataResult *)instantFuelConsumption {
-    NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption];
+    NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -126,14 +125,14 @@
 
 - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature {
     if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
     } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
+        [parameters removeObjectForKey:SDLNameExternalTemperature];
     }
 }
 
 - (SDLVehicleDataResult *)externalTemperature {
-    NSObject *obj = [parameters objectForKey:NAMES_externalTemperature];
+    NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -143,14 +142,14 @@
 
 - (void)setPrndl:(SDLVehicleDataResult *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:NAMES_prndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLVehicleDataResult *)prndl {
-    NSObject *obj = [parameters objectForKey:NAMES_prndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -160,14 +159,14 @@
 
 - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure {
     if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
     } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
+        [parameters removeObjectForKey:SDLNameTirePressure];
     }
 }
 
 - (SDLVehicleDataResult *)tirePressure {
-    NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
+    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -177,14 +176,14 @@
 
 - (void)setOdometer:(SDLVehicleDataResult *)odometer {
     if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
+        [parameters setObject:odometer forKey:SDLNameOdometer];
     } else {
-        [parameters removeObjectForKey:NAMES_odometer];
+        [parameters removeObjectForKey:SDLNameOdometer];
     }
 }
 
 - (SDLVehicleDataResult *)odometer {
-    NSObject *obj = [parameters objectForKey:NAMES_odometer];
+    NSObject *obj = [parameters objectForKey:SDLNameOdometer];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -194,14 +193,14 @@
 
 - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus {
     if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
+        [parameters removeObjectForKey:SDLNameBeltStatus];
     }
 }
 
 - (SDLVehicleDataResult *)beltStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -211,14 +210,14 @@
 
 - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation {
     if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
     } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
+        [parameters removeObjectForKey:SDLNameBodyInformation];
     }
 }
 
 - (SDLVehicleDataResult *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
+    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -228,14 +227,14 @@
 
 - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus {
     if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
+        [parameters removeObjectForKey:SDLNameDeviceStatus];
     }
 }
 
 - (SDLVehicleDataResult *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -245,14 +244,14 @@
 
 - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking {
     if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
     } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
+        [parameters removeObjectForKey:SDLNameDriverBraking];
     }
 }
 
 - (SDLVehicleDataResult *)driverBraking {
-    NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
+    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -262,14 +261,14 @@
 
 - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus {
     if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
+        [parameters removeObjectForKey:SDLNameWiperStatus];
     }
 }
 
 - (SDLVehicleDataResult *)wiperStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -279,14 +278,14 @@
 
 - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus {
     if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
+        [parameters removeObjectForKey:SDLNameHeadLampStatus];
     }
 }
 
 - (SDLVehicleDataResult *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -296,14 +295,14 @@
 
 - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque {
     if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
     } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
+        [parameters removeObjectForKey:SDLNameEngineTorque];
     }
 }
 
 - (SDLVehicleDataResult *)engineTorque {
-    NSObject *obj = [parameters objectForKey:NAMES_engineTorque];
+    NSObject *obj = [parameters objectForKey:SDLNameEngineTorque];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -313,14 +312,14 @@
 
 - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (SDLVehicleDataResult *)accPedalPosition {
-    NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition];
+    NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -330,14 +329,14 @@
 
 - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle {
     if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
     } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
     }
 }
 
 - (SDLVehicleDataResult *)steeringWheelAngle {
-    NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle];
+    NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -347,14 +346,14 @@
 
 - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo {
     if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
+        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
     } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
+        [parameters removeObjectForKey:SDLNameECallInfo];
     }
 }
 
 - (SDLVehicleDataResult *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
+    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -364,14 +363,14 @@
 
 - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus {
     if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
+        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
     } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
+        [parameters removeObjectForKey:SDLNameAirbagStatus];
     }
 }
 
 - (SDLVehicleDataResult *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
+    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -381,14 +380,14 @@
 
 - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent {
     if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
+        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
     } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
+        [parameters removeObjectForKey:SDLNameEmergencyEvent];
     }
 }
 
 - (SDLVehicleDataResult *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
+    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -398,14 +397,14 @@
 
 - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes {
     if (clusterModes != nil) {
-        [parameters setObject:clusterModes forKey:NAMES_clusterModes];
+        [parameters setObject:clusterModes forKey:SDLNameClusterModes];
     } else {
-        [parameters removeObjectForKey:NAMES_clusterModes];
+        [parameters removeObjectForKey:SDLNameClusterModes];
     }
 }
 
 - (SDLVehicleDataResult *)clusterModes {
-    NSObject *obj = [parameters objectForKey:NAMES_clusterModes];
+    NSObject *obj = [parameters objectForKey:SDLNameClusterModes];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -415,14 +414,14 @@
 
 - (void)setMyKey:(SDLVehicleDataResult *)myKey {
     if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
+        [parameters setObject:myKey forKey:SDLNameMyKey];
     } else {
-        [parameters removeObjectForKey:NAMES_myKey];
+        [parameters removeObjectForKey:SDLNameMyKey];
     }
 }
 
 - (SDLVehicleDataResult *)myKey {
-    NSObject *obj = [parameters objectForKey:NAMES_myKey];
+    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m
index 7a8cc4081..0c36845b8 100644
--- a/SmartDeviceLink/SDLUpdateTurnList.m
+++ b/SmartDeviceLink/SDLUpdateTurnList.m
@@ -11,7 +11,7 @@
 @implementation SDLUpdateTurnList
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UpdateTurnList]) {
+    if (self = [super initWithName:SDLNameUpdateTurnList]) {
     }
     return self;
 }
@@ -24,14 +24,14 @@
 
 - (void)setTurnList:(NSMutableArray<SDLTurn *> *)turnList {
     if (turnList != nil) {
-        [parameters setObject:turnList forKey:NAMES_turnList];
+        [parameters setObject:turnList forKey:SDLNameTurnList];
     } else {
-        [parameters removeObjectForKey:NAMES_turnList];
+        [parameters removeObjectForKey:SDLNameTurnList];
     }
 }
 
 - (NSMutableArray<SDLTurn *> *)turnList {
-    NSMutableArray<SDLTurn *> *array = [parameters objectForKey:NAMES_turnList];
+    NSMutableArray<SDLTurn *> *array = [parameters objectForKey:SDLNameTurnList];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTurn.class]) {
         return array;
     } else {
@@ -45,14 +45,14 @@
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m
index 8df93f9e9..80db56e1b 100644
--- a/SmartDeviceLink/SDLUpdateTurnListResponse.m
+++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLUpdateTurnListResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_UpdateTurnList]) {
+    if (self = [super initWithName:SDLNameUpdateTurnList]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLV2ProtocolMessage.m b/SmartDeviceLink/SDLV2ProtocolMessage.m
index 8213f495b..b874b4479 100644
--- a/SmartDeviceLink/SDLV2ProtocolMessage.m
+++ b/SmartDeviceLink/SDLV2ProtocolMessage.m
@@ -4,7 +4,7 @@
 #import "SDLV2ProtocolMessage.h"
 #import "SDLFunctionID.h"
 #import "SDLJsonDecoder.h"
-#import "SDLNames.h"
+
 #import "SDLProtocolHeader.h"
 #import "SDLRPCPayload.h"
 
@@ -33,26 +33,26 @@
 
     // Create the inner dictionary with the RPC properties
     NSMutableDictionary <NSString *, id> *innerDictionary = [[NSMutableDictionary alloc] init];
-    NSString *functionName = [[[SDLFunctionID alloc] init] getFunctionName:rpcPayload.functionID];
-    [innerDictionary setObject:functionName forKey:NAMES_operation_name];
-    [innerDictionary setObject:[NSNumber numberWithInt:rpcPayload.correlationID] forKey:NAMES_correlationID];
+    NSString *functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID];
+    [innerDictionary setObject:functionName forKey:SDLNameOperationName];
+    [innerDictionary setObject:[NSNumber numberWithInt:rpcPayload.correlationID] forKey:SDLNameCorrelationId];
 
     // Get the json data from the struct
     if (rpcPayload.jsonData) {
         NSDictionary *jsonDictionary = [[SDLJsonDecoder instance] decode:rpcPayload.jsonData];
         if (jsonDictionary) {
-            [innerDictionary setObject:jsonDictionary forKey:NAMES_parameters];
+            [innerDictionary setObject:jsonDictionary forKey:SDLNameParameters];
         }
     }
 
     // Store it in the containing dictionary
     UInt8 rpcType = rpcPayload.rpcType;
-    NSArray<NSString *> *rpcTypeNames = @[NAMES_request, NAMES_response, NAMES_notification];
+    NSArray<NSString *> *rpcTypeNames = @[SDLNameRequest, SDLNameResponse, SDLNameNotification];
     [rpcMessageAsDictionary setObject:innerDictionary forKey:rpcTypeNames[rpcType]];
 
     // The bulk data also goes in the dictionary
     if (rpcPayload.binaryData) {
-        [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:NAMES_bulkData];
+        [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:SDLNameBulkData];
     }
 
     return rpcMessageAsDictionary;
diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m
index 374dfd91b..86c3b65ff 100644
--- a/SmartDeviceLink/SDLVehicleDataResult.m
+++ b/SmartDeviceLink/SDLVehicleDataResult.m
@@ -7,7 +7,6 @@
 #import "SDLVehicleDataResultCode.h"
 #import "SDLVehicleDataType.h"
 
-
 @implementation SDLVehicleDataResult
 
 - (instancetype)init {
@@ -24,14 +23,14 @@
 
 - (void)setDataType:(SDLVehicleDataType *)dataType {
     if (dataType != nil) {
-        [store setObject:dataType forKey:NAMES_dataType];
+        [store setObject:dataType forKey:SDLNameDataType];
     } else {
-        [store removeObjectForKey:NAMES_dataType];
+        [store removeObjectForKey:SDLNameDataType];
     }
 }
 
 - (SDLVehicleDataType *)dataType {
-    NSObject *obj = [store objectForKey:NAMES_dataType];
+    NSObject *obj = [store objectForKey:SDLNameDataType];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataType.class]) {
         return (SDLVehicleDataType *)obj;
     } else {
@@ -41,14 +40,14 @@
 
 - (void)setResultCode:(SDLVehicleDataResultCode *)resultCode {
     if (resultCode != nil) {
-        [store setObject:resultCode forKey:NAMES_resultCode];
+        [store setObject:resultCode forKey:SDLNameResultCode];
     } else {
-        [store removeObjectForKey:NAMES_resultCode];
+        [store removeObjectForKey:SDLNameResultCode];
     }
 }
 
 - (SDLVehicleDataResultCode *)resultCode {
-    NSObject *obj = [store objectForKey:NAMES_resultCode];
+    NSObject *obj = [store objectForKey:SDLNameResultCode];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResultCode.class]) {
         return (SDLVehicleDataResultCode *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m
index 6f7b19667..8aa5faf92 100644
--- a/SmartDeviceLink/SDLVehicleType.m
+++ b/SmartDeviceLink/SDLVehicleType.m
@@ -22,50 +22,50 @@
 
 - (void)setMake:(NSString *)make {
     if (make != nil) {
-        [store setObject:make forKey:NAMES_make];
+        [store setObject:make forKey:SDLNameMake];
     } else {
-        [store removeObjectForKey:NAMES_make];
+        [store removeObjectForKey:SDLNameMake];
     }
 }
 
 - (NSString *)make {
-    return [store objectForKey:NAMES_make];
+    return [store objectForKey:SDLNameMake];
 }
 
 - (void)setModel:(NSString *)model {
     if (model != nil) {
-        [store setObject:model forKey:NAMES_model];
+        [store setObject:model forKey:SDLNameModel];
     } else {
-        [store removeObjectForKey:NAMES_model];
+        [store removeObjectForKey:SDLNameModel];
     }
 }
 
 - (NSString *)model {
-    return [store objectForKey:NAMES_model];
+    return [store objectForKey:SDLNameModel];
 }
 
 - (void)setModelYear:(NSString *)modelYear {
     if (modelYear != nil) {
-        [store setObject:modelYear forKey:NAMES_modelYear];
+        [store setObject:modelYear forKey:SDLNameModelYear];
     } else {
-        [store removeObjectForKey:NAMES_modelYear];
+        [store removeObjectForKey:SDLNameModelYear];
     }
 }
 
 - (NSString *)modelYear {
-    return [store objectForKey:NAMES_modelYear];
+    return [store objectForKey:SDLNameModelYear];
 }
 
 - (void)setTrim:(NSString *)trim {
     if (trim != nil) {
-        [store setObject:trim forKey:NAMES_trim];
+        [store setObject:trim forKey:SDLNameTrim];
     } else {
-        [store removeObjectForKey:NAMES_trim];
+        [store removeObjectForKey:SDLNameTrim];
     }
 }
 
 - (NSString *)trim {
-    return [store objectForKey:NAMES_trim];
+    return [store objectForKey:SDLNameTrim];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m
index 581da2688..e44a55afa 100644
--- a/SmartDeviceLink/SDLVrHelpItem.m
+++ b/SmartDeviceLink/SDLVrHelpItem.m
@@ -23,26 +23,26 @@
 
 - (void)setText:(NSString *)text {
     if (text != nil) {
-        [store setObject:text forKey:NAMES_text];
+        [store setObject:text forKey:SDLNameText];
     } else {
-        [store removeObjectForKey:NAMES_text];
+        [store removeObjectForKey:SDLNameText];
     }
 }
 
 - (NSString *)text {
-    return [store objectForKey:NAMES_text];
+    return [store objectForKey:SDLNameText];
 }
 
 - (void)setImage:(SDLImage *)image {
     if (image != nil) {
-        [store setObject:image forKey:NAMES_image];
+        [store setObject:image forKey:SDLNameImage];
     } else {
-        [store removeObjectForKey:NAMES_image];
+        [store removeObjectForKey:SDLNameImage];
     }
 }
 
 - (SDLImage *)image {
-    NSObject *obj = [store objectForKey:NAMES_image];
+    NSObject *obj = [store objectForKey:SDLNameImage];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -52,14 +52,14 @@
 
 - (void)setPosition:(NSNumber *)position {
     if (position != nil) {
-        [store setObject:position forKey:NAMES_position];
+        [store setObject:position forKey:SDLNamePosition];
     } else {
-        [store removeObjectForKey:NAMES_position];
+        [store removeObjectForKey:SDLNamePosition];
     }
 }
 
 - (NSNumber *)position {
-    return [store objectForKey:NAMES_position];
+    return [store objectForKey:SDLNamePosition];
 }
 
 @end
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..724b0dc7e 100644
--- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
+++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
@@ -13,139 +13,139 @@
 
 QuickSpecBegin(SDLFunctionIDSpec)
 
-SDLFunctionID* functionID = [[SDLFunctionID alloc] init];
+SDLFunctionID* functionID = [SDLFunctionID sharedInstance];
 
 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 functionNameForId:1]).to(equal(SDLNameRegisterAppInterface));
+        expect([functionID functionNameForId:2]).to(equal(SDLNameUnregisterAppInterface));
+        expect([functionID functionNameForId:3]).to(equal(SDLNameSetGlobalProperties));
+        expect([functionID functionNameForId:4]).to(equal(SDLNameResetGlobalProperties));
+        expect([functionID functionNameForId:5]).to(equal(SDLNameAddCommand));
+        expect([functionID functionNameForId:6]).to(equal(SDLNameDeleteCommand));
+        expect([functionID functionNameForId:7]).to(equal(SDLNameAddSubMenu));
+        expect([functionID functionNameForId:8]).to(equal(SDLNameDeleteSubMenu));
+        expect([functionID functionNameForId:9]).to(equal(SDLNameCreateInteractionChoiceSet));
+        expect([functionID functionNameForId:10]).to(equal(SDLNamePerformInteraction));
+        expect([functionID functionNameForId:11]).to(equal(SDLNameDeleteInteractionChoiceSet));
+        expect([functionID functionNameForId:12]).to(equal(SDLNameAlert));
+        expect([functionID functionNameForId:13]).to(equal(SDLNameShow));
+        expect([functionID functionNameForId:14]).to(equal(SDLNameSpeak));
+        expect([functionID functionNameForId:15]).to(equal(SDLNameSetMediaClockTimer));
+        expect([functionID functionNameForId:16]).to(equal(SDLNamePerformAudioPassThru));
+        expect([functionID functionNameForId:17]).to(equal(SDLNameEndAudioPassThru));
+        expect([functionID functionNameForId:18]).to(equal(SDLNameSubscribeButton));
+        expect([functionID functionNameForId:19]).to(equal(SDLNameUnsubscribeButton));
+        expect([functionID functionNameForId:20]).to(equal(SDLNameSubscribeVehicleData));
+        expect([functionID functionNameForId:21]).to(equal(SDLNameUnsubscribeVehicleData));
+        expect([functionID functionNameForId:22]).to(equal(SDLNameGetVehicleData));
+        expect([functionID functionNameForId:23]).to(equal(SDLNameReadDID));
+        expect([functionID functionNameForId:24]).to(equal(SDLNameGetDTCs));
+        expect([functionID functionNameForId:25]).to(equal(SDLNameScrollableMessage));
+        expect([functionID functionNameForId:26]).to(equal(SDLNameSlider));
+        expect([functionID functionNameForId:27]).to(equal(SDLNameShowConstantTBT));
+        expect([functionID functionNameForId:28]).to(equal(SDLNameAlertManeuver));
+        expect([functionID functionNameForId:29]).to(equal(SDLNameUpdateTurnList));
+        expect([functionID functionNameForId:30]).to(equal(SDLNameChangeRegistration));
+        expect([functionID functionNameForId:31]).to(equal(SDLNameGenericResponse));
+        expect([functionID functionNameForId:32]).to(equal(SDLNamePutFile));
+        expect([functionID functionNameForId:33]).to(equal(SDLNameDeleteFile));
+        expect([functionID functionNameForId:34]).to(equal(SDLNameListFiles));
+        expect([functionID functionNameForId:35]).to(equal(SDLNameSetAppIcon));
+        expect([functionID functionNameForId:36]).to(equal(SDLNameSetDisplayLayout));
+        expect([functionID functionNameForId:37]).to(equal(SDLNameDiagnosticMessage));
+        expect([functionID functionNameForId:38]).to(equal(SDLNameSystemRequest));
+        expect([functionID functionNameForId:39]).to(equal(SDLNameSendLocation));
+        expect([functionID functionNameForId:40]).to(equal(SDLNameDialNumber));
+        expect([functionID functionNameForId:32768]).to(equal(SDLNameOnHMIStatus));
+        expect([functionID functionNameForId:32769]).to(equal(SDLNameOnAppInterfaceUnregistered));
+        expect([functionID functionNameForId:32770]).to(equal(SDLNameOnButtonEvent));
+        expect([functionID functionNameForId:32771]).to(equal(SDLNameOnButtonPress));
+        expect([functionID functionNameForId:32772]).to(equal(SDLNameOnVehicleData));
+        expect([functionID functionNameForId:32773]).to(equal(SDLNameOnCommand));
+        expect([functionID functionNameForId:32774]).to(equal(SDLNameOnTBTClientState));
+        expect([functionID functionNameForId:32775]).to(equal(SDLNameOnDriverDistraction));
+        expect([functionID functionNameForId:32776]).to(equal(SDLNameOnPermissionsChange));
+        expect([functionID functionNameForId:32777]).to(equal(SDLNameOnAudioPassThru));
+        expect([functionID functionNameForId:32778]).to(equal(SDLNameOnLanguageChange));
+        expect([functionID functionNameForId:32779]).to(equal(SDLNameOnKeyboardInput));
+        expect([functionID functionNameForId:32780]).to(equal(SDLNameOnTouchEvent));
+        expect([functionID functionNameForId:32781]).to(equal(SDLNameOnSystemRequest));
+        expect([functionID functionNameForId: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 functionNameForId:65536]).to(equal(SDLNameEncodedSyncPData));
+        expect([functionID functionNameForId:65537]).to(equal(SDLNameSyncPData));
         
-        expect([functionID getFunctionName:98304]).to(equal(NAMES_OnEncodedSyncPData));
-        expect([functionID getFunctionName:98305]).to(equal(NAMES_OnSyncPData));
+        expect([functionID functionNameForId:98304]).to(equal(SDLNameOnEncodedSyncPData));
+        expect([functionID functionNameForId: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 functionIdForName:SDLNameRegisterAppInterface]).to(equal(@1));
+        expect([functionID functionIdForName:SDLNameUnregisterAppInterface]).to(equal(@2));
+        expect([functionID functionIdForName:SDLNameSetGlobalProperties]).to(equal(@3));
+        expect([functionID functionIdForName:SDLNameResetGlobalProperties]).to(equal(@4));
+        expect([functionID functionIdForName:SDLNameAddCommand]).to(equal(@5));
+        expect([functionID functionIdForName:SDLNameDeleteCommand]).to(equal(@6));
+        expect([functionID functionIdForName:SDLNameAddSubMenu]).to(equal(@7));
+        expect([functionID functionIdForName:SDLNameDeleteSubMenu]).to(equal(@8));
+        expect([functionID functionIdForName:SDLNameCreateInteractionChoiceSet]).to(equal(@9));
+        expect([functionID functionIdForName:SDLNamePerformInteraction]).to(equal(@10));
+        expect([functionID functionIdForName:SDLNameDeleteInteractionChoiceSet]).to(equal(@11));
+        expect([functionID functionIdForName:SDLNameAlert]).to(equal(@12));
+        expect([functionID functionIdForName:SDLNameShow]).to(equal(@13));
+        expect([functionID functionIdForName:SDLNameSpeak]).to(equal(@14));
+        expect([functionID functionIdForName:SDLNameSetMediaClockTimer]).to(equal(@15));
+        expect([functionID functionIdForName:SDLNamePerformAudioPassThru]).to(equal(@16));
+        expect([functionID functionIdForName:SDLNameEndAudioPassThru]).to(equal(@17));
+        expect([functionID functionIdForName:SDLNameSubscribeButton]).to(equal(@18));
+        expect([functionID functionIdForName:SDLNameUnsubscribeButton]).to(equal(@19));
+        expect([functionID functionIdForName:SDLNameSubscribeVehicleData]).to(equal(@20));
+        expect([functionID functionIdForName:SDLNameUnsubscribeVehicleData]).to(equal(@21));
+        expect([functionID functionIdForName:SDLNameGetVehicleData]).to(equal(@22));
+        expect([functionID functionIdForName:SDLNameReadDID]).to(equal(@23));
+        expect([functionID functionIdForName:SDLNameGetDTCs]).to(equal(@24));
+        expect([functionID functionIdForName:SDLNameScrollableMessage]).to(equal(@25));
+        expect([functionID functionIdForName:SDLNameSlider]).to(equal(@26));
+        expect([functionID functionIdForName:SDLNameShowConstantTBT]).to(equal(@27));
+        expect([functionID functionIdForName:SDLNameAlertManeuver]).to(equal(@28));
+        expect([functionID functionIdForName:SDLNameUpdateTurnList]).to(equal(@29));
+        expect([functionID functionIdForName:SDLNameChangeRegistration]).to(equal(@30));
+        expect([functionID functionIdForName:SDLNameGenericResponse]).to(equal(@31));
+        expect([functionID functionIdForName:SDLNamePutFile]).to(equal(@32));
+        expect([functionID functionIdForName:SDLNameDeleteFile]).to(equal(@33));
+        expect([functionID functionIdForName:SDLNameListFiles]).to(equal(@34));
+        expect([functionID functionIdForName:SDLNameSetAppIcon]).to(equal(@35));
+        expect([functionID functionIdForName:SDLNameSetDisplayLayout]).to(equal(@36));
+        expect([functionID functionIdForName:SDLNameDiagnosticMessage]).to(equal(@37));
+        expect([functionID functionIdForName:SDLNameSystemRequest]).to(equal(@38));
+        expect([functionID functionIdForName:SDLNameSendLocation]).to(equal(@39));
+        expect([functionID functionIdForName:SDLNameDialNumber]).to(equal(@40));
+        expect([functionID functionIdForName:SDLNameOnHMIStatus]).to(equal(@32768));
+        expect([functionID functionIdForName:SDLNameOnAppInterfaceUnregistered]).to(equal(@32769));
+        expect([functionID functionIdForName:SDLNameOnButtonEvent]).to(equal(@32770));
+        expect([functionID functionIdForName:SDLNameOnButtonPress]).to(equal(@32771));
+        expect([functionID functionIdForName:SDLNameOnVehicleData]).to(equal(@32772));
+        expect([functionID functionIdForName:SDLNameOnCommand]).to(equal(@32773));
+        expect([functionID functionIdForName:SDLNameOnTBTClientState]).to(equal(@32774));
+        expect([functionID functionIdForName:SDLNameOnDriverDistraction]).to(equal(@32775));
+        expect([functionID functionIdForName:SDLNameOnPermissionsChange]).to(equal(@32776));
+        expect([functionID functionIdForName:SDLNameOnAudioPassThru]).to(equal(@32777));
+        expect([functionID functionIdForName:SDLNameOnLanguageChange]).to(equal(@32778));
+        expect([functionID functionIdForName:SDLNameOnKeyboardInput]).to(equal(@32779));
+        expect([functionID functionIdForName:SDLNameOnTouchEvent]).to(equal(@32780));
+        expect([functionID functionIdForName:SDLNameOnSystemRequest]).to(equal(@32781));
+        expect([functionID functionIdForName: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 functionIdForName:SDLNameEncodedSyncPData]).to(equal(@65536));
+        expect([functionID functionIdForName:SDLNameSyncPData]).to(equal(@65537));
         
-        expect([functionID getFunctionID:NAMES_OnEncodedSyncPData]).to(equal(@98304));
-        expect([functionID getFunctionID:NAMES_OnSyncPData]).to(equal(@98305));
+        expect([functionID functionIdForName:SDLNameOnEncodedSyncPData]).to(equal(@98304));
+        expect([functionID functionIdForName:SDLNameOnSyncPData]).to(equal(@98305));
     });
 });
 
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m
index 668cedb86..51e7c4437 100644
--- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m
@@ -10,7 +10,7 @@
 
 #import "SDLHMIZoneCapabilities.h"
 
-QuickSpecBegin(SDLHmiZoneCapabilitiesSpec)
+QuickSpecBegin(SDLHMIZoneCapabilitiesSpec)
 
 describe(@"Individual Enum Value Tests", ^ {
     it(@"Should match internal values", ^ {
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
index c33083946..778c08308 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_reason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]},
-                                                             NAMES_operation_name:NAMES_OnAppInterfaceUnregistered}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameReason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]},
+                                                             SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy];
         SDLOnAppInterfaceUnregistered* testNotification = [[SDLOnAppInterfaceUnregistered alloc] initWithDictionary:dict];
         
         expect(testNotification.reason).to(equal([SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
index 7d021c3a1..503e5a5e0 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_buttonName:[SDLButtonName CUSTOM_BUTTON],
-                                                                   NAMES_buttonEventMode:[SDLButtonEventMode BUTTONDOWN],
-                                                                   NAMES_customButtonID:@4252},
-                                                             NAMES_operation_name:NAMES_OnButtonEvent}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
index c72aa92dc..617e143f1 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_buttonName:[SDLButtonName CUSTOM_BUTTON],
-                                                                   NAMES_buttonPressMode:[SDLButtonPressMode LONG],
-                                                                   NAMES_customButtonID:@5642},
-                                                             NAMES_operation_name:NAMES_OnButtonPress}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
index 2b4127de0..6c80341b1 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_cmdID:@5676544,
-                                                                   NAMES_triggerSource:[SDLTriggerSource KEYBOARD]},
-                                                             NAMES_operation_name:NAMES_OnCommand}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameCommandId:@5676544,
+                                                                   SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]},
+                                                             SDLNameOperationName:SDLNameOnCommand}} mutableCopy];
         SDLOnCommand* testNotification = [[SDLOnCommand alloc] initWithDictionary:dict];
         
         expect(testNotification.cmdID).to(equal(@5676544));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
index 1b7d7e531..7b9fb23f4 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_state:[SDLDriverDistractionState DD_ON]},
-                                                             NAMES_operation_name:NAMES_OnDriverDistraction}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameState:[SDLDriverDistractionState DD_ON]},
+                                                             SDLNameOperationName:SDLNameOnDriverDistraction}} mutableCopy];
         SDLOnDriverDistraction* testNotification = [[SDLOnDriverDistraction alloc] initWithDictionary:dict];
         
         expect(testNotification.state).to(equal([SDLDriverDistractionState DD_ON]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
index 4b37cc52d..b3fd3447e 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_data:[@[@0] mutableCopy],
-                                                                   NAMES_URL:@"www.zombo.com",
-                                                                   NAMES_Timeout:@564},
-                                                             NAMES_operation_name:NAMES_OnEncodedSyncPData}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
index a456c8cb4..b2c645870 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m
index 21132663f..14148d4ad 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_hashID:@"hash"},
-                                                             NAMES_operation_name:NAMES_OnHashChange}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameHashId:@"hash"},
+                                                             SDLNameOperationName:SDLNameOnHashChange}} mutableCopy];
         SDLOnHashChange* testNotification = [[SDLOnHashChange alloc] initWithDictionary:dict];
         
         expect(testNotification.hashID).to(equal(@"hash"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
index 6ca224a45..d14827556 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_event:[SDLKeyboardEvent ENTRY_SUBMITTED],
-                                                                   NAMES_data:@"qwertyg"},
-                                                             NAMES_operation_name:NAMES_OnKeyboardInput}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
index 45dedbb13..5342604f7 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_language:[SDLLanguage ES_ES],
-                                                                   NAMES_hmiDisplayLanguage:[SDLLanguage DE_DE]},
-                                                             NAMES_operation_name:NAMES_OnLanguageChange}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
index 0ac4edf48..350a98a15 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
+        NSMutableDictionary<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
index c26b63568..a66e22654 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_permissionItem:[@[item] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_OnPermissionsChange}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNamePermissionItem:[@[item] mutableCopy]},
+                                                             SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy];
         SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict];
         
         expect(testNotification.permissionItem).to(equal([@[item] mutableCopy]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
index bbbb1f82f..c14fe1d52 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_URL:@"https://www.youtube.com/watch?v=ygr5AHufBN4",
-                                                                   NAMES_Timeout:@8357},
-                                                             NAMES_operation_name:NAMES_OnSyncPData}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
index 6c977cb71..a32260c96 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
index 1a467cd73..eb507f0b5 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_state:[SDLTBTState ETA_REQUEST]},
-                                                             NAMES_operation_name:NAMES_OnTBTClientState}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameState:[SDLTBTState ETA_REQUEST]},
+                                                             SDLNameOperationName:SDLNameOnTBTClientState}} mutableCopy];
         SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict];
         
         expect(testNotification.state).to(equal([SDLTBTState ETA_REQUEST]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
index 82595457f..a8adcd263 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<NSString *, id> *dict = [@{NAMES_notification:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_type:[SDLTouchType BEGIN],
-                                                                   NAMES_event:[@[event] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_OnTouchEvent}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
index 5aa615b97..bdec1dbe3 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<NSString *, id> *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<NSString *, id> *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,
+                                                                   SDLNameAccelerationPedalPosition:@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));
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 f93ebfc01..0119291d9 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
@@ -34,13 +34,14 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary<NSString *, id> *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<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m
index 276a6a029..8dd5742cb 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_menuID:@4345645,
-                                                                   NAMES_position:@27,
-                                                                   NAMES_menuName:@"Welcome to the menu"},
-                                                             NAMES_operation_name:NAMES_AddSubMenu}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
index 259b8cc1b..4d42280db 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_ttsChunks:[@[tts] mutableCopy],
-                                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_AlertManeuver}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
index 2151666e5..a6092684a 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<NSString *, id> *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<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
index bb4cc9edd..8642fe63d 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<NSString *, id> *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<NSString *, id> *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 e08679bb4..52c496f8b 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_interactionChoiceSetID:@141414,
-                                                                   NAMES_choiceSet:[@[choice] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_CreateInteractionChoiceSet}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameInteractionChoiceSetId:@141414,
+                                                                   SDLNameChoiceSet:[@[choice] mutableCopy]},
+                                                             SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy];
         SDLCreateInteractionChoiceSet* testRequest = [[SDLCreateInteractionChoiceSet alloc] initWithDictionary:dict];
 
         expect(testRequest.interactionChoiceSetID).to(equal(@141414));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m
index aa4380b3c..b71e48028 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_cmdID:@11223344},
-                                                             NAMES_operation_name:NAMES_DeleteCommand}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameCommandId:@11223344},
+                                                             SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy];
         SDLDeleteCommand* testRequest = [[SDLDeleteCommand alloc] initWithDictionary:dict];
         
         expect(testRequest.cmdID).to(equal(@11223344));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m
index dffb00676..18ce7d1d7 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_syncFileName:@"synchro"},
-                                                             NAMES_operation_name:NAMES_DeleteFile}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameSyncFileName:@"synchro"},
+                                                             SDLNameOperationName:SDLNameDeleteFile}} mutableCopy];
         SDLDeleteFile* testRequest = [[SDLDeleteFile alloc] initWithDictionary:dict];
         
         expect(testRequest.syncFileName).to(equal(@"synchro"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m
index 17e11032c..bcc2c3756 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_interactionChoiceSetID:@20314},
-                                                             NAMES_operation_name:NAMES_DeleteInteractionChoiceSet}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameInteractionChoiceSetId:@20314},
+                                                             SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy];
         SDLDeleteInteractionChoiceSet* testRequest = [[SDLDeleteInteractionChoiceSet alloc] initWithDictionary:dict];
         
         expect(testRequest.interactionChoiceSetID).to(equal(@20314));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m
index 35e955637..888d94f59 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_menuID:@25614},
-                                                             NAMES_operation_name:NAMES_DeleteSubMenu}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameMenuId:@25614},
+                                                             SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy];
         SDLDeleteSubMenu* testRequest = [[SDLDeleteSubMenu alloc] initWithDictionary:dict];
         
         expect(testRequest.menuID).to(equal(@25614));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m
index b04daa170..c07a8b5fc 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<NSString *, id> *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<NSString *, id> *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));
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 16d46a2d8..739db2b66 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_data:[@[@2, @2, @2] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_EncodedSyncPData}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
index 7b292a906..fcdec90f8 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_ecuName:@4321,
-                                                                   NAMES_dtcMask:@22},
-                                                             NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameECUName:@4321,
+                                                                   SDLNameDTCMask:@22},
+                                                             SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy];
         SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict];
         
         expect(testRequest.ecuName).to(equal(@4321));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
index d0b57811f..053f90503 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<NSString *, id> *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<NSString *, id> *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,
+                                                                   SDLNameAccelerationPedalPosition:@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 7a9277bbf..78f8346c5 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<NSString *, id> *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<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
index c99a74646..6dd8f7b07 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<NSString *, id> *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<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
index 9732df66a..3b8af9d9c 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<NSString *, id> *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<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
index 9548dc12e..f0290c3b6 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_ecuName:@33112,
-                                                                   NAMES_didLocation:[@[@200, @201, @205] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
index 931c5511a..cb44868a6 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<NSString *, id> *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<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameSyncMessageVersion: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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
index d370733f2..eb0eca22e 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_properties:[@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]},
-                                                             NAMES_operation_name:NAMES_ResetGlobalProperties}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m
index f4b1b3f0a..f4b50c3f9 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_scrollableMessageBody:@"thatmessagebody",
-                                                                   NAMES_timeout:@9182,
-                                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_ScrollableMessage}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m
index 026bff3e2..869602aad 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 a859dd8ab..29c0f14f5 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_syncFileName:@"A/File/Name"},
-                                                             NAMES_operation_name:NAMES_SetAppIcon}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameSyncFileName:@"A/File/Name"},
+                                                             SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy];
         SDLSetAppIcon* testRequest = [[SDLSetAppIcon alloc] initWithDictionary:dict];
         
         expect(testRequest.syncFileName).to(equal(@"A/File/Name"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m
index 391184d15..ed712dede 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_displayLayout:@"wat"},
-                                                             NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameDisplayLayout:@"wat"},
+                                                             SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy];
         SDLSetDisplayLayout* testRequest = [[SDLSetDisplayLayout alloc] initWithDictionary:dict];
         
         expect(testRequest.displayLayout).to(equal(@"wat"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
index ed61d10a4..15062d29b 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
index 37f24539b..edbf7a246 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_startTime:time1,
-                                                                   NAMES_endTime:time2,
-                                                                   NAMES_updateMode:[SDLUpdateMode COUNTUP]},
-                                                             NAMES_operation_name:NAMES_SetMediaClockTimer}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
index 900b56e77..491096b84 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<NSString *, id> *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<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
index 72ad61943..6cc5b4974 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<NSString *, id> *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<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
index d1f5a29c5..294e0ce50 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<NSString *, id> *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<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameNumberTicks:@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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
index c08e9e045..e336b0067 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_ttsChunks:[@[chunk] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_Speak}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameTTSChunks:[@[chunk] mutableCopy]},
+                                                             SDLNameOperationName:SDLNameSpeak}} mutableCopy];
         SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict];
         
         expect(testRequest.ttsChunks).to(equal([@[chunk] mutableCopy]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
index 63b5b417d..fa562c3a3 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_buttonName:[SDLButtonName PRESET_5]},
-                                                             NAMES_operation_name:NAMES_SubscribeButton}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameButtonName:[SDLButtonName PRESET_5]},
+                                                             SDLNameOperationName:SDLNameSubscribeButton}} mutableCopy];
         SDLSubscribeButton* testRequest = [[SDLSubscribeButton alloc] initWithDictionary:dict];
         
         expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_5]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
index b49378a21..b85671aa4 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<NSString *, id> *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<NSString *, id> *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,
+                                                                   SDLNameAccelerationPedalPosition:@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 6ef7eba6e..884804c24 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_requestType:[SDLRequestType AUTH_REQUEST],
-                                                                   NAMES_fileName:@"AnotherFile"},
-                                                             NAMES_operation_name:NAMES_SystemRequest}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
index 696368681..9fa39ab96 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_buttonName:[SDLButtonName PRESET_0]},
-                                                             NAMES_operation_name:NAMES_UnsubscribeButton}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameButtonName:[SDLButtonName PRESET_0]},
+                                                             SDLNameOperationName:SDLNameUnsubscribeButton}} mutableCopy];
         SDLUnsubscribeButton* testRequest = [[SDLUnsubscribeButton alloc] initWithDictionary:dict];
         
         expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_0]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
index 1a2153b74..40ec363f8 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<NSString *, id> *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<NSString *, id> *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,
+                                                                   SDLNameAccelerationPedalPosition:@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 2dda09888..24bd699d2 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<NSString *, id> *dict = [@{NAMES_request:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_turnList:[@[turn] mutableCopy],
-                                                                   NAMES_softButtons:[@[button] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_UpdateTurnList}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m
index 32c02d52a..13f68a2ea 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<NSString *, id> *dict = [@{NAMES_response:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_spaceAvailable:@0},
-                                                             NAMES_operation_name:NAMES_DeleteFile}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameSpaceAvailable:@0},
+                                                             SDLNameOperationName:SDLNameDeleteFile}} mutableCopy];
         SDLDeleteFileResponse* testResponse = [[SDLDeleteFileResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.spaceAvailable).to(equal(@0));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m
index 5dd266c21..c36b3cbec 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<NSString *, id> *dict = [@{NAMES_response:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_messageDataResult:[@[@3, @9, @27, @81] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
index 69e992ddf..d22e8fd1b 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<NSString *, id> *dict = [@{NAMES_response:
-                                                          @{NAMES_parameters:
-                                                                @{NAMES_ecuHeader:@404,
-                                                                  NAMES_dtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]},
-                                                            NAMES_operation_name:NAMES_GetDTCs}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
index 3baa21655..c4ee631f7 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<NSString *, id> *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<NSString *, id> *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,
+                                                                   SDLNameAccelerationPedalPosition:@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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m
index 9cf9706a8..9cc6571a5 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
index 7bb67c6d2..af42eb3dd 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<NSString *, id> *dict = [@{NAMES_response:
-                                                          @{NAMES_parameters:
-                                                                @{NAMES_choiceID:@25,
-                                                                  NAMES_manualTextEntry:@"entry",
-                                                                  NAMES_triggerSource:[SDLTriggerSource KEYBOARD]},
-                                                            NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m
index a22cdd26c..09ae52453 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<NSString *, id> *dict = [@{NAMES_response:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_spaceAvailable:@1248},
-                                                             NAMES_operation_name:NAMES_PutFile}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameSpaceAvailable:@1248},
+                                                             SDLNameOperationName:SDLNamePutFile}} mutableCopy];
         SDLPutFileResponse* testResponse = [[SDLPutFileResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.spaceAvailable).to(equal(@1248));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
index c1e7a9a02..e8432243a 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<NSString *, id> *dict = [@{NAMES_response:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_didResult:[@[result] mutableCopy]},
-                                                             NAMES_operation_name:NAMES_ReadDID}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameDIDResult:[@[result] mutableCopy]},
+                                                             SDLNameOperationName:SDLNameReadDID}} mutableCopy];
         SDLReadDIDResponse* testResponse = [[SDLReadDIDResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.didResult).to(equal([@[result] mutableCopy]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
index 57143dc93..a0af019db 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<NSString *, id> *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<NSString *, id> *dict = [@{SDLNameRequest:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameSyncMessageVersion: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],
+                                                                   SDLNameSupportedDiagnosticModes:[@[@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 cad93839c..29b589eef 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<NSString *, id> *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<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m
index 30756d62e..b7dce33cb 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<NSString *, id> *dict = [@{NAMES_response:
-                                                           @{NAMES_parameters:
-                                                                 @{NAMES_sliderPosition:@13},
-                                                             NAMES_operation_name:NAMES_Slider}} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse:
+                                                           @{SDLNameParameters:
+                                                                 @{SDLNameSliderPosition:@13},
+                                                             SDLNameOperationName:SDLNameSlider}} mutableCopy];
         SDLSliderResponse* testResponse = [[SDLSliderResponse alloc] initWithDictionary:dict];
         
         expect(testResponse.sliderPosition).to(equal(@13));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
index 712a8132a..a8b890a8d 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<NSString *, id> *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<NSString *, id> *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,
+                                                                   SDLNameAccelerationPedalPosition: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 c2327bc9e..129d9cbd2 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<NSString *, id> *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<NSString *, id> *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,
+                                                                   SDLNameAccelerationPedalPosition: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 35a0116e7..74ed37ea3 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m
index 1d88530ef..b8495dc74 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<NSString *, id> *dict = [@{NAMES_appDisplayName:@"display name",
-                                                       NAMES_appVersion:@"1.2.3.4",
-                                                       NAMES_appBundleID:@"com.app.bundle"} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
index 3e46d861a..9bdcb8666 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<NSString *, id> *dict = [@{NAMES_samplingRate:[SDLSamplingRate _22KHZ],
-                                                       NAMES_bitsPerSample:[SDLBitsPerSample _8_BIT],
-                                                       NAMES_audioType:[SDLAudioType PCM]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
index 1a0249b57..4a3d4155e 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
index 2e9fec26d..24dc90d42 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<NSString *, id> *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<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
index b637ef72d..1413db447 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<NSString *, id> *dict = [@{NAMES_name:[SDLButtonName CUSTOM_BUTTON],
-                                                       NAMES_shortPressAvailable:@YES,
-                                                       NAMES_longPressAvailable:@YES,
-                                                       NAMES_upDownAvailable:@NO} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
index 46cb27b6e..3fa486a98 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<NSString *, id> *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<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
index 78da9438c..2a35e6ec6 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<NSString *, id> *dict = [@{NAMES_powerModeActive:@NO,
-                                                       NAMES_powerModeQualificationStatus:[SDLPowerModeQualificationStatus POWER_MODE_OK],
-                                                       NAMES_carModeStatus:[SDLCarModeStatus CRASH],
-                                                       NAMES_powerModeStatus:[SDLPowerModeStatus KEY_OUT]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
index f28005144..cffcd7851 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<NSString *, id> *dict = [@{NAMES_resultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED],
-                                                       NAMES_didLocation:@300,
-                                                       NAMES_data:@"gertwydhty4235tdhedt4tue"} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
index 700b4fd0a..3108257f4 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<NSString *, id> *dict = [@{NAMES_hardware:@"GDFR34F",
-                                                       NAMES_firmwareRev:@"4.2a",
-                                                       NAMES_os:@"Robot",
-                                                       NAMES_osVersion:@"9.9",
-                                                       NAMES_carrier:@"ThatOneWirelessCompany",
-                                                       NAMES_maxNumberRFCOMMPorts:@20} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameHardware:@"GDFR34F",
+                                                       SDLNameFirmwareRevision:@"4.2a",
+                                                       SDLNameOS:@"Robot",
+                                                       SDLNameOSVersion:@"9.9",
+                                                       SDLNameCarrier:@"ThatOneWirelessCompany",
+                                                       SDLNameMaxNumberRFCOMMPorts:@20} mutableCopy];
         SDLDeviceInfo* testStruct = [[SDLDeviceInfo alloc] initWithDictionary:dict];
         
         expect(testStruct.hardware).to(equal(@"GDFR34F"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
index c7010aee4..ce16e349f 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<NSString *, id> *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<NSString *, id> *dict = [@{SDLNameVoiceRecognitionOn:@NO,
+                                                       SDLNameBluetoothIconOn:@NO,
+                                                       SDLNameCallActive:@YES,
+                                                       SDLNamePhoneRoaming:@NO,
+                                                       SDLNameTextMessageAvailable:@YES,
+                                                       SDLNameBatteryLevelStatus:[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));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
index e6bcd259d..477685b5f 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<NSString *, id> *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<NSString *, id> *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,
+                                                       SDLNameNumberCustomPresetsAvailable:@43} mutableCopy];
         SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.displayType).to(equal([SDLDisplayType GEN2_6_DMA]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
index 6886b2c1e..af3164b29 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<NSString *, id> *dict = [@{NAMES_eCallNotificationStatus:[SDLVehicleDataNotificationStatus NORMAL],
-                                                       NAMES_auxECallNotificationStatus:[SDLVehicleDataNotificationStatus ACTIVE],
-                                                       NAMES_eCallConfirmationStatus:[SDLECallConfirmationStatus CALL_IN_PROGRESS]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
index ca65bd9dc..53d78e721 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<NSString *, id> *dict = [@{NAMES_emergencyEventType:[SDLEmergencyEventType FRONTAL],
-                                                       NAMES_fuelCutoffStatus:[SDLFuelCutoffStatus NORMAL_OPERATION],
-                                                       NAMES_rolloverEvent:[SDLVehicleDataEventStatus _YES],
-                                                       NAMES_maximumChangeVelocity:@33,
-                                                       NAMES_multipleEvents:[SDLVehicleDataEventStatus _NO]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
index 620fbccc8..2ff593834 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<NSString *, id> *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<NSString *, id> *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));
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 6be66bb2f..f9932c1ef 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<NSString *, id> *dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy],
-                                                       NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
index ebdb505a2..d0fce442e 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<NSString *, id> *dict = [@{NAMES_lowBeamsOn:@YES,
-                                                       NAMES_highBeamsOn:@NO,
-                                                       NAMES_ambientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameLowBeamsOn:@YES,
+                                                       SDLNameHighBeamsOn:@NO,
+                                                       SDLNameAmbientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy];
         SDLHeadLampStatus* testStruct = [[SDLHeadLampStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.lowBeamsOn).to(equal(@YES));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
index c92aac689..671210566 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<NSString *, id> *dict = [@{NAMES_name:[SDLImageFieldName turnIcon],
-                                                       NAMES_imageTypeSupported:[@[[SDLFileType GRAPHIC_PNG], [SDLFileType GRAPHIC_JPEG]] copy],
-                                                       NAMES_imageResolution:resolution} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
index cd14d8c75..c1e2923c8 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<NSString *, id> *dict = [@{NAMES_value:@"value",
-                                                       NAMES_imageType:[SDLImageType STATIC]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameValue:@"value",
+                                                       SDLNameImageType:[SDLImageType STATIC]} mutableCopy];
         SDLImage* testStruct = [[SDLImage alloc] initWithDictionary:dict];
         
         expect(testStruct.value).to(equal(@"value"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
index 1c26ae07f..536afe200 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m
index d516eb379..d823d414a 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<NSString *, id> *dict = [@{NAMES_parentID:@504320489,
-                                                       NAMES_position:@256,
-                                                       NAMES_menuName:@"Menu"} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameParentId:@504320489,
+                                                       SDLNamePosition:@256,
+                                                       SDLNameMenuName:@"Menu"} mutableCopy];
         SDLMenuParams* testStruct = [[SDLMenuParams alloc] initWithDictionary:dict];
         
         expect(testStruct.parentID).to(equal(@504320489));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
index 222e31c74..e04575796 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<NSString *, id> *dict = [@{NAMES_e911Override:[SDLVehicleDataStatus ON]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameE911Override:[SDLVehicleDataStatus ON]} mutableCopy];
         SDLMyKey* testStruct = [[SDLMyKey alloc] initWithDictionary:dict];
         
         expect(testStruct.e911Override).to(equal([SDLVehicleDataStatus ON]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
index d34d62470..f59a7c46a 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<NSString *, id> *dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy],
-                                                       NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
index c9949e8b6..4ff0ce5e5 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<NSString *, id> *dict = [@{NAMES_rpcName:@"RPCNameThing",
-                                                       NAMES_hmiPermissions:hmiPermissions,
-                                                       NAMES_parameterPermissions:parameterPermissions} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRPCName:@"RPCNameThing",
+                                                       SDLNameHMIPermissions:hmiPermissions,
+                                                       SDLNameParameterPermissions:parameterPermissions} mutableCopy];
         SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict];
         
         expect(testStruct.rpcName).to(equal(@"RPCNameThing"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m
index 31d7755f9..8bab3c147 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<NSString *, id> *dict = [@{NAMES_onScreenPresetsAvailable:@YES} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy];
         SDLPresetBankCapabilities* testStruct = [[SDLPresetBankCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.onScreenPresetsAvailable).to(equal(@YES));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m
index df4df3b1a..6c574d040 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<NSString *, id> *dict = [@{NAMES_resolution:resolution,
-                                                       NAMES_touchEventAvailable:capabilities} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResolution:resolution,
+                                                       SDLNameTouchEventAvailable:capabilities} mutableCopy];
         SDLScreenParams* testStruct = [[SDLScreenParams alloc] initWithDictionary:dict];
         
         expect(testStruct.resolution).to(equal(resolution));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
index 1ce151cd2..616396a49 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<NSString *, id> *dict = [@{NAMES_status:[SDLComponentVolumeStatus LOW]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameStatus:[SDLComponentVolumeStatus LOW]} mutableCopy];
         SDLSingleTireStatus* testStruct = [[SDLSingleTireStatus alloc] initWithDictionary:dict];
         
         expect(testStruct.status).to(equal([SDLComponentVolumeStatus LOW]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m
index da7d5182f..4000f2764 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<NSString *, id> *dict = [@{NAMES_shortPressAvailable:@NO,
-                                                       NAMES_longPressAvailable:@YES,
-                                                       NAMES_upDownAvailable:@NO,
-                                                       NAMES_imageSupported:@NO} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameShortPressAvailable:@NO,
+                                                       SDLNameLongPressAvailable:@YES,
+                                                       SDLNameUpDownAvailable:@NO,
+                                                       SDLNameImageSupported:@NO} mutableCopy];
         SDLSoftButtonCapabilities* testStruct = [[SDLSoftButtonCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.shortPressAvailable).to(equal(@NO));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
index f0e82c768..14f21500a 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<NSString *, id> *dict = [@{NAMES_type:[SDLSoftButtonType IMAGE],
-                                                       NAMES_text:@"Button",
-                                                       NAMES_image:image,
-                                                       NAMES_isHighlighted:@YES,
-                                                       NAMES_softButtonID:@5423,
-                                                       NAMES_systemAction:[SDLSystemAction KEEP_CONTEXT]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m
index b0729d0d6..4de9c43f4 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<NSString *, id> *dict = [@{NAMES_hours:@22,
-                                                       NAMES_minutes:@39,
-                                                       NAMES_seconds:@11} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameHours:@22,
+                                                       SDLNameMinutes:@39,
+                                                       SDLNameSeconds:@11} mutableCopy];
         SDLStartTime* testStruct = [[SDLStartTime alloc] initWithDictionary:dict];
         
         expect(testStruct.hours).to(equal(@22));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m
index 0ee6f9053..feebead39 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<NSString *, id> *dict = [@{NAMES_majorVersion:@4,
-                                                       NAMES_minorVersion:@532} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameMajorVersion:@4,
+                                                       SDLNameMinorVersion:@532} mutableCopy];
         SDLSyncMsgVersion* testStruct = [[SDLSyncMsgVersion alloc] initWithDictionary:dict];
         
         expect(testStruct.majorVersion).to(equal(@4));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
index 9960a1eb0..09ff6440f 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<NSString *, id> *dict = [@{NAMES_text:@"TEXT",
-                                                       NAMES_type:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameText:@"TEXT",
+                                                       SDLNameType:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy];
         SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] initWithDictionary:dict];
         
         expect(testStruct.text).to(equal(@"TEXT"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
index f167f1ef1..ffd3c9dca 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<NSString *, id> *dict = [@{NAMES_name:[SDLTextFieldName tertiaryText],
-                                                       NAMES_characterSet:[SDLCharacterSet TYPE5SET],
-                                                       NAMES_width:@111,
-                                                       NAMES_rows:@4} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
index 343c2b362..0cea03ae3 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<NSString *, id> *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<NSString *, id> *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]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m
index 58f11ff05..bc9ab9495 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<NSString *, id> *dict = [@{NAMES_x:@67,
-                                                       NAMES_y:@362} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameX:@67,
+                                                       SDLNameY:@362} mutableCopy];
         SDLTouchCoord* testStruct = [[SDLTouchCoord alloc] initWithDictionary:dict];
         
         expect(testStruct.x).to(equal(@67));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m
index 82caccbcc..6df769068 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<NSString *, id> *dict = [@{NAMES_pressAvailable:@YES,
-                                                       NAMES_multiTouchAvailable:@NO,
-                                                       NAMES_doublePressAvailable:@NO} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNamePressAvailable:@YES,
+                                                       SDLNameMultiTouchAvailable:@NO,
+                                                       SDLNameDoublePressAvailable:@NO} mutableCopy];
         SDLTouchEventCapabilities* testStruct = [[SDLTouchEventCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.pressAvailable).to(equal(@YES));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
index 49326816b..0419916e5 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<NSString *, id> *dict = [@{NAMES_id:@3,
-                                                       NAMES_ts:[@[@23, @52, @41345234] mutableCopy],
-                                                       NAMES_c:[@[coord] mutableCopy]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameId:@3,
+                                                       SDLNameTimestamp:[@[@23, @52, @41345234] mutableCopy],
+                                                       SDLNameCoordinate:[@[coord] mutableCopy]} mutableCopy];
         SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict];
         
         expect(testStruct.touchEventId).to(equal(@3));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m
index cb6ad58a0..c445da76e 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<NSString *, id> *dict = [@{NAMES_navigationText:@"NAVTEXT",
-                                                       NAMES_turnIcon:image} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNavigationText:@"NAVTEXT",
+                                                       SDLNameTurnIcon:image} mutableCopy];
         SDLTurn* testStruct = [[SDLTurn alloc] initWithDictionary:dict];
         
         expect(testStruct.navigationText).to(equal(@"NAVTEXT"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
index f1849802b..9a81f70c6 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<NSString *, id> *dict = [@{NAMES_dataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS],
-                                                       NAMES_resultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameDataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS],
+                                                       SDLNameResultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy];
         SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDictionary:dict];
         
         expect(testStruct.dataType).to(equal([SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m
index cc59776ca..eefc4618b 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<NSString *, id> *dict = [@{NAMES_make:@"Make",
-                                                       NAMES_model:@"Model",
-                                                       NAMES_modelYear:@"3.141*10^36",
-                                                       NAMES_trim:@"AE"} mutableCopy];
+        NSMutableDictionary<NSString *, id> *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"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m
index e8eced0dd..307d92621 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<NSString *, id> *dict = [@{NAMES_text:@"DON'T PANIC",
-                                                       NAMES_image:image,
-                                                       NAMES_position:@42} mutableCopy];
+        NSMutableDictionary<NSString *, id> *dict = [@{SDLNameText:@"DON'T PANIC",
+                                                       SDLNameImage:image,
+                                                       SDLNamePosition:@42} mutableCopy];
         SDLVRHelpItem* testStruct = [[SDLVRHelpItem alloc] initWithDictionary:dict];
         
         expect(testStruct.text).to(equal(@"DON'T PANIC"));
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
author	Muller, Alexander (A.) <amulle19@ford.com>	2016-09-27 14:09:38 -0700
committer	Muller, Alexander (A.) <amulle19@ford.com>	2016-09-27 14:09:38 -0700
commit	5667363639cf124e361a17b54be4d5905f8fa691 (patch)
tree	8563f31304eb5b6fe379f36d7aa761182b868b89
parent	f1a0fe829619cc259bb99debf46e234bb86fc964 (diff)
parent	530a160e69e9a8ffde0267ef289cc3ad0acac5bf (diff)
download	sdl_ios-5667363639cf124e361a17b54be4d5905f8fa691.tar.gz