diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
index 07b6cf2cf7..9776c4182e 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
@@ -209,7 +209,7 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
   [self updateTopController];
   NodeAttrs attrs;
   GetFramework().Storage().GetNodeAttrs(countryId, attrs);
-  if (IsDownloadFailed(attrs.m_status))
+  if (attrs.m_status == NodeStatus::Error)
     [self.downloadController setDownloadFailed];
   if (self.state == MWMSearchManagerStateTableSearch || self.state == MWMSearchManagerStateMapSearch)
   {
@@ -220,7 +220,7 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
   }
 }
 
-- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::LocalAndRemoteSizeT const &)progress
+- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::TLocalAndRemoteSize const &)progress
 {
   using namespace storage;
   CGFloat const normProgress = (CGFloat)progress.first / progress.second;
diff --git a/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm b/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm
index 5dc6d5baaa..055a6eb312 100644
--- a/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm
+++ b/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm
@@ -158,7 +158,7 @@ void loopWrappers(TObservers * observers, TLoopBlock block)
       [observer processCountryEvent:countryId];
     });
   },
-  [observers](storage::TCountryId const & countryId, storage::LocalAndRemoteSizeT const & progress)
+  [observers](storage::TCountryId const & countryId, storage::TLocalAndRemoteSize const & progress)
   {
     loopWrappers(observers, ^(TStorageObserver observer)
     {
diff --git a/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h b/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h
index 4814b4e294..81fbd08616 100644
--- a/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h
+++ b/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h
@@ -38,6 +38,7 @@
 
 @optional
 
-- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::LocalAndRemoteSizeT const &)progress;
+- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::TLocalAndRemoteSize const &)progress;
 
 @end
+
diff --git a/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm b/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
index 572e62f5c9..532bd271de 100644
--- a/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
+++ b/iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
@@ -89,7 +89,7 @@ static int gStorageSubscriptionId = kNotSubscribed;
             });
             [Alohalytics logEvent:kDownloadedSecondMapEvent];
           }
-        }, [](storage::TCountryId const &, storage::LocalAndRemoteSizeT const &){});
+        }, [](storage::TCountryId const &, storage::TLocalAndRemoteSize const &){});
       }
     }
   }