diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index de39a234c7..6b519c7b87 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -243,7 +243,9 @@ private:
 
   unique_ptr<TileTree> m_tileTree;
   int m_currentZoomLevel = -1;
-  int m_min3dZoomLevel = 17;
+  // TODO: Calculate min zoom level based on the device capabilities.
+  int const m_min3dZoomLevel = 17;
+
   double m_discardedFOV = 0.0;
   double m_discardedAngle = 0.0;
   
diff --git a/drape_frontend/memory_feature_index.hpp b/drape_frontend/memory_feature_index.hpp
index 991412f4c0..6d70dee9e5 100644
--- a/drape_frontend/memory_feature_index.hpp
+++ b/drape_frontend/memory_feature_index.hpp
@@ -35,8 +35,8 @@ struct FeatureInfo
 
 // It is better for TileInfo to have size that is equal or slightly less
 // than several memory pages.
-size_t const AverageFeaturesCount = 2040;
-using TFeaturesInfo = buffer_vector<FeatureInfo, AverageFeaturesCount>;
+size_t const kAverageFeaturesCount = 2040;
+using TFeaturesInfo = buffer_vector<FeatureInfo, kAverageFeaturesCount>;
 
 class MemoryFeatureIndex : private noncopyable
 {
diff --git a/drape_frontend/tile_info.cpp b/drape_frontend/tile_info.cpp
index 92dd7bb29f..1ecb07a67f 100644
--- a/drape_frontend/tile_info.cpp
+++ b/drape_frontend/tile_info.cpp
@@ -64,7 +64,7 @@ void TileInfo::ReadFeatures(MapDataProvider const & model, MemoryFeatureIndex &
 
     ReadFeatureIndex(model);
     CheckCanceled();
-    featuresToRead.reserve(AverageFeaturesCount);
+    featuresToRead.reserve(kAverageFeaturesCount);
     memIndex.ReadFeaturesRequest(m_featureInfo, featuresToRead);
   }