smartdevicelink · joeljfischer · Sep 27, 2016 · Sep 21, 2016 · Sep 22, 2016 · Sep 22, 2016
diff --git a/.xctool-args b/.xctool-args
@@ -1,6 +1,6 @@
 [
     "-project", "SmartDeviceLink-iOS.xcodeproj",
-    "-scheme", "SmartDeviceLink",
+    "-scheme", "SmartDeviceLinkTests",
     "-sdk", "iphonesimulator",
     "ONLY_ACTIVE_ARCH=NO",
     "RUN_CLANG_STATIC_ANALYZER=NO"

diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -891,6 +891,7 @@
 		DA4353EA1D2721680099B8C4 /* SDLTouchManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */; };
 		DA4353EB1D2721680099B8C4 /* SDLTouchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */; };
 		DA96C0661D4D4F730022F520 /* SDLAppInfoSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */; };
+		DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB537891D9319E8008EB556 /* SDLNames.m */; };
 		DAC572571D1067270004288B /* SDLTouchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC572551D1067270004288B /* SDLTouchManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAC572581D1067270004288B /* SDLTouchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572561D1067270004288B /* SDLTouchManager.m */; };
 		DAC5725B1D10B81E0004288B /* SDLTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572591D10B81E0004288B /* SDLTouch.m */; };
@@ -1877,6 +1878,7 @@
 		DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchManagerSpec.m; path = UtilitiesSpecs/Touches/SDLTouchManagerSpec.m; sourceTree = "<group>"; };
 		DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchSpec.m; path = UtilitiesSpecs/Touches/SDLTouchSpec.m; sourceTree = "<group>"; };
 		DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAppInfoSpec.m; sourceTree = "<group>"; };
+		DAB537891D9319E8008EB556 /* SDLNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNames.m; sourceTree = "<group>"; };
 		DAC572551D1067270004288B /* SDLTouchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTouchManager.h; sourceTree = "<group>"; };
 		DAC572561D1067270004288B /* SDLTouchManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouchManager.m; sourceTree = "<group>"; };
 		DAC572591D10B81E0004288B /* SDLTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouch.m; sourceTree = "<group>"; };
@@ -2956,6 +2958,7 @@
 				E9C32B8E1AB20BA200F283AF /* SDLTimer.h */,
 				E9C32B8F1AB20BA200F283AF /* SDLTimer.m */,
 				5D61FB0F1A84238A00846EE7 /* SDLNames.h */,
+				DAB537891D9319E8008EB556 /* SDLNames.m */,
 				5D535DC31B72473800CF7760 /* SDLGlobals.h */,
 				5D535DC41B72473800CF7760 /* SDLGlobals.m */,
 			);
@@ -4326,6 +4329,7 @@
 				5D61FE001A84238C00846EE7 /* SDLVehicleDataEventStatus.m in Sources */,
 				5D61FDC41A84238C00846EE7 /* SDLTBTState.m in Sources */,
 				5D61FDA61A84238C00846EE7 /* SDLSpeak.m in Sources */,
+				DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */,
 				5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */,
 				5D61FD9E1A84238C00846EE7 /* SDLSliderResponse.m in Sources */,
 				5D61FC5C1A84238C00846EE7 /* SDLChangeRegistration.m in Sources */,

diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
@@ -8,11 +8,10 @@
 #import "SDLMenuParams.h"
 #import "SDLNames.h"
 
-
 @implementation SDLAddCommand
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddCommand]) {
+    if (self = [super initWithName:SDLNameAddCommand]) {
     }
     return self;
 }
