diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 317b705988..adbb7e7b81 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -1317,7 +1317,7 @@ Java_com_mapswithme_maps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jcl
       jni::ToJavaString(env, info.m_targetUnitsSuffix), jni::ToJavaString(env, info.m_distToTurn),
       jni::ToJavaString(env, info.m_turnUnitsSuffix), jni::ToJavaString(env, info.m_sourceName),
       jni::ToJavaString(env, info.m_displayedStreetName), info.m_completionPercent, info.m_turn, info.m_nextTurn, info.m_pedestrianTurn,
-      info.m_pedestrianDirectionPos.lat, info.m_pedestrianDirectionPos.lon, info.m_exitNum, info.m_time, jLanes,
+      info.m_pedestrianDirectionPos.m_lat, info.m_pedestrianDirectionPos.m_lon, info.m_exitNum, info.m_time, jLanes,
       static_cast<jboolean>(isSpeedLimitExceeded), static_cast<jboolean>(shouldPlaySignal));
   ASSERT(result, (jni::DescribeException()));
   return result;
diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp
index 867429a5a6..af7a717be5 100644
--- a/android/jni/com/mapswithme/maps/SearchEngine.cpp
+++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp
@@ -327,7 +327,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
   {
     jni::TScopedLocalRef name(env, jni::ToJavaString(env, result.GetString()));
     jni::TScopedLocalRef suggest(env, jni::ToJavaString(env, result.GetSuggestionString()));
-    jobject ret = env->NewObject(g_resultClass, g_suggestConstructor, name.get(), suggest.get(), ll.lat, ll.lon, ranges.get());
+    jobject ret = env->NewObject(g_resultClass, g_suggestConstructor, name.get(), suggest.get(), ll.m_lat, ll.m_lon, ranges.get());
     ASSERT(ret, ());
     return ret;
   }
@@ -365,7 +365,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
                                                       g_popularityConstructor,
                                                       static_cast<jint>(result.GetRankingInfo().m_popularity)));
   jobject ret =
-      env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.lat, ll.lon,
+      env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.m_lat, ll.m_lon,
                      ranges.get(), result.IsHotel(), productInfo.m_isLocalAdsCustomer,
                      popularity.get());
   ASSERT(ret, ());
diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp
index ead7069ca1..bbdfd8048f 100644
--- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp
+++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp
@@ -207,7 +207,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
   {
     return CreateMapObject(env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(),
                            info.GetID().m_index, kMyPosition, info.GetTitle(),
-                           info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon,
+                           info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon,
                            info.GetAddress(), {}, "", jbanners.get(), jTaxiTypes.get(),
                            info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(),
                            info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(),
@@ -219,7 +219,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
   {
     return CreateMapObject(
         env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index,
-        kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon,
+        kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon,
         info.GetAddress(), info.GetMetadata(), info.GetApiUrl(), jbanners.get(), jTaxiTypes.get(),
         info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(), info.GetOpeningMode(),
         info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get(),
@@ -228,7 +228,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
 
   return CreateMapObject(
       env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, kPoi,
-      info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon,
+      info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon,
       info.GetAddress(), info.IsFeature() ? info.GetMetadata() : Metadata(), "", jbanners.get(),
       jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(),
       info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(),
diff --git a/coding/coding_tests/traffic_test.cpp b/coding/coding_tests/traffic_test.cpp
index 2ba6b3e034..3727d72cec 100644
--- a/coding/coding_tests/traffic_test.cpp
+++ b/coding/coding_tests/traffic_test.cpp
@@ -21,8 +21,8 @@ double CalculateLength(vector<TrafficGPSEncoder::DataPoint> const & path)
   double res = 0;
   for (size_t i = 1; i < path.size(); ++i)
   {
-    auto p1 = MercatorBounds::FromLatLon(path[i - 1].m_latLon.lat, path[i - 1].m_latLon.lon);
-    auto p2 = MercatorBounds::FromLatLon(path[i].m_latLon.lat, path[i].m_latLon.lon);
+    auto p1 = MercatorBounds::FromLatLon(path[i - 1].m_latLon.m_lat, path[i - 1].m_latLon.m_lon);
+    auto p2 = MercatorBounds::FromLatLon(path[i].m_latLon.m_lat, path[i].m_latLon.m_lon);
     res += MercatorBounds::DistanceOnEarth(p1, p2);
   }
   return res;
@@ -48,10 +48,10 @@ void Test(vector<TrafficGPSEncoder::DataPoint> & points)
     {
       TEST_EQUAL(points[i].m_timestamp, result[i].m_timestamp,
                  (points[i].m_timestamp, result[i].m_timestamp));
-      TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.lat, result[i].m_latLon.lat, kEps),
-           (points[i].m_latLon.lat, result[i].m_latLon.lat));
-      TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.lon, result[i].m_latLon.lon, kEps),
-           (points[i].m_latLon.lon, result[i].m_latLon.lon));
+      TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.m_lat, result[i].m_latLon.m_lat, kEps),
+           (points[i].m_latLon.m_lat, result[i].m_latLon.m_lat));
+      TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.m_lon, result[i].m_latLon.m_lon, kEps),
+           (points[i].m_latLon.m_lon, result[i].m_latLon.m_lon));
     }
 
     if (version == TrafficGPSEncoder::kLatestVersion)
diff --git a/coding/serdes_json.hpp b/coding/serdes_json.hpp
index 61ae2af589..46977fbf31 100644
--- a/coding/serdes_json.hpp
+++ b/coding/serdes_json.hpp
@@ -165,8 +165,8 @@ public:
   void operator()(ms::LatLon const & ll, char const * name = nullptr)
   {
     NewScopeWith(base::NewJSONObject(), name, [this, &ll] {
-      (*this)(ll.lat, "lat");
-      (*this)(ll.lon, "lon");
+      (*this)(ll.m_lat, "lat");
+      (*this)(ll.m_lon, "lon");
     });
   }
 
@@ -374,8 +374,8 @@ public:
   void operator()(ms::LatLon & ll, char const * name = nullptr)
   {
     json_t * outerContext = SaveContext(name);
-    (*this)(ll.lat, "lat");
-    (*this)(ll.lon, "lon");
+    (*this)(ll.m_lat, "lat");
+    (*this)(ll.m_lon, "lon");
     RestoreContext(outerContext);
   }
 
diff --git a/coding/traffic.hpp b/coding/traffic.hpp
index 363cc56e2f..d3581c6120 100644
--- a/coding/traffic.hpp
+++ b/coding/traffic.hpp
@@ -88,9 +88,9 @@ private:
     if (!points.empty())
     {
       uint64_t const firstTimestamp = points[0].m_timestamp;
-      uint32_t const firstLat = DoubleToUint32(points[0].m_latLon.lat, ms::LatLon::kMinLat,
+      uint32_t const firstLat = DoubleToUint32(points[0].m_latLon.m_lat, ms::LatLon::kMinLat,
                                                ms::LatLon::kMaxLat, kCoordBits);
-      uint32_t const firstLon = DoubleToUint32(points[0].m_latLon.lon, ms::LatLon::kMinLon,
+      uint32_t const firstLon = DoubleToUint32(points[0].m_latLon.m_lon, ms::LatLon::kMinLon,
                                                ms::LatLon::kMaxLon, kCoordBits);
       WriteVarUint(writer, firstTimestamp);
       WriteVarUint(writer, firstLat);
@@ -102,9 +102,9 @@ private:
       ASSERT_LESS_OR_EQUAL(points[i - 1].m_timestamp, points[i].m_timestamp, ());
 
       uint64_t const deltaTimestamp = points[i].m_timestamp - points[i - 1].m_timestamp;
-      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.lat - points[i - 1].m_latLon.lat,
+      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.m_lat - points[i - 1].m_latLon.m_lat,
                                          kMinDeltaLat, kMaxDeltaLat, kCoordBits);
-      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.lon - points[i - 1].m_latLon.lon,
+      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.m_lon - points[i - 1].m_latLon.m_lon,
                                          kMinDeltaLon, kMaxDeltaLon, kCoordBits);
 
       WriteVarUint(writer, deltaTimestamp);
@@ -125,9 +125,9 @@ private:
     if (!points.empty())
     {
       uint64_t const firstTimestamp = points[0].m_timestamp;
-      uint32_t const firstLat = DoubleToUint32(points[0].m_latLon.lat, ms::LatLon::kMinLat,
+      uint32_t const firstLat = DoubleToUint32(points[0].m_latLon.m_lat, ms::LatLon::kMinLat,
                                                ms::LatLon::kMaxLat, kCoordBits);
-      uint32_t const firstLon = DoubleToUint32(points[0].m_latLon.lon, ms::LatLon::kMinLon,
+      uint32_t const firstLon = DoubleToUint32(points[0].m_latLon.m_lon, ms::LatLon::kMinLon,
                                                ms::LatLon::kMaxLon, kCoordBits);
       uint32_t const traffic = points[0].m_traffic;
       WriteVarUint(writer, firstTimestamp);
@@ -141,9 +141,9 @@ private:
       ASSERT_LESS_OR_EQUAL(points[i - 1].m_timestamp, points[i].m_timestamp, ());
 
       uint64_t const deltaTimestamp = points[i].m_timestamp - points[i - 1].m_timestamp;
-      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.lat - points[i - 1].m_latLon.lat,
+      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.m_lat - points[i - 1].m_latLon.m_lat,
                                          kMinDeltaLat, kMaxDeltaLat, kCoordBits);
-      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.lon - points[i - 1].m_latLon.lon,
+      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.m_lon - points[i - 1].m_latLon.m_lon,
                                          kMinDeltaLon, kMaxDeltaLon, kCoordBits);
 
       uint32_t const traffic = points[i - 1].m_traffic;
diff --git a/editor/changeset_wrapper.cpp b/editor/changeset_wrapper.cpp
index ed64dcfc7a..e9b9caaba2 100644
--- a/editor/changeset_wrapper.cpp
+++ b/editor/changeset_wrapper.cpp
@@ -29,7 +29,7 @@ m2::RectD GetBoundingRect(vector<m2::PointD> const & geometry)
   for (auto const & p : geometry)
   {
     auto const latLon = MercatorBounds::ToLatLon(p);
-    rect.Add({latLon.lon, latLon.lat});
+    rect.Add({latLon.m_lon, latLon.m_lat});
   }
   return rect;
 }
@@ -132,7 +132,7 @@ ChangesetWrapper::~ChangesetWrapper()
 void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & ll, pugi::xml_document & doc,
                                       double radiusInMeters)
 {
-  auto const response = m_api.GetXmlFeaturesAtLatLon(ll.lat, ll.lon, radiusInMeters);
+  auto const response = m_api.GetXmlFeaturesAtLatLon(ll.m_lat, ll.m_lon, radiusInMeters);
   if (response.first != OsmOAuth::HTTP::OK)
     MYTHROW(HttpErrorException, ("HTTP error", response, "with GetXmlFeaturesAtLatLon", ll));
 
@@ -145,7 +145,7 @@ void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & ll, pugi::xml_document
 void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & min, ms::LatLon const & max,
                                       pugi::xml_document & doc)
 {
-  auto const response = m_api.GetXmlFeaturesInRect(min.lat, min.lon, max.lat, max.lon);
+  auto const response = m_api.GetXmlFeaturesInRect(min.m_lat, min.m_lon, max.m_lat, max.m_lon);
   if (response.first != OsmOAuth::HTTP::OK)
     MYTHROW(HttpErrorException, ("HTTP error", response, "with GetXmlFeaturesInRect", min, max));
 
diff --git a/editor/editor_notes.cpp b/editor/editor_notes.cpp
index 5056a82bb7..4a7f46ea9f 100644
--- a/editor/editor_notes.cpp
+++ b/editor/editor_notes.cpp
@@ -39,11 +39,11 @@ bool LoadFromXml(pugi::xml_document const & xml, std::list<editor::Note> & notes
 
     auto const node = xNode.node();
     auto const lat = node.attribute("lat");
-    if (!lat || !strings::to_double(lat.value(), latLon.lat))
+    if (!lat || !strings::to_double(lat.value(), latLon.m_lat))
       continue;
 
     auto const lon = node.attribute("lon");
-    if (!lon || !strings::to_double(lon.value(), latLon.lon))
+    if (!lon || !strings::to_double(lon.value(), latLon.m_lon))
       continue;
 
     auto const text = node.attribute("text");
@@ -66,9 +66,9 @@ void SaveToXml(std::list<editor::Note> const & notes, pugi::xml_document & xml,
     auto node = root.append_child("note");
 
     node.append_attribute("lat") =
-        strings::to_string_dac(note.m_point.lat, kDigitsAfterComma).data();
+        strings::to_string_dac(note.m_point.m_lat, kDigitsAfterComma).data();
     node.append_attribute("lon") =
-        strings::to_string_dac(note.m_point.lon, kDigitsAfterComma).data();
+        strings::to_string_dac(note.m_point.m_lon, kDigitsAfterComma).data();
     node.append_attribute("text") = note.m_note.data();
   }
 }
@@ -144,7 +144,7 @@ void Notes::CreateNote(ms::LatLon const & latLon, std::string const & text)
     return;
   }
 
