diff --git a/coding/coding_tests/geometry_coding_test.cpp b/coding/coding_tests/geometry_coding_test.cpp
index 3e398a17b3..0af921ffec 100644
--- a/coding/coding_tests/geometry_coding_test.cpp
+++ b/coding/coding_tests/geometry_coding_test.cpp
@@ -20,7 +20,7 @@ using PU = m2::PointU;
 
 namespace
 {
-m2::PointU D2U(m2::PointD const & p) { return PointDToPointU(p, POINT_COORD_BITS); }
+m2::PointU D2U(m2::PointD const & p) { return PointDToPointU(p, kPointCoordBits); }
 
 m2::PointU GetMaxPoint() { return D2U(m2::PointD(MercatorBounds::kMaxX, MercatorBounds::kMaxY)); }
 
diff --git a/coding/coding_tests/geometry_serialization_test.cpp b/coding/coding_tests/geometry_serialization_test.cpp
index 6e858ab14a..25937556b7 100644
--- a/coding/coding_tests/geometry_serialization_test.cpp
+++ b/coding/coding_tests/geometry_serialization_test.cpp
@@ -8,26 +8,31 @@
 #include "geometry/mercator.hpp"
 
 #include "base/logging.hpp"
+#include "base/math.hpp"
 
-// Copy-Paste from feature_builder.cpp
+#include <vector>
+
+using namespace std;
+
+// Copy-Paste from generator/feature_builder.cpp
 namespace
 {
-bool is_equal(double d1, double d2)
+bool IsEqual(double d1, double d2)
 {
-  return (fabs(d1 - d2) < kCellIdToPointEps);
+  return base::AlmostEqualAbs(d1, d2, kCellIdToPointEps);
 }
 
-bool is_equal(m2::PointD const & p1, m2::PointD const & p2)
+bool IsEqual(m2::PointD const & p1, m2::PointD const & p2)
 {
   return p1.EqualDxDy(p2, kCellIdToPointEps);
 }
 
-bool is_equal(m2::RectD const & r1, m2::RectD const & r2)
+bool IsEqual(m2::RectD const & r1, m2::RectD const & r2)
 {
-  return (is_equal(r1.minX(), r2.minX()) && is_equal(r1.minY(), r2.minY()) &&
-          is_equal(r1.maxX(), r2.maxX()) && is_equal(r1.maxY(), r2.maxY()));
-}
+  return (IsEqual(r1.minX(), r2.minX()) && IsEqual(r1.minY(), r2.minY()) &&
+          IsEqual(r1.maxX(), r2.maxX()) && IsEqual(r1.maxY(), r2.maxY()));
 }
+}  // namespace
 
 UNIT_TEST(SaveLoadPolyline_DataSet1)
 {
@@ -53,8 +58,8 @@ UNIT_TEST(SaveLoadPolyline_DataSet1)
     r1.Add(data1[i]);
     r2.Add(data2[i]);
 
-    TEST(is_equal(data1[i], data2[i]), (data1[i], data2[i]));
+    TEST(IsEqual(data1[i], data2[i]), (data1[i], data2[i]));
   }
 
-  TEST(is_equal(r1, r2), (r1, r2));
+  TEST(IsEqual(r1, r2), (r1, r2));
 }
