1 files changed, 20 insertions, 7 deletions
diff --git a/SmartDeviceLink/SDLLightState.m b/SmartDeviceLink/SDLLightState.m
index 0f74487d7..24e1909e6 100644
--- a/SmartDeviceLink/SDLLightState.m
+++ b/SmartDeviceLink/SDLLightState.m
@@ -4,7 +4,7 @@
 #import "SDLLightState.h"
 #import "SDLNames.h"
 #import "NSMutableDictionary+Store.h"
-#import "SDLSRGBColor.h"
+#import "SDLRGBColor.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-- (instancetype)initWithId:(SDLLightName)id status:(SDLLightStatus)status density:(double)density sRGBColor:(SDLSRGBColor *)sRGBColor {
+- (instancetype)initWithId:(SDLLightName)id status:(SDLLightStatus)status density:(double)density color:(SDLRGBColor *)color {
     self = [self init];
     if(!self) {
         return nil;
@@ -29,7 +29,20 @@ NS_ASSUME_NONNULL_BEGIN
     self.id = id;
     self.status = status;
     self.density = @(density);
-    self.sRGBColor = sRGBColor;
+    self.color = color;
+
+    return self;
+}
+
+- (instancetype)initWithId:(SDLLightName)id lightStatus:(SDLLightStatus)lightStatus lightDensity:(double)lightDensity lightColor:(UIColor *)lightColor {
+    self = [self init];
+    if(!self) {
+        return nil;
+    }
+    self.id = id;
+    self.status = lightStatus;
+    self.density = @(lightDensity);
+    self.color = [[SDLRGBColor alloc] initWithColor:lightColor];
 
     return self;
 }
@@ -58,12 +71,12 @@ NS_ASSUME_NONNULL_BEGIN
     return [store sdl_objectForName:SDLNameDensity];
 }
 
-- (void)setSRGBColor:(nullable SDLSRGBColor *)sRGBColor {
-    [store sdl_setObject:sRGBColor forName:SDLNameSRGBColor];
+- (void)setColor:(nullable SDLRGBColor *)color {
+    [store sdl_setObject:color forName:SDLNameColor];
 }
 
-- (nullable SDLSRGBColor *)sRGBColor {
-    return [store sdl_objectForName:SDLNameSRGBColor];
+- (nullable SDLRGBColor *)color {
+    return [store sdl_objectForName:SDLNameColor ofClass:[SDLRGBColor class]];
 }
 
 @end