-  if (!MercatorBounds::ValidLat(latLon.lat) || !MercatorBounds::ValidLon(latLon.lon))
+  if (!MercatorBounds::ValidLat(latLon.m_lat) || !MercatorBounds::ValidLon(latLon.m_lon))
   {
     LOG(LWARNING, ("A note attached to a wrong latLon", latLon));
     return;
diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index b2f3351ddd..23dfd66b71 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -814,7 +814,7 @@ void Editor::UploadChanges(string const & key, string const & secret, ChangesetT
                {"our", ourDebugFeatureString},
                {"mwm", fti.m_object.GetID().GetMwmName()},
                {"mwm_version", strings::to_string(fti.m_object.GetID().GetMwmVersion())}},
-              alohalytics::Location::FromLatLon(ll.lat, ll.lon));
+              alohalytics::Location::FromLatLon(ll.m_lat, ll.m_lon));
         }
 
         GetPlatform().RunTask(Platform::Thread::Gui,
diff --git a/editor/server_api.cpp b/editor/server_api.cpp
index 26149aeaab..4689ed7ceb 100644
--- a/editor/server_api.cpp
+++ b/editor/server_api.cpp
@@ -122,8 +122,8 @@ void ServerApi06::CloseChangeSet(uint64_t changesetId) const
 uint64_t ServerApi06::CreateNote(ms::LatLon const & ll, std::string const & message) const
 {
   CHECK(!message.empty(), ("Note content should not be empty."));
-  std::string const params = "?lat=" + strings::to_string_dac(ll.lat, 7) +
-                             "&lon=" + strings::to_string_dac(ll.lon, 7) +
+  std::string const params = "?lat=" + strings::to_string_dac(ll.m_lat, 7) +
+                             "&lon=" + strings::to_string_dac(ll.m_lon, 7) +
                              "&text=" + UrlEncode(message + " #mapsme");
   OsmOAuth::Response const response = m_auth.Request("/notes" + params, "POST");
   if (response.first != OsmOAuth::HTTP::OK)
@@ -200,7 +200,7 @@ OsmOAuth::Response ServerApi06::GetXmlFeaturesAtLatLon(double lat, double lon, d
 
 OsmOAuth::Response ServerApi06::GetXmlFeaturesAtLatLon(ms::LatLon const & ll, double radiusInMeters) const
 {
-  return GetXmlFeaturesAtLatLon(ll.lat, ll.lon, radiusInMeters);
+  return GetXmlFeaturesAtLatLon(ll.m_lat, ll.m_lon, radiusInMeters);
 }
 
 } // namespace osm
diff --git a/editor/xml_feature.cpp b/editor/xml_feature.cpp
index 48eeab5cbc..cc8153cbe8 100644
--- a/editor/xml_feature.cpp
+++ b/editor/xml_feature.cpp
@@ -40,12 +40,12 @@ pugi::xml_node FindTag(pugi::xml_document const & document, string const & key)
 ms::LatLon GetLatLonFromNode(pugi::xml_node const & node)
 {
   ms::LatLon ll;
-  if (!strings::to_double(node.attribute("lat").value(), ll.lat))
+  if (!strings::to_double(node.attribute("lat").value(), ll.m_lat))
   {
     MYTHROW(editor::NoLatLon,
             ("Can't parse lat attribute:", string(node.attribute("lat").value())));
   }
-  if (!strings::to_double(node.attribute("lon").value(), ll.lon))
+  if (!strings::to_double(node.attribute("lon").value(), ll.m_lon))
   {
     MYTHROW(editor::NoLatLon,
             ("Can't parse lon attribute:", string(node.attribute("lon").value())));
@@ -203,8 +203,8 @@ ms::LatLon XMLFeature::GetCenter() const
 void XMLFeature::SetCenter(ms::LatLon const & ll)
 {
   ASSERT_EQUAL(GetType(), Type::Node, ());
-  SetAttribute("lat", strings::to_string_dac(ll.lat, kLatLonTolerance));
-  SetAttribute("lon", strings::to_string_dac(ll.lon, kLatLonTolerance));
+  SetAttribute("lat", strings::to_string_dac(ll.m_lat, kLatLonTolerance));
+  SetAttribute("lon", strings::to_string_dac(ll.m_lon, kLatLonTolerance));
 }
 
 void XMLFeature::SetCenter(m2::PointD const & mercatorCenter)
diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp
index 23667e6b45..4d4a862c20 100644
--- a/feature_list/feature_list.cpp
+++ b/feature_list/feature_list.cpp
@@ -124,8 +124,8 @@ bool HasAtm(FeatureType & f)
 string BuildUniqueId(ms::LatLon const & coords, string const & name)
 {
   ostringstream ss;
-  ss << strings::to_string_with_digits_after_comma(coords.lat, 6) << ','
-     << strings::to_string_with_digits_after_comma(coords.lon, 6) << ',' << name;
+  ss << strings::to_string_with_digits_after_comma(coords.m_lat, 6) << ','
+     << strings::to_string_with_digits_after_comma(coords.m_lon, 6) << ',' << name;
   uint32_t hash = 0;
   for (char const c : ss.str())
     hash = hash * 101 + c;
@@ -238,8 +238,8 @@ public:
         osmId = f.GetMetadata().Get(feature::Metadata::FMD_SPONSORED_ID) + "00";
     }
     string const & uid = BuildUniqueId(ll, name);
-    string const & lat = strings::to_string_with_digits_after_comma(ll.lat, 6);
-    string const & lon = strings::to_string_with_digits_after_comma(ll.lon, 6);
+    string const & lat = strings::to_string_with_digits_after_comma(ll.m_lat, 6);
+    string const & lon = strings::to_string_with_digits_after_comma(ll.m_lon, 6);
     search::ReverseGeocoder::Address addr;
     string addrStreet = "";
     string addrHouse = "";
diff --git a/generator/booking_dataset.cpp b/generator/booking_dataset.cpp
index 2e7fe1aa10..64a81a88ce 100644
--- a/generator/booking_dataset.cpp
+++ b/generator/booking_dataset.cpp
@@ -25,8 +25,8 @@ BookingHotel::BookingHotel(std::string const & src)
 
   CLOG(LDEBUG, strings::to_uint(rec[FieldIndex(Fields::Id)], m_id.Get()), ());
   // TODO(mgsergio): Use ms::LatLon.
-  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Latitude)], m_latLon.lat), ());
-  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Longtitude)], m_latLon.lon), ());
+  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Latitude)], m_latLon.m_lat), ());
+  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Longtitude)], m_latLon.m_lon), ());
 
   m_name = rec[FieldIndex(Fields::Name)];
   m_address = rec[FieldIndex(Fields::Address)];
@@ -87,7 +87,7 @@ void BookingDataset::BuildObject(Object const & hotel,
 {
   FeatureBuilder1 fb;
 
-  fb.SetCenter(MercatorBounds::FromLatLon(hotel.m_latLon.lat, hotel.m_latLon.lon));
+  fb.SetCenter(MercatorBounds::FromLatLon(hotel.m_latLon.m_lat, hotel.m_latLon.m_lon));
 
   auto & metadata = fb.GetMetadata();
   metadata.Set(feature::Metadata::FMD_SPONSORED_ID, strings::to_string(hotel.m_id.Get()));
diff --git a/generator/booking_quality_check/booking_quality_check.cpp b/generator/booking_quality_check/booking_quality_check.cpp
index ee3f2d93ff..075a3f6a18 100644
--- a/generator/booking_quality_check/booking_quality_check.cpp
+++ b/generator/booking_quality_check/booking_quality_check.cpp
@@ -69,7 +69,7 @@ string PrintBuilder(FeatureBuilder1 const & fb)
     s << "Address: " << address << '\t';
 
   auto const center = MercatorBounds::ToLatLon(fb.GetKeyPoint());
-  s << "lat: " << center.lat << " lon: " << center.lon << '\t';
+  s << "lat: " << center.m_lat << " lon: " << center.m_lon << '\t';
 
   if (fb.GetGeomType() == feature::GeomType::Point)
     s << "GeomType: Point";
@@ -229,8 +229,8 @@ void GenerateFactors(Dataset const & dataset,
     ost << "# " << PrintBuilder(feature) << endl;
     ost << "# " << object << endl;
     ost << "# URL: https://www.openstreetmap.org/?mlat="
-        << object.m_latLon.lat << "&mlon=" << object.m_latLon.lon << "#map=18/"
-        << object.m_latLon.lat << "/" << object.m_latLon.lon << endl;
+        << object.m_latLon.m_lat << "&mlon=" << object.m_latLon.m_lon << "#map=18/"
+        << object.m_latLon.m_lat << "/" << object.m_latLon.m_lon << endl;
   }
 }
 
@@ -281,8 +281,8 @@ void GenerateSample(Dataset const & dataset,
       outStream << "# " << PrintBuilder(fb) << endl;
       outStream << "# " << object << endl;
       outStream << "# URL: https://www.openstreetmap.org/?mlat="
-                << object.m_latLon.lat << "&mlon=" << object.m_latLon.lon
-                << "#map=18/" << object.m_latLon.lat << "/" << object.m_latLon.lon << endl;
+                << object.m_latLon.m_lat << "&mlon=" << object.m_latLon.m_lon
+                << "#map=18/" << object.m_latLon.m_lat << "/" << object.m_latLon.m_lon << endl;
     }
     if (!sponsoredIndexes.empty())
       outStream << endl << endl;
diff --git a/generator/borders.cpp b/generator/borders.cpp
index 0e39e831c0..c3e8283fd8 100644
--- a/generator/borders.cpp
+++ b/generator/borders.cpp
@@ -263,7 +263,7 @@ void UnpackBorders(string const & baseDir, string const & targetDir)
       for (auto p : points)
       {
         ms::LatLon const ll = MercatorBounds::ToLatLon(p);
-        poly << "    " << scientific << ll.lon << "    " << ll.lat << endl;
+        poly << "    " << scientific << ll.m_lon << "    " << ll.m_lat << endl;
       }
       poly << "END" << endl;
     }