diff --git a/coding/coding_tests/point_coding_tests.cpp b/coding/coding_tests/point_coding_tests.cpp
index d5a0a8dc96..03dc73f63d 100644
--- a/coding/coding_tests/point_coding_tests.cpp
+++ b/coding/coding_tests/point_coding_tests.cpp
@@ -15,7 +15,7 @@ using namespace std;
 namespace
 {
 double const kEps = kCellIdToPointEps;
-uint32_t const kCoordBits = POINT_COORD_BITS;
+uint8_t const kCoordBits = kPointCoordBits;
 uint32_t const kBig = uint32_t{1} << 30;
 
 void CheckEqualPoints(m2::PointD const & p1, m2::PointD const & p2)
diff --git a/coding/geometry_coding.cpp b/coding/geometry_coding.cpp
index 6dd2cd2ccb..1ef1bb8f5c 100644
--- a/coding/geometry_coding.cpp
+++ b/coding/geometry_coding.cpp
@@ -296,7 +296,7 @@ void DecodeTriangleStrip(InDeltasT const & deltas, m2::PointU const & basePoint,
 namespace serial
 {
 // GeometryCodingParams ----------------------------------------------------------------------------
-GeometryCodingParams::GeometryCodingParams() : m_BasePointUint64(0), m_CoordBits(POINT_COORD_BITS)
+GeometryCodingParams::GeometryCodingParams() : m_BasePointUint64(0), m_CoordBits(kPointCoordBits)
 {
   m_BasePoint = Uint64ToPointUObsolete(m_BasePointUint64);
 }
diff --git a/coding/geometry_coding.hpp b/coding/geometry_coding.hpp
index 28f7869f32..bfe2b52205 100644
--- a/coding/geometry_coding.hpp
+++ b/coding/geometry_coding.hpp
@@ -114,7 +114,7 @@ public:
 
   void SetBasePoint(m2::PointD const & pt);
 
-  uint32_t GetCoordBits() const { return m_CoordBits; }
+  uint8_t GetCoordBits() const { return m_CoordBits; }
 
   template <typename WriterT>
   void Save(WriterT & writer) const
diff --git a/coding/point_coding.cpp b/coding/point_coding.cpp
index bb65162750..9670a4eeb2 100644
--- a/coding/point_coding.cpp
+++ b/coding/point_coding.cpp
@@ -8,27 +8,29 @@
 
 namespace
 {
-double CoordSize(uint32_t coordBits) { return (1 << coordBits) - 1; }
+double CoordSize(uint8_t coordBits)
+{
+  ASSERT_LESS_OR_EQUAL(coordBits, 32, ());
+  return static_cast<double>((uint64_t{1} << coordBits) - 1);
+}
 }  // namespace
 
-uint32_t DoubleToUint32(double x, double min, double max, uint32_t coordBits)
+uint32_t DoubleToUint32(double x, double min, double max, uint8_t coordBits)
 {
   ASSERT_GREATER_OR_EQUAL(coordBits, 1, ());
   ASSERT_LESS_OR_EQUAL(coordBits, 32, ());
   x = base::clamp(x, min, max);
-  uint64_t const fullMask = bits::GetFullMask(static_cast<uint8_t>(coordBits));
-  return static_cast<uint32_t>(0.5 + (x - min) / (max - min) * fullMask);
+  return static_cast<uint32_t>(0.5 + (x - min) / (max - min) * bits::GetFullMask(coordBits));
 }
 
-double Uint32ToDouble(uint32_t x, double min, double max, uint32_t coordBits)
+double Uint32ToDouble(uint32_t x, double min, double max, uint8_t coordBits)
 {
   ASSERT_GREATER_OR_EQUAL(coordBits, 1, ());
   ASSERT_LESS_OR_EQUAL(coordBits, 32, ());
-  return min +
-         static_cast<double>(x) * (max - min) / bits::GetFullMask(static_cast<uint8_t>(coordBits));
+  return min + static_cast<double>(x) * (max - min) / bits::GetFullMask(coordBits);
 }
 
-m2::PointU PointDToPointU(double x, double y, uint32_t coordBits)
+m2::PointU PointDToPointU(double x, double y, uint8_t coordBits)
 {
   x = base::clamp(x, MercatorBounds::kMinX, MercatorBounds::kMaxX);
   y = base::clamp(y, MercatorBounds::kMinY, MercatorBounds::kMaxY);
@@ -44,12 +46,12 @@ m2::PointU PointDToPointU(double x, double y, uint32_t coordBits)
   return m2::PointU(ix, iy);
 }
 
-m2::PointU PointDToPointU(m2::PointD const & pt, uint32_t coordBits)
+m2::PointU PointDToPointU(m2::PointD const & pt, uint8_t coordBits)
 {
   return PointDToPointU(pt.x, pt.y, coordBits);
 }
 
-m2::PointD PointUToPointD(m2::PointU const & pt, uint32_t coordBits)
+m2::PointD PointUToPointD(m2::PointU const & pt, uint8_t coordBits)
 {
   return m2::PointD(static_cast<double>(pt.x) * MercatorBounds::kRangeX / CoordSize(coordBits) +
                         MercatorBounds::kMinX,
@@ -59,35 +61,35 @@ m2::PointD PointUToPointD(m2::PointU const & pt, uint32_t coordBits)
 
 // Obsolete functions ------------------------------------------------------------------------------
 
-int64_t PointToInt64Obsolete(double x, double y, uint32_t coordBits)
+int64_t PointToInt64Obsolete(double x, double y, uint8_t coordBits)
 {
   int64_t const res = static_cast<int64_t>(PointUToUint64Obsolete(PointDToPointU(x, y, coordBits)));
 
   ASSERT_GREATER_OR_EQUAL(res, 0, ("Highest bits of (ix, iy) are not used, so res should be > 0."));
-  ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(res), uint64_t{3} << 2 * POINT_COORD_BITS, ());
+  ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(res), uint64_t{3} << 2 * kPointCoordBits, ());
   return res;
 }
 
-int64_t PointToInt64Obsolete(m2::PointD const & pt, uint32_t coordBits)
+int64_t PointToInt64Obsolete(m2::PointD const & pt, uint8_t coordBits)
 {
   return PointToInt64Obsolete(pt.x, pt.y, coordBits);
 }
 
-m2::PointD Int64ToPointObsolete(int64_t v, uint32_t coordBits)
+m2::PointD Int64ToPointObsolete(int64_t v, uint8_t coordBits)
 {
   ASSERT_GREATER_OR_EQUAL(v, 0, ("Highest bits of (ix, iy) are not used, so res should be > 0."));
-  ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(v), uint64_t{3} << 2 * POINT_COORD_BITS, ());
+  ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(v), uint64_t{3} << 2 * kPointCoordBits, ());
   return PointUToPointD(Uint64ToPointUObsolete(static_cast<uint64_t>(v)), coordBits);
 }
 
-std::pair<int64_t, int64_t> RectToInt64Obsolete(m2::RectD const & r, uint32_t coordBits)
+std::pair<int64_t, int64_t> RectToInt64Obsolete(m2::RectD const & r, uint8_t coordBits)
 {
   int64_t const p1 = PointToInt64Obsolete(r.minX(), r.minY(), coordBits);
   int64_t const p2 = PointToInt64Obsolete(r.maxX(), r.maxY(), coordBits);
   return std::make_pair(p1, p2);
 }
 
-m2::RectD Int64ToRectObsolete(std::pair<int64_t, int64_t> const & p, uint32_t coordBits)
+m2::RectD Int64ToRectObsolete(std::pair<int64_t, int64_t> const & p, uint8_t coordBits)
 {
   m2::PointD const pt1 = Int64ToPointObsolete(p.first, coordBits);
   m2::PointD const pt2 = Int64ToPointObsolete(p.second, coordBits);
diff --git a/coding/point_coding.hpp b/coding/point_coding.hpp
index c8dd7e930d..6d0226569e 100644
--- a/coding/point_coding.hpp
+++ b/coding/point_coding.hpp
@@ -6,41 +6,48 @@
 #include <cstdint>
 #include <utility>
 
-#define POINT_COORD_BITS 30
+uint8_t constexpr kPointCoordBits = 30;
+
+uint8_t constexpr kFeatureSorterPointCoordBits = 27;
 
 // The absolute precision of the point encoding in the mwm files.
 // If both x and y coordinates of two points lie within |kMwmPointAccuracy| of one
 // another we consider the points equal. In other words, |kMwmPointAccuracy| may
 // be used as the eps value for both x and y in Point::EqualDxDy, base::AlmostEqualAbs and such.
 //
-// The constant is loosely tied to MercatorBounds::kRangeX / (1 << POINT_COORD_BITS):
+// The constant is loosely tied to MercatorBounds::kRangeX / (1 << kPointCoordBits):
 //   The range of possible values for point coordinates
 //      MercatorBounds::kRangeX = 360.0
 //   The number of distinct values for each coordinate after encoding
-//      (1 << POINT_COORD_BITS) = 1073741824 ≈ 1e9
+//      (1 << kPointCoordBits) = 1073741824 ≈ 1e9
 //   Distance between two discernible points in the uniform case
 //      360.0 / 1e9 ≈ 4e-7 ≈ 0.04 * |kMwmPointAccuracy|.
 //
 // On the other hand, this should be enough for most purposes because
-// 1e-5 difference in the coordinates of a mercator-proected point corresponds to roughly
+// 1e-5 difference in the coordinates of a mercator-projected point corresponds to roughly
 // 1 meter difference on the equator and we do not expect most OSM points to be mapped
 // with better precision.
 //
 // todo(@m) By this argument, it seems that 1e-6 is a better choice.
+//
+// Note. generator/feature_sorter.cpp uses |kFeatureSorterPointCoordBits|,
+// effectively overriding |kPointCoordBits|. Presumably it does so to guarantee a maximum of
+// 4 bytes in the varint encoding, (27+1 sign(?) bit) / 7 = 4.
+// todo(@m) Clarify how kPointCoordBits and kFeatureSorterPointCoordBits are related.
 double constexpr kMwmPointAccuracy = 1e-5;
 
 // todo(@m) Explain this constant.
 double constexpr kCellIdToPointEps = 1e-4;
 
-uint32_t DoubleToUint32(double x, double min, double max, uint32_t coordBits);
+uint32_t DoubleToUint32(double x, double min, double max, uint8_t coordBits);
 
-double Uint32ToDouble(uint32_t x, double min, double max, uint32_t coordBits);
+double Uint32ToDouble(uint32_t x, double min, double max, uint8_t coordBits);
 
-m2::PointU PointDToPointU(double x, double y, uint32_t coordBits);
+m2::PointU PointDToPointU(double x, double y, uint8_t coordBits);
 
-m2::PointU PointDToPointU(m2::PointD const & pt, uint32_t coordBits);
+m2::PointU PointDToPointU(m2::PointD const & pt, uint8_t coordBits);
 
-m2::PointD PointUToPointD(m2::PointU const & p, uint32_t coordBits);
+m2::PointD PointUToPointD(m2::PointU const & p, uint8_t coordBits);
 
 // All functions below are deprecated and are left
 // only for backward compatibility.
@@ -62,15 +69,15 @@ m2::PointD PointUToPointD(m2::PointU const & p, uint32_t coordBits);
 // when implementing the Z-order curve but we have this
 // written elsewhere (see geometry/cellid.hpp).
 
-int64_t PointToInt64Obsolete(double x, double y, uint32_t coordBits);
+int64_t PointToInt64Obsolete(double x, double y, uint8_t coordBits);
 
-int64_t PointToInt64Obsolete(m2::PointD const & pt, uint32_t coordBits);
+int64_t PointToInt64Obsolete(m2::PointD const & pt, uint8_t coordBits);
 
-m2::PointD Int64ToPointObsolete(int64_t v, uint32_t coordBits);
+m2::PointD Int64ToPointObsolete(int64_t v, uint8_t coordBits);
 
-std::pair<int64_t, int64_t> RectToInt64Obsolete(m2::RectD const & r, uint32_t coordBits);
+std::pair<int64_t, int64_t> RectToInt64Obsolete(m2::RectD const & r, uint8_t coordBits);
 
-m2::RectD Int64ToRectObsolete(std::pair<int64_t, int64_t> const & p, uint32_t coordBits);
+m2::RectD Int64ToRectObsolete(std::pair<int64_t, int64_t> const & p, uint8_t coordBits);
 
 uint64_t PointUToUint64Obsolete(m2::PointU const & pt);
 
diff --git a/generator/camera_info_collector.cpp b/generator/camera_info_collector.cpp
index 85f61f79d4..e25dd94a86 100644
--- a/generator/camera_info_collector.cpp
+++ b/generator/camera_info_collector.cpp
@@ -123,8 +123,8 @@ bool CamerasInfoCollector::ParseIntermediateInfo(std::string const & camerasInfo
   {
     ReadPrimitiveFromSource(src, latInt);
     ReadPrimitiveFromSource(src, lonInt);
-    lat = Uint32ToDouble(latInt, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, POINT_COORD_BITS);
-    lon = Uint32ToDouble(lonInt, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, POINT_COORD_BITS);
+    lat = Uint32ToDouble(latInt, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kPointCoordBits);
+    lon = Uint32ToDouble(lonInt, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kPointCoordBits);
 
     ReadPrimitiveFromSource(src, maxSpeedKmPH);
     ReadPrimitiveFromSource(src, relatedWaysNumber);
diff --git a/generator/camera_node_processor.cpp b/generator/camera_node_processor.cpp
index 5be4650c0f..ffb54a38d1 100644
--- a/generator/camera_node_processor.cpp
+++ b/generator/camera_node_processor.cpp
@@ -128,10 +128,12 @@ void CameraNodeProcessor::Process(OsmElement & p, FeatureParams const & params,
 
   CHECK_GREATER_OR_EQUAL(maxSpeedKmPH, 0, ());
 
-  uint32_t const lat = DoubleToUint32(p.lat, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, POINT_COORD_BITS);
+  uint32_t const lat =
+      DoubleToUint32(p.lat, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kPointCoordBits);
   WriteToSink(*m_fileWriter, lat);
 
-  uint32_t const lon = DoubleToUint32(p.lon, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, POINT_COORD_BITS);
+  uint32_t const lon =
+      DoubleToUint32(p.lon, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kPointCoordBits);
   WriteToSink(*m_fileWriter, lon);
 
   WriteToSink(*m_fileWriter, static_cast<uint32_t>(maxSpeedKmPH));
diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp
index 38c3618ed7..27ef4032df 100644
--- a/generator/coastlines_generator.cpp
+++ b/generator/coastlines_generator.cpp
@@ -21,7 +21,7 @@ using PointT = m2::PointI;
 using RectT = m2::RectI;
 
 CoastlineFeaturesGenerator::CoastlineFeaturesGenerator(uint32_t coastType)
-  : m_merger(POINT_COORD_BITS), m_coastType(coastType)
+  : m_merger(kPointCoordBits), m_coastType(coastType)
 {
 }
 
@@ -35,7 +35,7 @@ namespace
 
   inline PointT D2I(m2::PointD const & p)
   {
-    m2::PointU const pu = PointDToPointU(p, POINT_COORD_BITS);
+    m2::PointU const pu = PointDToPointU(p, kPointCoordBits);
     return PointT(static_cast<int32_t>(pu.x), static_cast<int32_t>(pu.y));
   }
 
@@ -185,7 +185,7 @@ public:
   void operator()(PointT const & p)
   {
     m_points.push_back(PointUToPointD(
-        m2::PointU(static_cast<uint32_t>(p.x), static_cast<uint32_t>(p.y)), POINT_COORD_BITS));
+        m2::PointU(static_cast<uint32_t>(p.x), static_cast<uint32_t>(p.y)), kPointCoordBits));
   }
 
   size_t GetPointsCount() const
diff --git a/generator/feature_helpers.hpp b/generator/feature_helpers.hpp
index 0e4cc7a9bb..34dfd69560 100644
--- a/generator/feature_helpers.hpp
+++ b/generator/feature_helpers.hpp
@@ -41,7 +41,7 @@ private:
   m2::PointD m_midAll;
   size_t m_locCount = 0;
   size_t m_allCount = 0;
-  uint32_t m_coordBits = serial::GeometryCodingParams().GetCoordBits();
+  uint8_t m_coordBits = serial::GeometryCodingParams().GetCoordBits();
   std::vector<CellAndOffset> m_vec;
 };
 
diff --git a/generator/feature_merger.hpp b/generator/feature_merger.hpp
index 0d39e37a74..538768cdfc 100644
--- a/generator/feature_merger.hpp
+++ b/generator/feature_merger.hpp
@@ -73,7 +73,7 @@ class FeatureMergeProcessor
   }
   void Remove(MergedFeatureBuilder1 const * p);
 
-  uint32_t m_coordBits;
+  uint8_t m_coordBits;
 
 public:
   FeatureMergeProcessor(uint32_t coordBits);
diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp
index 63d6536ae7..1eef41a6e4 100644
--- a/generator/feature_sorter.cpp
+++ b/generator/feature_sorter.cpp
@@ -21,6 +21,7 @@
 #include "coding/file_container.hpp"
 #include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
+#include "coding/point_coding.hpp"
 
 #include "geometry/polygon.hpp"
 
@@ -333,7 +334,7 @@ bool GenerateFinalFeatures(feature::GenerateInfo const & info, string const & na
     // Fill mwm header.
     DataHeader header;
 
-    uint32_t coordBits = 27;
+    uint8_t coordBits = kFeatureSorterPointCoordBits;
     if (isWorld)
       coordBits -= ((scales::GetUpperScale() - scales::GetUpperWorldScale()) / 2);
 
diff --git a/generator/generator_tests/coasts_test.cpp b/generator/generator_tests/coasts_test.cpp
index 61761d9262..3dfa742e78 100644
--- a/generator/generator_tests/coasts_test.cpp
+++ b/generator/generator_tests/coasts_test.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 namespace
 {
-m2::PointU D2I(double x, double y) { return PointDToPointU(m2::PointD(x, y), POINT_COORD_BITS); }
+m2::PointU D2I(double x, double y) { return PointDToPointU(m2::PointD(x, y), kPointCoordBits); }
 
 class ProcessCoastsBase
 {
diff --git a/generator/generator_tests/feature_merger_test.cpp b/generator/generator_tests/feature_merger_test.cpp
index 986ad5c858..ea6b4ef022 100644
--- a/generator/generator_tests/feature_merger_test.cpp
+++ b/generator/generator_tests/feature_merger_test.cpp
@@ -61,7 +61,7 @@ UNIT_TEST(FeatureMerger_MultipleTypes)
   arrF[1].AddType(4);
   arrF[2].AddType(4);
 
-  FeatureMergeProcessor processor(POINT_COORD_BITS);
+  FeatureMergeProcessor processor(kPointCoordBits);
 
   for (size_t i = 0; i < count; ++i)
     processor(arrF[i]);
@@ -124,7 +124,7 @@ UNIT_TEST(FeatureMerger_Branches)
   vF.back().AddPoint(P(1, 0));
   vF.back().AddPoint(P(2, 0));
 
-  FeatureMergeProcessor processor(POINT_COORD_BITS);
+  FeatureMergeProcessor processor(kPointCoordBits);
 
   for (size_t i = 0; i < vF.size(); ++i)
   {
@@ -174,7 +174,7 @@ UNIT_TEST(FeatureMerger_Rounds)
   vF.back().AddPoint(P(5, 0));
   vF.back().AddPoint(P(10, 0));
 
-  FeatureMergeProcessor processor(POINT_COORD_BITS);
+  FeatureMergeProcessor processor(kPointCoordBits);
 
   for (size_t i = 0; i < vF.size(); ++i)
   {
diff --git a/generator/generator_tests/triangles_tree_coding_test.cpp b/generator/generator_tests/triangles_tree_coding_test.cpp
index dbb3346758..52d0c891f2 100644
--- a/generator/generator_tests/triangles_tree_coding_test.cpp
+++ b/generator/generator_tests/triangles_tree_coding_test.cpp
@@ -61,7 +61,7 @@ namespace
     serial::TrianglesChainSaver saver(cp);
     tesselator::PointsInfo points;
 
-    m2::PointU (*D2U)(m2::PointD const &, uint32_t) = &PointDToPointU;
+    m2::PointU (*D2U)(m2::PointD const &, uint8_t) = &PointDToPointU;
     info.GetPointsInfo(saver.GetBasePoint(), saver.GetMaxPoint(),
                        std::bind(D2U, std::placeholders::_1, cp.GetCoordBits()), points);
 
diff --git a/generator/geometry_holder.hpp b/generator/geometry_holder.hpp
index e3e6e4a143..780d1700cc 100644
--- a/generator/geometry_holder.hpp
+++ b/generator/geometry_holder.hpp
@@ -188,7 +188,7 @@ private:
 
     // points conversion
     tesselator::PointsInfo points;
-    m2::PointU (*D2U)(m2::PointD const &, uint32_t) = &PointDToPointU;
+    m2::PointU (*D2U)(m2::PointD const &, uint8_t) = &PointDToPointU;
     info.GetPointsInfo(saver.GetBasePoint(), saver.GetMaxPoint(),
                        std::bind(D2U, std::placeholders::_1, cp.GetCoordBits()), points);
 
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index b809c7464a..944a1954ee 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -141,7 +141,7 @@ private:
 
     for (size_t i = 0; i < f.GetPointsCount(); ++i)
     {
-      uint64_t const locationKey = PointToInt64Obsolete(f.GetPoint(i), POINT_COORD_BITS);
+      uint64_t const locationKey = PointToInt64Obsolete(f.GetPoint(i), kPointCoordBits);
       m_posToJoint[locationKey].AddPoint(RoadPoint(id, base::checked_cast<uint32_t>(i)));
     }
   }
diff --git a/generator/world_map_generator.hpp b/generator/world_map_generator.hpp
index 00e2c5cb34..c277acac16 100644
--- a/generator/world_map_generator.hpp
+++ b/generator/world_map_generator.hpp
@@ -254,9 +254,9 @@ class WorldMapGenerator
 
 public:
   explicit WorldMapGenerator(feature::GenerateInfo const & info)
-      : m_worldBucket(info),
-        m_merger(POINT_COORD_BITS - (scales::GetUpperScale() - scales::GetUpperWorldScale()) / 2),
-        m_boundaryChecker(info)
+    : m_worldBucket(info)
+    , m_merger(kPointCoordBits - (scales::GetUpperScale() - scales::GetUpperWorldScale()) / 2)
+    , m_boundaryChecker(info)
   {
     // Do not strip last types for given tags,
     // for example, do not cut 'admin_level' in  'boundary-administrative-XXX'.
diff --git a/indexer/data_header.cpp b/indexer/data_header.cpp
index 17b393c3fa..ab0074d970 100644
--- a/indexer/data_header.cpp
+++ b/indexer/data_header.cpp
@@ -143,7 +143,7 @@ namespace feature
   {
     ReaderSource<ModelReaderPtr> src(r);
     int64_t const base = ReadPrimitiveFromSource<int64_t>(src);
-    m_codingParams = serial::GeometryCodingParams(POINT_COORD_BITS, base);
+    m_codingParams = serial::GeometryCodingParams(kPointCoordBits, base);
 
     m_bounds.first = ReadVarInt<int64_t>(src) + base;
     m_bounds.second = ReadVarInt<int64_t>(src) + base;
diff --git a/local_ads/statistics.cpp b/local_ads/statistics.cpp
index 0c7bc82e0c..5b19de28ac 100644
--- a/local_ads/statistics.cpp
+++ b/local_ads/statistics.cpp
@@ -168,7 +168,7 @@ std::list<local_ads::Event> ReadEvents(std::string const & fileName)
     ReadPackedData(src, [&result](local_ads::Statistics::PackedData && data,
                                   std::string const & countryId, int64_t mwmVersion,
                                   local_ads::Timestamp const & baseTimestamp) {
-      auto const mercatorPt = Int64ToPointObsolete(data.m_mercator, POINT_COORD_BITS);
+      auto const mercatorPt = Int64ToPointObsolete(data.m_mercator, kPointCoordBits);
       result.emplace_back(static_cast<local_ads::EventType>(data.m_eventType), mwmVersion, countryId,
                           data.m_featureIndex, data.m_zoomLevel,
                           baseTimestamp + std::chrono::seconds(data.m_seconds),
@@ -343,7 +343,7 @@ std::list<Event> Statistics::WriteEvents(std::list<Event> & events, std::string
       data.m_zoomLevel = event.m_zoomLevel;
       data.m_eventType = static_cast<uint8_t>(event.m_type);
       auto const mercatorPt = MercatorBounds::FromLatLon(event.m_latitude, event.m_longitude);
-      data.m_mercator = PointToInt64Obsolete(mercatorPt, POINT_COORD_BITS);
+      data.m_mercator = PointToInt64Obsolete(mercatorPt, kPointCoordBits);
       data.m_accuracy = event.m_accuracyInMeters;
       WritePackedData(*writer, std::move(data));
     }
diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp
index c999a4b66d..e7da7c4a3f 100644
--- a/map/local_ads_manager.cpp
+++ b/map/local_ads_manager.cpp
@@ -573,7 +573,8 @@ void LocalAdsManager::WriteFeaturesFile(std::string const & featuresFile)
         packedData.clear();
       }
       lastMwm = fid.m_mwmId;
-      packedData.emplace_back(fid.m_index, PointToInt64Obsolete(entry.second.m_position, POINT_COORD_BITS));
+      packedData.emplace_back(fid.m_index,
+                              PointToInt64Obsolete(entry.second.m_position, kPointCoordBits));
     }
     if (!packedData.empty())
     {
@@ -925,7 +926,7 @@ void LocalAdsFeaturesReader::ReadCampaignFeaturesFile()
 
       for (auto const & data : packedData)
       {
-        auto const pos = Int64ToPointObsolete(data.m_mercator, POINT_COORD_BITS);
+        auto const pos = Int64ToPointObsolete(data.m_mercator, kPointCoordBits);
         m_features.push_back(CampaignFeature(mwmVersion, countryId, data.m_featureIndex,
                                              MercatorBounds::YToLat(pos.y), MercatorBounds::XToLon(pos.x)));
       }
diff --git a/transit/transit_serdes.hpp b/transit/transit_serdes.hpp
index 2f53098bff..50c51dbcc9 100644
--- a/transit/transit_serdes.hpp
+++ b/transit/transit_serdes.hpp
@@ -32,7 +32,7 @@ namespace transit
 // Let us assume that it takes less than 10^7 seconds (115 days) to get from one station to a neighboring one.
 double constexpr kMinDoubleAtTransitSection = kInvalidWeight;
 double constexpr kMaxDoubleAtTransitSection = 10000000.0;
-uint32_t constexpr kDoubleBits = 32;
+uint8_t constexpr kDoubleBits = 32;
 
 template <typename Sink>
 class Serializer
@@ -79,7 +79,7 @@ public:
 
   void operator()(m2::PointD const & p, char const * /* name */ = nullptr)
   {
-    WriteVarInt(m_sink, PointToInt64Obsolete(p, POINT_COORD_BITS));
+    WriteVarInt(m_sink, PointToInt64Obsolete(p, kPointCoordBits));
   }
 
   void operator()(std::vector<m2::PointD> const & vs, char const * /* name */ = nullptr)
@@ -89,7 +89,7 @@ public:
     m2::PointU lastEncodedPoint;
     for (auto const & p : vs)
     {
-      m2::PointU const pointU = PointDToPointU(p, POINT_COORD_BITS);
+      m2::PointU const pointU = PointDToPointU(p, kPointCoordBits);
       WriteVarUint(m_sink, coding::EncodePointDeltaAsUint(pointU, lastEncodedPoint));
       lastEncodedPoint = pointU;
     }
@@ -211,7 +211,7 @@ public:
 
   void operator()(m2::PointD & p, char const * /* name */ = nullptr)
   {
-    p = Int64ToPointObsolete(ReadVarInt<int64_t, Source>(m_source), POINT_COORD_BITS);
+    p = Int64ToPointObsolete(ReadVarInt<int64_t, Source>(m_source), kPointCoordBits);
   }
 
   void operator()(Edge::WrappedEdgeId & id, char const * /* name */ = nullptr)
@@ -290,7 +290,7 @@ public:
     {
       m2::PointU const pointU = coding::DecodePointDeltaFromUint(
           ReadVarUint<uint64_t, Source>(m_source), lastDecodedPoint);
-      p = PointUToPointD(pointU, POINT_COORD_BITS);
+      p = PointUToPointD(pointU, kPointCoordBits);
       lastDecodedPoint = pointU;
     }
   }