diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp
index 4110f829cf..acdbf04580 100644
--- a/drape_frontend/stylist.cpp
+++ b/drape_frontend/stylist.cpp
@@ -63,7 +63,7 @@ inline bool IsTypeOf(drule::Key const & key, int flags)
 
 bool IsMiddleTunnel(int const layer, double const depth)
 {
-  return layer != feature::LAYER_FLAGS_EMPTY && depth < 19000;
+  return layer != feature::LAYER_EMPTY && depth < 19000;
 }
 
 class Aggregator
@@ -136,8 +136,8 @@ private:
   void Init()
   {
     m_depthLayer = m_f.GetLayer();
-    if (m_depthLayer == feature::LAYER_FLAGS_TRANSPARENT_TUNNEL)
-      m_depthLayer = feature::LAYER_FLAGS_EMPTY;
+    if (m_depthLayer == feature::LAYER_TRANSPARENT_TUNNEL)
+      m_depthLayer = feature::LAYER_EMPTY;
 
     if (m_geomType == feature::GeomType::Point)
       m_priorityModifier = (double)m_f.GetPopulation() / 7E9;
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 09aa39380d..e0ab7f1d4e 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -206,7 +206,7 @@ bool FeatureParamsBase::operator == (FeatureParamsBase const & rhs) const
 
 bool FeatureParamsBase::CheckValid() const
 {
-   CHECK(layer > LAYER_FLAGS_LOW && layer < LAYER_FLAGS_HIGH, ());
+   CHECK(layer > LAYER_LOW && layer < LAYER_HIGH, ());
    return true;
 }
 
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index 6b824f23c7..1f3e57f3e2 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -42,14 +42,14 @@ namespace feature
 
   static constexpr int kMaxTypesCount = HEADER_MASK_TYPE + 1;
 
-  enum LayerFlags
+  enum Layer
   {
-    LAYER_FLAGS_LOW = -11,
+    LAYER_LOW = -11,
 
-    LAYER_FLAGS_EMPTY = 0,
-    LAYER_FLAGS_TRANSPARENT_TUNNEL = 11,
+    LAYER_EMPTY = 0,
+    LAYER_TRANSPARENT_TUNNEL = 11,
 
-    LAYER_FLAGS_HIGH = 12
+    LAYER_HIGH = 12
   };
 
   class TypesHolder