diff --git a/generator/extract_addr/extract_addr.cpp b/generator/extract_addr/extract_addr.cpp
index a81d349fc8..56617d2a6c 100644
--- a/generator/extract_addr/extract_addr.cpp
+++ b/generator/extract_addr/extract_addr.cpp
@@ -52,8 +52,8 @@ void PrintFeature(FeatureBuilder1 const & fb, uint64_t)
 
   auto const center = MercatorBounds::ToLatLon(fb.GetKeyPoint());
   auto coordinates = base::NewJSONArray();
-  ToJSONArray(*coordinates, std::round(center.lon * kRoundDigits) / kRoundDigits);
-  ToJSONArray(*coordinates, std::round(center.lat * kRoundDigits) / kRoundDigits);
+  ToJSONArray(*coordinates, std::round(center.m_lon * kRoundDigits) / kRoundDigits);
+  ToJSONArray(*coordinates, std::round(center.m_lat * kRoundDigits) / kRoundDigits);
   auto geometry = base::NewJSONObject();
   ToJSONObject(*geometry, "type", "Point");
   ToJSONObject(*geometry, "coordinates", coordinates);
diff --git a/generator/geo_objects/geo_objects.cpp b/generator/geo_objects/geo_objects.cpp
index c6083eb894..4653ad7f32 100644
--- a/generator/geo_objects/geo_objects.cpp
+++ b/generator/geo_objects/geo_objects.cpp
@@ -55,8 +55,8 @@ void UpdateCoordinates(m2::PointD const & point, base::Json json)
   if (json_array_size(coordinates) == 2)
   {
     auto const latLon = MercatorBounds::ToLatLon(point);
-    json_array_set_new(coordinates, 0, ToJSON(latLon.lat).release());
-    json_array_set_new(coordinates, 1, ToJSON(latLon.lon).release());
+    json_array_set_new(coordinates, 0, ToJSON(latLon.m_lat).release());
+    json_array_set_new(coordinates, 1, ToJSON(latLon.m_lon).release());
   }
 }
 
diff --git a/generator/opentable_dataset.cpp b/generator/opentable_dataset.cpp
index 80cfaf2424..6cdbb801f0 100644
--- a/generator/opentable_dataset.cpp
+++ b/generator/opentable_dataset.cpp
@@ -25,8 +25,8 @@ OpentableRestaurant::OpentableRestaurant(std::string const & src)
                                           boost::replace_all_copy(src, "\t", "\\t")));
 
   CLOG(LDEBUG, strings::to_uint(rec[FieldIndex(Fields::Id)], m_id.Get()), ());
-  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Latitude)], m_latLon.lat), ());
-  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Longtitude)], m_latLon.lon), ());
+  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Latitude)], m_latLon.m_lat), ());
+  CLOG(LDEBUG, strings::to_double(rec[FieldIndex(Fields::Longtitude)], m_latLon.m_lon), ());
 
   m_name = rec[FieldIndex(Fields::Name)];
   m_address = rec[FieldIndex(Fields::Address)];
diff --git a/generator/popularity.cpp b/generator/popularity.cpp
index ad6467b54c..887cb389c3 100644
--- a/generator/popularity.cpp
+++ b/generator/popularity.cpp
@@ -302,7 +302,7 @@ void WriteLines(std::vector<PopularityLine> const & lines, std::string const & o
       stream << *line.m_parent;
 
     auto const center = MercatorBounds::ToLatLon(line.m_center);
-    stream << ";" << center.lat << ";" << center.lon << ";"
+    stream << ";" << center.m_lat << ";" << center.m_lon << ";"
            << line.m_type << ";" << line.m_name << "\n";
   }
 }
diff --git a/generator/regions/node.cpp b/generator/regions/node.cpp
index 909039004a..6d54bd7cb0 100644
--- a/generator/regions/node.cpp
+++ b/generator/regions/node.cpp
@@ -157,7 +157,7 @@ void PrintTree(Node::Ptr node, std::ostream & stream = std::cout, std::string pr
          << DebugPrint(d.GetId())
          << ";" << (label ? label : "-")
          << ";" << static_cast<size_t>(d.GetRank())
-         << ";[" << std::fixed << std::setprecision(7) << center.lat << "," << center.lon << "])"
+         << ";[" << std::fixed << std::setprecision(7) << center.m_lat << "," << center.m_lon << "])"
          << std::endl;
   for (size_t i = 0, size = children.size(); i < size; ++i)
     PrintTree(children[i], stream, prefix, i == size - 1);
diff --git a/generator/regions/to_string_policy.cpp b/generator/regions/to_string_policy.cpp
index a06bd680c4..c903dfb465 100644
--- a/generator/regions/to_string_policy.cpp
+++ b/generator/regions/to_string_policy.cpp
@@ -21,8 +21,8 @@ std::string JsonPolicy::ToString(NodePath const & path) const
   auto coordinates = base::NewJSONArray();
   auto const tmpCenter = main.GetCenter();
   auto const center = MercatorBounds::ToLatLon({tmpCenter.get<0>(), tmpCenter.get<1>()});
-  ToJSONArray(*coordinates, center.lat);
-  ToJSONArray(*coordinates, center.lon);
+  ToJSONArray(*coordinates, center.m_lat);
+  ToJSONArray(*coordinates, center.m_lon);
   ToJSONObject(*geometry, "coordinates", coordinates);
 
   auto localeEn = base::NewJSONObject();
diff --git a/generator/restaurants_info/restaurants_info.cpp b/generator/restaurants_info/restaurants_info.cpp
index ec6b954dc2..8878dd0199 100644
--- a/generator/restaurants_info/restaurants_info.cpp
+++ b/generator/restaurants_info/restaurants_info.cpp
@@ -62,7 +62,7 @@ void DumpRestaurants(std::vector<FeatureBuilder1> const & features, std::ostream
     auto const center = MercatorBounds::ToLatLon(f.GetKeyPoint());
 
     out << defaultName << '\t' << strings::JoinStrings(translations, '|') << '\t'
-        << center.lat << ' ' << center.lon << '\t' << DebugPrint(f.GetGeomType()) << "\n";
+        << center.m_lat << ' ' << center.m_lon << '\t' << DebugPrint(f.GetGeomType()) << "\n";
   }
 }
 }  // namespace
diff --git a/generator/sponsored_object_base.hpp b/generator/sponsored_object_base.hpp
index e2c273543e..356632c9ab 100644
--- a/generator/sponsored_object_base.hpp
+++ b/generator/sponsored_object_base.hpp
@@ -45,7 +45,7 @@ inline std::ostream & operator<<(std::ostream & s, SponsoredObjectBase const & h
 {
   s << std::fixed << std::setprecision(7);
   s << "Id: " << h.m_id << "\t Name: " << h.m_name << "\t Address: " << h.m_address
-    << "\t lat: " << h.m_latLon.lat << " lon: " << h.m_latLon.lon;
+    << "\t lat: " << h.m_latLon.m_lat << " lon: " << h.m_latLon.m_lon;
   return s;
 }
 }  // namespace generator
diff --git a/generator/sponsored_object_storage.hpp b/generator/sponsored_object_storage.hpp
index a04e395226..91d39c5754 100644
--- a/generator/sponsored_object_storage.hpp
+++ b/generator/sponsored_object_storage.hpp
@@ -124,8 +124,8 @@ public:
     for (auto const & item : m_objects)
     {
       auto const & object = item.second;
-      Box b(Point(object.m_latLon.lat, object.m_latLon.lon),
-            Point(object.m_latLon.lat, object.m_latLon.lon));
+      Box b(Point(object.m_latLon.m_lat, object.m_latLon.m_lon),
+            Point(object.m_latLon.m_lat, object.m_latLon.m_lon));
       m_rtree.insert(make_pair(b, object.m_id));
     }
   }
@@ -149,7 +149,7 @@ public:
     namespace bgi = boost::geometry::index;
 
     std::vector<ObjectId> indexes;
