diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index be5ab7ddf5..61767410a5 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -722,7 +722,7 @@ extern "C"
     auto const * feature = mark->GetFeature();
     if (feature)
     {
-      info = fm->GetPOIAddressInfo(*feature);
+      info = fm->GetFeatureAddressInfo(*feature);
       metadata = feature->GetMetadata();
     }
     else
@@ -1164,7 +1164,7 @@ extern "C"
     if (feature)
     {
       metadata = feature->GetMetadata();
-      info = frm()->GetPOIAddressInfo(*feature);
+      info = frm()->GetFeatureAddressInfo(*feature);
     }
     // TODO(AlexZ): else case?
 
diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm
index 4a8eba572f..3b5e5b7908 100644
--- a/iphone/Maps/Classes/MWMPlacePageEntity.mm
+++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm
@@ -179,7 +179,7 @@ void initFieldsMap()
 {
   if (feature)
   {
-    search::AddressInfo const info = GetFramework().GetPOIAddressInfo(*feature);
+    search::AddressInfo const info = GetFramework().GetFeatureAddressInfo(*feature);
     feature::Metadata const & metadata = feature->GetMetadata();
     NSString * const name = @(info.GetPinName().c_str());
     self.title = name.length > 0 ? name : L(@"dropped_pin");
diff --git a/map/address_finder.cpp b/map/address_finder.cpp
index 58d2d81794..67c24fca49 100644
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@@ -474,7 +474,7 @@ void Framework::GetAddressInfoForGlobalPoint(m2::PointD const & pt, search::Addr
   //GetLocality(pt, info);
 }
 
-search::AddressInfo Framework::GetPOIAddressInfo(FeatureType const & ft) const
+search::AddressInfo Framework::GetFeatureAddressInfo(FeatureType const & ft) const
 {
   search::AddressInfo info;
 
diff --git a/map/framework.hpp b/map/framework.hpp
index 867d23ecef..093b3e35f6 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -484,7 +484,7 @@ private:
   void GetLocality(m2::PointD const & pt, search::AddressInfo & info) const;
 
 public:
-  search::AddressInfo GetPOIAddressInfo(FeatureType const & ft) const;
+  search::AddressInfo GetFeatureAddressInfo(FeatureType const & ft) const;
   /// Get feature at given point even if it's invisible on the screen.
   /// TODO(AlexZ): Refactor out other similar methods.
   /// @returns nullptr if no feature was found at the given mercator point.