diff --git a/test/enums.cpp b/test/enums.cpp
index e959994a5..f909631e3 100644
--- a/test/enums.cpp
+++ b/test/enums.cpp
@@ -13,8 +13,7 @@ TEST(Enums, StyleLayerType) {
     ASSERT_EQ(StyleLayerType::Unknown, StyleLayerTypeClass("unknown"));
     ASSERT_EQ(StyleLayerType::Fill, StyleLayerTypeClass("fill"));
     ASSERT_EQ(StyleLayerType::Line, StyleLayerTypeClass("line"));
-    ASSERT_EQ(StyleLayerType::Icon, StyleLayerTypeClass("icon"));
-    ASSERT_EQ(StyleLayerType::Text, StyleLayerTypeClass("text"));
+    ASSERT_EQ(StyleLayerType::Symbol, StyleLayerTypeClass("symbol"));
     ASSERT_EQ(StyleLayerType::Raster, StyleLayerTypeClass("raster"));
     ASSERT_EQ(StyleLayerType::Composite, StyleLayerTypeClass("composite"));
     ASSERT_EQ(StyleLayerType::Background, StyleLayerTypeClass("background"));
@@ -22,8 +21,7 @@ TEST(Enums, StyleLayerType) {
     ASSERT_EQ(StyleLayerType::Unknown, StyleLayerTypeClass(StyleLayerType::Unknown));
     ASSERT_EQ(StyleLayerType::Fill, StyleLayerTypeClass(StyleLayerType::Fill));
     ASSERT_EQ(StyleLayerType::Line, StyleLayerTypeClass(StyleLayerType::Line));
-    ASSERT_EQ(StyleLayerType::Icon, StyleLayerTypeClass(StyleLayerType::Icon));
-    ASSERT_EQ(StyleLayerType::Text, StyleLayerTypeClass(StyleLayerType::Text));
+    ASSERT_EQ(StyleLayerType::Symbol, StyleLayerTypeClass(StyleLayerType::Symbol));
     ASSERT_EQ(StyleLayerType::Raster, StyleLayerTypeClass(StyleLayerType::Raster));
     ASSERT_EQ(StyleLayerType::Composite, StyleLayerTypeClass(StyleLayerType::Composite));
     ASSERT_EQ(StyleLayerType::Background, StyleLayerTypeClass(StyleLayerType::Background));
@@ -31,8 +29,7 @@ TEST(Enums, StyleLayerType) {
     ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Unknown), StyleLayerTypeClass(StyleLayerType::Unknown));
     ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Fill), StyleLayerTypeClass(StyleLayerType::Fill));
     ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Line), StyleLayerTypeClass(StyleLayerType::Line));
-    ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Icon), StyleLayerTypeClass(StyleLayerType::Icon));
-    ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Text), StyleLayerTypeClass(StyleLayerType::Text));
+    ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Symbol), StyleLayerTypeClass(StyleLayerType::Symbol));
     ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Raster), StyleLayerTypeClass(StyleLayerType::Raster));
     ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Composite), StyleLayerTypeClass(StyleLayerType::Composite));
     ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Background), StyleLayerTypeClass(StyleLayerType::Background));