Merge branch 'develop' into feature/issue_151_struct_dictionary_init

# Conflicts:
#	SmartDeviceLink/SDLRPCStruct.m

1 files changed, 10 insertions, 10 deletions

diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m
index a0c8d67c7..4ea18ca08 100644
--- a/SmartDeviceLink/SDLScrollableMessage.m
+++ b/SmartDeviceLink/SDLScrollableMessage.m
@@ -10,45 +10,45 @@
 @implementation SDLScrollableMessage
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_ScrollableMessage]) {
+    if (self = [super initWithName:SDLNameScrollableMessage]) {
     }
     return self;
 }
 
 - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody {
     if (scrollableMessageBody != nil) {
-        [parameters setObject:scrollableMessageBody forKey:NAMES_scrollableMessageBody];
+        [parameters setObject:scrollableMessageBody forKey:SDLNameScrollableMessageBody];
     } else {
-        [parameters removeObjectForKey:NAMES_scrollableMessageBody];
+        [parameters removeObjectForKey:SDLNameScrollableMessageBody];
     }
 }
 
 - (NSString *)scrollableMessageBody {
-    return [parameters objectForKey:NAMES_scrollableMessageBody];
+    return [parameters objectForKey:SDLNameScrollableMessageBody];
 }
 
 - (void)setTimeout:(NSNumber *)timeout {
     if (timeout != nil) {
-        [parameters setObject:timeout forKey:NAMES_timeout];
+        [parameters setObject:timeout forKey:SDLNameTimeout];
     } else {
-        [parameters removeObjectForKey:NAMES_timeout];
+        [parameters removeObjectForKey:SDLNameTimeout];
     }
 }
 
 - (NSNumber *)timeout {
-    return [parameters objectForKey:NAMES_timeout];
+    return [parameters objectForKey:SDLNameTimeout];
 }
 
 - (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 {