@@ -36,26 +35,26 @@ - (instancetype)initWithDictionary:(NSMutableDictionary *)dict {
 
 - (void)setCmdID:(NSNumber *)cmdID {
     if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:NAMES_cmdID];
+        [parameters setObject:cmdID forKey:SDLNameCommandId];
     } else {
-        [parameters removeObjectForKey:NAMES_cmdID];
+        [parameters removeObjectForKey:SDLNameCommandId];
     }
 }
 
 - (NSNumber *)cmdID {
-    return [parameters objectForKey:NAMES_cmdID];
+    return [parameters objectForKey:SDLNameCommandId];
 }
 
 - (void)setMenuParams:(SDLMenuParams *)menuParams {
     if (menuParams != nil) {
-        [parameters setObject:menuParams forKey:NAMES_menuParams];
+        [parameters setObject:menuParams forKey:SDLNameMenuParams];
     } else {
-        [parameters removeObjectForKey:NAMES_menuParams];
+        [parameters removeObjectForKey:SDLNameMenuParams];
     }
 }
 
 - (SDLMenuParams *)menuParams {
-    NSObject *obj = [parameters objectForKey:NAMES_menuParams];
+    NSObject *obj = [parameters objectForKey:SDLNameMenuParams];
     if (obj == nil || [obj isKindOfClass:SDLMenuParams.class]) {
         return (SDLMenuParams *)obj;
     } else {
@@ -65,26 +64,26 @@ - (SDLMenuParams *)menuParams {
 
 - (void)setVrCommands:(NSMutableArray *)vrCommands {
     if (vrCommands != nil) {
-        [parameters setObject:vrCommands forKey:NAMES_vrCommands];
+        [parameters setObject:vrCommands forKey:SDLNameVRCommands];
     } else {
-        [parameters removeObjectForKey:NAMES_vrCommands];
+        [parameters removeObjectForKey:SDLNameVRCommands];
     }
 }
 
 - (NSMutableArray *)vrCommands {
-    return [parameters objectForKey:NAMES_vrCommands];
+    return [parameters objectForKey:SDLNameVRCommands];
 }
 
 - (void)setCmdIcon:(SDLImage *)cmdIcon {
     if (cmdIcon != nil) {
-        [parameters setObject:cmdIcon forKey:NAMES_cmdIcon];
+        [parameters setObject:cmdIcon forKey:SDLNameCommandIcon];
     } else {
-        [parameters removeObjectForKey:NAMES_cmdIcon];
+        [parameters removeObjectForKey:SDLNameCommandIcon];
     }
 }
 
 - (SDLImage *)cmdIcon {
-    NSObject *obj = [parameters objectForKey:NAMES_cmdIcon];
+    NSObject *obj = [parameters objectForKey:SDLNameCommandIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {

diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m
@@ -7,7 +7,7 @@
 @implementation SDLAddCommandResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddCommand]) {
+    if (self = [super initWithName:SDLNameAddCommand]) {
     }
     return self;
 }

diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
@@ -7,7 +7,7 @@
 @implementation SDLAddSubMenu
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddSubMenu]) {
+    if (self = [super initWithName:SDLNameAddSubMenu]) {
     }
     return self;
 }
@@ -20,38 +20,38 @@ - (instancetype)initWithDictionary:(NSMutableDictionary *)dict {
 
 - (void)setMenuID:(NSNumber *)menuID {
     if (menuID != nil) {
-        [parameters setObject:menuID forKey:NAMES_menuID];
+        [parameters setObject:menuID forKey:SDLNameMenuId];
     } else {
-        [parameters removeObjectForKey:NAMES_menuID];
+        [parameters removeObjectForKey:SDLNameMenuId];
     }
 }
 
 - (NSNumber *)menuID {
-    return [parameters objectForKey:NAMES_menuID];
+    return [parameters objectForKey:SDLNameMenuId];
 }
 
 - (void)setPosition:(NSNumber *)position {
     if (position != nil) {
-        [parameters setObject:position forKey:NAMES_position];
+        [parameters setObject:position forKey:SDLNamePosition];
     } else {
-        [parameters removeObjectForKey:NAMES_position];
+        [parameters removeObjectForKey:SDLNamePosition];
     }
 }
 
 - (NSNumber *)position {
-    return [parameters objectForKey:NAMES_position];
+    return [parameters objectForKey:SDLNamePosition];
 }
 
 - (void)setMenuName:(NSString *)menuName {
     if (menuName != nil) {
-        [parameters setObject:menuName forKey:NAMES_menuName];
+        [parameters setObject:menuName forKey:SDLNameMenuName];
     } else {
-        [parameters removeObjectForKey:NAMES_menuName];
+        [parameters removeObjectForKey:SDLNameMenuName];
     }
 }
 
 - (NSString *)menuName {
-    return [parameters objectForKey:NAMES_menuName];
+    return [parameters objectForKey:SDLNameMenuName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m
@@ -7,7 +7,7 @@
 @implementation SDLAddSubMenuResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_AddSubMenu]) {
+    if (self = [super initWithName:SDLNameAddSubMenu]) {
     }
     return self;
 }

diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m
@@ -5,7 +5,6 @@
 #import "SDLNames.h"
 #import "SDLVehicleDataEventStatus.h"
 
-
 @implementation SDLAirbagStatus
 
 - (instancetype)init {
@@ -22,14 +21,14 @@ - (instancetype)initWithDictionary:(NSMutableDictionary *)dict {
 
 - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus *)driverAirbagDeployed {
     if (driverAirbagDeployed != nil) {
-        [store setObject:driverAirbagDeployed forKey:NAMES_driverAirbagDeployed];
+        [store setObject:driverAirbagDeployed forKey:SDLNameDriverAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -39,14 +38,14 @@ - (SDLVehicleDataEventStatus *)driverAirbagDeployed {
 
 - (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
     if (driverSideAirbagDeployed != nil) {
-        [store setObject:driverSideAirbagDeployed forKey:NAMES_driverSideAirbagDeployed];
+        [store setObject:driverSideAirbagDeployed forKey:SDLNameDriverSideAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverSideAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverSideAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverSideAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverSideAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -56,14 +55,14 @@ - (SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
 
 - (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
     if (driverCurtainAirbagDeployed != nil) {
-        [store setObject:driverCurtainAirbagDeployed forKey:NAMES_driverCurtainAirbagDeployed];
+        [store setObject:driverCurtainAirbagDeployed forKey:SDLNameDriverCurtainAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverCurtainAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverCurtainAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverCurtainAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverCurtainAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -73,14 +72,14 @@ - (SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
 
 - (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus *)passengerAirbagDeployed {
     if (passengerAirbagDeployed != nil) {
-        [store setObject:passengerAirbagDeployed forKey:NAMES_passengerAirbagDeployed];
+        [store setObject:passengerAirbagDeployed forKey:SDLNamePassengerAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -90,14 +89,14 @@ - (SDLVehicleDataEventStatus *)passengerAirbagDeployed {
 
 - (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
     if (passengerCurtainAirbagDeployed != nil) {
-        [store setObject:passengerCurtainAirbagDeployed forKey:NAMES_passengerCurtainAirbagDeployed];
+        [store setObject:passengerCurtainAirbagDeployed forKey:SDLNamePassengerCurtainAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerCurtainAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerCurtainAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerCurtainAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerCurtainAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -107,14 +106,14 @@ - (SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
 
 - (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
     if (driverKneeAirbagDeployed != nil) {
-        [store setObject:driverKneeAirbagDeployed forKey:NAMES_driverKneeAirbagDeployed];
+        [store setObject:driverKneeAirbagDeployed forKey:SDLNameDriverKneeAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_driverKneeAirbagDeployed];
+        [store removeObjectForKey:SDLNameDriverKneeAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_driverKneeAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNameDriverKneeAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -124,14 +123,14 @@ - (SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
 
 - (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
     if (passengerSideAirbagDeployed != nil) {
-        [store setObject:passengerSideAirbagDeployed forKey:NAMES_passengerSideAirbagDeployed];
+        [store setObject:passengerSideAirbagDeployed forKey:SDLNamePassengerSideAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerSideAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerSideAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerSideAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerSideAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
@@ -141,14 +140,14 @@ - (SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
 
 - (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed {
     if (passengerKneeAirbagDeployed != nil) {
-        [store setObject:passengerKneeAirbagDeployed forKey:NAMES_passengerKneeAirbagDeployed];
+        [store setObject:passengerKneeAirbagDeployed forKey:SDLNamePassengerKneeAirbagDeployed];
     } else {
-        [store removeObjectForKey:NAMES_passengerKneeAirbagDeployed];
+        [store removeObjectForKey:SDLNamePassengerKneeAirbagDeployed];
     }
 }
 
 - (SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed {
-    NSObject *obj = [store objectForKey:NAMES_passengerKneeAirbagDeployed];
+    NSObject *obj = [store objectForKey:SDLNamePassengerKneeAirbagDeployed];
     if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {