Merge branch 'develop' into feature/issue_151_struct_dictionary_init

# Conflicts:
#	SmartDeviceLink/SDLRPCStruct.m

1 files changed, 7 insertions, 7 deletions

diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index df94f19c1..dc9441f40 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -10,33 +10,33 @@
 @implementation SDLCreateInteractionChoiceSet
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_CreateInteractionChoiceSet]) {
+    if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) {
     }
     return self;
 }
 
 - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID {
     if (interactionChoiceSetID != nil) {
-        [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID];
+        [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId];
     } else {
-        [parameters removeObjectForKey:NAMES_interactionChoiceSetID];
+        [parameters removeObjectForKey:SDLNameInteractionChoiceSetId];
     }
 }
 
 - (NSNumber *)interactionChoiceSetID {
-    return [parameters objectForKey:NAMES_interactionChoiceSetID];
+    return [parameters objectForKey:SDLNameInteractionChoiceSetId];
 }
 
 - (void)setChoiceSet:(NSMutableArray *)choiceSet {
     if (choiceSet != nil) {
-        [parameters setObject:choiceSet forKey:NAMES_choiceSet];
+        [parameters setObject:choiceSet forKey:SDLNameChoiceSet];
     } else {
-        [parameters removeObjectForKey:NAMES_choiceSet];
+        [parameters removeObjectForKey:SDLNameChoiceSet];
     }
 }
 
 - (NSMutableArray *)choiceSet {
-    NSMutableArray *array = [parameters objectForKey:NAMES_choiceSet];
+    NSMutableArray *array = [parameters objectForKey:SDLNameChoiceSet];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLChoice.class]) {
         return array;
     } else {