diff --git a/map/extrapolation/extrapolator.cpp b/map/extrapolation/extrapolator.cpp
index bb44b7d73e..b8c1a84867 100644
--- a/map/extrapolation/extrapolator.cpp
+++ b/map/extrapolation/extrapolator.cpp
@@ -127,7 +127,7 @@ void Extrapolator::ExtrapolatedLocationUpdate()
 
   {
     lock_guard<mutex> guard(m_mutex);
-    if (m_extrapolationCounter != m_extrapolationCounterUndefined)
+    if (m_extrapolationCounter != kExtrapolationCounterUndefined)
       ++m_extrapolationCounter;
   }
 
@@ -145,7 +145,7 @@ bool Extrapolator::DoesExtrapolationWork(uint64_t extrapolationTimeMs) const
   // It may happen in rare cases because GpsInfo::m_timestamp is not monotonic generally.
   // Please see comment in declaration of class GpsInfo for details.
 
-  if (!m_isEnabled || m_extrapolationCounter == m_extrapolationCounterUndefined ||
+  if (!m_isEnabled || m_extrapolationCounter == kExtrapolationCounterUndefined ||
       !m_lastGpsInfo.IsValid() || !m_beforeLastGpsInfo.IsValid() ||
       m_beforeLastGpsInfo.m_timestamp >= m_lastGpsInfo.m_timestamp)
   {
diff --git a/map/extrapolation/extrapolator.hpp b/map/extrapolation/extrapolator.hpp
index 2a6de3b1a6..df85df974a 100644
--- a/map/extrapolation/extrapolator.hpp
+++ b/map/extrapolation/extrapolator.hpp
@@ -17,11 +17,11 @@ location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1,
 
 class Extrapolator
 {
+  static uint64_t constexpr kExtrapolationCounterUndefined = std::numeric_limits<uint64_t>::max();
+
 public:
   using ExtrapolatedLocationUpdateFn = std::function<void(location::GpsInfo const &)>;
 
-  static uint64_t constexpr m_extrapolationCounterUndefined = std::numeric_limits<uint64_t>::max();
-
   /// \param update is a function which is called with params according to extrapolated position.
   /// |update| will be called on gui thread.
   explicit Extrapolator(ExtrapolatedLocationUpdateFn const & update);
@@ -43,6 +43,6 @@ private:
   ExtrapolatedLocationUpdateFn m_extrapolatedLocationUpdate;
   location::GpsInfo m_lastGpsInfo;
   location::GpsInfo m_beforeLastGpsInfo;
-  uint64_t m_extrapolationCounter = m_extrapolationCounterUndefined;
+  uint64_t m_extrapolationCounter = kExtrapolationCounterUndefined;
 };
 }  // namespace extrapolation
diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 6ca3e533b7..82c732c2ce 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -1243,7 +1243,7 @@ void RoutingManager::OnExtrapolatedLocationUpdate(location::GpsInfo const & info
 {
   location::GpsInfo gpsInfo(info);
   if (!m_drapeEngine)
-    m_gpsInfoCache = my::make_unique<location::GpsInfo>(gpsInfo);
+    m_gpsInfoCache = make_unique<location::GpsInfo>(gpsInfo);
 
   auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
   m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, gpsInfo,