-    for_each(bgi::qbegin(m_rtree, bgi::nearest(Point(latLon.lat, latLon.lon),
+    for_each(bgi::qbegin(m_rtree, bgi::nearest(Point(latLon.m_lat, latLon.m_lon),
                                                static_cast<unsigned>(m_maxSelectedElements))),
              bgi::qend(m_rtree), [this, &latLon, &indexes](Value const & v) {
                auto const & object = GetObjectById(v.second);
diff --git a/generator/srtm_parser.cpp b/generator/srtm_parser.cpp
index 7ecb577a7c..33e3055249 100644
--- a/generator/srtm_parser.cpp
+++ b/generator/srtm_parser.cpp
@@ -89,10 +89,10 @@ feature::TAltitude SrtmTile::GetHeight(ms::LatLon const & coord)
   if (!IsValid())
     return feature::kInvalidAltitude;
 
-  double ln = coord.lon - static_cast<int>(coord.lon);
+  double ln = coord.m_lon - static_cast<int>(coord.m_lon);
   if (ln < 0)
     ln += 1;
-  double lt = coord.lat - static_cast<int>(coord.lat);
+  double lt = coord.m_lat - static_cast<int>(coord.m_lat);
   if (lt < 0)
     lt += 1;
   lt = 1 - lt;  // from North to South
@@ -110,29 +110,29 @@ feature::TAltitude SrtmTile::GetHeight(ms::LatLon const & coord)
 std::string SrtmTile::GetBase(ms::LatLon coord)
 {
   std::ostringstream ss;
-  if (coord.lat < 0)
+  if (coord.m_lat < 0)
   {
     ss << "S";
-    coord.lat *= -1;
-    coord.lat += 1;
+    coord.m_lat *= -1;
+    coord.m_lat += 1;
   }
   else
   {
     ss << "N";
   }
-  ss << std::setw(2) << std::setfill('0') << static_cast<int>(coord.lat);
+  ss << std::setw(2) << std::setfill('0') << static_cast<int>(coord.m_lat);
 
-  if (coord.lon < 0)
+  if (coord.m_lon < 0)
   {
     ss << "W";
-    coord.lon *= -1;
-    coord.lon += 1;
+    coord.m_lon *= -1;
+    coord.m_lon += 1;
   }
   else
   {
     ss << "E";
   }
-  ss << std::setw(3) << static_cast<int>(coord.lon);
+  ss << std::setw(3) << static_cast<int>(coord.m_lon);
   return ss.str();
 }
 
diff --git a/generator/towns_dumper.cpp b/generator/towns_dumper.cpp
index 9e96f9a666..a1aeb1581d 100644
--- a/generator/towns_dumper.cpp
+++ b/generator/towns_dumper.cpp
@@ -108,6 +108,6 @@ void TownsDumper::Dump(std::string const & filePath)
   for (auto const & record : m_records)
   {
     std::string const isCapital = record.capital ? "t" : "f";
-    stream << record.point.lat << ";" << record.point.lon << ";" << record.id << ";" << isCapital <<  std::endl;
+    stream << record.point.m_lat << ";" << record.point.m_lon << ";" << record.id << ";" << isCapital <<  std::endl;
   }
 }
diff --git a/geometry/distance_on_sphere.cpp b/geometry/distance_on_sphere.cpp
index 52040c692f..b81f2543fc 100644
--- a/geometry/distance_on_sphere.cpp
+++ b/geometry/distance_on_sphere.cpp
@@ -31,10 +31,10 @@ double DistanceOnSphere(double lat1Deg, double lon1Deg, double lat2Deg, double l
 double AreaOnSphere(ms::LatLon const & ll1, ms::LatLon const & ll2, ms::LatLon const & ll3)
 {
   // Todo: proper area on sphere (not needed for now)
-  double const avgLat = base::DegToRad((ll1.lat + ll2.lat + ll3.lat) / 3);
+  double const avgLat = base::DegToRad((ll1.m_lat + ll2.m_lat + ll3.m_lat) / 3);
   return cos(avgLat) * 0.5 *
-         fabs((ll2.lon - ll1.lon) * (ll3.lat - ll1.lat) -
-              (ll3.lon - ll1.lon) * (ll2.lat - ll1.lat));
+         fabs((ll2.m_lon - ll1.m_lon) * (ll3.m_lat - ll1.m_lat) -
+              (ll3.m_lon - ll1.m_lon) * (ll2.m_lat - ll1.m_lat));
 }
 
 double DistanceOnEarth(double lat1Deg, double lon1Deg, double lat2Deg, double lon2Deg)
@@ -44,7 +44,7 @@ double DistanceOnEarth(double lat1Deg, double lon1Deg, double lat2Deg, double lo
 
 double DistanceOnEarth(LatLon const & ll1, LatLon const & ll2)
 {
-  return DistanceOnEarth(ll1.lat, ll1.lon, ll2.lat, ll2.lon);
+  return DistanceOnEarth(ll1.m_lat, ll1.m_lon, ll2.m_lat, ll2.m_lon);
 }
 
 double AreaOnEarth(LatLon const & ll1, LatLon const & ll2, LatLon const & ll3)
diff --git a/geometry/latlon.cpp b/geometry/latlon.cpp
index 9df06e46a5..d8248f8d9f 100644
--- a/geometry/latlon.cpp
+++ b/geometry/latlon.cpp
@@ -2,28 +2,30 @@
 
 #include <sstream>
 
-using namespace std;
-
 namespace ms
 {
 // static
-double const LatLon::kMinLat = -90;
-double const LatLon::kMaxLat = 90;
-double const LatLon::kMinLon = -180;
-double const LatLon::kMaxLon = 180;
+double const LatLon::kMinLat = -90.0;
+double const LatLon::kMaxLat = 90.0;
+double const LatLon::kMinLon = -180.0;
+double const LatLon::kMaxLon = 180.0;
 
-string DebugPrint(LatLon const & t)
-{
-  ostringstream out;
-  out.precision(20);
-  out << "ms::LatLon(" << t.lat << ", " << t.lon << ")";
-  return out.str();
-}
+// Note. LatLon(-180.0, -180.0) are an invalid coordinates which are used in statistics.
+// So if you want to change the value you should change the code of processing the statistics.
+LatLon const LatLon::kInvalidValue = LatLon(-180.0, -180.0);
 
-bool LatLon::operator==(ms::LatLon const & p) const { return lat == p.lat && lon == p.lon; }
+bool LatLon::operator==(ms::LatLon const & p) const { return m_lat == p.m_lat && m_lon == p.m_lon; }
 
 bool LatLon::EqualDxDy(LatLon const & p, double eps) const
 {
-  return (base::AlmostEqualAbs(lat, p.lat, eps) && base::AlmostEqualAbs(lon, p.lon, eps));
+  return (base::AlmostEqualAbs(m_lat, p.m_lat, eps) && base::AlmostEqualAbs(m_lon, p.m_lon, eps));
+}
+
+std::string DebugPrint(LatLon const & t)
+{
+  std::ostringstream out;
+  out.precision(20);
+  out << "ms::LatLon(" << t.m_lat << ", " << t.m_lon << ")";
+  return out.str();
 }
 }  // namespace ms
diff --git a/geometry/latlon.hpp b/geometry/latlon.hpp
index a8e69cd2c7..e1f5cf8f00 100644
--- a/geometry/latlon.hpp
+++ b/geometry/latlon.hpp
@@ -14,15 +14,15 @@ public:
   static double const kMaxLat;
   static double const kMinLon;
   static double const kMaxLon;
+  static LatLon const kInvalidValue;
 
-  double lat;
-  double lon;
+  double m_lat = kInvalidValue.m_lat;
+  double m_lon = kInvalidValue.m_lon;
 
-  /// Does NOT initialize lat and lon. Allows to use it as a property of an ObjC class.
   LatLon() = default;
-  LatLon(double lat, double lon) : lat(lat), lon(lon) {}
+  LatLon(double lat, double lon) : m_lat(lat), m_lon(lon) {}
 
-  static LatLon Zero() { return LatLon(0., 0.); }
+  static LatLon Zero() { return LatLon(0.0, 0.0); }
 
   bool operator==(ms::LatLon const & p) const;
 
@@ -30,7 +30,7 @@ public:
 
   struct Hash
   {
-    size_t operator()(ms::LatLon const & p) const { return base::Hash(p.lat, p.lon); }
+    size_t operator()(ms::LatLon const & p) const { return base::Hash(p.m_lat, p.m_lon); }
   };
 };
 
diff --git a/geometry/mercator.hpp b/geometry/mercator.hpp
index 6f064ca45e..e7111fe399 100644
--- a/geometry/mercator.hpp
+++ b/geometry/mercator.hpp
@@ -87,7 +87,7 @@ struct MercatorBounds
 
   static m2::PointD FromLatLon(ms::LatLon const & point)
   {
-    return FromLatLon(point.lat, point.lon);
+    return FromLatLon(point.m_lat, point.m_lon);
   }
 
   static m2::RectD RectByCenterLatLonAndSizeInMeters(double lat, double lon, double size)
diff --git a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
index e6911311cd..c61111ff53 100644
--- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
+++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
@@ -65,7 +65,7 @@ NSString * httpGe0Url(NSString * shortUrl)
 
   ms::LatLon const ll = self.object ? self.object.latLon
                                     : ms::LatLon(self.location.latitude, self.location.longitude);
-  string const & s = f.CodeGe0url(ll.lat, ll.lon, f.GetDrawScale(), title(self.object).UTF8String);
+  string const & s = f.CodeGe0url(ll.m_lat, ll.m_lon, f.GetDrawScale(), title(self.object).UTF8String);
 
   NSString * url = @(s.c_str());
   if (!isShort)
diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm
index 271daa4268..10b520f222 100644
--- a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm
+++ b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm
@@ -62,7 +62,7 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
   string distance;
   auto const f = MercatorBounds::ToLatLon(from);
   auto const t = MercatorBounds::ToLatLon(to);
-  measurement_utils::FormatDistance(ms::DistanceOnEarth(f.lat, f.lon, t.lat, t.lon), distance);
+  measurement_utils::FormatDistance(ms::DistanceOnEarth(f.m_lat, f.m_lon, t.m_lat, t.m_lon), distance);
   return distance;
 }
 }  // namespace
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index b1085e2c4c..34d71c8685 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -275,7 +275,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
     auto const latLon = m_mapObject.GetLatLon();
     NSMutableDictionary * noteInfo = [info mutableCopy];
     noteInfo[kStatProblem] = self.note;
-    CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.lat longitude:latLon.lon];
+    CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.m_lat longitude:latLon.m_lon];
     [Statistics logEvent:kStatEditorProblemReport withParameters:noteInfo atLocation:location];
     f.CreateNote(m_mapObject, osm::Editor::NoteProblemType::General, self.note.UTF8String);
   }
@@ -948,7 +948,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
 {
   auto const & fid = m_mapObject.GetID();
   auto const latLon = m_mapObject.GetLatLon();
-  CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.lat longitude:latLon.lon];
+  CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.m_lat longitude:latLon.m_lon];
   self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index);
   NSIndexPath * ip = [self.tableView indexPathForCell:cell];
   [self.tableView reloadRowsAtIndexPaths:@[ ip ] withRowAnimation:UITableViewRowAnimationFade];
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
index cc80da7a82..86383dd078 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@@ -43,25 +43,25 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
   {
     stat[kStatProvider] = kStatBooking;
     stat[kStatHotel] = data.sponsoredId;
-    stat[kStatHotelLocation] = makeLocationEventValue(latLon.lat, latLon.lon);
+    stat[kStatHotelLocation] = makeLocationEventValue(latLon.m_lat, latLon.m_lon);
   }
   else if (data.isOpentable)
   {
     stat[kStatProvider] = kStatOpentable;
     stat[kStatRestaurant] = data.sponsoredId;
-    stat[kStatRestaurantLocation] = makeLocationEventValue(latLon.lat, latLon.lon);
+    stat[kStatRestaurantLocation] = makeLocationEventValue(latLon.m_lat, latLon.m_lon);
   }
   else if (data.isPartner)
   {
     stat[kStatProvider] = data.partnerName;
     stat[kStatCategory] = @(data.ratingRawValue);
-    stat[kStatObjectLat] = @(latLon.lat);
-    stat[kStatObjectLon] = @(latLon.lon);
+    stat[kStatObjectLat] = @(latLon.m_lat);
+    stat[kStatObjectLon] = @(latLon.m_lon);
   }
   else
   {
     stat[kStatProvider] = kStatPlacePageHotelSearch;
-    stat[kStatHotelLocation] = makeLocationEventValue(latLon.lat, latLon.lon);
+    stat[kStatHotelLocation] = makeLocationEventValue(latLon.m_lat, latLon.m_lon);
   }
 
   [Statistics logEvent:eventName withParameters:stat atLocation:[MWMLocationManager lastLocation]];
