1 files changed, 26 insertions, 26 deletions

diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index ddc7fdc3a..bd86192ba 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -2,14 +2,14 @@
 
 #import "SDLAlert.h"
 
-#import "SDLNames.h"
+
 #import "SDLSoftButton.h"
 #import "SDLTTSChunk.h"
 
 @implementation SDLAlert
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Alert]) {
+    if (self = [super initWithName:SDLNameAlert]) {
     }
     return self;
 }
@@ -22,50 +22,50 @@
 
 - (void)setAlertText1:(NSString *)alertText1 {
     if (alertText1 != nil) {
-        [parameters setObject:alertText1 forKey:NAMES_alertText1];
+        [parameters setObject:alertText1 forKey:SDLNameAlertText1];
     } else {
-        [parameters removeObjectForKey:NAMES_alertText1];
+        [parameters removeObjectForKey:SDLNameAlertText1];
     }
 }
 
 - (NSString *)alertText1 {
-    return [parameters objectForKey:NAMES_alertText1];
+    return [parameters objectForKey:SDLNameAlertText1];
 }
 
 - (void)setAlertText2:(NSString *)alertText2 {
     if (alertText2 != nil) {
-        [parameters setObject:alertText2 forKey:NAMES_alertText2];
+        [parameters setObject:alertText2 forKey:SDLNameAlertText2];
     } else {
-        [parameters removeObjectForKey:NAMES_alertText2];
+        [parameters removeObjectForKey:SDLNameAlertText2];
     }
 }
 
 - (NSString *)alertText2 {
-    return [parameters objectForKey:NAMES_alertText2];
+    return [parameters objectForKey:SDLNameAlertText2];
 }
 
 - (void)setAlertText3:(NSString *)alertText3 {
     if (alertText3 != nil) {
-        [parameters setObject:alertText3 forKey:NAMES_alertText3];
+        [parameters setObject:alertText3 forKey:SDLNameAlertText3];
     } else {
-        [parameters removeObjectForKey:NAMES_alertText3];
+        [parameters removeObjectForKey:SDLNameAlertText3];
     }
 }
 
 - (NSString *)alertText3 {
-    return [parameters objectForKey:NAMES_alertText3];
+    return [parameters objectForKey:SDLNameAlertText3];
 }
 
 - (void)setTtsChunks:(NSMutableArray *)ttsChunks {
     if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:NAMES_ttsChunks];
+        [parameters setObject:ttsChunks forKey:SDLNameTtsChunks];
     } else {
-        [parameters removeObjectForKey:NAMES_ttsChunks];
+        [parameters removeObjectForKey:SDLNameTtsChunks];
     }
 }
 
 - (NSMutableArray *)ttsChunks {
-    NSMutableArray *array = [parameters objectForKey:NAMES_ttsChunks];
+    NSMutableArray *array = [parameters objectForKey:SDLNameTtsChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -79,50 +79,50 @@
 
 - (void)setDuration:(NSNumber *)duration {
     if (duration != nil) {
-        [parameters setObject:duration forKey:NAMES_duration];
+        [parameters setObject:duration forKey:SDLNameDuration];
     } else {
-        [parameters removeObjectForKey:NAMES_duration];
+        [parameters removeObjectForKey:SDLNameDuration];
     }
 }
 
 - (NSNumber *)duration {
-    return [parameters objectForKey:NAMES_duration];
+    return [parameters objectForKey:SDLNameDuration];
 }
 
 - (void)setPlayTone:(NSNumber *)playTone {
     if (playTone != nil) {
-        [parameters setObject:playTone forKey:NAMES_playTone];
+        [parameters setObject:playTone forKey:SDLNamePlayTone];
     } else {
-        [parameters removeObjectForKey:NAMES_playTone];
+        [parameters removeObjectForKey:SDLNamePlayTone];
     }
 }
 
 - (NSNumber *)playTone {
-    return [parameters objectForKey:NAMES_playTone];
+    return [parameters objectForKey:SDLNamePlayTone];
 }
 
 - (void)setProgressIndicator:(NSNumber *)progressIndicator {
     if (progressIndicator != nil) {
-        [parameters setObject:progressIndicator forKey:NAMES_progressIndicator];
+        [parameters setObject:progressIndicator forKey:SDLNameProgressIndicator];
     } else {
-        [parameters removeObjectForKey:NAMES_progressIndicator];
+        [parameters removeObjectForKey:SDLNameProgressIndicator];
     }
 }
 
 - (NSNumber *)progressIndicator {
-    return [parameters objectForKey:NAMES_progressIndicator];
+    return [parameters objectForKey:SDLNameProgressIndicator];
 }
 
 - (void)setSoftButtons:(NSMutableArray *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray *)softButtons {
-    NSMutableArray *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {