Updated naming of some constant.

83 files changed, 544 insertions, 544 deletions

diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index 688f76b31..aa17fa002 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -64,14 +64,14 @@
 
 - (void)setVrCommands:(NSMutableArray *)vrCommands {
     if (vrCommands != nil) {
-        [parameters setObject:vrCommands forKey:SDLNameVrCommands];
+        [parameters setObject:vrCommands forKey:SDLNameVRCommands];
     } else {
-        [parameters removeObjectForKey:SDLNameVrCommands];
+        [parameters removeObjectForKey:SDLNameVRCommands];
     }
 }
 
 - (NSMutableArray *)vrCommands {
-    return [parameters objectForKey:SDLNameVrCommands];
+    return [parameters objectForKey:SDLNameVRCommands];
 }
 
 - (void)setCmdIcon:(SDLImage *)cmdIcon {
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index 40d9407ba..ed340f27e 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -58,14 +58,14 @@
 
 - (void)setTtsChunks:(NSMutableArray *)ttsChunks {
     if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:SDLNameTtsChunks];
+        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
     } else {
-        [parameters removeObjectForKey:SDLNameTtsChunks];
+        [parameters removeObjectForKey:SDLNameTTSChunks];
     }
 }
 
 - (NSMutableArray *)ttsChunks {
-    NSMutableArray *array = [parameters objectForKey:SDLNameTtsChunks];
+    NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index c3e90c6ad..6b82a8dd4 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -24,14 +24,14 @@
 
 - (void)setTtsChunks:(NSMutableArray *)ttsChunks {
     if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:SDLNameTtsChunks];
+        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
     } else {
-        [parameters removeObjectForKey:SDLNameTtsChunks];
+        [parameters removeObjectForKey:SDLNameTTSChunks];
     }
 }
 
 - (NSMutableArray *)ttsChunks {
-    NSMutableArray *array = [parameters objectForKey:SDLNameTtsChunks];
+    NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index 064c68d6c..c20897233 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -40,14 +40,14 @@
 
 - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage {
     if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHmiDisplayLanguage];
+        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
     } else {
-        [parameters removeObjectForKey:SDLNameHmiDisplayLanguage];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguage];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -69,38 +69,38 @@
 
 - (void)setTtsName:(NSArray *)ttsName {
     if (ttsName != nil) {
-        [parameters setObject:[ttsName copy] forKey:SDLNameTtsName];
+        [parameters setObject:[ttsName copy] forKey:SDLNameTTSName];
     } else {
-        [parameters removeObjectForKey:SDLNameTtsName];
+        [parameters removeObjectForKey:SDLNameTTSName];
     }
 }
 
 - (NSArray *)ttsName {
-    return [parameters[SDLNameTtsName] copy];
+    return [parameters[SDLNameTTSName] copy];
 }
 
 - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName {
     if (ngnMediaScreenAppName != nil) {
-        parameters[SDLNameNgnMediaScreenAppName] = [ngnMediaScreenAppName copy];
+        parameters[SDLNameNGNMediaScreenAppName] = [ngnMediaScreenAppName copy];
     } else {
-        [parameters removeObjectForKey:SDLNameNgnMediaScreenAppName];
+        [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName];
     }
 }
 
 - (NSString *)ngnMediaScreenAppName {
-    return [parameters[SDLNameNgnMediaScreenAppName] copy];
+    return [parameters[SDLNameNGNMediaScreenAppName] copy];
 }
 
 - (void)setVrSynonyms:(NSArray *)vrSynonyms {
     if (vrSynonyms != nil) {
-        [parameters setObject:[vrSynonyms copy] forKey:SDLNameVrSynonyms];
+        [parameters setObject:[vrSynonyms copy] forKey:SDLNameVRSynonyms];
     } else {
-        [parameters removeObjectForKey:SDLNameVrSynonyms];
+        [parameters removeObjectForKey:SDLNameVRSynonyms];
     }
 }
 
 - (NSArray *)vrSynonyms {
-    return [parameters[SDLNameVrSynonyms] copy];
+    return [parameters[SDLNameVRSynonyms] copy];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index 6230a736f..954cf7711 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -46,14 +46,14 @@
 
 - (void)setVrCommands:(NSMutableArray *)vrCommands {
     if (vrCommands != nil) {
-        [store setObject:vrCommands forKey:SDLNameVrCommands];
+        [store setObject:vrCommands forKey:SDLNameVRCommands];
     } else {
-        [store removeObjectForKey:SDLNameVrCommands];
+        [store removeObjectForKey:SDLNameVRCommands];
     }
 }
 
 - (NSMutableArray *)vrCommands {
-    return [store objectForKey:SDLNameVrCommands];
+    return [store objectForKey:SDLNameVRCommands];
 }
 
 - (void)setImage:(SDLImage *)image {
diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m
index a5f6cc2f9..d8f5997d4 100644
--- a/SmartDeviceLink/SDLDIDResult.m
+++ b/SmartDeviceLink/SDLDIDResult.m
@@ -39,14 +39,14 @@
 
 - (void)setDidLocation:(NSNumber *)didLocation {
     if (didLocation != nil) {
-        [store setObject:didLocation forKey:SDLNameDidLocation];
+        [store setObject:didLocation forKey:SDLNameDIDLocation];
     } else {
-        [store removeObjectForKey:SDLNameDidLocation];
+        [store removeObjectForKey:SDLNameDIDLocation];
     }
 }
 
 - (NSNumber *)didLocation {
-    return [store objectForKey:SDLNameDidLocation];
+    return [store objectForKey:SDLNameDIDLocation];
 }
 
 - (void)setData:(NSString *)data {
diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m
index e19b9c42d..bb02ba22c 100644
--- a/SmartDeviceLink/SDLDeviceInfo.m
+++ b/SmartDeviceLink/SDLDeviceInfo.m
@@ -33,38 +33,38 @@
 
 - (void)setFirmwareRev:(NSString *)firmwareRev {
     if (firmwareRev != nil) {
-        [store setObject:firmwareRev forKey:SDLNameFirmwareRev];
+        [store setObject:firmwareRev forKey:SDLNameFirmwareRevision];
     } else {
-        [store removeObjectForKey:SDLNameFirmwareRev];
+        [store removeObjectForKey:SDLNameFirmwareRevision];
     }
 }
 
 - (NSString *)firmwareRev {
-    return [store objectForKey:SDLNameFirmwareRev];
+    return [store objectForKey:SDLNameFirmwareRevision];
 }
 
 - (void)setOs:(NSString *)os {
     if (os != nil) {
-        [store setObject:os forKey:SDLNameOs];
+        [store setObject:os forKey:SDLNameOS];
     } else {
-        [store removeObjectForKey:SDLNameOs];
+        [store removeObjectForKey:SDLNameOS];
     }
 }
 
 - (NSString *)os {
-    return [store objectForKey:SDLNameOs];
+    return [store objectForKey:SDLNameOS];
 }
 
 - (void)setOsVersion:(NSString *)osVersion {
     if (osVersion != nil) {
-        [store setObject:osVersion forKey:SDLNameOsVersion];
+        [store setObject:osVersion forKey:SDLNameOSVersion];
     } else {
-        [store removeObjectForKey:SDLNameOsVersion];
+        [store removeObjectForKey:SDLNameOSVersion];
     }
 }
 
 - (NSString *)osVersion {
-    return [store objectForKey:SDLNameOsVersion];
+    return [store objectForKey:SDLNameOSVersion];
 }
 
 - (void)setCarrier:(NSString *)carrier {
@@ -81,14 +81,14 @@
 
 - (void)setMaxNumberRFCOMMPorts:(NSNumber *)maxNumberRFCOMMPorts {
     if (maxNumberRFCOMMPorts != nil) {
-        [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRfcommPorts];
+        [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRFCOMMPorts];
     } else {
-        [store removeObjectForKey:SDLNameMaxNumberRfcommPorts];
+        [store removeObjectForKey:SDLNameMaxNumberRFCOMMPorts];
     }
 }
 
 - (NSNumber *)maxNumberRFCOMMPorts {
-    return [store objectForKey:SDLNameMaxNumberRfcommPorts];
+    return [store objectForKey:SDLNameMaxNumberRFCOMMPorts];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m
index 32acd20cf..530211b31 100644
--- a/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink/SDLDeviceStatus.m
@@ -23,14 +23,14 @@
 
 - (void)setVoiceRecOn:(NSNumber *)voiceRecOn {
     if (voiceRecOn != nil) {
-        [store setObject:voiceRecOn forKey:SDLNameVoiceRecOn];
+        [store setObject:voiceRecOn forKey:SDLNameVoiceRecognitionOn];
     } else {
-        [store removeObjectForKey:SDLNameVoiceRecOn];
+        [store removeObjectForKey:SDLNameVoiceRecognitionOn];
     }
 }
 
 - (NSNumber *)voiceRecOn {
-    return [store objectForKey:SDLNameVoiceRecOn];
+    return [store objectForKey:SDLNameVoiceRecognitionOn];
 }
 
 - (void)setBtIconOn:(NSNumber *)btIconOn {
@@ -71,26 +71,26 @@
 
 - (void)setTextMsgAvailable:(NSNumber *)textMsgAvailable {
     if (textMsgAvailable != nil) {
-        [store setObject:textMsgAvailable forKey:SDLNameTextMsgAvailable];
+        [store setObject:textMsgAvailable forKey:SDLNameTextMessageAvailable];
     } else {
-        [store removeObjectForKey:SDLNameTextMsgAvailable];
+        [store removeObjectForKey:SDLNameTextMessageAvailable];
     }
 }
 
 - (NSNumber *)textMsgAvailable {
-    return [store objectForKey:SDLNameTextMsgAvailable];
+    return [store objectForKey:SDLNameTextMessageAvailable];
 }
 
 - (void)setBattLevelStatus:(SDLDeviceLevelStatus *)battLevelStatus {
     if (battLevelStatus != nil) {
-        [store setObject:battLevelStatus forKey:SDLNameBattLevelStatus];
+        [store setObject:battLevelStatus forKey:SDLNameBatteryLevelStatus];
     } else {
-        [store removeObjectForKey:SDLNameBattLevelStatus];
+        [store removeObjectForKey:SDLNameBatteryLevelStatus];
     }
 }
 
 - (SDLDeviceLevelStatus *)battLevelStatus {
-    NSObject *obj = [store objectForKey:SDLNameBattLevelStatus];
+    NSObject *obj = [store objectForKey:SDLNameBatteryLevelStatus];
     if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) {
         return (SDLDeviceLevelStatus *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m
index dcf589956..2ff5cd17c 100644
--- a/SmartDeviceLink/SDLDisplayCapabilities.m
+++ b/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -147,14 +147,14 @@
 
 - (void)setNumCustomPresetsAvailable:(NSNumber *)numCustomPresetsAvailable {
     if (numCustomPresetsAvailable != nil) {
-        [store setObject:numCustomPresetsAvailable forKey:SDLNameNumCustomPresetsAvailable];
+        [store setObject:numCustomPresetsAvailable forKey:SDLNameNumberCustomPresetsAvailable];
     } else {
-        [store removeObjectForKey:SDLNameNumCustomPresetsAvailable];
+        [store removeObjectForKey:SDLNameNumberCustomPresetsAvailable];
     }
 }
 
 - (NSNumber *)numCustomPresetsAvailable {
-    return [store objectForKey:SDLNameNumCustomPresetsAvailable];
+    return [store objectForKey:SDLNameNumberCustomPresetsAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m
index 9b2c016af..7bb4f13d7 100644
--- a/SmartDeviceLink/SDLFunctionID.m
+++ b/SmartDeviceLink/SDLFunctionID.m
@@ -40,11 +40,11 @@
                             @20: SDLNameSubscribeVehicleData,
                             @21: SDLNameUnsubscribeVehicleData,
                             @22: SDLNameGetVehicleData,
-                            @23: SDLNameReadDid,
-                            @24: SDLNameGetDtcs,
+                            @23: SDLNameReadDID,
+                            @24: SDLNameGetDTCs,
                             @25: SDLNameScrollableMessage,
                             @26: SDLNameSlider,
-                            @27: SDLNameShowConstantTbt,
+                            @27: SDLNameShowConstantTBT,
                             @28: SDLNameAlertManeuver,
                             @29: SDLNameUpdateTurnList,
                             @30: SDLNameChangeRegistration,
@@ -58,13 +58,13 @@
                             @38: SDLNameSystemRequest,
                             @39: SDLNameSendLocation,
                             @40: SDLNameDialNumber,
-                            @32768: SDLNameOnHmiStatus,
+                            @32768: SDLNameOnHMIStatus,
                             @32769: SDLNameOnAppInterfaceUnregistered,
                             @32770: SDLNameOnButtonEvent,
                             @32771: SDLNameOnButtonPress,
                             @32772: SDLNameOnVehicleData,
                             @32773: SDLNameOnCommand,
-                            @32774: SDLNameOnTbtClientState,
+                            @32774: SDLNameOnTBTClientState,
                             @32775: SDLNameOnDriverDistraction,
                             @32776: SDLNameOnPermissionsChange,
                             @32777: SDLNameOnAudioPassThru,
diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m
index 2ae666db3..b61265852 100644
--- a/SmartDeviceLink/SDLGPSData.m
+++ b/SmartDeviceLink/SDLGPSData.m
@@ -47,74 +47,74 @@
 
 - (void)setUtcYear:(NSNumber *)utcYear {
     if (utcYear != nil) {
-        [store setObject:utcYear forKey:SDLNameUtcYear];
+        [store setObject:utcYear forKey:SDLNameUTCYear];
     } else {
-        [store removeObjectForKey:SDLNameUtcYear];
+        [store removeObjectForKey:SDLNameUTCYear];
     }
 }
 
 - (NSNumber *)utcYear {
-    return [store objectForKey:SDLNameUtcYear];
+    return [store objectForKey:SDLNameUTCYear];
 }
 
 - (void)setUtcMonth:(NSNumber *)utcMonth {
     if (utcMonth != nil) {
-        [store setObject:utcMonth forKey:SDLNameUtcMonth];
+        [store setObject:utcMonth forKey:SDLNameUTCMonth];
     } else {
-        [store removeObjectForKey:SDLNameUtcMonth];
+        [store removeObjectForKey:SDLNameUTCMonth];
     }
 }
 
 - (NSNumber *)utcMonth {
-    return [store objectForKey:SDLNameUtcMonth];
+    return [store objectForKey:SDLNameUTCMonth];
 }
 
 - (void)setUtcDay:(NSNumber *)utcDay {
     if (utcDay != nil) {
-        [store setObject:utcDay forKey:SDLNameUtcDay];
+        [store setObject:utcDay forKey:SDLNameUTCDay];
     } else {
-        [store removeObjectForKey:SDLNameUtcDay];
+        [store removeObjectForKey:SDLNameUTCDay];
     }
 }
 
 - (NSNumber *)utcDay {
-    return [store objectForKey:SDLNameUtcDay];
+    return [store objectForKey:SDLNameUTCDay];
 }
 
 - (void)setUtcHours:(NSNumber *)utcHours {
     if (utcHours != nil) {
-        [store setObject:utcHours forKey:SDLNameUtcHours];
+        [store setObject:utcHours forKey:SDLNameUTCHours];
     } else {
-        [store removeObjectForKey:SDLNameUtcHours];
+        [store removeObjectForKey:SDLNameUTCHours];
     }
 }
 
 - (NSNumber *)utcHours {
-    return [store objectForKey:SDLNameUtcHours];
+    return [store objectForKey:SDLNameUTCHours];
 }
 
 - (void)setUtcMinutes:(NSNumber *)utcMinutes {
     if (utcMinutes != nil) {
-        [store setObject:utcMinutes forKey:SDLNameUtcMinutes];
+        [store setObject:utcMinutes forKey:SDLNameUTCMinutes];
     } else {
-        [store removeObjectForKey:SDLNameUtcMinutes];
+        [store removeObjectForKey:SDLNameUTCMinutes];
     }
 }
 
 - (NSNumber *)utcMinutes {
-    return [store objectForKey:SDLNameUtcMinutes];
+    return [store objectForKey:SDLNameUTCMinutes];
 }
 
 - (void)setUtcSeconds:(NSNumber *)utcSeconds {
     if (utcSeconds != nil) {
-        [store setObject:utcSeconds forKey:SDLNameUtcSeconds];
+        [store setObject:utcSeconds forKey:SDLNameUTCSeconds];
     } else {
-        [store removeObjectForKey:SDLNameUtcSeconds];
+        [store removeObjectForKey:SDLNameUTCSeconds];
     }
 }
 
 - (NSNumber *)utcSeconds {
-    return [store objectForKey:SDLNameUtcSeconds];
+    return [store objectForKey:SDLNameUTCSeconds];
 }
 
 - (void)setCompassDirection:(SDLCompassDirection *)compassDirection {
@@ -136,38 +136,38 @@
 
 - (void)setPdop:(NSNumber *)pdop {
     if (pdop != nil) {
-        [store setObject:pdop forKey:SDLNamePdop];
+        [store setObject:pdop forKey:SDLNamePDOP];
     } else {
-        [store removeObjectForKey:SDLNamePdop];
+        [store removeObjectForKey:SDLNamePDOP];
     }
 }
 
 - (NSNumber *)pdop {
-    return [store objectForKey:SDLNamePdop];
+    return [store objectForKey:SDLNamePDOP];
 }
 
 - (void)setHdop:(NSNumber *)hdop {
     if (hdop != nil) {
-        [store setObject:hdop forKey:SDLNameHdop];
+        [store setObject:hdop forKey:SDLNameHDOP];
     } else {
-        [store removeObjectForKey:SDLNameHdop];
+        [store removeObjectForKey:SDLNameHDOP];
     }
 }
 
 - (NSNumber *)hdop {
-    return [store objectForKey:SDLNameHdop];
+    return [store objectForKey:SDLNameHDOP];
 }
 
 - (void)setVdop:(NSNumber *)vdop {
     if (vdop != nil) {
-        [store setObject:vdop forKey:SDLNameVdop];
+        [store setObject:vdop forKey:SDLNameVDOP];
     } else {
-        [store removeObjectForKey:SDLNameVdop];
+        [store removeObjectForKey:SDLNameVDOP];
     }
 }
 
 - (NSNumber *)vdop {
-    return [store objectForKey:SDLNameVdop];
+    return [store objectForKey:SDLNameVDOP];
 }
 
 - (void)setActual:(NSNumber *)actual {
diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m
index f56e2ec6a..327fc2456 100644
--- a/SmartDeviceLink/SDLGetDTCs.m
+++ b/SmartDeviceLink/SDLGetDTCs.m
@@ -9,7 +9,7 @@
 @implementation SDLGetDTCs
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameGetDtcs]) {
+    if (self = [super initWithName:SDLNameGetDTCs]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setEcuName:(NSNumber *)ecuName {
     if (ecuName != nil) {
-        [parameters setObject:ecuName forKey:SDLNameEcuName];
+        [parameters setObject:ecuName forKey:SDLNameECUName];
     } else {
-        [parameters removeObjectForKey:SDLNameEcuName];
+        [parameters removeObjectForKey:SDLNameECUName];
     }
 }
 
 - (NSNumber *)ecuName {
-    return [parameters objectForKey:SDLNameEcuName];
+    return [parameters objectForKey:SDLNameECUName];
 }
 
 - (void)setDtcMask:(NSNumber *)dtcMask {
     if (dtcMask != nil) {
-        [parameters setObject:dtcMask forKey:SDLNameDtcMask];
+        [parameters setObject:dtcMask forKey:SDLNameDTCMask];
     } else {
-        [parameters removeObjectForKey:SDLNameDtcMask];
+        [parameters removeObjectForKey:SDLNameDTCMask];
     }
 }
 
 - (NSNumber *)dtcMask {
-    return [parameters objectForKey:SDLNameDtcMask];
+    return [parameters objectForKey:SDLNameDTCMask];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m
index 32a0a19be..6f83f1432 100644
--- a/SmartDeviceLink/SDLGetDTCsResponse.m
+++ b/SmartDeviceLink/SDLGetDTCsResponse.m
@@ -9,7 +9,7 @@
 @implementation SDLGetDTCsResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameGetDtcs]) {
+    if (self = [super initWithName:SDLNameGetDTCs]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setEcuHeader:(NSNumber *)ecuHeader {
     if (ecuHeader != nil) {
-        [parameters setObject:ecuHeader forKey:SDLNameEcuHeader];
+        [parameters setObject:ecuHeader forKey:SDLNameECUHeader];
     } else {
-        [parameters removeObjectForKey:SDLNameEcuHeader];
+        [parameters removeObjectForKey:SDLNameECUHeader];
     }
 }
 
 - (NSNumber *)ecuHeader {
-    return [parameters objectForKey:SDLNameEcuHeader];
+    return [parameters objectForKey:SDLNameECUHeader];
 }
 
 - (void)setDtc:(NSMutableArray *)dtc {
     if (dtc != nil) {
-        [parameters setObject:dtc forKey:SDLNameDtc];
+        [parameters setObject:dtc forKey:SDLNameDTC];
     } else {
-        [parameters removeObjectForKey:SDLNameDtc];
+        [parameters removeObjectForKey:SDLNameDTC];
     }
 }
 
 - (NSMutableArray *)dtc {
-    return [parameters objectForKey:SDLNameDtc];
+    return [parameters objectForKey:SDLNameDTC];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index 8d2f1eeaf..370b54419 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -22,14 +22,14 @@
 
 - (void)setGps:(NSNumber *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:SDLNameGps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (NSNumber *)gps {
-    return [parameters objectForKey:SDLNameGps];
+    return [parameters objectForKey:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber *)speed {
@@ -46,14 +46,14 @@
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:SDLNameRpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:SDLNameRpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
@@ -106,26 +106,26 @@
 
 - (void)setVin:(NSNumber *)vin {
     if (vin != nil) {
-        [parameters setObject:vin forKey:SDLNameVin];
+        [parameters setObject:vin forKey:SDLNameVIN];
     } else {
-        [parameters removeObjectForKey:SDLNameVin];
+        [parameters removeObjectForKey:SDLNameVIN];
     }
 }
 
 - (NSNumber *)vin {
-    return [parameters objectForKey:SDLNameVin];
+    return [parameters objectForKey:SDLNameVIN];
 }
 
 - (void)setPrndl:(NSNumber *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePrndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:SDLNamePrndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (NSNumber *)prndl {
-    return [parameters objectForKey:SDLNamePrndl];
+    return [parameters objectForKey:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber *)tirePressure {
@@ -238,14 +238,14 @@
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:SDLNameAccPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m
index a273a441d..253161663 100644
--- a/SmartDeviceLink/SDLGetVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -38,14 +38,14 @@
 
 - (void)setGps:(SDLGPSData *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:SDLNameGps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLGPSData *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) {
         return (SDLGPSData *)obj;
     } else {
@@ -67,14 +67,14 @@
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:SDLNameRpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:SDLNameRpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
@@ -132,26 +132,26 @@
 
 - (void)setVin:(NSString *)vin {
     if (vin != nil) {
-        [parameters setObject:vin forKey:SDLNameVin];
+        [parameters setObject:vin forKey:SDLNameVIN];
     } else {
-        [parameters removeObjectForKey:SDLNameVin];
+        [parameters removeObjectForKey:SDLNameVIN];
     }
 }
 
 - (NSString *)vin {
-    return [parameters objectForKey:SDLNameVin];
+    return [parameters objectForKey:SDLNameVIN];
 }
 
 - (void)setPrndl:(SDLPRNDL *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePrndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:SDLNamePrndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLPRNDL *)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePrndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) {
         return (SDLPRNDL *)obj;
     } else {
@@ -304,14 +304,14 @@
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:SDLNameAccPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h
index fb7c0d009..9ae9173b9 100644
--- a/SmartDeviceLink/SDLNames.h
+++ b/SmartDeviceLink/SDLNames.h
@@ -5,7 +5,7 @@
 
 typedef NSString* SDLName NS_STRING_ENUM;
 
-extern SDLName const SDLNameAccPedalPosition;
+extern SDLName const SDLNameAccelerationPedalPosition;
 extern SDLName const SDLNameActual;
 extern SDLName const SDLNameAddCommand;
 extern SDLName const SDLNameAddressLines;
@@ -22,7 +22,7 @@ extern SDLName const SDLNameAltitude;
 extern SDLName const SDLNameAmbientLightSensorStatus;
 extern SDLName const SDLNameAmbientLightStatus;
 extern SDLName const SDLNameAppBundleId;
-extern SDLName const SDLNameAppHmiType;
+extern SDLName const SDLNameAppHMIType;
 extern SDLName const SDLNameAppId;
 extern SDLName const SDLNameAppInfo;
 extern SDLName const SDLNameAppName;
@@ -35,7 +35,7 @@ extern SDLName const SDLNameAudioStreamingState;
 extern SDLName const SDLNameAudioType;
 extern SDLName const SDLNameAutoCompleteText;
 extern SDLName const SDLNameAuxECallNotificationStatus;
-extern SDLName const SDLNameBattLevelStatus;
+extern SDLName const SDLNameBatteryLevelStatus;
 extern SDLName const SDLNameBeltStatus;
 extern SDLName const SDLNameBitsPerSample;
 extern SDLName const SDLNameBodyInformation;
@@ -45,7 +45,7 @@ extern SDLName const SDLNameButtonCapabilities;
 extern SDLName const SDLNameButtonEventMode;
 extern SDLName const SDLNameButtonName;
 extern SDLName const SDLNameButtonPressMode;
-extern SDLName const SDLNameCoord;
+extern SDLName const SDLNameCoordinate;
 extern SDLName const SDLNameCallActive;
 extern SDLName const SDLNameCarModeStatus;
 extern SDLName const SDLNameCarrier;
@@ -72,8 +72,8 @@ 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 SDLNameDIDLocation;
+extern SDLName const SDLNameDIDResult;
 extern SDLName const SDLNameDimension;
 extern SDLName const SDLNameDisplayCapabilities;
 extern SDLName const SDLNameDisplayLayout;
@@ -90,52 +90,52 @@ 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 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 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 SDLNameETA;
 extern SDLName const SDLNameEvent;
 extern SDLName const SDLNameExternalTemperature;
-extern SDLName const SDLNameFileName;
+extern SDLName const SDLNameFilename;
 extern SDLName const SDLNameFilenames;
 extern SDLName const SDLNameFileType;
-extern SDLName const SDLNameFirmwareRev;
+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 SDLNameGetDTCs;
 extern SDLName const SDLNameGetVehicleData;
-extern SDLName const SDLNameGps;
+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 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 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;
@@ -189,7 +189,7 @@ extern SDLName const SDLNameManeuverComplete;
 extern SDLName const SDLNameManualTextEntry;
 extern SDLName const SDLNameMaxDuration;
 extern SDLName const SDLNameMaximumChangeVelocity;
-extern SDLName const SDLNameMaxNumberRfcommPorts;
+extern SDLName const SDLNameMaxNumberRFCOMMPorts;
 extern SDLName const SDLNameMediaClock;
 extern SDLName const SDLNameMediaClockFormats;
 extern SDLName const SDLNameMediaTrack;
@@ -220,11 +220,11 @@ extern SDLName const SDLNameNavigationText;
 extern SDLName const SDLNameNavigationText1;
 extern SDLName const SDLNameNavigationText2;
 extern SDLName const SDLNameNextTurnIcon;
-extern SDLName const SDLNameNgnMediaScreenAppName;
+extern SDLName const SDLNameNGNMediaScreenAppName;
 extern SDLName const SDLNameNotification;
 extern SDLName const SDLNameNumber;
-extern SDLName const SDLNameNumCustomPresetsAvailable;
-extern SDLName const SDLNameNumTicks;
+extern SDLName const SDLNameNumberCustomPresetsAvailable;
+extern SDLName const SDLNameNumberTicks;
 extern SDLName const SDLNameOdometer;
 extern SDLName const SDLNameOffset;
 extern SDLName const SDLNameOnAppInterfaceUnregistered;
@@ -235,19 +235,19 @@ extern SDLName const SDLNameOnCommand;
 extern SDLName const SDLNameOnDriverDistraction;
 extern SDLName const SDLNameOnEncodedSyncPData;
 extern SDLName const SDLNameOnHashChange;
-extern SDLName const SDLNameOnHmiStatus;
+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 SDLNameOnTBTClientState;
 extern SDLName const SDLNameOnTouchEvent;
 extern SDLName const SDLNameOnVehicleData;
 extern SDLName const SDLNameOperationName;
-extern SDLName const SDLNameOs;
-extern SDLName const SDLNameOsVersion;
+extern SDLName const SDLNameOS;
+extern SDLName const SDLNameOSVersion;
 extern SDLName const SDLNameParameterPermissions;
 extern SDLName const SDLNameParameters;
 extern SDLName const SDLNameParentId;
@@ -260,7 +260,7 @@ extern SDLName const SDLNamePassengerCurtainAirbagDeployed;
 extern SDLName const SDLNamePassengerDoorAjar;
 extern SDLName const SDLNamePassengerKneeAirbagDeployed;
 extern SDLName const SDLNamePassengerSideAirbagDeployed;
-extern SDLName const SDLNamePdop;
+extern SDLName const SDLNamePDOP;
 extern SDLName const SDLNamePerformAudioPassThru;
 extern SDLName const SDLNamePerformInteraction;
 extern SDLName const SDLNamePermissionItem;
@@ -279,11 +279,11 @@ extern SDLName const SDLNamePressAvailable;
 extern SDLName const SDLNamePressure;
 extern SDLName const SDLNamePressureTelltale;
 extern SDLName const SDLNamePrimaryAudioSource;
-extern SDLName const SDLNamePrndl;
+extern SDLName const SDLNamePRNDL;
 extern SDLName const SDLNameProgressIndicator;
 extern SDLName const SDLNameProperties;
 extern SDLName const SDLNamePutFile;
-extern SDLName const SDLNameReadDid;
+extern SDLName const SDLNameReadDID;
 extern SDLName const SDLNameRearLeftDoorAjar;
 extern SDLName const SDLNameRearRightDoorAjar;
 extern SDLName const SDLNameReason;
@@ -305,14 +305,14 @@ 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 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 SDLNameSDLVersion;
 extern SDLName const SDLNameSecondaryGraphic;
 extern SDLName const SDLNameSecondaryImage;
 extern SDLName const SDLNameSecondaryText;
@@ -325,7 +325,7 @@ extern SDLName const SDLNameSetMediaClockTimer;
 extern SDLName const SDLNameShortPress;
 extern SDLName const SDLNameShortPressAvailable;
 extern SDLName const SDLNameShow;
-extern SDLName const SDLNameShowConstantTbt;
+extern SDLName const SDLNameShowConstantTBT;
 extern SDLName const SDLNameSignalLevelStatus;
 extern SDLName const SDLNameSlider;
 extern SDLName const SDLNameSliderFooter;
@@ -349,9 +349,9 @@ extern SDLName const SDLNameSubscribe;
 extern SDLName const SDLNameSubscribeButton;
 extern SDLName const SDLNameSubscribeVehicleData;
 extern SDLName const SDLNameSuccess;
-extern SDLName const SDLNameSupportedDiagModes;
+extern SDLName const SDLNameSupportedDiagnosticModes;
 extern SDLName const SDLNameSyncFileName;
-extern SDLName const SDLNameSyncMsgVersion;
+extern SDLName const SDLNameSyncMessageVersion;
 extern SDLName const SDLNameSyncPData;
 extern SDLName const SDLNameSystemAction;
 extern SDLName const SDLNameSystemContext;
@@ -364,7 +364,7 @@ extern SDLName const SDLNameTemplatesAvailable;
 extern SDLName const SDLNameTertiaryText;
 extern SDLName const SDLNameText;
 extern SDLName const SDLNameTextFields;
-extern SDLName const SDLNameTextMsgAvailable;
+extern SDLName const SDLNameTextMessageAvailable;
 extern SDLName const SDLNameTimeout;
 extern SDLName const SDLNameTimeoutCapitalized;
 extern SDLName const SDLNameTimeoutPrompt;
@@ -375,9 +375,9 @@ extern SDLName const SDLNameTouchEventAvailable;
 extern SDLName const SDLNameTriggerSource;
 extern SDLName const SDLNameTrim;
 extern SDLName const SDLNameTryAgainTime;
-extern SDLName const SDLNameTs;
-extern SDLName const SDLNameTtsChunks;
-extern SDLName const SDLNameTtsName;
+extern SDLName const SDLNameTimestamp;
+extern SDLName const SDLNameTTSChunks;
+extern SDLName const SDLNameTTSName;
 extern SDLName const SDLNameTurnIcon;
 extern SDLName const SDLNameTurnList;
 extern SDLName const SDLNameType;
@@ -388,25 +388,25 @@ 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 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 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 SDLNameVDOP;
 extern SDLName const SDLNameVehicleType;
-extern SDLName const SDLNameVin;
-extern SDLName const SDLNameVoiceRecOn;
-extern SDLName const SDLNameVrCapabilities;
-extern SDLName const SDLNameVrCommands;
-extern SDLName const SDLNameVrHelp;
-extern SDLName const SDLNameVrHelpTitle;
-extern SDLName const SDLNameVrSynonyms;
+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;
diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m
index 8f63eb13f..a3314d1bd 100644
--- a/SmartDeviceLink/SDLNames.m
+++ b/SmartDeviceLink/SDLNames.m
@@ -3,7 +3,7 @@
 
 #import "SDLNames.h"
 
-SDLName const SDLNameAccPedalPosition = @"accPedalPosition";
+SDLName const SDLNameAccelerationPedalPosition = @"accPedalPosition";
 SDLName const SDLNameActual = @"actual";
 SDLName const SDLNameAddCommand = @"AddCommand";
 SDLName const SDLNameAddressLines = @"addressLines";
@@ -20,7 +20,7 @@ SDLName const SDLNameAltitude = @"altitude";
 SDLName const SDLNameAmbientLightSensorStatus = @"ambientLightSensorStatus";
 SDLName const SDLNameAmbientLightStatus = @"ambientLightStatus";
 SDLName const SDLNameAppBundleId = @"appBundleID";
-SDLName const SDLNameAppHmiType = @"appHMIType";
+SDLName const SDLNameAppHMIType = @"appHMIType";
 SDLName const SDLNameAppId = @"appID";
 SDLName const SDLNameAppInfo = @"appInfo";
 SDLName const SDLNameAppName = @"appName";
@@ -33,7 +33,7 @@ SDLName const SDLNameAudioStreamingState = @"audioStreamingState";
 SDLName const SDLNameAudioType = @"audioType";
 SDLName const SDLNameAutoCompleteText = @"autoCompleteText";
 SDLName const SDLNameAuxECallNotificationStatus = @"auxECallNotificationStatus";
-SDLName const SDLNameBattLevelStatus = @"battLevelStatus";
+SDLName const SDLNameBatteryLevelStatus = @"battLevelStatus";
 SDLName const SDLNameBeltStatus = @"beltStatus";
 SDLName const SDLNameBitsPerSample = @"bitsPerSample";
 SDLName const SDLNameBodyInformation = @"bodyInformation";
@@ -43,7 +43,7 @@ SDLName const SDLNameButtonCapabilities = @"buttonCapabilities";
 SDLName const SDLNameButtonEventMode = @"buttonEventMode";
 SDLName const SDLNameButtonName = @"buttonName";
 SDLName const SDLNameButtonPressMode = @"buttonPressMode";
-SDLName const SDLNameCoord = @"c";
+SDLName const SDLNameCoordinate = @"c";
 SDLName const SDLNameCallActive = @"callActive";
 SDLName const SDLNameCarModeStatus = @"carModeStatus";
 SDLName const SDLNameCarrier = @"carrier";
@@ -70,8 +70,8 @@ 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 SDLNameDIDLocation = @"didLocation";
+SDLName const SDLNameDIDResult = @"didResult";
 SDLName const SDLNameDimension = @"dimension";
 SDLName const SDLNameDisplayCapabilities = @"displayCapabilities";
 SDLName const SDLNameDisplayLayout = @"displayLayout";
@@ -88,52 +88,52 @@ 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 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 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 SDLNameETA = @"eta";
 SDLName const SDLNameEvent = @"event";
 SDLName const SDLNameExternalTemperature = @"externalTemperature";
-SDLName const SDLNameFileName = @"fileName";
+SDLName const SDLNameFilename = @"fileName";
 SDLName const SDLNameFilenames = @"filenames";
 SDLName const SDLNameFileType = @"fileType";
-SDLName const SDLNameFirmwareRev = @"firmwareRev";
+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 SDLNameGetDTCs = @"GetDTCs";
 SDLName const SDLNameGetVehicleData = @"GetVehicleData";
-SDLName const SDLNameGps = @"gps";
+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 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 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";
@@ -187,7 +187,7 @@ SDLName const SDLNameManeuverComplete = @"maneuverComplete";
 SDLName const SDLNameManualTextEntry = @"manualTextEntry";
 SDLName const SDLNameMaxDuration = @"maxDuration";
 SDLName const SDLNameMaximumChangeVelocity = @"maximumChangeVelocity";
-SDLName const SDLNameMaxNumberRfcommPorts = @"maxNumberRFCOMMPorts";
+SDLName const SDLNameMaxNumberRFCOMMPorts = @"maxNumberRFCOMMPorts";
 SDLName const SDLNameMediaClock = @"mediaClock";
 SDLName const SDLNameMediaClockFormats = @"mediaClockFormats";
 SDLName const SDLNameMediaTrack = @"mediaTrack";
@@ -218,11 +218,11 @@ SDLName const SDLNameNavigationText = @"navigationText";
 SDLName const SDLNameNavigationText1 = @"navigationText1";
 SDLName const SDLNameNavigationText2 = @"navigationText2";
 SDLName const SDLNameNextTurnIcon = @"nextTurnIcon";
-SDLName const SDLNameNgnMediaScreenAppName = @"ngnMediaScreenAppName";
+SDLName const SDLNameNGNMediaScreenAppName = @"ngnMediaScreenAppName";
 SDLName const SDLNameNotification = @"notification";
 SDLName const SDLNameNumber = @"number";
-SDLName const SDLNameNumCustomPresetsAvailable = @"numCustomPresetsAvailable";
-SDLName const SDLNameNumTicks = @"numTicks";
+SDLName const SDLNameNumberCustomPresetsAvailable = @"numCustomPresetsAvailable";
+SDLName const SDLNameNumberTicks = @"numTicks";
 SDLName const SDLNameOdometer = @"odometer";
 SDLName const SDLNameOffset = @"offset";
 SDLName const SDLNameOnAppInterfaceUnregistered = @"OnAppInterfaceUnregistered";
@@ -233,19 +233,19 @@ SDLName const SDLNameOnCommand = @"OnCommand";
 SDLName const SDLNameOnDriverDistraction = @"OnDriverDistraction";
 SDLName const SDLNameOnEncodedSyncPData = @"OnEncodedSyncPData";
 SDLName const SDLNameOnHashChange = @"OnHashChange";
-SDLName const SDLNameOnHmiStatus = @"OnHMIStatus";
+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 SDLNameOnTBTClientState = @"OnTBTClientState";
 SDLName const SDLNameOnTouchEvent = @"OnTouchEvent";
 SDLName const SDLNameOnVehicleData = @"OnVehicleData";
 SDLName const SDLNameOperationName = @"name";
-SDLName const SDLNameOs = @"os";
-SDLName const SDLNameOsVersion = @"osVersion";
+SDLName const SDLNameOS = @"os";
+SDLName const SDLNameOSVersion = @"osVersion";
 SDLName const SDLNameParameterPermissions = @"parameterPermissions";
 SDLName const SDLNameParameters = @"parameters";
 SDLName const SDLNameParentId = @"parentID";
@@ -258,7 +258,7 @@ SDLName const SDLNamePassengerCurtainAirbagDeployed = @"passengerCurtainAirbagDe
 SDLName const SDLNamePassengerDoorAjar = @"passengerDoorAjar";
 SDLName const SDLNamePassengerKneeAirbagDeployed = @"passengerKneeAirbagDeployed";
 SDLName const SDLNamePassengerSideAirbagDeployed = @"passengerSideAirbagDeployed";
-SDLName const SDLNamePdop = @"pdop";
+SDLName const SDLNamePDOP = @"pdop";
 SDLName const SDLNamePerformAudioPassThru = @"PerformAudioPassThru";
 SDLName const SDLNamePerformInteraction = @"PerformInteraction";
 SDLName const SDLNamePermissionItem = @"permissionItem";
@@ -277,11 +277,11 @@ SDLName const SDLNamePressAvailable = @"pressAvailable";
 SDLName const SDLNamePressure = @"pressure";
 SDLName const SDLNamePressureTelltale = @"pressureTelltale";
 SDLName const SDLNamePrimaryAudioSource = @"primaryAudioSource";
-SDLName const SDLNamePrndl = @"prndl";
+SDLName const SDLNamePRNDL = @"prndl";
 SDLName const SDLNameProgressIndicator = @"progressIndicator";
 SDLName const SDLNameProperties = @"properties";
 SDLName const SDLNamePutFile = @"PutFile";
-SDLName const SDLNameReadDid = @"ReadDID";
+SDLName const SDLNameReadDID = @"ReadDID";
 SDLName const SDLNameRearLeftDoorAjar = @"rearLeftDoorAjar";
 SDLName const SDLNameRearRightDoorAjar = @"rearRightDoorAjar";
 SDLName const SDLNameReason = @"reason";
@@ -303,14 +303,14 @@ 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 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 SDLNameSDLVersion = @"sdlVersion";
 SDLName const SDLNameSecondaryGraphic = @"secondaryGraphic";
 SDLName const SDLNameSecondaryImage = @"secondaryImage";
 SDLName const SDLNameSecondaryText = @"secondaryText";
@@ -323,7 +323,7 @@ SDLName const SDLNameSetMediaClockTimer = @"SetMediaClockTimer";
 SDLName const SDLNameShortPress = @"shortPress";
 SDLName const SDLNameShortPressAvailable = @"shortPressAvailable";
 SDLName const SDLNameShow = @"Show";
-SDLName const SDLNameShowConstantTbt = @"ShowConstantTBT";
+SDLName const SDLNameShowConstantTBT = @"ShowConstantTBT";
 SDLName const SDLNameSignalLevelStatus = @"signalLevelStatus";
 SDLName const SDLNameSlider = @"Slider";
 SDLName const SDLNameSliderFooter = @"sliderFooter";
@@ -347,9 +347,9 @@ SDLName const SDLNameSubscribe = @"Subscribe";
 SDLName const SDLNameSubscribeButton = @"SubscribeButton";
 SDLName const SDLNameSubscribeVehicleData = @"SubscribeVehicleData";
 SDLName const SDLNameSuccess = @"success";
-SDLName const SDLNameSupportedDiagModes = @"supportedDiagModes";
+SDLName const SDLNameSupportedDiagnosticModes = @"supportedDiagModes";
 SDLName const SDLNameSyncFileName = @"syncFileName";
-SDLName const SDLNameSyncMsgVersion = @"syncMsgVersion";
+SDLName const SDLNameSyncMessageVersion = @"syncMessageVersion";
 SDLName const SDLNameSyncPData = @"SyncPData";
 SDLName const SDLNameSystemAction = @"systemAction";
 SDLName const SDLNameSystemContext = @"systemContext";
@@ -362,7 +362,7 @@ SDLName const SDLNameTemplatesAvailable = @"templatesAvailable";
 SDLName const SDLNameTertiaryText = @"tertiaryText";
 SDLName const SDLNameText = @"text";
 SDLName const SDLNameTextFields = @"textFields";
-SDLName const SDLNameTextMsgAvailable = @"textMsgAvailable";
+SDLName const SDLNameTextMessageAvailable = @"textMessageAvailable";
 SDLName const SDLNameTimeout = @"timeout";
 SDLName const SDLNameTimeoutCapitalized = @"Timeout";
 SDLName const SDLNameTimeoutPrompt = @"timeoutPrompt";
@@ -373,9 +373,9 @@ SDLName const SDLNameTouchEventAvailable = @"touchEventAvailable";
 SDLName const SDLNameTriggerSource = @"triggerSource";
 SDLName const SDLNameTrim = @"trim";
 SDLName const SDLNameTryAgainTime = @"tryAgainTime";
-SDLName const SDLNameTs = @"ts";
-SDLName const SDLNameTtsChunks = @"ttsChunks";
-SDLName const SDLNameTtsName = @"ttsName";
+SDLName const SDLNameTimestamp = @"ts";
+SDLName const SDLNameTTSChunks = @"ttsChunks";
+SDLName const SDLNameTTSName = @"ttsName";
 SDLName const SDLNameTurnIcon = @"turnIcon";
 SDLName const SDLNameTurnList = @"turnList";
 SDLName const SDLNameType = @"type";
@@ -386,25 +386,25 @@ 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 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 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 SDLNameVDOP = @"vdop";
 SDLName const SDLNameVehicleType = @"vehicleType";
-SDLName const SDLNameVin = @"vin";
-SDLName const SDLNameVoiceRecOn = @"voiceRecOn";
-SDLName const SDLNameVrCapabilities = @"vrCapabilities";
-SDLName const SDLNameVrCommands = @"vrCommands";
-SDLName const SDLNameVrHelp = @"vrHelp";
-SDLName const SDLNameVrHelpTitle = @"vrHelpTitle";
-SDLName const SDLNameVrSynonyms = @"vrSynonyms";
+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";
diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m
index f9ce20dd8..5e270c2b2 100644
--- a/SmartDeviceLink/SDLOnEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -33,14 +33,14 @@
 
 - (void)setURL:(NSString *)URL {
     if (URL != nil) {
-        [parameters setObject:URL forKey:SDLNameUrlUppercase];
+        [parameters setObject:URL forKey:SDLNameURLUppercase];
     } else {
-        [parameters removeObjectForKey:SDLNameUrlUppercase];
+        [parameters removeObjectForKey:SDLNameURLUppercase];
     }
 }
 
 - (NSString *)URL {
-    return [parameters objectForKey:SDLNameUrlUppercase];
+    return [parameters objectForKey:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(NSNumber *)Timeout {
diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m
index 3948384a6..e1534919d 100644
--- a/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/SmartDeviceLink/SDLOnHMIStatus.m
@@ -11,7 +11,7 @@
 @implementation SDLOnHMIStatus
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameOnHmiStatus]) {
+    if (self = [super initWithName:SDLNameOnHMIStatus]) {
     }
     return self;
 }
@@ -24,14 +24,14 @@
 
 - (void)setHmiLevel:(SDLHMILevel *)hmiLevel {
     if (hmiLevel != nil) {
-        [parameters setObject:hmiLevel forKey:SDLNameHmiLevel];
+        [parameters setObject:hmiLevel forKey:SDLNameHMILevel];
     } else {
-        [parameters removeObjectForKey:SDLNameHmiLevel];
+        [parameters removeObjectForKey:SDLNameHMILevel];
     }
 }
 
 - (SDLHMILevel *)hmiLevel {
-    NSObject *obj = [parameters objectForKey:SDLNameHmiLevel];
+    NSObject *obj = [parameters objectForKey:SDLNameHMILevel];
     if (obj == nil || [obj isKindOfClass:SDLHMILevel.class]) {
         return (SDLHMILevel *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m
index f5ea69f8a..3854ed977 100644
--- a/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/SmartDeviceLink/SDLOnLanguageChange.m
@@ -39,14 +39,14 @@
 
 - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage {
     if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHmiDisplayLanguage];
+        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
     } else {
-        [parameters removeObjectForKey:SDLNameHmiDisplayLanguage];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguage];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m
index 5432bfa04..49f0f751e 100644
--- a/SmartDeviceLink/SDLOnSyncPData.m
+++ b/SmartDeviceLink/SDLOnSyncPData.m
@@ -22,14 +22,14 @@
 
 - (void)setURL:(NSString *)URL {
     if (URL != nil) {
-        [parameters setObject:URL forKey:SDLNameUrlUppercase];
+        [parameters setObject:URL forKey:SDLNameURLUppercase];
     } else {
-        [parameters removeObjectForKey:SDLNameUrlUppercase];
+        [parameters removeObjectForKey:SDLNameURLUppercase];
     }
 }
 
 - (NSString *)URL {
-    return [parameters objectForKey:SDLNameUrlUppercase];
+    return [parameters objectForKey:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(NSNumber *)Timeout {
diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m
index 495ee551e..7e494e6a3 100644
--- a/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/SmartDeviceLink/SDLOnSystemRequest.m
@@ -40,14 +40,14 @@
 
 - (void)setUrl:(NSString *)url {
     if (url != nil) {
-        [parameters setObject:url forKey:SDLNameUrl];
+        [parameters setObject:url forKey:SDLNameURL];
     } else {
-        [parameters removeObjectForKey:SDLNameUrl];
+        [parameters removeObjectForKey:SDLNameURL];
     }
 }
 
 - (NSString *)url {
-    return [parameters objectForKey:SDLNameUrl];
+    return [parameters objectForKey:SDLNameURL];
 }
 
 - (void)setTimeout:(NSNumber *)timeout {
diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m
index acc1d7bc2..cff907a0c 100644
--- a/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/SmartDeviceLink/SDLOnTBTClientState.m
@@ -9,7 +9,7 @@
 @implementation SDLOnTBTClientState
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameOnTbtClientState]) {
+    if (self = [super initWithName:SDLNameOnTBTClientState]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m
index b5981bd1d..2caf20d3b 100644
--- a/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink/SDLOnVehicleData.m
@@ -37,14 +37,14 @@
 
 - (void)setGps:(SDLGPSData *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:SDLNameGps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLGPSData *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) {
         return (SDLGPSData *)obj;
     } else {
@@ -66,14 +66,14 @@
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:SDLNameRpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:SDLNameRpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
@@ -131,26 +131,26 @@
 
 - (void)setVin:(NSString *)vin {
     if (vin != nil) {
-        [parameters setObject:vin forKey:SDLNameVin];
+        [parameters setObject:vin forKey:SDLNameVIN];
     } else {
-        [parameters removeObjectForKey:SDLNameVin];
+        [parameters removeObjectForKey:SDLNameVIN];
     }
 }
 
 - (NSString *)vin {
-    return [parameters objectForKey:SDLNameVin];
+    return [parameters objectForKey:SDLNameVIN];
 }
 
 - (void)setPrndl:(SDLPRNDL *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePrndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:SDLNamePrndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLPRNDL *)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePrndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) {
         return (SDLPRNDL *)obj;
     } else {
@@ -303,14 +303,14 @@
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:SDLNameAccPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index 4f3272b04..93646adf1 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -142,14 +142,14 @@
 
 - (void)setVrHelp:(NSMutableArray *)vrHelp {
     if (vrHelp != nil) {
-        [parameters setObject:vrHelp forKey:SDLNameVrHelp];
+        [parameters setObject:vrHelp forKey:SDLNameVRHelp];
     } else {
-        [parameters removeObjectForKey:SDLNameVrHelp];
+        [parameters removeObjectForKey:SDLNameVRHelp];
     }
 }
 
 - (NSMutableArray *)vrHelp {
-    NSMutableArray *array = [parameters objectForKey:SDLNameVrHelp];
+    NSMutableArray *array = [parameters objectForKey:SDLNameVRHelp];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m
index 2b6a2ed61..8506e9920 100644
--- a/SmartDeviceLink/SDLPermissionItem.m
+++ b/SmartDeviceLink/SDLPermissionItem.m
@@ -23,26 +23,26 @@
 
 - (void)setRpcName:(NSString *)rpcName {
     if (rpcName != nil) {
-        [store setObject:rpcName forKey:SDLNameRpcName];
+        [store setObject:rpcName forKey:SDLNameRPCName];
     } else {
-        [store removeObjectForKey:SDLNameRpcName];
+        [store removeObjectForKey:SDLNameRPCName];
     }
 }
 
 - (NSString *)rpcName {
-    return [store objectForKey:SDLNameRpcName];
+    return [store objectForKey:SDLNameRPCName];
 }
 
 - (void)setHmiPermissions:(SDLHMIPermissions *)hmiPermissions {
     if (hmiPermissions != nil) {
-        [store setObject:hmiPermissions forKey:SDLNameHmiPermissions];
+        [store setObject:hmiPermissions forKey:SDLNameHMIPermissions];
     } else {
-        [store removeObjectForKey:SDLNameHmiPermissions];
+        [store removeObjectForKey:SDLNameHMIPermissions];
     }
 }
 
 - (SDLHMIPermissions *)hmiPermissions {
-    NSObject *obj = [store objectForKey:SDLNameHmiPermissions];
+    NSObject *obj = [store objectForKey:SDLNameHMIPermissions];
     if (obj == nil || [obj isKindOfClass:SDLHMIPermissions.class]) {
         return (SDLHMIPermissions *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLProxy.h b/SmartDeviceLink/SDLProxy.h
index 05da1c2b5..ddfa23304 100644
--- a/SmartDeviceLink/SDLProxy.h
+++ b/SmartDeviceLink/SDLProxy.h
@@ -42,7 +42,7 @@ __deprecated_msg("Use SDLManager instead")
 - (void)sendRPCRequest:(SDLRPCMessage *)msg __deprecated_msg("use -sendRPC: instead");
 
 - (void)handleRPCDictionary:(NSDictionary *)dictionary;
-- (void)handleRpcMessage:(NSDictionary *)msg __deprecated_msg("use -handleRPCDictionary: instead");
+- (void)handleRPCMessage:(NSDictionary *)msg __deprecated_msg("use -handleRPCDictionary: instead");
 
 - (void)handleProtocolMessage:(SDLProtocolMessage *)msgData;
 
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index bae7bfaa7..11dbf3597 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -364,7 +364,7 @@ const int POLICIES_CORRELATION_ID = 65535;
     }
 }
 
-- (void)handleRpcMessage:(NSDictionary *)msg {
+- (void)handleRPCMessage:(NSDictionary *)msg {
     [self handleRPCDictionary:msg];
 }
 
@@ -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:SDLNameHmiLevel];
+    NSString *statusString = (NSString *)[message getParameters:SDLNameHMILevel];
     SDLHMILevel *hmiLevel = [SDLHMILevel valueOf:statusString];
     _lsm.hmiLevel = hmiLevel;
 
diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m
index 7f1bde9f9..fed18baaa 100644
--- a/SmartDeviceLink/SDLReadDID.m
+++ b/SmartDeviceLink/SDLReadDID.m
@@ -9,7 +9,7 @@
 @implementation SDLReadDID
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameReadDid]) {
+    if (self = [super initWithName:SDLNameReadDID]) {
     }
     return self;
 }
@@ -22,26 +22,26 @@
 
 - (void)setEcuName:(NSNumber *)ecuName {
     if (ecuName != nil) {
-        [parameters setObject:ecuName forKey:SDLNameEcuName];
+        [parameters setObject:ecuName forKey:SDLNameECUName];
     } else {
-        [parameters removeObjectForKey:SDLNameEcuName];
+        [parameters removeObjectForKey:SDLNameECUName];
     }
 }
 
 - (NSNumber *)ecuName {
-    return [parameters objectForKey:SDLNameEcuName];
+    return [parameters objectForKey:SDLNameECUName];
 }
 
 - (void)setDidLocation:(NSMutableArray *)didLocation {
     if (didLocation != nil) {
-        [parameters setObject:didLocation forKey:SDLNameDidLocation];
+        [parameters setObject:didLocation forKey:SDLNameDIDLocation];
     } else {
-        [parameters removeObjectForKey:SDLNameDidLocation];
+        [parameters removeObjectForKey:SDLNameDIDLocation];
     }
 }
 
 - (NSMutableArray *)didLocation {
-    return [parameters objectForKey:SDLNameDidLocation];
+    return [parameters objectForKey:SDLNameDIDLocation];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m
index f1eca420e..eac7139ef 100644
--- a/SmartDeviceLink/SDLReadDIDResponse.m
+++ b/SmartDeviceLink/SDLReadDIDResponse.m
@@ -10,7 +10,7 @@
 @implementation SDLReadDIDResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameReadDid]) {
+    if (self = [super initWithName:SDLNameReadDID]) {
     }
     return self;
 }
@@ -23,14 +23,14 @@
 
 - (void)setDidResult:(NSMutableArray *)didResult {
     if (didResult != nil) {
-        [parameters setObject:didResult forKey:SDLNameDidResult];
+        [parameters setObject:didResult forKey:SDLNameDIDResult];
     } else {
-        [parameters removeObjectForKey:SDLNameDidResult];
+        [parameters removeObjectForKey:SDLNameDIDResult];
     }
 }
 
 - (NSMutableArray *)didResult {
-    NSMutableArray *array = [parameters objectForKey:SDLNameDidResult];
+    NSMutableArray *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 4a95b1790..53ed41e4f 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -29,14 +29,14 @@
 
 - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion {
     if (syncMsgVersion != nil) {
-        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMsgVersion];
+        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion];
     } else {
-        [parameters removeObjectForKey:SDLNameSyncMsgVersion];
+        [parameters removeObjectForKey:SDLNameSyncMessageVersion];
     }
 }
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
-    NSObject *obj = [parameters objectForKey:SDLNameSyncMsgVersion];
+    NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion];
     if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) {
         return (SDLSyncMsgVersion *)obj;
     } else {
@@ -58,14 +58,14 @@
 
 - (void)setTtsName:(NSMutableArray *)ttsName {
     if (ttsName != nil) {
-        [parameters setObject:ttsName forKey:SDLNameTtsName];
+        [parameters setObject:ttsName forKey:SDLNameTTSName];
     } else {
-        [parameters removeObjectForKey:SDLNameTtsName];
+        [parameters removeObjectForKey:SDLNameTTSName];
     }
 }
 
 - (NSMutableArray *)ttsName {
-    NSMutableArray *array = [parameters objectForKey:SDLNameTtsName];
+    NSMutableArray *array = [parameters objectForKey:SDLNameTTSName];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -79,26 +79,26 @@
 
 - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName {
     if (ngnMediaScreenAppName != nil) {
-        [parameters setObject:ngnMediaScreenAppName forKey:SDLNameNgnMediaScreenAppName];
+        [parameters setObject:ngnMediaScreenAppName forKey:SDLNameNGNMediaScreenAppName];
     } else {
-        [parameters removeObjectForKey:SDLNameNgnMediaScreenAppName];
+        [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName];
     }
 }
 
 - (NSString *)ngnMediaScreenAppName {
-    return [parameters objectForKey:SDLNameNgnMediaScreenAppName];
+    return [parameters objectForKey:SDLNameNGNMediaScreenAppName];
 }
 
 - (void)setVrSynonyms:(NSMutableArray *)vrSynonyms {
     if (vrSynonyms != nil) {
-        [parameters setObject:vrSynonyms forKey:SDLNameVrSynonyms];
+        [parameters setObject:vrSynonyms forKey:SDLNameVRSynonyms];
     } else {
-        [parameters removeObjectForKey:SDLNameVrSynonyms];
+        [parameters removeObjectForKey:SDLNameVRSynonyms];
     }
 }
 
 - (NSMutableArray *)vrSynonyms {
-    return [parameters objectForKey:SDLNameVrSynonyms];
+    return [parameters objectForKey:SDLNameVRSynonyms];
 }
 
 - (void)setIsMediaApplication:(NSNumber *)isMediaApplication {
@@ -132,14 +132,14 @@
 
 - (void)setHmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired {
     if (hmiDisplayLanguageDesired != nil) {
-        [parameters setObject:hmiDisplayLanguageDesired forKey:SDLNameHmiDisplayLanguageDesired];
+        [parameters setObject:hmiDisplayLanguageDesired forKey:SDLNameHMIDisplayLanguageDesired];
     } else {
-        [parameters removeObjectForKey:SDLNameHmiDisplayLanguageDesired];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguageDesired];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguageDesired {
-    NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguageDesired];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguageDesired];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -149,14 +149,14 @@
 
 - (void)setAppHMIType:(NSMutableArray *)appHMIType {
     if (appHMIType != nil) {
-        [parameters setObject:appHMIType forKey:SDLNameAppHmiType];
+        [parameters setObject:appHMIType forKey:SDLNameAppHMIType];
     } else {
-        [parameters removeObjectForKey:SDLNameAppHmiType];
+        [parameters removeObjectForKey:SDLNameAppHMIType];
     }
 }
 
 - (NSMutableArray *)appHMIType {
-    NSMutableArray *array = [parameters objectForKey:SDLNameAppHmiType];
+    NSMutableArray *array = [parameters objectForKey:SDLNameAppHMIType];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAppHMIType.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index 84968e326..24ca2ce45 100644
--- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -35,14 +35,14 @@
 
 - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion {
     if (syncMsgVersion != nil) {
-        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMsgVersion];
+        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion];
     } else {
-        [parameters removeObjectForKey:SDLNameSyncMsgVersion];
+        [parameters removeObjectForKey:SDLNameSyncMessageVersion];
     }
 }
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
-    NSObject *obj = [parameters objectForKey:SDLNameSyncMsgVersion];
+    NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion];
     if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) {
         return (SDLSyncMsgVersion *)obj;
     } else {
@@ -69,14 +69,14 @@
 
 - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage {
     if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHmiDisplayLanguage];
+        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
     } else {
-        [parameters removeObjectForKey:SDLNameHmiDisplayLanguage];
+        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
     }
 }
 
 - (SDLLanguage *)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguage];
+    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
     if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
@@ -162,14 +162,14 @@
 
 - (void)setHmiZoneCapabilities:(NSMutableArray *)hmiZoneCapabilities {
     if (hmiZoneCapabilities != nil) {
-        [parameters setObject:hmiZoneCapabilities forKey:SDLNameHmiZoneCapabilities];
+        [parameters setObject:hmiZoneCapabilities forKey:SDLNameHMIZoneCapabilities];
     } else {
-        [parameters removeObjectForKey:SDLNameHmiZoneCapabilities];
+        [parameters removeObjectForKey:SDLNameHMIZoneCapabilities];
     }
 }
 
 - (NSMutableArray *)hmiZoneCapabilities {
-    NSMutableArray *array = [parameters objectForKey:SDLNameHmiZoneCapabilities];
+    NSMutableArray *array = [parameters objectForKey:SDLNameHMIZoneCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMIZoneCapabilities.class]) {
         return array;
     } else {
@@ -225,14 +225,14 @@
 
 - (void)setVrCapabilities:(NSMutableArray *)vrCapabilities {
     if (vrCapabilities != nil) {
-        [parameters setObject:vrCapabilities forKey:SDLNameVrCapabilities];
+        [parameters setObject:vrCapabilities forKey:SDLNameVRCapabilities];
     } else {
-        [parameters removeObjectForKey:SDLNameVrCapabilities];
+        [parameters removeObjectForKey:SDLNameVRCapabilities];
     }
 }
 
 - (NSMutableArray *)vrCapabilities {
-    NSMutableArray *array = [parameters objectForKey:SDLNameVrCapabilities];
+    NSMutableArray *array = [parameters objectForKey:SDLNameVRCapabilities];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRCapabilities.class]) {
         return array;
     } else {
@@ -284,26 +284,26 @@
 
 - (void)setSupportedDiagModes:(NSMutableArray *)supportedDiagModes {
     if (supportedDiagModes != nil) {
-        [parameters setObject:supportedDiagModes forKey:SDLNameSupportedDiagModes];
+        [parameters setObject:supportedDiagModes forKey:SDLNameSupportedDiagnosticModes];
     } else {
-        [parameters removeObjectForKey:SDLNameSupportedDiagModes];
+        [parameters removeObjectForKey:SDLNameSupportedDiagnosticModes];
     }
 }
 
 - (NSMutableArray *)supportedDiagModes {
-    return [parameters objectForKey:SDLNameSupportedDiagModes];
+    return [parameters objectForKey:SDLNameSupportedDiagnosticModes];
 }
 
 - (void)setHmiCapabilities:(SDLHMICapabilities *)hmiCapabilities {
     if (hmiCapabilities != nil) {
-        [parameters setObject:hmiCapabilities forKey:SDLNameHmiCapabilities];
+        [parameters setObject:hmiCapabilities forKey:SDLNameHMICapabilities];
     } else {
-        [parameters removeObjectForKey:SDLNameHmiCapabilities];
+        [parameters removeObjectForKey:SDLNameHMICapabilities];
     }
 }
 
 - (SDLHMICapabilities *)hmiCapabilities {
-    NSObject *obj = [parameters objectForKey:SDLNameHmiCapabilities];
+    NSObject *obj = [parameters objectForKey:SDLNameHMICapabilities];
     if (obj == nil || [obj isKindOfClass:[SDLHMICapabilities class]]) {
         return (SDLHMICapabilities *)obj;
     } else {
@@ -313,14 +313,14 @@
 
 - (void)setSdlVersion:(NSString *)sdlVersion {
     if (sdlVersion != nil) {
-        parameters[SDLNameSdlVersion] = sdlVersion;
+        parameters[SDLNameSDLVersion] = sdlVersion;
     } else {
-        [parameters removeObjectForKey:SDLNameSdlVersion];
+        [parameters removeObjectForKey:SDLNameSDLVersion];
     }
 }
 
 - (NSString *)sdlVersion {
-    return parameters[SDLNameSdlVersion];
+    return parameters[SDLNameSDLVersion];
 }
 
 - (void)setSystemSoftwareVersion:(NSString *)systemSoftwareVersion {
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m
index 7692fc196..4f2814d02 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -69,26 +69,26 @@
 
 - (void)setVrHelpTitle:(NSString *)vrHelpTitle {
     if (vrHelpTitle != nil) {
-        [parameters setObject:vrHelpTitle forKey:SDLNameVrHelpTitle];
+        [parameters setObject:vrHelpTitle forKey:SDLNameVRHelpTitle];
     } else {
-        [parameters removeObjectForKey:SDLNameVrHelpTitle];
+        [parameters removeObjectForKey:SDLNameVRHelpTitle];
     }
 }
 
 - (NSString *)vrHelpTitle {
-    return [parameters objectForKey:SDLNameVrHelpTitle];
+    return [parameters objectForKey:SDLNameVRHelpTitle];
 }
 
 - (void)setVrHelp:(NSMutableArray *)vrHelp {
     if (vrHelp != nil) {
-        [parameters setObject:vrHelp forKey:SDLNameVrHelp];
+        [parameters setObject:vrHelp forKey:SDLNameVRHelp];
     } else {
-        [parameters removeObjectForKey:SDLNameVrHelp];
+        [parameters removeObjectForKey:SDLNameVRHelp];
     }
 }
 
 - (NSMutableArray *)vrHelp {
-    NSMutableArray *array = [parameters objectForKey:SDLNameVrHelp];
+    NSMutableArray *array = [parameters objectForKey:SDLNameVRHelp];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index 300089fb9..f6df021f6 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -11,7 +11,7 @@
 @implementation SDLShowConstantTBT
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameShowConstantTbt]) {
+    if (self = [super initWithName:SDLNameShowConstantTBT]) {
     }
     return self;
 }
@@ -48,14 +48,14 @@
 
 - (void)setEta:(NSString *)eta {
     if (eta != nil) {
-        [parameters setObject:eta forKey:SDLNameEta];
+        [parameters setObject:eta forKey:SDLNameETA];
     } else {
-        [parameters removeObjectForKey:SDLNameEta];
+        [parameters removeObjectForKey:SDLNameETA];
     }
 }
 
 - (NSString *)eta {
-    return [parameters objectForKey:SDLNameEta];
+    return [parameters objectForKey:SDLNameETA];
 }
 
 - (void)setTimeToDestination:(NSString *)timeToDestination {
diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m
index 7552bbbf3..4f7e01446 100644
--- a/SmartDeviceLink/SDLShowConstantTBTResponse.m
+++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m
@@ -8,7 +8,7 @@
 @implementation SDLShowConstantTBTResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameShowConstantTbt]) {
+    if (self = [super initWithName:SDLNameShowConstantTBT]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m
index 76d1ea7c2..c94c0ae81 100644
--- a/SmartDeviceLink/SDLSlider.m
+++ b/SmartDeviceLink/SDLSlider.m
@@ -22,14 +22,14 @@
 
 - (void)setNumTicks:(NSNumber *)numTicks {
     if (numTicks != nil) {
-        [parameters setObject:numTicks forKey:SDLNameNumTicks];
+        [parameters setObject:numTicks forKey:SDLNameNumberTicks];
     } else {
-        [parameters removeObjectForKey:SDLNameNumTicks];
+        [parameters removeObjectForKey:SDLNameNumberTicks];
     }
 }
 
 - (NSNumber *)numTicks {
-    return [parameters objectForKey:SDLNameNumTicks];
+    return [parameters objectForKey:SDLNameNumberTicks];
 }
 
 - (void)setPosition:(NSNumber *)position {
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index 173b7e6ac..710578ae3 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -23,14 +23,14 @@
 
 - (void)setTtsChunks:(NSMutableArray *)ttsChunks {
     if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:SDLNameTtsChunks];
+        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
     } else {
-        [parameters removeObjectForKey:SDLNameTtsChunks];
+        [parameters removeObjectForKey:SDLNameTTSChunks];
     }
 }
 
 - (NSMutableArray *)ttsChunks {
-    NSMutableArray *array = [parameters objectForKey:SDLNameTtsChunks];
+    NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m
index 86d927fed..5248e75e3 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -22,14 +22,14 @@
 
 - (void)setGps:(NSNumber *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:SDLNameGps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (NSNumber *)gps {
-    return [parameters objectForKey:SDLNameGps];
+    return [parameters objectForKey:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber *)speed {
@@ -46,14 +46,14 @@
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:SDLNameRpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:SDLNameRpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
@@ -106,14 +106,14 @@
 
 - (void)setPrndl:(NSNumber *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePrndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:SDLNamePrndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (NSNumber *)prndl {
-    return [parameters objectForKey:SDLNamePrndl];
+    return [parameters objectForKey:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber *)tirePressure {
@@ -226,14 +226,14 @@
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:SDLNameAccPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
index 6153947f4..9b5324f69 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -23,14 +23,14 @@
 
 - (void)setGps:(SDLVehicleDataResult *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:SDLNameGps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLVehicleDataResult *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -57,14 +57,14 @@
 
 - (void)setRpm:(SDLVehicleDataResult *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:SDLNameRpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (SDLVehicleDataResult *)rpm {
-    NSObject *obj = [parameters objectForKey:SDLNameRpm];
+    NSObject *obj = [parameters objectForKey:SDLNameRPM];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -142,14 +142,14 @@
 
 - (void)setPrndl:(SDLVehicleDataResult *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePrndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:SDLNamePrndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLVehicleDataResult *)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePrndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -312,14 +312,14 @@
 
 - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:SDLNameAccPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (SDLVehicleDataResult *)accPedalPosition {
-    NSObject *obj = [parameters objectForKey:SDLNameAccPedalPosition];
+    NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m
index 70813ac8d..a058d4de9 100644
--- a/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink/SDLSystemRequest.m
@@ -40,14 +40,14 @@
 
 - (void)setFileName:(NSString *)fileName {
     if (fileName != nil) {
-        [parameters setObject:fileName forKey:SDLNameFileName];
+        [parameters setObject:fileName forKey:SDLNameFilename];
     } else {
-        [parameters removeObjectForKey:SDLNameFileName];
+        [parameters removeObjectForKey:SDLNameFilename];
     }
 }
 
 - (NSString *)fileName {
-    return [parameters objectForKey:SDLNameFileName];
+    return [parameters objectForKey:SDLNameFilename];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m
index 18d188a21..9ce202bd5 100644
--- a/SmartDeviceLink/SDLTouchEvent.m
+++ b/SmartDeviceLink/SDLTouchEvent.m
@@ -35,26 +35,26 @@
 
 - (void)setTimeStamp:(NSMutableArray *)timeStamp {
     if (timeStamp != nil) {
-        [store setObject:timeStamp forKey:SDLNameTs];
+        [store setObject:timeStamp forKey:SDLNameTimestamp];
     } else {
-        [store removeObjectForKey:SDLNameTs];
+        [store removeObjectForKey:SDLNameTimestamp];
     }
 }
 
 - (NSMutableArray *)timeStamp {
-    return [store objectForKey:SDLNameTs];
+    return [store objectForKey:SDLNameTimestamp];
 }
 
 - (void)setCoord:(NSMutableArray *)coord {
     if (coord != nil) {
-        [store setObject:coord forKey:SDLNameCoord];
+        [store setObject:coord forKey:SDLNameCoordinate];
     } else {
-        [store removeObjectForKey:SDLNameCoord];
+        [store removeObjectForKey:SDLNameCoordinate];
     }
 }
 
 - (NSMutableArray *)coord {
-    NSMutableArray *array = [store objectForKey:SDLNameCoord];
+    NSMutableArray *array = [store objectForKey:SDLNameCoordinate];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchCoord.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
index 3a1370b84..6a58bb9bf 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -22,14 +22,14 @@
 
 - (void)setGps:(NSNumber *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:SDLNameGps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (NSNumber *)gps {
-    return [parameters objectForKey:SDLNameGps];
+    return [parameters objectForKey:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber *)speed {
@@ -46,14 +46,14 @@
 
 - (void)setRpm:(NSNumber *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:SDLNameRpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (NSNumber *)rpm {
-    return [parameters objectForKey:SDLNameRpm];
+    return [parameters objectForKey:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber *)fuelLevel {
@@ -106,14 +106,14 @@
 
 - (void)setPrndl:(NSNumber *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePrndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:SDLNamePrndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (NSNumber *)prndl {
-    return [parameters objectForKey:SDLNamePrndl];
+    return [parameters objectForKey:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber *)tirePressure {
@@ -226,14 +226,14 @@
 
 - (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:SDLNameAccPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (NSNumber *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccPedalPosition];
+    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index ed3c224e0..8e2efcdad 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -23,14 +23,14 @@
 
 - (void)setGps:(SDLVehicleDataResult *)gps {
     if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGps];
+        [parameters setObject:gps forKey:SDLNameGPS];
     } else {
-        [parameters removeObjectForKey:SDLNameGps];
+        [parameters removeObjectForKey:SDLNameGPS];
     }
 }
 
 - (SDLVehicleDataResult *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGps];
+    NSObject *obj = [parameters objectForKey:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -57,14 +57,14 @@
 
 - (void)setRpm:(SDLVehicleDataResult *)rpm {
     if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRpm];
+        [parameters setObject:rpm forKey:SDLNameRPM];
     } else {
-        [parameters removeObjectForKey:SDLNameRpm];
+        [parameters removeObjectForKey:SDLNameRPM];
     }
 }
 
 - (SDLVehicleDataResult *)rpm {
-    NSObject *obj = [parameters objectForKey:SDLNameRpm];
+    NSObject *obj = [parameters objectForKey:SDLNameRPM];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -142,14 +142,14 @@
 
 - (void)setPrndl:(SDLVehicleDataResult *)prndl {
     if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePrndl];
+        [parameters setObject:prndl forKey:SDLNamePRNDL];
     } else {
-        [parameters removeObjectForKey:SDLNamePrndl];
+        [parameters removeObjectForKey:SDLNamePRNDL];
     }
 }
 
 - (SDLVehicleDataResult *)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePrndl];
+    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
@@ -312,14 +312,14 @@
 
 - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition {
     if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition];
+        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
     } else {
-        [parameters removeObjectForKey:SDLNameAccPedalPosition];
+        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
     }
 }
 
 - (SDLVehicleDataResult *)accPedalPosition {
-    NSObject *obj = [parameters objectForKey:SDLNameAccPedalPosition];
+    NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
index 01c822ceb..a346e63cc 100644
--- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
+++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
@@ -39,11 +39,11 @@ describe(@"GetFunctionName Tests", ^ {
         expect([functionID getFunctionName:20]).to(equal(SDLNameSubscribeVehicleData));
         expect([functionID getFunctionName:21]).to(equal(SDLNameUnsubscribeVehicleData));
         expect([functionID getFunctionName:22]).to(equal(SDLNameGetVehicleData));
-        expect([functionID getFunctionName:23]).to(equal(SDLNameReadDid));
-        expect([functionID getFunctionName:24]).to(equal(SDLNameGetDtcs));
+        expect([functionID getFunctionName:23]).to(equal(SDLNameReadDID));
+        expect([functionID getFunctionName:24]).to(equal(SDLNameGetDTCs));
         expect([functionID getFunctionName:25]).to(equal(SDLNameScrollableMessage));
         expect([functionID getFunctionName:26]).to(equal(SDLNameSlider));
-        expect([functionID getFunctionName:27]).to(equal(SDLNameShowConstantTbt));
+        expect([functionID getFunctionName:27]).to(equal(SDLNameShowConstantTBT));
         expect([functionID getFunctionName:28]).to(equal(SDLNameAlertManeuver));
         expect([functionID getFunctionName:29]).to(equal(SDLNameUpdateTurnList));
         expect([functionID getFunctionName:30]).to(equal(SDLNameChangeRegistration));
@@ -57,13 +57,13 @@ describe(@"GetFunctionName Tests", ^ {
         expect([functionID getFunctionName:38]).to(equal(SDLNameSystemRequest));
         expect([functionID getFunctionName:39]).to(equal(SDLNameSendLocation));
         expect([functionID getFunctionName:40]).to(equal(SDLNameDialNumber));
-        expect([functionID getFunctionName:32768]).to(equal(SDLNameOnHmiStatus));
+        expect([functionID getFunctionName:32768]).to(equal(SDLNameOnHMIStatus));
         expect([functionID getFunctionName:32769]).to(equal(SDLNameOnAppInterfaceUnregistered));
         expect([functionID getFunctionName:32770]).to(equal(SDLNameOnButtonEvent));
         expect([functionID getFunctionName:32771]).to(equal(SDLNameOnButtonPress));
         expect([functionID getFunctionName:32772]).to(equal(SDLNameOnVehicleData));
         expect([functionID getFunctionName:32773]).to(equal(SDLNameOnCommand));
-        expect([functionID getFunctionName:32774]).to(equal(SDLNameOnTbtClientState));
+        expect([functionID getFunctionName:32774]).to(equal(SDLNameOnTBTClientState));
         expect([functionID getFunctionName:32775]).to(equal(SDLNameOnDriverDistraction));
         expect([functionID getFunctionName:32776]).to(equal(SDLNameOnPermissionsChange));
         expect([functionID getFunctionName:32777]).to(equal(SDLNameOnAudioPassThru));
@@ -106,11 +106,11 @@ describe(@"GetFunctionID Tests", ^ {
         expect([functionID getFunctionID:SDLNameSubscribeVehicleData]).to(equal(@20));
         expect([functionID getFunctionID:SDLNameUnsubscribeVehicleData]).to(equal(@21));
         expect([functionID getFunctionID:SDLNameGetVehicleData]).to(equal(@22));
-        expect([functionID getFunctionID:SDLNameReadDid]).to(equal(@23));
-        expect([functionID getFunctionID:SDLNameGetDtcs]).to(equal(@24));
+        expect([functionID getFunctionID:SDLNameReadDID]).to(equal(@23));
+        expect([functionID getFunctionID:SDLNameGetDTCs]).to(equal(@24));
         expect([functionID getFunctionID:SDLNameScrollableMessage]).to(equal(@25));
         expect([functionID getFunctionID:SDLNameSlider]).to(equal(@26));
-        expect([functionID getFunctionID:SDLNameShowConstantTbt]).to(equal(@27));
+        expect([functionID getFunctionID:SDLNameShowConstantTBT]).to(equal(@27));
         expect([functionID getFunctionID:SDLNameAlertManeuver]).to(equal(@28));
         expect([functionID getFunctionID:SDLNameUpdateTurnList]).to(equal(@29));
         expect([functionID getFunctionID:SDLNameChangeRegistration]).to(equal(@30));
@@ -124,13 +124,13 @@ describe(@"GetFunctionID Tests", ^ {
         expect([functionID getFunctionID:SDLNameSystemRequest]).to(equal(@38));
         expect([functionID getFunctionID:SDLNameSendLocation]).to(equal(@39));
         expect([functionID getFunctionID:SDLNameDialNumber]).to(equal(@40));
-        expect([functionID getFunctionID:SDLNameOnHmiStatus]).to(equal(@32768));
+        expect([functionID getFunctionID:SDLNameOnHMIStatus]).to(equal(@32768));
         expect([functionID getFunctionID:SDLNameOnAppInterfaceUnregistered]).to(equal(@32769));
         expect([functionID getFunctionID:SDLNameOnButtonEvent]).to(equal(@32770));
         expect([functionID getFunctionID:SDLNameOnButtonPress]).to(equal(@32771));
         expect([functionID getFunctionID:SDLNameOnVehicleData]).to(equal(@32772));
         expect([functionID getFunctionID:SDLNameOnCommand]).to(equal(@32773));
-        expect([functionID getFunctionID:SDLNameOnTbtClientState]).to(equal(@32774));
+        expect([functionID getFunctionID:SDLNameOnTBTClientState]).to(equal(@32774));
         expect([functionID getFunctionID:SDLNameOnDriverDistraction]).to(equal(@32775));
         expect([functionID getFunctionID:SDLNameOnPermissionsChange]).to(equal(@32776));
         expect([functionID getFunctionID:SDLNameOnAudioPassThru]).to(equal(@32777));
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m
index d19e1f855..97b047770 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", ^ {
@@ -50,4 +50,4 @@ describe(@"Value List Tests", ^ {
     });
 });
 
-QuickSpecEnd
\ No newline at end of file
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m
index d02cfbd2c..6331bf727 100644
--- a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m
@@ -506,9 +506,9 @@ describe(@"BuildRegisterAppInterface Tests", ^ {
                                                                  isMediaApp:@YES languageDesired:[SDLLanguage EN_US]
                                                                  hmiDisplayLanguageDesired:[SDLLanguage ES_MX] appID:@"6h43g"];
         
-        expect(message.syncMsgVersion).toNot(beNil());
-        expect(message.syncMsgVersion.majorVersion).to(equal(@1));
-        expect(message.syncMsgVersion.minorVersion).to(equal(@0));
+        expect(message.syncMessageVersion).toNot(beNil());
+        expect(message.syncMessageVersion.majorVersion).to(equal(@1));
+        expect(message.syncMessageVersion.minorVersion).to(equal(@0));
         
         expect(message.appInfo.appBundleID).to(equal(@"com.register.test"));
         expect(message.appInfo.appDisplayName).to(equal(@"Interface"));
@@ -529,9 +529,9 @@ describe(@"BuildRegisterAppInterface Tests", ^ {
         
         message = [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:@"Register App Interface" isMediaApp:@NO languageDesired:[SDLLanguage PT_BR] appID:@"36g6rsw4"];
         
-        expect(message.syncMsgVersion).toNot(beNil());
-        expect(message.syncMsgVersion.majorVersion).to(equal(@1));
-        expect(message.syncMsgVersion.minorVersion).to(equal(@0));
+        expect(message.syncMessageVersion).toNot(beNil());
+        expect(message.syncMessageVersion.majorVersion).to(equal(@1));
+        expect(message.syncMessageVersion.minorVersion).to(equal(@0));
         
         expect(message.appInfo.appBundleID).to(equal(@"com.register.test"));
         expect(message.appInfo.appDisplayName).to(equal(@"Register App Interface"));
@@ -552,9 +552,9 @@ describe(@"BuildRegisterAppInterface Tests", ^ {
         
         message = [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:@"..." languageDesired:[SDLLanguage CS_CZ] appID:@"56ht5j"];
         
-        expect(message.syncMsgVersion).toNot(beNil());
-        expect(message.syncMsgVersion.majorVersion).to(equal(@1));
-        expect(message.syncMsgVersion.minorVersion).to(equal(@0));
+        expect(message.syncMessageVersion).toNot(beNil());
+        expect(message.syncMessageVersion.majorVersion).to(equal(@1));
+        expect(message.syncMessageVersion.minorVersion).to(equal(@0));
         
         expect(message.appInfo.appBundleID).to(equal(@"com.register.test"));
         expect(message.appInfo.appDisplayName).to(equal(@"..."));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
index 31fad837b..3e4b8878f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
@@ -30,7 +30,7 @@ describe(@"Getter/Setter Tests", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
                                                  @{SDLNameData:[@[@0] mutableCopy],
-                                                   SDLNameUrlUppercase:@"www.zombo.com",
+                                                   SDLNameURLUppercase:@"www.zombo.com",
                                                    SDLNameTimeoutCapitalized:@564},
                                              SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy];
         SDLOnEncodedSyncPData* testNotification = [[SDLOnEncodedSyncPData alloc] initWithDictionary:dict];
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
index b0c95cf67..016a5e449 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
@@ -33,10 +33,10 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
-                                                 @{SDLNameHmiLevel:[SDLHMILevel LIMITED],
+                                                 @{SDLNameHMILevel:[SDLHMILevel LIMITED],
                                                    SDLNameAudioStreamingState:[SDLAudioStreamingState ATTENUATED],
                                                    SDLNameSystemContext:[SDLSystemContext HMI_OBSCURED]},
-                                             SDLNameOperationName:SDLNameOnHmiStatus}} mutableCopy];
+                                             SDLNameOperationName:SDLNameOnHMIStatus}} mutableCopy];
         SDLOnHMIStatus* testNotification = [[SDLOnHMIStatus alloc] initWithDictionary:dict];
         
         expect(testNotification.hmiLevel).to(equal([SDLHMILevel LIMITED]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
index ecb882b8a..b1b2a0ed3 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
@@ -30,7 +30,7 @@ describe(@"Getter/Setter Tests", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
                                                  @{SDLNameLanguage:[SDLLanguage ES_ES],
-                                                   SDLNameHmiDisplayLanguage:[SDLLanguage DE_DE]},
+                                                   SDLNameHMIDisplayLanguage:[SDLLanguage DE_DE]},
                                              SDLNameOperationName:SDLNameOnLanguageChange}} mutableCopy];
         SDLOnLanguageChange* testNotification = [[SDLOnLanguageChange alloc] initWithDictionary:dict];
         
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
index ea916c9f8..ff7f95509 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
@@ -27,7 +27,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
-                                                 @{SDLNameUrlUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4",
+                                                 @{SDLNameURLUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4",
                                                    SDLNameTimeoutCapitalized:@8357},
                                              SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy];
         SDLOnSyncPData* testNotification = [[SDLOnSyncPData alloc] initWithDictionary:dict];
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
index 4b65f9a83..786e38d6c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
@@ -39,7 +39,7 @@ describe(@"Getter/Setter Tests", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
                                                  @{SDLNameRequestType:[SDLRequestType FILE_RESUME],
-                                                   SDLNameUrl:[@[@"www.google.com"] mutableCopy],
+                                                   SDLNameURL:[@[@"www.google.com"] mutableCopy],
                                                    SDLNameTimeout:@52345,
                                                    SDLNameFileType:[SDLFileType GRAPHIC_PNG],
                                                    SDLNameOffset:@2532678684,
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
index db3396445..102364f1d 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
@@ -28,7 +28,7 @@ describe(@"Getter/Setter Tests", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
                                                  @{SDLNameState:[SDLTBTState ETA_REQUEST]},
-                                             SDLNameOperationName:SDLNameOnTbtClientState}} mutableCopy];
+                                             SDLNameOperationName:SDLNameOnTBTClientState}} mutableCopy];
         SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict];
         
         expect(testNotification.state).to(equal([SDLTBTState ETA_REQUEST]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
index 68161263e..201ff580e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
@@ -86,15 +86,15 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
-                                                 @{SDLNameGps:gps,
+                                                 @{SDLNameGPS:gps,
                                                    SDLNameSpeed:@70.1,
-                                                   SDLNameRpm:@4242,
+                                                   SDLNameRPM:@4242,
                                                    SDLNameFuelLevel:@10.3,
                                                    SDLNameFuelLevelState:[SDLComponentVolumeStatus ALERT],
                                                    SDLNameInstantFuelConsumption:@4000.63,
                                                    SDLNameExternalTemperature:@-10,
-                                                   SDLNameVin:@"222222222722",
-                                                   SDLNamePrndl:[SDLPRNDL DRIVE],
+                                                   SDLNameVIN:@"222222222722",
+                                                   SDLNamePRNDL:[SDLPRNDL DRIVE],
                                                    SDLNameTirePressure:tires,
                                                    SDLNameOdometer:@100050,
                                                    SDLNameBeltStatus:belt,
@@ -104,7 +104,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameWiperStatus:[SDLWiperStatus STALLED],
                                                    SDLNameHeadLampStatus:headLamp,
                                                    SDLNameEngineTorque:@-200.124,
-                                                   SDLNameAccPedalPosition:@99.99999999,
+                                                   SDLNameAccelerationPedalPosition:@99.99999999,
                                                    SDLNameSteeringWheelAngle:@0.000000001,
                                                    SDLNameECallInfo:eCall,
                                                    SDLNameAirbagStatus:airbag,
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
index 6dfa5423c..5e6385cee 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
@@ -38,7 +38,7 @@ describe(@"Getter/Setter Tests", ^ {
                                            @{SDLNameParameters:
                                                  @{SDLNameCommandId:@434577,
                                                    SDLNameMenuParams:menu,
-                                                   SDLNameVrCommands:[@[@"name", @"anotherName"] mutableCopy],
+                                                   SDLNameVRCommands:[@[@"name", @"anotherName"] mutableCopy],
                                                    SDLNameCommandIcon:image},
                                              SDLNameOperationName:SDLNameAddCommand}} mutableCopy];
         SDLAddCommand* testRequest = [[SDLAddCommand alloc] initWithDictionary:dict];
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
index c64019d1b..48091794e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
@@ -32,7 +32,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameTtsChunks:[@[tts] mutableCopy],
+                                                 @{SDLNameTTSChunks:[@[tts] mutableCopy],
                                                    SDLNameSoftButtons:[@[button] mutableCopy]},
                                              SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy];
         SDLAlertManeuver* testRequest = [[SDLAlertManeuver alloc] initWithDictionary:dict];
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
index 1e6bd589c..158557002 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
@@ -47,7 +47,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                  @{SDLNameAlertText1:@"alert#1",
                                                    SDLNameAlertText2:@"alert#2",
                                                    SDLNameAlertText3:@"alert#3",
-                                                   SDLNameTtsChunks:[@[tts] mutableCopy],
+                                                   SDLNameTTSChunks:[@[tts] mutableCopy],
                                                    SDLNameDuration:@4357,
                                                    SDLNamePlayTone:@YES,
                                                    SDLNameProgressIndicator:@NO,
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
index 1fd8e21e5..43fd5326f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
@@ -115,11 +115,11 @@ describe(@"change registration", ^ {
                 NSMutableDictionary* dict = [@{SDLNameRequest:
                                                    @{SDLNameParameters:
                                                          @{SDLNameLanguage:someLanguage,
-                                                           SDLNameHmiDisplayLanguage:someOtherLanguage,
+                                                           SDLNameHMIDisplayLanguage:someOtherLanguage,
                                                            SDLNameAppName:someAppName,
-                                                           SDLNameTtsName:someTTSChunks,
-                                                           SDLNameNgnMediaScreenAppName:someNGNMediaAppName,
-                                                           SDLNameVrSynonyms:someVRSynonyms},
+                                                           SDLNameTTSName:someTTSChunks,
+                                                           SDLNameNGNMediaScreenAppName:someNGNMediaAppName,
+                                                           SDLNameVRSynonyms:someVRSynonyms},
                                                         SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy];
                 
                 testRequest = [[SDLChangeRegistration alloc] initWithDictionary:dict];
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
index d3373093c..0c4ca3af7 100755
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
@@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameEcuName:@4321,
-                                                   SDLNameDtcMask:@22},
+                                                 @{SDLNameECUName:@4321,
+                                                   SDLNameDTCMask:@22},
                                              SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy];
         SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict];
         
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
index b83a1ee5e..7e45c4bd6 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
@@ -73,15 +73,15 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameGps:@NO,
+                                                 @{SDLNameGPS:@NO,
                                                    SDLNameSpeed:@YES,
-                                                   SDLNameRpm:@NO,
+                                                   SDLNameRPM:@NO,
                                                    SDLNameFuelLevel:@YES,
                                                    SDLNameFuelLevelState:@NO,
                                                    SDLNameInstantFuelConsumption:@YES,
                                                    SDLNameExternalTemperature:@NO,
-                                                   SDLNameVin:@YES,
-                                                   SDLNamePrndl:@NO,
+                                                   SDLNameVIN:@YES,
+                                                   SDLNamePRNDL:@NO,
                                                    SDLNameTirePressure:@YES,
                                                    SDLNameOdometer:@NO,
                                                    SDLNameBeltStatus:@YES,
@@ -91,7 +91,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameWiperStatus:@YES,
                                                    SDLNameHeadLampStatus:@NO,
                                                    SDLNameEngineTorque:@YES,
-                                                   SDLNameAccPedalPosition:@NO,
+                                                   SDLNameAccelerationPedalPosition:@NO,
                                                    SDLNameSteeringWheelAngle:@YES,
                                                    SDLNameECallInfo:@NO,
                                                    SDLNameAirbagStatus:@YES,
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
index 232a2188d..7782b50dd 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
@@ -57,7 +57,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameHelpPrompt:[@[chunk2] mutableCopy],
                                                    SDLNameTimeoutPrompt:[@[chunk3] mutableCopy],
                                                    SDLNameTimeout:@42000,
-                                                   SDLNameVrHelp:[@[helpItem] mutableCopy],
+                                                   SDLNameVRHelp:[@[helpItem] mutableCopy],
                                                    SDLNameInteractionLayout:[SDLLayoutMode ICON_WITH_SEARCH]},
                                              SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy];
         SDLPerformInteraction* testRequest = [[SDLPerformInteraction alloc] initWithDictionary:dict];
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
index 8c544159d..31b65061f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
@@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameEcuName:@33112,
-                                                   SDLNameDidLocation:[@[@200, @201, @205] mutableCopy]},
+                                                 @{SDLNameECUName:@33112,
+                                                   SDLNameDIDLocation:[@[@200, @201, @205] mutableCopy]},
                                              SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy];
         SDLReadDID* testRequest = [[SDLReadDID alloc] initWithDictionary:dict];
         
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
index f23c48dd4..90d917c9b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
@@ -29,7 +29,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
         SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] init];
         
-        testRequest.syncMsgVersion = version;
+        testRequest.syncMessageVersion = version;
         testRequest.appName = @"app56";
         testRequest.ttsName = [@[chunk] mutableCopy];
         testRequest.ngnMediaScreenAppName = @"whatisanngn";
@@ -43,7 +43,7 @@ describe(@"Getter/Setter Tests", ^ {
         testRequest.appID = @"123456789";
         testRequest.appInfo = appInfo;
         
-        expect(testRequest.syncMsgVersion).to(equal(version));
+        expect(testRequest.syncMessageVersion).to(equal(version));
         expect(testRequest.appName).to(equal(@"app56"));
         expect(testRequest.ttsName).to(equal([@[chunk] mutableCopy]));
         expect(testRequest.ngnMediaScreenAppName).to(equal(@"whatisanngn"));
@@ -61,15 +61,15 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameSyncMsgVersion:version,
+                                                 @{SDLNameSyncMessageVersion:version,
                                                    SDLNameAppName:@"app56",
-                                                   SDLNameTtsName:[@[chunk] mutableCopy],
-                                                   SDLNameNgnMediaScreenAppName:@"whatisanngn",
-                                                   SDLNameVrSynonyms:[@[@"paraphrase of the original name"] mutableCopy],
+                                                   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],
+                                                   SDLNameHMIDisplayLanguageDesired:[SDLLanguage PT_PT],
+                                                   SDLNameAppHMIType:[@[[SDLAppHMIType MESSAGING], [SDLAppHMIType INFORMATION]] copy],
                                                    SDLNameHashId:@"gercd35grw2",
                                                    SDLNameDeviceInfo:info,
                                                    SDLNameAppId:@"123456789",
@@ -77,7 +77,7 @@ describe(@"Getter/Setter Tests", ^ {
                                              SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy];
         SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] initWithDictionary:dict];
         
-        expect(testRequest.syncMsgVersion).to(equal(version));
+        expect(testRequest.syncMessageVersion).to(equal(version));
         expect(testRequest.appName).to(equal(@"app56"));
         expect(testRequest.ttsName).to(equal([@[chunk] mutableCopy]));
         expect(testRequest.ngnMediaScreenAppName).to(equal(@"whatisanngn"));
@@ -95,7 +95,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should return nil if not set", ^ {
         SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] init];
         
-        expect(testRequest.syncMsgVersion).to(beNil());
+        expect(testRequest.syncMessageVersion).to(beNil());
         expect(testRequest.appName).to(beNil());
         expect(testRequest.ttsName).to(beNil());
         expect(testRequest.ngnMediaScreenAppName).to(beNil());
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
index 920363093..b5228cc0a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
@@ -50,8 +50,8 @@ describe(@"Getter/Setter Tests", ^ {
                                            @{SDLNameParameters:
                                                  @{SDLNameHelpPrompt:[@[chunk1] mutableCopy],
                                                    SDLNameTimeoutPrompt:[@[chunk2] mutableCopy],
-                                                   SDLNameVrHelpTitle:@"vr",
-                                                   SDLNameVrHelp:[@[help] mutableCopy],
+                                                   SDLNameVRHelpTitle:@"vr",
+                                                   SDLNameVRHelp:[@[help] mutableCopy],
                                                    SDLNameMenuTitle:@"TheNewMenu",
                                                    SDLNameMenuIcon:image,
                                                    SDLNameKeyboardProperties:keyboard},
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
index 7e4f1bb64..8b8c0928b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
@@ -54,7 +54,7 @@ describe(@"Getter/Setter Tests", ^ {
                                            @{SDLNameParameters:
                                                  @{SDLNameNavigationText1:@"nav1",
                                                    SDLNameNavigationText2:@"nav2",
-                                                   SDLNameEta:@"4/1/7015",
+                                                   SDLNameETA:@"4/1/7015",
                                                    SDLNameTimeToDestination:@"5000 Years",
                                                    SDLNameTotalDistance:@"1 parsec",
                                                    SDLNameTurnIcon:image1,
@@ -63,7 +63,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameDistanceToManeuverScale:@4,
                                                    SDLNameManeuverComplete:@NO,
                                                    SDLNameSoftButtons:[@[button] mutableCopy]},
-                                             SDLNameOperationName:SDLNameShowConstantTbt}} mutableCopy];
+                                             SDLNameOperationName:SDLNameShowConstantTBT}} mutableCopy];
         SDLShowConstantTBT* testRequest = [[SDLShowConstantTBT alloc] initWithDictionary:dict];
         
         expect(testRequest.navigationText1).to(equal(@"nav1"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
index 3092d0024..e0e49ca3c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
@@ -33,7 +33,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameNumTicks:@2,
+                                                 @{SDLNameNumberTicks:@2,
                                                    SDLNamePosition:@1,
                                                    SDLNameSliderHeader:@"Head",
                                                    SDLNameSliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy],
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
index 999eb9a08..7781f4458 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
@@ -28,7 +28,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameTtsChunks:[@[chunk] mutableCopy]},
+                                                 @{SDLNameTTSChunks:[@[chunk] mutableCopy]},
                                              SDLNameOperationName:SDLNameSpeak}} mutableCopy];
         SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict];
         
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
index 289d1b344..25af6ca52 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
@@ -71,14 +71,14 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameGps:@YES,
+                                                 @{SDLNameGPS:@YES,
                                                    SDLNameSpeed:@NO,
-                                                   SDLNameRpm:@YES,
+                                                   SDLNameRPM:@YES,
                                                    SDLNameFuelLevel:@NO,
                                                    SDLNameFuelLevelState:@YES,
                                                    SDLNameInstantFuelConsumption:@NO,
                                                    SDLNameExternalTemperature:@YES,
-                                                   SDLNamePrndl:@YES,
+                                                   SDLNamePRNDL:@YES,
                                                    SDLNameTirePressure:@NO,
                                                    SDLNameOdometer:@YES,
                                                    SDLNameBeltStatus:@NO,
@@ -88,7 +88,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameWiperStatus:@NO,
                                                    SDLNameHeadLampStatus:@YES,
                                                    SDLNameEngineTorque:@NO,
-                                                   SDLNameAccPedalPosition:@YES,
+                                                   SDLNameAccelerationPedalPosition:@YES,
                                                    SDLNameSteeringWheelAngle:@NO,
                                                    SDLNameECallInfo:@YES,
                                                    SDLNameAirbagStatus:@NO,
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
index a200fb147..7341787e2 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
@@ -29,7 +29,7 @@ describe(@"Getter/Setter Tests", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
                                                  @{SDLNameRequestType:[SDLRequestType AUTH_REQUEST],
-                                                   SDLNameFileName:@"AnotherFile"},
+                                                   SDLNameFilename:@"AnotherFile"},
                                              SDLNameOperationName:SDLNameSystemRequest}} mutableCopy];
         SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] initWithDictionary:dict];
         
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
index 529862cf4..f4efec0fc 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
@@ -71,14 +71,14 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameGps:@YES,
+                                                 @{SDLNameGPS:@YES,
                                                    SDLNameSpeed:@YES,
-                                                   SDLNameRpm:@YES,
+                                                   SDLNameRPM:@YES,
                                                    SDLNameFuelLevel:@YES,
                                                    SDLNameFuelLevelState:@YES,
                                                    SDLNameInstantFuelConsumption:@YES,
                                                    SDLNameExternalTemperature:@YES,
-                                                   SDLNamePrndl:@YES,
+                                                   SDLNamePRNDL:@YES,
                                                    SDLNameTirePressure:@YES,
                                                    SDLNameOdometer:@YES,
                                                    SDLNameBeltStatus:@YES,
@@ -88,7 +88,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameWiperStatus:@YES,
                                                    SDLNameHeadLampStatus:@YES,
                                                    SDLNameEngineTorque:@YES,
-                                                   SDLNameAccPedalPosition:@YES,
+                                                   SDLNameAccelerationPedalPosition:@YES,
                                                    SDLNameSteeringWheelAngle:@YES,
                                                    SDLNameECallInfo:@YES,
                                                    SDLNameAirbagStatus:@YES,
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
index c40eb2cfb..deb787b9a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
@@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameResponse:
                                           @{SDLNameParameters:
-                                                @{SDLNameEcuHeader:@404,
-                                                  SDLNameDtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]},
-                                            SDLNameOperationName:SDLNameGetDtcs}} mutableCopy];
+                                                @{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 974249c52..ece7d087c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
@@ -86,15 +86,15 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameNotification:
                                            @{SDLNameParameters:
-                                                 @{SDLNameGps:gps,
+                                                 @{SDLNameGPS:gps,
                                                    SDLNameSpeed:@100,
-                                                   SDLNameRpm:@3,
+                                                   SDLNameRPM:@3,
                                                    SDLNameFuelLevel:@99.9999,
                                                    SDLNameFuelLevelState:[SDLComponentVolumeStatus FAULT],
                                                    SDLNameInstantFuelConsumption:@40.7,
                                                    SDLNameExternalTemperature:@0,
-                                                   SDLNameVin:@"6574839201",
-                                                   SDLNamePrndl:[SDLPRNDL PARK],
+                                                   SDLNameVIN:@"6574839201",
+                                                   SDLNamePRNDL:[SDLPRNDL PARK],
                                                    SDLNameTirePressure:tires,
                                                    SDLNameOdometer:@70000,
                                                    SDLNameBeltStatus:belt,
@@ -104,7 +104,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameWiperStatus:[SDLWiperStatus AUTO_HIGH],
                                                    SDLNameHeadLampStatus:headLamp,
                                                    SDLNameEngineTorque:@630.4,
-                                                   SDLNameAccPedalPosition:@0,
+                                                   SDLNameAccelerationPedalPosition:@0,
                                                    SDLNameSteeringWheelAngle:@-1500,
                                                    SDLNameECallInfo:eCall,
                                                    SDLNameAirbagStatus:airbag,
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
index 4dc152c48..d5f080aba 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
@@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameResponse:
                                            @{SDLNameParameters:
-                                                 @{SDLNameDidResult:[@[result] mutableCopy]},
-                                             SDLNameOperationName:SDLNameReadDid}} mutableCopy];
+                                                 @{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 c3f40d585..3ead0db62 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
@@ -27,7 +27,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
         SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] init];
         
-        testResponse.syncMsgVersion = version;
+        testResponse.syncMessageVersion = version;
         testResponse.language = [SDLLanguage ES_MX];
         testResponse.hmiDisplayLanguage = [SDLLanguage RU_RU];
         testResponse.displayCapabilities = info;
@@ -45,7 +45,7 @@ describe(@"Getter/Setter Tests", ^ {
         testResponse.sdlVersion = @"sdlVersion";
         testResponse.systemSoftwareVersion = @"systemSoftwareVersion";
         
-        expect(testResponse.syncMsgVersion).to(equal(version));
+        expect(testResponse.syncMessageVersion).to(equal(version));
         expect(testResponse.language).to(equal([SDLLanguage ES_MX]));
         expect(testResponse.hmiDisplayLanguage).to(equal([SDLLanguage RU_RU]));
         expect(testResponse.displayCapabilities).to(equal(info));
@@ -67,28 +67,28 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameSyncMsgVersion:version,
+                                                 @{SDLNameSyncMessageVersion:version,
                                                    SDLNameLanguage:[SDLLanguage ES_MX],
-                                                   SDLNameHmiDisplayLanguage:[SDLLanguage RU_RU],
+                                                   SDLNameHMIDisplayLanguage:[SDLLanguage RU_RU],
                                                    SDLNameDisplayCapabilities:info,
                                                    SDLNameButtonCapabilities:[@[button] mutableCopy],
                                                    SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy],
                                                    SDLNamePresetBankCapabilities:presetBank,
-                                                   SDLNameHmiZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy],
+                                                   SDLNameHMIZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy],
                                                    SDLNameSpeechCapabilities:[@[[SDLSpeechCapabilities SAPI_PHONEMES], [SDLSpeechCapabilities SILENCE]] copy],
-                                                   SDLNameVrCapabilities:[@[[SDLVRCapabilities TEXT]] copy],
+                                                   SDLNameVRCapabilities:[@[[SDLVRCapabilities TEXT]] copy],
                                                    SDLNameAudioPassThruCapabilities:[@[audioPassThru] mutableCopy],
                                                    SDLNameVehicleType:vehicle,
                                                    SDLNamePrerecordedSpeech:[@[[SDLPrerecordedSpeech LISTEN_JINGLE], [SDLPrerecordedSpeech HELP_JINGLE]] mutableCopy],
-                                                   SDLNameSupportedDiagModes:[@[@67, @99, @111] mutableCopy],
-                                                   SDLNameHmiCapabilities: hmiCapabilities,
-                                                   SDLNameSdlVersion: @"sdlVersion",
+                                                   SDLNameSupportedDiagnosticModes:[@[@67, @99, @111] mutableCopy],
+                                                   SDLNameHMICapabilities: hmiCapabilities,
+                                                   SDLNameSDLVersion: @"sdlVersion",
                                                    SDLNameSystemSoftwareVersion: @"systemSoftwareVersion"
                                                    },
                                              SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy];
         SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] initWithDictionary:dict];
         
-        expect(testResponse.syncMsgVersion).to(equal(version));
+        expect(testResponse.syncMessageVersion).to(equal(version));
         expect(testResponse.language).to(equal([SDLLanguage ES_MX]));
         expect(testResponse.hmiDisplayLanguage).to(equal([SDLLanguage RU_RU]));
         expect(testResponse.displayCapabilities).to(equal(info));
@@ -110,7 +110,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should return nil if not set", ^ {
         SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] init];
         
-        expect(testResponse.syncMsgVersion).to(beNil());
+        expect(testResponse.syncMessageVersion).to(beNil());
         expect(testResponse.language).to(beNil());
         expect(testResponse.hmiDisplayLanguage).to(beNil());
         expect(testResponse.displayCapabilities).to(beNil());
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
index bc7db3765..6b6b93ddc 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
@@ -75,14 +75,14 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameResponse:
                                            @{SDLNameParameters:
-                                                 @{SDLNameGps:vehicleDataResult,
+                                                 @{SDLNameGPS:vehicleDataResult,
                                                    SDLNameSpeed:vehicleDataResult,
-                                                   SDLNameRpm:vehicleDataResult,
+                                                   SDLNameRPM:vehicleDataResult,
                                                    SDLNameFuelLevel:vehicleDataResult,
                                                    SDLNameFuelLevelState:vehicleDataResult,
                                                    SDLNameInstantFuelConsumption:vehicleDataResult,
                                                    SDLNameExternalTemperature:vehicleDataResult,
-                                                   SDLNamePrndl:vehicleDataResult,
+                                                   SDLNamePRNDL:vehicleDataResult,
                                                    SDLNameTirePressure:vehicleDataResult,
                                                    SDLNameOdometer:vehicleDataResult,
                                                    SDLNameBeltStatus:vehicleDataResult,
@@ -92,7 +92,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameWiperStatus:vehicleDataResult,
                                                    SDLNameHeadLampStatus:vehicleDataResult,
                                                    SDLNameEngineTorque:vehicleDataResult,
-                                                   SDLNameAccPedalPosition:vehicleDataResult,
+                                                   SDLNameAccelerationPedalPosition:vehicleDataResult,
                                                    SDLNameSteeringWheelAngle:vehicleDataResult,
                                                    SDLNameECallInfo:vehicleDataResult,
                                                    SDLNameAirbagStatus:vehicleDataResult,
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
index 0089e1ccf..022dd306f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
@@ -75,14 +75,14 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameResponse:
                                            @{SDLNameParameters:
-                                                 @{SDLNameGps:vehicleDataResult,
+                                                 @{SDLNameGPS:vehicleDataResult,
                                                    SDLNameSpeed:vehicleDataResult,
-                                                   SDLNameRpm:vehicleDataResult,
+                                                   SDLNameRPM:vehicleDataResult,
                                                    SDLNameFuelLevel:vehicleDataResult,
                                                    SDLNameFuelLevelState:vehicleDataResult,
                                                    SDLNameInstantFuelConsumption:vehicleDataResult,
                                                    SDLNameExternalTemperature:vehicleDataResult,
-                                                   SDLNamePrndl:vehicleDataResult,
+                                                   SDLNamePRNDL:vehicleDataResult,
                                                    SDLNameTirePressure:vehicleDataResult,
                                                    SDLNameOdometer:vehicleDataResult,
                                                    SDLNameBeltStatus:vehicleDataResult,
@@ -92,7 +92,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    SDLNameWiperStatus:vehicleDataResult,
                                                    SDLNameHeadLampStatus:vehicleDataResult,
                                                    SDLNameEngineTorque:vehicleDataResult,
-                                                   SDLNameAccPedalPosition:vehicleDataResult,
+                                                   SDLNameAccelerationPedalPosition:vehicleDataResult,
                                                    SDLNameSteeringWheelAngle:vehicleDataResult,
                                                    SDLNameECallInfo:vehicleDataResult,
                                                    SDLNameAirbagStatus:vehicleDataResult,
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
index 09857a90e..51405d639 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
@@ -42,7 +42,7 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameChoiceId:@3,
                                        SDLNameMenuName:@"Hello",
-                                       SDLNameVrCommands:[@[@"1", @"2"] mutableCopy],
+                                       SDLNameVRCommands:[@[@"1", @"2"] mutableCopy],
                                        SDLNameImage:image,
                                        SDLNameSecondaryText:@"Arbitrary",
                                        SDLNameTertiaryText:@"qwerty",
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
index f88b1d92e..e89ce6ab3 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
@@ -30,7 +30,7 @@ describe(@"Getter/Setter Tests", ^ {
     
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameResultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED],
-                                       SDLNameDidLocation:@300,
+                                       SDLNameDIDLocation:@300,
                                        SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy];
         SDLDIDResult* testStruct = [[SDLDIDResult alloc] initWithDictionary:dict];
         
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
index bfc36e708..785a53877 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
@@ -34,11 +34,11 @@ describe(@"Getter/Setter Tests", ^ {
     
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameHardware:@"GDFR34F",
-                                       SDLNameFirmwareRev:@"4.2a",
-                                       SDLNameOs:@"Robot",
-                                       SDLNameOsVersion:@"9.9",
+                                       SDLNameFirmwareRevision:@"4.2a",
+                                       SDLNameOS:@"Robot",
+                                       SDLNameOSVersion:@"9.9",
                                        SDLNameCarrier:@"ThatOneWirelessCompany",
-                                       SDLNameMaxNumberRfcommPorts:@20} mutableCopy];
+                                       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 b15902c6c..01004eaf0 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
@@ -24,7 +24,7 @@ describe(@"Getter/Setter Tests", ^ {
         testStruct.btIconOn = @NO;
         testStruct.callActive = @YES;
         testStruct.phoneRoaming = @NO;
-        testStruct.textMsgAvailable = @YES;
+        testStruct.textMessageAvailable = @YES;
         testStruct.battLevelStatus = [SDLDeviceLevelStatus FOUR_LEVEL_BARS];
         testStruct.stereoAudioOutputMuted = @YES;
         testStruct.monoAudioOutputMuted = @YES;
@@ -36,7 +36,7 @@ describe(@"Getter/Setter Tests", ^ {
         expect(testStruct.btIconOn).to(equal(@NO));
         expect(testStruct.callActive).to(equal(@YES));
         expect(testStruct.phoneRoaming).to(equal(@NO));
-        expect(testStruct.textMsgAvailable).to(equal(@YES));
+        expect(testStruct.textMessageAvailable).to(equal(@YES));
         expect(testStruct.battLevelStatus).to(equal([SDLDeviceLevelStatus FOUR_LEVEL_BARS]));
         expect(testStruct.stereoAudioOutputMuted).to(equal(@YES));
         expect(testStruct.monoAudioOutputMuted).to(equal(@YES));
@@ -46,12 +46,12 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{SDLNameVoiceRecOn:@NO,
+        NSMutableDictionary* dict = [@{SDLNameVoiceRecognitionOn:@NO,
                                        SDLNameBluetoothIconOn:@NO,
                                        SDLNameCallActive:@YES,
                                        SDLNamePhoneRoaming:@NO,
-                                       SDLNameTextMsgAvailable:@YES,
-                                       SDLNameBattLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS],
+                                       SDLNameTextMessageAvailable:@YES,
+                                       SDLNameBatteryLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS],
                                        SDLNameStereoAudioOutputMuted:@YES,
                                        SDLNameMonoAudioOutputMuted:@YES,
                                        SDLNameSignalLevelStatus:[SDLDeviceLevelStatus TWO_LEVEL_BARS],
@@ -63,7 +63,7 @@ describe(@"Getter/Setter Tests", ^ {
         expect(testStruct.btIconOn).to(equal(@NO));
         expect(testStruct.callActive).to(equal(@YES));
         expect(testStruct.phoneRoaming).to(equal(@NO));
-        expect(testStruct.textMsgAvailable).to(equal(@YES));
+        expect(testStruct.textMessageAvailable).to(equal(@YES));
         expect(testStruct.battLevelStatus).to(equal([SDLDeviceLevelStatus FOUR_LEVEL_BARS]));
         expect(testStruct.stereoAudioOutputMuted).to(equal(@YES));
         expect(testStruct.monoAudioOutputMuted).to(equal(@YES));
@@ -79,7 +79,7 @@ describe(@"Getter/Setter Tests", ^ {
         expect(testStruct.btIconOn).to(beNil());
         expect(testStruct.callActive).to(beNil());
         expect(testStruct.phoneRoaming).to(beNil());
-        expect(testStruct.textMsgAvailable).to(beNil());
+        expect(testStruct.textMessageAvailable).to(beNil());
         expect(testStruct.battLevelStatus).to(beNil());
         expect(testStruct.stereoAudioOutputMuted).to(beNil());
         expect(testStruct.monoAudioOutputMuted).to(beNil());
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
index 1db8cea08..c17c1fc69 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
@@ -54,7 +54,7 @@ describe(@"Getter/Setter Tests", ^ {
                                        SDLNameGraphicSupported:@YES,
                                        SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy],
                                        SDLNameScreenParams:screenParams,
-                                       SDLNameNumCustomPresetsAvailable:@43} mutableCopy];
+                                       SDLNameNumberCustomPresetsAvailable:@43} mutableCopy];
         SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict];
         
         expect(testStruct.displayType).to(equal([SDLDisplayType GEN2_6_DMA]));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
index e88bfaaab..e856c26e2 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
@@ -62,16 +62,16 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameLongitudeDegrees:@31.41592653589793,
                                        SDLNameLatitudeDegrees:@45,
-                                       SDLNameUtcYear:@2015,
-                                       SDLNameUtcMonth:@1,
-                                       SDLNameUtcDay:@26,
-                                       SDLNameUtcHours:@23,
-                                       SDLNameUtcMinutes:@59,
-                                       SDLNameUtcSeconds:@59,
+                                       SDLNameUTCYear:@2015,
+                                       SDLNameUTCMonth:@1,
+                                       SDLNameUTCDay:@26,
+                                       SDLNameUTCHours:@23,
+                                       SDLNameUTCMinutes:@59,
+                                       SDLNameUTCSeconds:@59,
                                        SDLNameCompassDirection:[SDLCompassDirection SOUTHEAST],
-                                       SDLNamePdop:@3.4,
-                                       SDLNameHdop:@9.9,
-                                       SDLNameVdop:@0,
+                                       SDLNamePDOP:@3.4,
+                                       SDLNameHDOP:@9.9,
+                                       SDLNameVDOP:@0,
                                        SDLNameActual:@NO,
                                        SDLNameSatellites:@12,
                                        SDLNameDimension:[SDLDimension _3D],
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
index e19b64258..ee502ebf8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
@@ -32,8 +32,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary* dict = [@{SDLNameRpcName:@"RPCNameThing",
-                                       SDLNameHmiPermissions:hmiPermissions,
+        NSMutableDictionary* dict = [@{SDLNameRPCName:@"RPCNameThing",
+                                       SDLNameHMIPermissions:hmiPermissions,
                                        SDLNameParameterPermissions:parameterPermissions} mutableCopy];
         SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict];
         
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
index 63ffae0d7..d21dedb97 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
@@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ {
     
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameId:@3,
-                                       SDLNameTs:[@[@23, @52, @41345234] mutableCopy],
-                                       SDLNameCoord:[@[coord] mutableCopy]} mutableCopy];
+                                       SDLNameTimestamp:[@[@23, @52, @41345234] mutableCopy],
+                                       SDLNameCoordinate:[@[coord] mutableCopy]} mutableCopy];
         SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict];
         
         expect(testStruct.touchEventId).to(equal(@3));