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/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m
index 21260bbee..010ddd93c 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.m
+++ b/SmartDeviceLink/SDLDiagnosticMessage.m
@@ -9,45 +9,45 @@
 @implementation SDLDiagnosticMessage
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_DiagnosticMessage]) {
+    if (self = [super initWithName:SDLNameDiagnosticMessage]) {
     }
     return self;
 }
 
 - (void)setTargetID:(NSNumber *)targetID {
     if (targetID != nil) {
-        [parameters setObject:targetID forKey:NAMES_targetID];
+        [parameters setObject:targetID forKey:SDLNameTargetId];
     } else {
-        [parameters removeObjectForKey:NAMES_targetID];
+        [parameters removeObjectForKey:SDLNameTargetId];
     }
 }
 
 - (NSNumber *)targetID {
-    return [parameters objectForKey:NAMES_targetID];
+    return [parameters objectForKey:SDLNameTargetId];
 }
 
 - (void)setMessageLength:(NSNumber *)messageLength {
     if (messageLength != nil) {
-        [parameters setObject:messageLength forKey:NAMES_messageLength];
+        [parameters setObject:messageLength forKey:SDLNameMessageLength];
     } else {
-        [parameters removeObjectForKey:NAMES_messageLength];
+        [parameters removeObjectForKey:SDLNameMessageLength];
     }
 }
 
 - (NSNumber *)messageLength {
-    return [parameters objectForKey:NAMES_messageLength];
+    return [parameters objectForKey:SDLNameMessageLength];
 }
 
 - (void)setMessageData:(NSMutableArray *)messageData {
     if (messageData != nil) {
-        [parameters setObject:messageData forKey:NAMES_messageData];
+        [parameters setObject:messageData forKey:SDLNameMessageData];
     } else {
-        [parameters removeObjectForKey:NAMES_messageData];
+        [parameters removeObjectForKey:SDLNameMessageData];
     }
 }
 
 - (NSMutableArray *)messageData {
-    return [parameters objectForKey:NAMES_messageData];
+    return [parameters objectForKey:SDLNameMessageData];
 }
 
 @end