@@ -188,7 +188,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
   CLLocationCoordinate2D const & coord = lastLocation.coordinate;
   ms::LatLon const & target = data.latLon;
   measurement_utils::FormatDistance(
-      ms::DistanceOnEarth(coord.latitude, coord.longitude, target.lat, target.lon), distance);
+      ms::DistanceOnEarth(coord.latitude, coord.longitude, target.m_lat, target.m_lon), distance);
   return @(distance.c_str());
 }
 
diff --git a/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm b/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm
index b2b2303582..e6cc7d0608 100644
--- a/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm
+++ b/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm
@@ -11,7 +11,7 @@ static int8_t kAgeOfChild = 5;
   if (self)
   {
     _types.insert(ftypes::IsHotelChecker::Type::Hotel);
-    CHECK(data.hotelType, ("Incorrect hotel type at coordinate:", data.latLon.lat, data.latLon.lon));
+    CHECK(data.hotelType, ("Incorrect hotel type at coordinate:", data.latLon.m_lat, data.latLon.m_lon));
     
     if (data.isBooking)
     {
diff --git a/kml/pykmlib/bindings.cpp b/kml/pykmlib/bindings.cpp
index fcd6eee3f6..debb199112 100644
--- a/kml/pykmlib/bindings.cpp
+++ b/kml/pykmlib/bindings.cpp
@@ -262,7 +262,7 @@ void VectorAdapter<m2::PointD>::Set(std::vector<m2::PointD> & v, boost::python::
   auto const latLon = python_list_to_std_vector<ms::LatLon>(iterable);
   v.reserve(latLon.size());
   for (size_t i = 0; i < latLon.size(); ++i)
-    v.emplace_back(MercatorBounds::LonToX(latLon[i].lon), MercatorBounds::LatToY(latLon[i].lat));
+    v.emplace_back(MercatorBounds::LonToX(latLon[i].m_lon), MercatorBounds::LatToY(latLon[i].m_lat));
 }
 
 std::string LatLonToString(ms::LatLon const & latLon);
@@ -362,8 +362,8 @@ std::string LatLonToString(ms::LatLon const & latLon)
 {
   std::ostringstream out;
   out << "["
-      << "lat:" << latLon.lat << ", "
-      << "lon:" << latLon.lon
+      << "lat:" << latLon.m_lat << ", "
+      << "lon:" << latLon.m_lon
       << "]";
   return out.str();
 }
@@ -503,7 +503,7 @@ struct LatLonConverter
   static void construct(PyObject * objPtr, converter::rvalue_from_python_stage1_data * data)
   {
     ms::LatLon latLon = extract<ms::LatLon>(objPtr);
-    m2::PointD pt(MercatorBounds::LonToX(latLon.lon), MercatorBounds::LatToY(latLon.lat));
+    m2::PointD pt(MercatorBounds::LonToX(latLon.m_lon), MercatorBounds::LatToY(latLon.m_lat));
     void * storage =
       reinterpret_cast<converter::rvalue_from_python_storage<m2::PointD> *>(data)->storage.bytes;
     new (storage) m2::PointD(pt);
@@ -730,8 +730,8 @@ BOOST_PYTHON_MODULE(pykmlib)
     .def("__str__", &VectorAdapter<uint8_t>::ToString);
 
   class_<ms::LatLon>("LatLon", init<double, double>())
-    .def_readwrite("lat", &ms::LatLon::lat)
-    .def_readwrite("lon", &ms::LatLon::lon)
+    .def_readwrite("lat", &ms::LatLon::m_lat)
+    .def_readwrite("lon", &ms::LatLon::m_lon)
     .def("__str__", &LatLonToString);
 
   class_<m2::PointD>("PointD");
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 9c8890b3b4..12bba3440c 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -572,8 +572,8 @@ Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData && bm, kml::MarkGro
   auto const latLon = MercatorBounds::ToLatLon(bm.m_point);
   alohalytics::TStringMap details{
     {"action", "create"},
-    {"lat", strings::to_string(latLon.lat)},
-    {"lon", strings::to_string(latLon.lon)},
+    {"lat", strings::to_string(latLon.m_lat)},
+    {"lon", strings::to_string(latLon.m_lon)},
     {"tags", ss.str()}};
   alohalytics::Stats::Instance().LogEvent("Bookmarks_Bookmark_action", details);
 
diff --git a/map/discovery/discovery_manager.cpp b/map/discovery/discovery_manager.cpp
index 546a2fc69e..efb5905378 100644
--- a/map/discovery/discovery_manager.cpp
+++ b/map/discovery/discovery_manager.cpp
@@ -48,7 +48,7 @@ std::string Manager::GetLocalExpertsUrl(m2::PointD const & point) const
 {
   ms::LatLon const ll(MercatorBounds::ToLatLon(point));
   std::ostringstream os;
-  os << locals::Api::GetLocalsPageUrl() << "?lat=" << ll.lat << "&lon=" << ll.lon;
+  os << locals::Api::GetLocalsPageUrl() << "?lat=" << ll.m_lat << "&lon=" << ll.m_lon;
   return os.str();
 }
 }  // namespace discovery
diff --git a/map/discovery/discovery_manager.hpp b/map/discovery/discovery_manager.hpp
index 4b3b5a5483..c6ea61ffc6 100644
--- a/map/discovery/discovery_manager.hpp
+++ b/map/discovery/discovery_manager.hpp
@@ -98,7 +98,7 @@ public:
         auto const latLon = MercatorBounds::ToLatLon(params.m_viewportCenter);
         auto constexpr pageNumber = 1;
         m_localsApi.GetLocals(
-            latLon.lat, latLon.lon, params.m_lang, params.m_itemsCount, pageNumber,
+            latLon.m_lat, latLon.m_lon, params.m_lang, params.m_itemsCount, pageNumber,
             [this, requestId, onResult](uint64_t id, std::vector<locals::LocalExpert> const & locals,
                                         size_t /* pageNumber */, size_t /* countPerPage */,
                                         bool /* hasPreviousPage */, bool /* hasNextPage */) {
diff --git a/map/framework.cpp b/map/framework.cpp
index edcf2828f2..6f0480f733 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1478,7 +1478,7 @@ void Framework::EnterBackground()
   alohalytics::Stats::Instance().LogEvent("Framework::EnterBackground", {{"zoom", strings::to_string(GetDrawScale())},
                                           {"foregroundSeconds", strings::to_string(
                                            static_cast<int>(m_startBackgroundTime - m_startForegroundTime))}},
-                                          alohalytics::Location::FromLatLon(ll.lat, ll.lon));
+                                          alohalytics::Location::FromLatLon(ll.m_lat, ll.m_lon));
   // Do not clear caches for Android. This function is called when main activity is paused,
   // but at the same time search activity (for example) is enabled.
   // TODO(AlexZ): Use onStart/onStop on Android to correctly detect app background and remove #ifndef.
@@ -2442,7 +2442,7 @@ void Framework::OnTapEvent(TapEvent const & tapEvent)
 
       // Older version of statistics used "$GetUserMark" event.
       alohalytics::Stats::Instance().LogEvent("$SelectMapObject", kv,
-                                              alohalytics::Location::FromLatLon(ll.lat, ll.lon));
+                                              alohalytics::Location::FromLatLon(ll.m_lat, ll.m_lon));
 
       if (info.GetSponsoredType() == SponsoredType::Booking)
       {
@@ -2644,7 +2644,7 @@ string Framework::GenerateApiBackUrl(ApiMarkPoint const & point) const
   if (!res.empty())
   {
     ms::LatLon const ll = point.GetLatLon();
-    res += "pin?ll=" + strings::to_string(ll.lat) + "," + strings::to_string(ll.lon);
+    res += "pin?ll=" + strings::to_string(ll.m_lat) + "," + strings::to_string(ll.m_lon);
     if (!point.GetName().empty())
       res += "&n=" + UrlEncode(point.GetName());
     if (!point.GetApiID().empty())
diff --git a/map/map_tests/gps_track_collection_test.cpp b/map/map_tests/gps_track_collection_test.cpp
index 9fca7caa0f..df25178d53 100644
--- a/map/map_tests/gps_track_collection_test.cpp
+++ b/map/map_tests/gps_track_collection_test.cpp
@@ -14,8 +14,8 @@ location::GpsTrackInfo MakeGpsTrackInfo(double timestamp, ms::LatLon const & ll,
   location::GpsTrackInfo info;
   info.m_timestamp = timestamp;
   info.m_speed = speed;
-  info.m_latitude = ll.lat;
-  info.m_longitude = ll.lon;
+  info.m_latitude = ll.m_lat;
+  info.m_longitude = ll.m_lon;
   return info;
 }
 
diff --git a/map/map_tests/gps_track_storage_test.cpp b/map/map_tests/gps_track_storage_test.cpp
index 59b11dc8a9..c9c4e9460d 100644
--- a/map/map_tests/gps_track_storage_test.cpp
+++ b/map/map_tests/gps_track_storage_test.cpp
@@ -22,8 +22,8 @@ location::GpsInfo Make(double timestamp, ms::LatLon const & ll, double speed)
   location::GpsInfo info;
   info.m_timestamp = timestamp;
   info.m_speedMpS = speed;
-  info.m_latitude = ll.lat;
-  info.m_longitude = ll.lon;
+  info.m_latitude = ll.m_lat;
+  info.m_longitude = ll.m_lon;
   info.m_source = location::EAndroidNative;
   return info;
 }
diff --git a/map/map_tests/gps_track_test.cpp b/map/map_tests/gps_track_test.cpp
index 5b1117c4bf..bc09db261a 100644
--- a/map/map_tests/gps_track_test.cpp
+++ b/map/map_tests/gps_track_test.cpp
@@ -23,8 +23,8 @@ inline location::GpsInfo Make(double timestamp, ms::LatLon const & ll, double sp
   location::GpsInfo info;
   info.m_timestamp = timestamp;
   info.m_speedMpS = speed;
-  info.m_latitude = ll.lat;
-  info.m_longitude = ll.lon;
+  info.m_latitude = ll.m_lat;
+  info.m_longitude = ll.m_lon;
   info.m_horizontalAccuracy = 15;
   info.m_source = location::EAndroidNative;
   return info;
diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp
index 31b3d1abb4..fa9a25f4ef 100644
--- a/map/map_tests/mwm_url_tests.cpp
+++ b/map/map_tests/mwm_url_tests.cpp
@@ -65,7 +65,7 @@ public:
   bool TestLatLon(int index, double lat, double lon) const
   {
     ms::LatLon const ll = GetMark(index)->GetLatLon();
-    return base::AlmostEqualULPs(ll.lat, lat) && base::AlmostEqualULPs(ll.lon, lon);
+    return base::AlmostEqualULPs(ll.m_lat, lat) && base::AlmostEqualULPs(ll.m_lon, lon);
   }
 
   bool TestRoutePoint(int index, double lat, double lon, string const & name)
diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp
index 8ef05c1f24..d92cede182 100644
--- a/map/place_page_info.cpp
+++ b/map/place_page_info.cpp
@@ -264,8 +264,8 @@ void Info::SetTitlesForBookmark()
 string Info::GetFormattedCoordinate(bool isDMS) const
 {
   auto const & ll = GetLatLon();
-  return isDMS ? measurement_utils::FormatLatLon(ll.lat, ll.lon, true)
-               : measurement_utils::FormatLatLonAsDMS(ll.lat, ll.lon, 2);
+  return isDMS ? measurement_utils::FormatLatLon(ll.m_lat, ll.m_lon, true)
+               : measurement_utils::FormatLatLonAsDMS(ll.m_lat, ll.m_lon, 2);
 }
 
 float Info::GetRatingRawValue() const
diff --git a/openlr/decoded_path.cpp b/openlr/decoded_path.cpp
index 6ed600ce1a..29702c41da 100644
--- a/openlr/decoded_path.cpp
+++ b/openlr/decoded_path.cpp
@@ -34,15 +34,15 @@ bool IsForwardFromXML(pugi::xml_node const & node)
 void LatLonToXML(ms::LatLon const & latLon, pugi::xml_node & node)
 {
   auto const kDigitsAfterComma = 5;
-  node.append_child("lat").text() = strings::to_string_dac(latLon.lat, kDigitsAfterComma).data();
-  node.append_child("lon").text() = strings::to_string_dac(latLon.lon, kDigitsAfterComma).data();
+  node.append_child("lat").text() = strings::to_string_dac(latLon.m_lat, kDigitsAfterComma).data();
+  node.append_child("lon").text() = strings::to_string_dac(latLon.m_lon, kDigitsAfterComma).data();
 }
 
 void LatLonFromXML(pugi::xml_node const & node, ms::LatLon & latLon)
 {
   THROW_IF_NODE_IS_EMPTY(node, openlr::DecodedPathLoadError, ("Can't parse latLon"));
-  latLon.lat = node.child("lat").text().as_double();
-  latLon.lon = node.child("lon").text().as_double();
+  latLon.m_lat = node.child("lat").text().as_double();
+  latLon.m_lon = node.child("lon").text().as_double();
 }
 
 void FeatureIdFromXML(pugi::xml_node const & node, DataSource const & dataSource, FeatureID & fid)
diff --git a/openlr/helpers.cpp b/openlr/helpers.cpp
index 30541d8ea6..260db6d4ad 100644
--- a/openlr/helpers.cpp
+++ b/openlr/helpers.cpp
@@ -137,16 +137,16 @@ string LogAs2GisPath(Graph::EdgeVector const & path)
   ost << "https://2gis.ru/moscow?queryState=";
 
   auto ll = MercatorBounds::ToLatLon(path.front().GetStartPoint());
-  ost << "center%2F" << ll.lon << "%2C" << ll.lat << "%2F";
+  ost << "center%2F" << ll.m_lon << "%2C" << ll.m_lat << "%2F";
   ost << "zoom%2F" << 17 << "%2F";
   ost << "ruler%2Fpoints%2F";
   for (auto const & e : path)
   {
     ll = MercatorBounds::ToLatLon(e.GetStartPoint());
-    ost << ll.lon << "%20" << ll.lat << "%2C";
+    ost << ll.m_lon << "%20" << ll.m_lat << "%2C";
   }
   ll = MercatorBounds::ToLatLon(path.back().GetEndPoint());
-  ost << ll.lon << "%20" << ll.lat;
+  ost << ll.m_lon << "%20" << ll.m_lat;
 
   return ost.str();
 }
diff --git a/openlr/openlr_model_xml.cpp b/openlr/openlr_model_xml.cpp
index bae165e88d..ce6b3217d3 100644
--- a/openlr/openlr_model_xml.cpp
+++ b/openlr/openlr_model_xml.cpp
@@ -104,8 +104,8 @@ bool FirstCoordinateFromXML(pugi::xml_node const & node, ms::LatLon & latLon)
   if (!GetLatLon(node.child("olr:coordinate"), lat, lon))
     return false;
 
-  latLon.lat = ((lat - base::Sign(lat) * 0.5) * 360) / (1 << 24);
-  latLon.lon = ((lon - base::Sign(lon) * 0.5) * 360) / (1 << 24);
+  latLon.m_lat = ((lat - base::Sign(lat) * 0.5) * 360) / (1 << 24);
+  latLon.m_lon = ((lon - base::Sign(lon) * 0.5) * 360) / (1 << 24);
 
   return true;
 }
@@ -129,8 +129,8 @@ bool CoordinateFromXML(pugi::xml_node const & node, ms::LatLon const & prevCoord
   // with no special meaning and is used as a factor to store doubles as ints.
   auto const kOpenlrDeltaFactor = 100000;
 
-  latLon.lat = prevCoord.lat + static_cast<double>(lat) / kOpenlrDeltaFactor;
-  latLon.lon = prevCoord.lon + static_cast<double>(lon) / kOpenlrDeltaFactor;
+  latLon.m_lat = prevCoord.m_lat + static_cast<double>(lat) / kOpenlrDeltaFactor;
+  latLon.m_lon = prevCoord.m_lon + static_cast<double>(lon) / kOpenlrDeltaFactor;
 
   return true;
 }
diff --git a/partners_api/maxim_api.cpp b/partners_api/maxim_api.cpp
index 68488b0c2a..acd7e06e68 100644
--- a/partners_api/maxim_api.cpp
+++ b/partners_api/maxim_api.cpp
@@ -41,8 +41,8 @@ bool RawApi::GetTaxiInfo(ms::LatLon const & from, ms::LatLon const & to, std::st
   url << std::fixed << std::setprecision(6) << baseUrl
       << "/CalculateByCoords?version=1.0&platform=WEB&RefOrgId="
       << MAXIM_CLIENT_ID << "&access-token=" << MAXIM_SERVER_TOKEN
-      << "&startLatitude=" << from.lat << "&startLongitude=" << from.lon
-      << "&endLatitude=" << to.lat << "&endLongitude=" << to.lon;
+      << "&startLatitude=" << from.m_lat << "&startLongitude=" << from.m_lon
+      << "&endLatitude=" << to.m_lat << "&endLongitude=" << to.m_lon;
 
   return RunSimpleHttpRequest(url.str(), result);
 }
@@ -99,9 +99,9 @@ RideRequestLinks Api::GetRideRequestLinks(std::string const & productId, ms::Lat
   std::ostringstream orderLink;
   std::ostringstream installLink;
 
-  orderLink << "order?refOrgId=" << MAXIM_CLIENT_ID << "&startLatitude=" << from.lat
-            << "&startLongitude=" << from.lon << "&endLatitude=" << to.lat
-            << "&endLongitude=" << to.lon;
+  orderLink << "order?refOrgId=" << MAXIM_CLIENT_ID << "&startLatitude=" << from.m_lat
+            << "&startLongitude=" << from.m_lon << "&endLatitude=" << to.m_lat
+            << "&endLongitude=" << to.m_lon;
 
 #if defined(OMIM_OS_IPHONE)
   installLink << "https://app.appsflyer.com/id579985456?pid=maps_me";
diff --git a/partners_api/rutaxi_api.cpp b/partners_api/rutaxi_api.cpp
index 2e0a6fe369..d9bdfe6ea0 100644
--- a/partners_api/rutaxi_api.cpp
+++ b/partners_api/rutaxi_api.cpp
@@ -54,7 +54,7 @@ bool RawApi::GetNearObject(ms::LatLon const & pos, std::string const & city, std
                            std::string const & baseUrl /* = kTaxiInfoUrl */)
 {
   std::ostringstream data;
-  data << R"({"latitude": )" << pos.lat << R"(, "longitude": )" << pos.lon << R"(, "city": ")"
+  data << R"({"latitude": )" << pos.m_lat << R"(, "longitude": )" << pos.m_lon << R"(, "city": ")"
        << city << R"("})";
 
   return RunSimpleHttpRequest(baseUrl + "near/", data.str(), result);
