1 files changed, 14 insertions, 14 deletions

diff --git a/platform/darwin/src/MGLLight.mm b/platform/darwin/src/MGLLight.mm
index c83ef127a6..db2893ed44 100644
--- a/platform/darwin/src/MGLLight.mm
+++ b/platform/darwin/src/MGLLight.mm
@@ -44,39 +44,39 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
 {
     if (self = [super init]) {
         auto anchor = mbglLight->getAnchor();
-        MGLStyleValue<NSValue *> *anchorStyleValue;
+        NSExpression *anchorExpression;
         if (anchor.isUndefined()) {
             mbgl::style::PropertyValue<mbgl::style::LightAnchorType> defaultAnchor = mbglLight->getDefaultAnchor();
-            anchorStyleValue = MGLStyleValueTransformer<mbgl::style::LightAnchorType, NSValue *, mbgl::style::LightAnchorType, MGLLightAnchor>().toEnumStyleValue(defaultAnchor);
+            anchorExpression = MGLStyleValueTransformer<mbgl::style::LightAnchorType, NSValue *, mbgl::style::LightAnchorType, MGLLightAnchor>().toExpression(defaultAnchor);
         } else {
-            anchorStyleValue = MGLStyleValueTransformer<mbgl::style::LightAnchorType, NSValue *, mbgl::style::LightAnchorType, MGLLightAnchor>().toEnumStyleValue(anchor);
+            anchorExpression = MGLStyleValueTransformer<mbgl::style::LightAnchorType, NSValue *, mbgl::style::LightAnchorType, MGLLightAnchor>().toExpression(anchor);
         }
 
-        _anchor = anchorStyleValue;
+        _anchor = anchorExpression;
 
         auto positionValue = mbglLight->getPosition();
         if (positionValue.isUndefined()) {
-            _position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toStyleValue(mbglLight->getDefaultPosition());
+            _position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toExpression(mbglLight->getDefaultPosition());
         } else {
-            _position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toStyleValue(positionValue);
+            _position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toExpression(positionValue);
         }
         
         _positionTransition = MGLTransitionFromOptions(mbglLight->getPositionTransition());
  
         auto colorValue = mbglLight->getColor();
         if (colorValue.isUndefined()) {
-            _color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toStyleValue(mbglLight->getDefaultColor());
+            _color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toExpression(mbglLight->getDefaultColor());
         } else {
-            _color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toStyleValue(colorValue);
+            _color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toExpression(colorValue);
         }
         
         _colorTransition = MGLTransitionFromOptions(mbglLight->getColorTransition());
  
         auto intensityValue = mbglLight->getIntensity();
         if (intensityValue.isUndefined()) {
-            _intensity = MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(mbglLight->getDefaultIntensity());
+            _intensity = MGLStyleValueTransformer<float, NSNumber *>().toExpression(mbglLight->getDefaultIntensity());
         } else {
-            _intensity = MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(intensityValue);
+            _intensity = MGLStyleValueTransformer<float, NSNumber *>().toExpression(intensityValue);
         }
         
         _intensityTransition = MGLTransitionFromOptions(mbglLight->getIntensityTransition());
@@ -89,20 +89,20 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
 - (mbgl::style::Light)mbglLight
 {
     mbgl::style::Light mbglLight;
-    auto anchor = MGLStyleValueTransformer<mbgl::style::LightAnchorType, NSValue *, mbgl::style::LightAnchorType, MGLLightAnchor>().toEnumPropertyValue(self.anchor);
+    auto anchor = MGLStyleValueTransformer<mbgl::style::LightAnchorType, NSValue *, mbgl::style::LightAnchorType, MGLLightAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::LightAnchorType>>(self.anchor);
     mbglLight.setAnchor(anchor);
 
-    auto position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toInterpolatablePropertyValue(self.position);
+    auto position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::Position>>(self.position);
     mbglLight.setPosition(position);
  
     mbglLight.setPositionTransition(MGLOptionsFromTransition(self.positionTransition));
 
-    auto color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toInterpolatablePropertyValue(self.color);
+    auto color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(self.color);
     mbglLight.setColor(color);
  
     mbglLight.setColorTransition(MGLOptionsFromTransition(self.colorTransition));
 
-    auto intensity = MGLStyleValueTransformer<float, NSNumber *>().toInterpolatablePropertyValue(self.intensity);
+    auto intensity = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(self.intensity);
     mbglLight.setIntensity(intensity);
  
     mbglLight.setIntensityTransition(MGLOptionsFromTransition(self.intensityTransition));