diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp
index 84ad6ada4..28dfddad7 100644
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -481,81 +481,81 @@ void StyleParser::parseStyle(JSVal value, ClassProperties &klass) {
     using Key = PropertyKey;
 
     parseStyleProperty<FunctionProperty>("fill-enabled", Key::FillEnabled, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("fill-enabled-transition", Key::FillEnabled, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-fill-enabled", Key::FillEnabled, klass, value);
     parseStyleProperty<FunctionProperty>("fill-antialias", Key::FillAntialias, klass, value);
     parseStyleProperty<FunctionProperty>("fill-opacity", Key::FillOpacity, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("fill-opacity-transition", Key::FillOpacity, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-fill-opacity", Key::FillOpacity, klass, value);
     parseStyleProperty<Color>("fill-color", Key::FillColor, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("fill-color-transition", Key::FillColor, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-fill-color", Key::FillColor, klass, value);
     parseStyleProperty<Color>("fill-outline-color", Key::FillOutlineColor, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("fill-outline-color-transition", Key::FillOutlineColor, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-fill-outline-color", Key::FillOutlineColor, klass, value);
     parseStyleProperty<FunctionProperty>("fill-translate", { Key::FillTranslateX, Key::FillTranslateY }, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("fill-translate-transition", Key::FillTranslate, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-fill-translate", Key::FillTranslate, klass, value);
     parseStyleProperty<TranslateAnchorType>("fill-translate-anchor", Key::FillTranslateAnchor, klass, value);
     parseStyleProperty<std::string>("fill-image", Key::FillImage, klass, value);
 
     parseStyleProperty<FunctionProperty>("line-enabled", Key::LineEnabled, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-enabled-transition", Key::LineEnabled, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-enabled", Key::LineEnabled, klass, value);
     parseStyleProperty<FunctionProperty>("line-opacity", Key::LineOpacity, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-opacity-transition", Key::LineOpacity, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-opacity", Key::LineOpacity, klass, value);
     parseStyleProperty<Color>("line-color", Key::LineColor, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-color-transition", Key::LineColor, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-color", Key::LineColor, klass, value);
     parseStyleProperty<FunctionProperty>("line-translate", { Key::LineTranslateX, Key::LineTranslateY }, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-translate-transition", Key::LineTranslate, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-translate", Key::LineTranslate, klass, value);
     parseStyleProperty<TranslateAnchorType>("line-translate-anchor", Key::LineTranslateAnchor, klass, value);
     parseStyleProperty<FunctionProperty>("line-width", Key::LineWidth, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-width-transition", Key::LineWidth, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-width", Key::LineWidth, klass, value);
     parseStyleProperty<FunctionProperty>("line-offset", Key::LineOffset, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-offset-transition", Key::LineOffset, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-offset", Key::LineOffset, klass, value);
     parseStyleProperty<FunctionProperty>("line-blur", Key::LineBlur, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-blur-transition", Key::LineBlur, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-blur", Key::LineBlur, klass, value);
     parseStyleProperty<FunctionProperty>("line-dasharray", { Key::LineDashLand, Key::LineDashGap }, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("line-dasharray-transition", Key::LineDashArray, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-line-dasharray", Key::LineDashArray, klass, value);
     parseStyleProperty<std::string>("line-image", Key::LineImage, klass, value);
 
     parseStyleProperty<FunctionProperty>("icon-enabled", Key::IconEnabled, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("icon-enabled-transition", Key::IconEnabled, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-icon-enabled", Key::IconEnabled, klass, value);
     parseStyleProperty<FunctionProperty>("icon-opacity", Key::IconOpacity, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("icon-opacity-transition", Key::IconOpacity, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-icon-opacity", Key::IconOpacity, klass, value);
     parseStyleProperty<FunctionProperty>("icon-rotate", Key::IconRotate, klass, value);
     parseStyleProperty<RotateAnchorType>("icon-rotate-anchor", Key::IconRotateAnchor, klass, value);
 
     parseStyleProperty<FunctionProperty>("text-enabled", Key::TextEnabled, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("text-enabled-transition", Key::TextEnabled, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-text-enabled", Key::TextEnabled, klass, value);
     parseStyleProperty<FunctionProperty>("text-opacity", Key::TextOpacity, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("text-opacity-transition", Key::TextOpacity, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-text-opacity", Key::TextOpacity, klass, value);
     parseStyleProperty<FunctionProperty>("text-size", Key::TextSize, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("text-size-transition", Key::TextSize, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-text-size", Key::TextSize, klass, value);
     parseStyleProperty<Color>("text-color", Key::TextColor, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("text-color-transition", Key::TextColor, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-text-color", Key::TextColor, klass, value);
     parseStyleProperty<Color>("text-halo-color", Key::TextHaloColor, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("text-halo-color-transition", Key::TextHaloColor, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-text-halo-color", Key::TextHaloColor, klass, value);
     parseStyleProperty<FunctionProperty>("text-halo-width", Key::TextHaloWidth, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("text-halo-width-transition", Key::TextHaloWidth, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-text-halo-width", Key::TextHaloWidth, klass, value);
     parseStyleProperty<FunctionProperty>("text-halo-blur", Key::TextHaloBlur, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("text-halo-blur-transition", Key::TextHaloBlur, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-text-halo-blur", Key::TextHaloBlur, klass, value);
 
     parseStyleProperty<FunctionProperty>("composite-enabled", Key::CompositeEnabled, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("composite-enabled-transition", Key::CompositeEnabled, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-composite-enabled", Key::CompositeEnabled, klass, value);
     parseStyleProperty<FunctionProperty>("composite-opacity", Key::CompositeOpacity, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("composite-opacity-transition", Key::CompositeOpacity, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-composite-opacity", Key::CompositeOpacity, klass, value);
 
     parseStyleProperty<FunctionProperty>("raster-enabled", Key::RasterEnabled, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-enabled-transition", Key::RasterEnabled, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-enabled", Key::RasterEnabled, klass, value);
     parseStyleProperty<FunctionProperty>("raster-opacity", Key::RasterOpacity, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-opacity-transition", Key::RasterOpacity, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-opacity", Key::RasterOpacity, klass, value);
     parseStyleProperty<FunctionProperty>("raster-spin", Key::RasterSpin, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-spin-transition", Key::RasterSpin, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-spin", Key::RasterSpin, klass, value);
     parseStyleProperty<FunctionProperty>("raster-brightness-low", Key::RasterBrightnessLow, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-brightness-low-transition", Key::RasterBrightnessLow, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-brightness-low", Key::RasterBrightnessLow, klass, value);
     parseStyleProperty<FunctionProperty>("raster-brightness-high", Key::RasterBrightnessHigh, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-brightness-high-transition", Key::RasterBrightnessHigh, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-brightness-high", Key::RasterBrightnessHigh, klass, value);
     parseStyleProperty<FunctionProperty>("raster-saturation", Key::RasterSaturation, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-saturation-transition", Key::RasterSaturation, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-saturation", Key::RasterSaturation, klass, value);
     parseStyleProperty<FunctionProperty>("raster-contrast", Key::RasterContrast, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-contrast-transition", Key::RasterContrast, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-contrast", Key::RasterContrast, klass, value);
     parseStyleProperty<FunctionProperty>("raster-fade", Key::RasterFade, klass, value);
-    parseStyleProperty<ClassPropertyTransition>("raster-fade-transition", Key::RasterFade, klass, value);
+    parseStyleProperty<ClassPropertyTransition>("transition-raster-fade", Key::RasterFade, klass, value);
 
     parseStyleProperty<Color>("background-color", Key::BackgroundColor, klass, value);
 }