diff --git a/partners_api/uber_api.cpp b/partners_api/uber_api.cpp
index a90d7e5887..8deef61119 100644
--- a/partners_api/uber_api.cpp
+++ b/partners_api/uber_api.cpp
@@ -130,7 +130,7 @@ bool RawApi::GetProducts(ms::LatLon const & pos, string & result,
 {
   ostringstream url;
   url << fixed << setprecision(6) << baseUrl << "?server_token=" << UBER_SERVER_TOKEN
-      << "&latitude=" << pos.lat << "&longitude=" << pos.lon;
+      << "&latitude=" << pos.m_lat << "&longitude=" << pos.m_lon;
 
   return RunSimpleHttpRequest(url.str(), result);
 }
@@ -141,7 +141,7 @@ bool RawApi::GetEstimatedTime(ms::LatLon const & pos, string & result,
 {
   ostringstream url;
   url << fixed << setprecision(6) << baseUrl << "/time?server_token=" << UBER_SERVER_TOKEN
-      << "&start_latitude=" << pos.lat << "&start_longitude=" << pos.lon;
+      << "&start_latitude=" << pos.m_lat << "&start_longitude=" << pos.m_lon;
 
   return RunSimpleHttpRequest(url.str(), result);
 }
@@ -152,8 +152,8 @@ bool RawApi::GetEstimatedPrice(ms::LatLon const & from, ms::LatLon const & to, s
 {
   ostringstream url;
   url << fixed << setprecision(6) << baseUrl << "/price?server_token=" << UBER_SERVER_TOKEN
-      << "&start_latitude=" << from.lat << "&start_longitude=" << from.lon
-      << "&end_latitude=" << to.lat << "&end_longitude=" << to.lon;
+      << "&start_latitude=" << from.m_lat << "&start_longitude=" << from.m_lon
+      << "&end_latitude=" << to.m_lat << "&end_longitude=" << to.m_lon;
 
   return RunSimpleHttpRequest(url.str(), result);
 }
@@ -281,8 +281,8 @@ RideRequestLinks Api::GetRideRequestLinks(string const & productId, ms::LatLon c
   stringstream url;
   url << fixed << setprecision(6)
       << "?client_id=" << UBER_CLIENT_ID << "&action=setPickup&product_id=" << productId
-      << "&pickup[latitude]=" << from.lat << "&pickup[longitude]=" << from.lon
-      << "&dropoff[latitude]=" << to.lat << "&dropoff[longitude]=" << to.lon;
+      << "&pickup[latitude]=" << from.m_lat << "&pickup[longitude]=" << from.m_lon
+      << "&dropoff[latitude]=" << to.m_lat << "&dropoff[longitude]=" << to.m_lon;
 
   return {"uber://" + url.str(), "https://m.uber.com/ul" + url.str()};
 }
diff --git a/partners_api/yandex_api.cpp b/partners_api/yandex_api.cpp
index 0cec103a17..5bdda88d21 100644
--- a/partners_api/yandex_api.cpp
+++ b/partners_api/yandex_api.cpp
@@ -60,7 +60,7 @@ bool RawApi::GetTaxiInfo(ms::LatLon const & from, ms::LatLon const & to, std::st
 {
   std::ostringstream url;
   url << std::fixed << std::setprecision(6) << baseUrl << "/taxi_info?clid=" << YANDEX_CLIENT_ID
-      << "&rll=" << from.lon << "," << from.lat << "~" << to.lon << "," << to.lat
+      << "&rll=" << from.m_lon << "," << from.m_lat << "~" << to.m_lon << "," << to.m_lat
       << "&class=econom";
 
   return RunSimpleHttpRequest(url.str(), result);
@@ -118,13 +118,13 @@ RideRequestLinks Api::GetRideRequestLinks(std::string const & productId, ms::Lat
   std::ostringstream deepLink;
 
 #if defined(OMIM_OS_IPHONE)
-  deepLink << "https://3.redirect.appmetrica.yandex.com/route?start-lat=" << from.lat
-           << "&start-lon=" << from.lon << "&end-lat=" << to.lat << "&end-lon=" << to.lon
+  deepLink << "https://3.redirect.appmetrica.yandex.com/route?start-lat=" << from.m_lat
+           << "&start-lon=" << from.m_lon << "&end-lat=" << to.m_lat << "&end-lon=" << to.m_lon
            << "&utm_source=mapsme&appmetrica_tracking_id=" << YANDEX_TRACKING_ID
            << "&ref=8d20bf0f9e4749c48822358cdaf6a6c7";
 #elif defined(OMIM_OS_ANDROID)
   deepLink << "https://redirect.appmetrica.yandex.com/serve/" << YANDEX_TRACKING_ID << "?startlat="
-           << from.lat << "&startlon=" << from.lon << "&endlat=" << to.lat << "&endlon=" << to.lon
+           << from.m_lat << "&startlon=" << from.m_lon << "&endlat=" << to.m_lat << "&endlon=" << to.m_lon
            << "&ref=8d20bf0f9e4749c48822358cdaf6a6c7";
 #endif
 
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index fd0ea47155..407848a6da 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -345,7 +345,7 @@ string DrawWidget::GetDistance(search::Result const & res) const
   {
     auto const ll = MercatorBounds::ToLatLon(*position);
     double dummy;
-    (void)m_framework.GetDistanceAndAzimut(res.GetFeatureCenter(), ll.lat, ll.lon, -1.0, dist,
+    (void)m_framework.GetDistanceAndAzimut(res.GetFeatureCenter(), ll.m_lat, ll.m_lon, -1.0, dist,
                                            dummy);
   }
   return dist;
diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp
index 905c264d9e..a895fa2e4a 100644
--- a/qt/editor_dialog.cpp
+++ b/qt/editor_dialog.cpp
@@ -32,8 +32,8 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
     ms::LatLon const ll = emo.GetLatLon();
     grid->addWidget(new QLabel("Latitude/Longitude:"), row, 0);
     QHBoxLayout * coords = new QHBoxLayout();
-    coords->addWidget(new QLabel(QString::fromStdString(strings::to_string_dac(ll.lat, 7) + " " +
-                                                        strings::to_string_dac(ll.lon, 7))));
+    coords->addWidget(new QLabel(QString::fromStdString(strings::to_string_dac(ll.m_lat, 7) + " " +
+                                                        strings::to_string_dac(ll.m_lon, 7))));
     grid->addLayout(coords, row++, 1);
   }
 
diff --git a/qt/place_page_dialog.cpp b/qt/place_page_dialog.cpp
index 0f2558ca35..44b7dc0734 100644
--- a/qt/place_page_dialog.cpp
+++ b/qt/place_page_dialog.cpp
@@ -27,7 +27,7 @@ PlacePageDialog::PlacePageDialog(QWidget * parent, place_page::Info const & info
     grid->addWidget(new QLabel("lat, lon"), row, 0);
     ms::LatLon const ll = info.GetLatLon();
     string const llstr =
-        strings::to_string_dac(ll.lat, 7) + ", " + strings::to_string_dac(ll.lon, 7);
+        strings::to_string_dac(ll.m_lat, 7) + ", " + strings::to_string_dac(ll.m_lon, 7);
     QLabel * label = new QLabel(llstr.c_str());
     label->setTextInteractionFlags(Qt::TextSelectableByMouse);
     grid->addWidget(label, row++, 1);
diff --git a/qt/routing_settings_dialog.cpp b/qt/routing_settings_dialog.cpp
index 42f0cd6f09..ff2d544459 100644
--- a/qt/routing_settings_dialog.cpp
+++ b/qt/routing_settings_dialog.cpp
@@ -54,12 +54,12 @@ boost::optional<ms::LatLon> RoutingSettings::GetCoordsFromString(std::string con
   if (!iter)
     return {};
 
-  if (!strings::to_double(*iter, coords.lat))
+  if (!strings::to_double(*iter, coords.m_lat))
     return {};
 
   ++iter;
 
-  if (!strings::to_double(*iter, coords.lon))
+  if (!strings::to_double(*iter, coords.m_lon))
     return {};
 
   return {coords};
diff --git a/routing/checkpoints.cpp b/routing/checkpoints.cpp
index 66d6f23953..c100c33a75 100644
--- a/routing/checkpoints.cpp
+++ b/routing/checkpoints.cpp
@@ -61,7 +61,7 @@ std::string DebugPrint(Checkpoints const & checkpoints)
   for (auto const & point : checkpoints.GetPoints())
   {
     auto const latlon = MercatorBounds::ToLatLon(point);
-    out << latlon.lat << ", " << latlon.lon << "; ";
+    out << latlon.m_lat << ", " << latlon.m_lon << "; ";
   }
   out << "passed: " << checkpoints.GetPassedIdx() << ")";
   return out.str();
diff --git a/routing/online_cross_fetcher.cpp b/routing/online_cross_fetcher.cpp
index 21f09e4c16..824ead8b2c 100644
--- a/routing/online_cross_fetcher.cpp
+++ b/routing/online_cross_fetcher.cpp
@@ -16,7 +16,7 @@ namespace
 {
 inline string LatLonToURLArgs(ms::LatLon const & point)
 {
-  return strings::to_string(point.lat) + ','+ strings::to_string(point.lon);
+  return strings::to_string(point.m_lat) + ','+ strings::to_string(point.m_lon);
 }
 }  // namespace
 
diff --git a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp b/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
index 701ade9ccf..7299364438 100644
--- a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
+++ b/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
@@ -37,15 +37,15 @@ location::GpsInfo MoveTo(ms::LatLon const & coords, double speed = -1)
   location::GpsInfo info;
   info.m_horizontalAccuracy = kGpsAccuracy;
   info.m_verticalAccuracy = kGpsAccuracy;
-  info.m_latitude = coords.lat;
-  info.m_longitude = coords.lon;
+  info.m_latitude = coords.m_lat;
+  info.m_longitude = coords.m_lon;
   info.m_speedMpS = speed;
   return info;
 }
 
 void ChangePosition(ms::LatLon const & coords, double speedKmPH, RoutingSession & routingSession)
 {
-  routingSession.OnLocationPositionChanged(MoveTo({coords.lat, coords.lon}, KMPH2MPS(speedKmPH)));
+  routingSession.OnLocationPositionChanged(MoveTo({coords.m_lat, coords.m_lon}, KMPH2MPS(speedKmPH)));
 }
 
 void InitRoutingSession(ms::LatLon const & from, ms::LatLon const & to, RoutingSession & routingSession,
diff --git a/routing/routing_integration_tests/street_names_test.cpp b/routing/routing_integration_tests/street_names_test.cpp
index 5f640017b2..721267528b 100644
--- a/routing/routing_integration_tests/street_names_test.cpp
+++ b/routing/routing_integration_tests/street_names_test.cpp
@@ -15,8 +15,8 @@ void MoveRoute(Route & route, ms::LatLon const & coords)
   location::GpsInfo info;
   info.m_horizontalAccuracy = 0.01;
   info.m_verticalAccuracy = 0.01;
-  info.m_longitude = coords.lon;
-  info.m_latitude = coords.lat;
+  info.m_longitude = coords.m_lon;
+  info.m_latitude = coords.m_lat;
   route.MoveIterator(info);
 }
 
diff --git a/routing/routing_quality/mapbox/api.cpp b/routing/routing_quality/mapbox/api.cpp
index 841ecbbc62..403b86f8b5 100644
--- a/routing/routing_quality/mapbox/api.cpp
+++ b/routing/routing_quality/mapbox/api.cpp
@@ -50,7 +50,7 @@ string LatLonsToString(vector<ms::LatLon> const & coords)
   for (size_t i = 0; i < size; ++i)
   {
     auto const & ll = coords[i];
-    oss << ll.lon << "," << ll.lat;
+    oss << ll.m_lon << "," << ll.m_lat;
     if (i + 1 != size)
       oss << ";";
   }
diff --git a/routing/routing_quality/mapbox/types.hpp b/routing/routing_quality/mapbox/types.hpp
index 34231eea88..9d8a216ca0 100644
--- a/routing/routing_quality/mapbox/types.hpp
+++ b/routing/routing_quality/mapbox/types.hpp
@@ -27,7 +27,7 @@ struct Geometry
     for (auto const & p : from)
     {
       auto const ll = MercatorBounds::ToLatLon(p);
-      m_coordinates.push_back({ll.lon, ll.lat});
+      m_coordinates.push_back({ll.m_lon, ll.m_lat});
     }
 
     m_type = "LineString";
diff --git a/routing/routing_quality/waypoints.cpp b/routing/routing_quality/waypoints.cpp
index 4719ae8dfc..144e888b66 100644
--- a/routing/routing_quality/waypoints.cpp
+++ b/routing/routing_quality/waypoints.cpp
@@ -31,7 +31,7 @@ Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline && polyli
     for (size_t i = 0; i < size; ++i)
     {
       auto const & ll = waypoints[i];
-      m2::RectD const rect = MercatorBounds::MetersToXY(ll.lon, ll.lat, kMaxDistanceFromRouteM /* metresR */);
+      m2::RectD const rect = MercatorBounds::MetersToXY(ll.m_lon, ll.m_lat, kMaxDistanceFromRouteM /* metresR */);
       auto const iter = current.UpdateProjection(rect);
       if (iter.IsValid())
       {
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index 76eee9a120..e8269e605d 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -434,7 +434,7 @@ double RoutingSession::GetCompletionPercent() const
         MercatorBounds::ToLatLon(m_route->GetFollowedPolyline().GetCurrentIter().m_pt);
     alohalytics::Stats::Instance().LogEvent(
         "RouteTracking_PercentUpdate", {{"percent", strings::to_string(percent)}},
-        alohalytics::Location::FromLatLon(lastGoodPoint.lat, lastGoodPoint.lon));
+        alohalytics::Location::FromLatLon(lastGoodPoint.m_lat, lastGoodPoint.m_lon));
     m_lastCompletionPercent = percent;
   }
   return percent;
@@ -675,7 +675,7 @@ void RoutingSession::EmitCloseRoutingEvent() const
                                        m_route->GetCurrentDistanceToEndMeters())},
        {"router", m_route->GetRouterId()},
        {"rebuildCount", strings::to_string(m_routingRebuildCount)}},
-      alohalytics::Location::FromLatLon(lastGoodPoint.lat, lastGoodPoint.lon));
+      alohalytics::Location::FromLatLon(lastGoodPoint.m_lat, lastGoodPoint.m_lon));
 }
 
 bool RoutingSession::HasRouteAltitude() const
diff --git a/routing/speed_camera_manager.cpp b/routing/speed_camera_manager.cpp
index 23a6cda4da..e4fec20b54 100644
--- a/routing/speed_camera_manager.cpp
+++ b/routing/speed_camera_manager.cpp
@@ -382,7 +382,7 @@ void SpeedCameraManager::SendEnterZoneStat(double distToCameraMeters, double spe
     {"distance", to_string(distToCameraMeters)},
     {"speed", to_string(measurement_utils::MpsToKmph(speedMpS))},
     {"speedlimit", camera.NoSpeed() ? "0" : to_string(camera.m_maxSpeedKmH)},
-    {"coord", "(" + to_string(latlon.lat) + "," + to_string(latlon.lon) + ")"}
+    {"coord", "(" + to_string(latlon.m_lat) + "," + to_string(latlon.m_lon) + ")"}
   };
 
   alohalytics::LogEvent("SpeedCameras_enter_zone", params);
diff --git a/search/processor.cpp b/search/processor.cpp
index 913d8e1f45..184ea66193 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -471,7 +471,7 @@ void Processor::SearchPlusCode()
     if (!m_position)
       return;
     ms::LatLon const latLon = MercatorBounds::ToLatLon(*m_position);
-    code = openlocationcode::RecoverNearest(query, {latLon.lat, latLon.lon});
+    code = openlocationcode::RecoverNearest(query, {latLon.m_lat, latLon.m_lon});
   }
 
   if (code.empty())
