1 files changed, 12 insertions, 18 deletions

diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index 3eb77bf8c..b93062b21 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -10,61 +10,55 @@
 @implementation SDLSetMediaClockTimer
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_SetMediaClockTimer]) {
-    }
-    return self;
-}
-
-- (instancetype)initWithDictionary:(NSMutableDictionary *)dict {
-    if (self = [super initWithDictionary:dict]) {
+    if (self = [super initWithName:SDLNameSetMediaClockTimer]) {
     }
     return self;
 }
 
 - (void)setStartTime:(SDLStartTime *)startTime {
     if (startTime != nil) {
-        [parameters setObject:startTime forKey:NAMES_startTime];
+        [parameters setObject:startTime forKey:SDLNameStartTime];
     } else {
-        [parameters removeObjectForKey:NAMES_startTime];
+        [parameters removeObjectForKey:SDLNameStartTime];
     }
 }
 
 - (SDLStartTime *)startTime {
-    NSObject *obj = [parameters objectForKey:NAMES_startTime];
+    NSObject *obj = [parameters objectForKey:SDLNameStartTime];
     if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
-        return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj];
+        return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj];
     }
 }
 
 - (void)setEndTime:(SDLStartTime *)endTime {
     if (endTime != nil) {
-        [parameters setObject:endTime forKey:NAMES_endTime];
+        [parameters setObject:endTime forKey:SDLNameEndTime];
     } else {
-        [parameters removeObjectForKey:NAMES_endTime];
+        [parameters removeObjectForKey:SDLNameEndTime];
     }
 }
 
 - (SDLStartTime *)endTime {
-    NSObject *obj = [parameters objectForKey:NAMES_endTime];
+    NSObject *obj = [parameters objectForKey:SDLNameEndTime];
     if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
-        return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj];
+        return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj];
     }
 }
 
 - (void)setUpdateMode:(SDLUpdateMode)updateMode {
     if (updateMode != nil) {
-        [parameters setObject:updateMode forKey:NAMES_updateMode];
+        [parameters setObject:updateMode forKey:SDLNameUpdateMode];
     } else {
-        [parameters removeObjectForKey:NAMES_updateMode];
+        [parameters removeObjectForKey:SDLNameUpdateMode];
     }
 }
 
 - (SDLUpdateMode)updateMode {
-    NSObject *obj = [parameters objectForKey:NAMES_updateMode];
+    NSObject *obj = [parameters objectForKey:SDLNameUpdateMode];
     return (SDLUpdateMode)obj;
 }