1 files changed, 13 insertions, 14 deletions

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