diff --git a/search/search_quality/assessment_tool/feature_info_dialog.cpp b/search/search_quality/assessment_tool/feature_info_dialog.cpp
index 47b09b532c..193608d87e 100644
--- a/search/search_quality/assessment_tool/feature_info_dialog.cpp
+++ b/search/search_quality/assessment_tool/feature_info_dialog.cpp
@@ -51,7 +51,7 @@ FeatureInfoDialog::FeatureInfoDialog(QWidget * parent, osm::MapObject const & ma
   {
     auto * label = new QLabel("lat lon:");
     auto const ll = mapObject.GetLatLon();
-    auto const ss = strings::to_string_dac(ll.lat, 5) + " " + strings::to_string_dac(ll.lon, 5);
+    auto const ss = strings::to_string_dac(ll.m_lat, 5) + " " + strings::to_string_dac(ll.m_lon, 5);
     auto * content = MakeSelectableLabel(ss);
 
     AddRow(*layout, label, content);
diff --git a/track_analyzing/track_analyzer/cmd_cpp_track.cpp b/track_analyzing/track_analyzer/cmd_cpp_track.cpp
index 3f4553cefb..15058e9214 100644
--- a/track_analyzing/track_analyzer/cmd_cpp_track.cpp
+++ b/track_analyzing/track_analyzer/cmd_cpp_track.cpp
@@ -24,7 +24,7 @@ void CmdCppTrack(string const & trackFile, string const & mwmName, string const
   cout.precision(8);
   for (MatchedTrackPoint const & point : track)
   {
-    cout << "  {" << point.GetDataPoint().m_latLon.lat << ", " << point.GetDataPoint().m_latLon.lon
+    cout << "  {" << point.GetDataPoint().m_latLon.m_lat << ", " << point.GetDataPoint().m_latLon.m_lon
          << "}," << endl;
   }
   cout.precision(backupPrecision);
diff --git a/track_analyzing/track_analyzer/cmd_gpx.cpp b/track_analyzing/track_analyzer/cmd_gpx.cpp
index ac129a43e0..6b2a623b53 100644
--- a/track_analyzing/track_analyzer/cmd_gpx.cpp
+++ b/track_analyzing/track_analyzer/cmd_gpx.cpp
@@ -50,9 +50,9 @@ void CmdGPX(string const & logFile, string const & outputDirName, string const &
       for (auto const & point : track.second)
       {
         ofs << "<wpt lat=\""
-            << point.m_latLon.lat
+            << point.m_latLon.m_lat
             << "\" lon=\""
-            << point.m_latLon.lon << "\">"
+            << point.m_latLon.m_lon << "\">"
             << "</wpt>\n";
       }
 
diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp
index d14439f6ae..6bf853f934 100644
--- a/track_analyzing/track_analyzer/cmd_table.cpp
+++ b/track_analyzing/track_analyzer/cmd_table.cpp
@@ -202,7 +202,7 @@ public:
   MoveType(RoadInfo const & roadType, traffic::SpeedGroup speedGroup, DataPoint const & dataPoint)
     : m_roadInfo(roadType), m_speedGroup(speedGroup), m_latLon(dataPoint.m_latLon)
   {
-    m_isDayTime = DayTimeToBool(GetDayTime(dataPoint.m_timestamp, m_latLon.lat, m_latLon.lon));
+    m_isDayTime = DayTimeToBool(GetDayTime(dataPoint.m_timestamp, m_latLon.m_lat, m_latLon.m_lon));
   }
 
   bool operator==(MoveType const & rhs) const
@@ -234,7 +234,7 @@ public:
     ostringstream out;
     out << m_roadInfo.GetSummary() << ","
         << m_isDayTime << ","
-        << m_latLon.lat << " " << m_latLon.lon;
+        << m_latLon.m_lat << " " << m_latLon.m_lon;
 
     return out.str();
   }
diff --git a/track_analyzing/track_analyzer/cmd_tracks.cpp b/track_analyzing/track_analyzer/cmd_tracks.cpp
index b2d9236171..d1a87f9d90 100644
--- a/track_analyzing/track_analyzer/cmd_tracks.cpp
+++ b/track_analyzing/track_analyzer/cmd_tracks.cpp
@@ -185,8 +185,8 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil
                << ", departure: " << base::SecondsSinceEpochToString(start.m_timestamp)
                << ", arrival: " << base::SecondsSinceEpochToString(finish.m_timestamp)
                << setprecision(numeric_limits<double>::max_digits10)
-               << ", start: " << start.m_latLon.lat << ", " << start.m_latLon.lon
-               << ", finish: " << finish.m_latLon.lat << ", " << finish.m_latLon.lon << endl;
+               << ", start: " << start.m_latLon.m_lat << ", " << start.m_latLon.m_lon
+               << ", finish: " << finish.m_latLon.m_lat << ", " << finish.m_latLon.m_lon << endl;
         }
 
         mwmStats.AddTracks(1);
diff --git a/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp b/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
index ef96a6f4fa..48040144ba 100644
--- a/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
+++ b/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
@@ -34,7 +34,7 @@ void CmdUnmatchedTracks(string const & logFile, string const & trackFileCsv)
     {
       ofs << numMwmIds->GetFile(kv.first).GetName() << sep << idTrack.first;
       for (auto const & pnt : idTrack.second)
-        ofs << sep << pnt.m_timestamp << sep << pnt.m_latLon.lat << sep << pnt.m_latLon.lon;
+        ofs << sep << pnt.m_timestamp << sep << pnt.m_latLon.m_lat << sep << pnt.m_latLon.m_lon;
       ofs << "\n";
     }
   }
diff --git a/track_generator/pytrack_generator/bindings.cpp b/track_generator/pytrack_generator/bindings.cpp
index 8c2a72a882..2e63bca455 100644
--- a/track_generator/pytrack_generator/bindings.cpp
+++ b/track_generator/pytrack_generator/bindings.cpp
@@ -142,8 +142,8 @@ BOOST_PYTHON_MODULE(pytrack_generator)
 
   class_<ms::LatLon>("LatLon", init<double, double>())
       .def("__str__", &ms::DebugPrint)
-      .def_readonly("lat", &ms::LatLon::lat)
-      .def_readonly("lon", &ms::LatLon::lon);
+      .def_readonly("lat", &ms::LatLon::m_lat)
+      .def_readonly("lon", &ms::LatLon::m_lon);
 
   class_<vector<ms::LatLon>>("LatLonList")
       .def(vector_indexing_suite<vector<ms::LatLon>>());
diff --git a/tracking/pytracking/bindings.cpp b/tracking/pytracking/bindings.cpp
index 6887f4f268..c1f576075c 100644
--- a/tracking/pytracking/bindings.cpp
+++ b/tracking/pytracking/bindings.cpp
@@ -26,8 +26,8 @@ BOOST_PYTHON_MODULE(pytracking)
       .def(vector_indexing_suite<Protocol::DataElementsVec>());
 
   class_<ms::LatLon>("LatLon")
-      .def_readwrite("lat", &ms::LatLon::lat)
-      .def_readwrite("lon", &ms::LatLon::lon);
+      .def_readwrite("lat", &ms::LatLon::m_lat)
+      .def_readwrite("lon", &ms::LatLon::m_lon);
 
   class_<coding::TrafficGPSEncoder::DataPoint>("DataPoint")
       .def(init<uint64_t, ms::LatLon const &, uint8_t>())
diff --git a/tracking/tracking_tests/protocol_test.cpp b/tracking/tracking_tests/protocol_test.cpp
index 76cf4640b3..29f94bc993 100644
--- a/tracking/tracking_tests/protocol_test.cpp
+++ b/tracking/tracking_tests/protocol_test.cpp
@@ -87,10 +87,10 @@ void DecodeDataPacketVersionTest(Container const & points, Protocol::PacketType
   {
     TEST_EQUAL(points[i].m_timestamp, result[i].m_timestamp,
                (points[i].m_timestamp, result[i].m_timestamp));
-    TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.lat, result[i].m_latLon.lat, kEps),
-         (points[i].m_latLon.lat, result[i].m_latLon.lat));
-    TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.lon, result[i].m_latLon.lon, kEps),
-         (points[i].m_latLon.lon, result[i].m_latLon.lon));
+    TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.m_lat, result[i].m_latLon.m_lat, kEps),
+         (points[i].m_latLon.m_lat, result[i].m_latLon.m_lat));
+    TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.m_lon, result[i].m_latLon.m_lon, kEps),
+         (points[i].m_latLon.m_lon, result[i].m_latLon.m_lon));
   }
 }
 
diff --git a/tracking/tracking_tests/reporter_test.cpp b/tracking/tracking_tests/reporter_test.cpp
index 17bff04d7c..c8bac1c45e 100644
--- a/tracking/tracking_tests/reporter_test.cpp
+++ b/tracking/tracking_tests/reporter_test.cpp
@@ -66,8 +66,8 @@ void TransferLocation(Reporter & reporter, TestSocket & testSocket, double times
   TEST_EQUAL(points.size(), 1, ());
   auto const & point = points[0];
   TEST_EQUAL(point.m_timestamp, timestamp, ());
-  TEST(base::AlmostEqualAbs(point.m_latLon.lat, latidute, 0.001), ());
-  TEST(base::AlmostEqualAbs(point.m_latLon.lon, longtitude, 0.001), ());
+  TEST(base::AlmostEqualAbs(point.m_latLon.m_lat, latidute, 0.001), ());
+  TEST(base::AlmostEqualAbs(point.m_latLon.m_lon, longtitude, 0.001), ());
 }
 }