diff --git a/iphone/Maps/Categories/UIViewController+alternative.swift b/iphone/Maps/Categories/UIViewController+alternative.swift
index 5b0ac0a38..ad126ce03 100644
--- a/iphone/Maps/Categories/UIViewController+alternative.swift
+++ b/iphone/Maps/Categories/UIViewController+alternative.swift
@@ -1,9 +1,9 @@
 extension UIViewController {
   func alternativeSizeClass<T>(iPhone: @autoclosure () -> T, iPad: @autoclosure () -> T) -> T {
-    isIPad ? iPad() : iPhone()
+    isiPad ? iPad() : iPhone()
   }
 
   func alternativeSizeClass(iPhone: () -> Void, iPad: () -> Void) {
-    isIPad ? iPad() : iPhone()
+    isiPad ? iPad() : iPhone()
   }
 }
diff --git a/iphone/Maps/Common/Common.swift b/iphone/Maps/Common/Common.swift
index 27a5c39c2..79f85d43f 100644
--- a/iphone/Maps/Common/Common.swift
+++ b/iphone/Maps/Common/Common.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-var isIPad: Bool {
+var isiPad: Bool {
   if #available(iOS 14.0, *), ProcessInfo.processInfo.isiOSAppOnMac {
     return true
   }
@@ -9,16 +9,16 @@ var isIPad: Bool {
 
 func L(_ key: String) -> String { return NSLocalizedString(key, comment: "") }
 
-func alternative<T>(iPhone: T, iPad: T) -> T { isIPad ? iPad : iPhone }
+func alternative<T>(iPhone: T, iPad: T) -> T { isiPad ? iPad : iPhone }
 
 func iPadSpecific(_ f: () -> Void) {
-  if isIPad {
+  if isiPad {
     f()
   }
 }
 
 func iPhoneSpecific(_ f: () -> Void) {
-  if !isIPad {
+  if !isiPad {
     f()
   }
 }
diff --git a/iphone/Maps/Core/Theme/GlobalStyleSheet.swift b/iphone/Maps/Core/Theme/GlobalStyleSheet.swift
index bed3b22e5..3afe39ae7 100644
--- a/iphone/Maps/Core/Theme/GlobalStyleSheet.swift
+++ b/iphone/Maps/Core/Theme/GlobalStyleSheet.swift
@@ -452,7 +452,7 @@ extension GlobalStyleSheet: IStyleSheet {
         s.shadowRadius = 6
         s.cornerRadius = .modalSheet
         s.clip = false
-        s.maskedCorners = isIPad ? [] : [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        s.maskedCorners = isiPad ? [] : [.layerMinXMinYCorner, .layerMaxXMinYCorner]
       }
     case .modalSheetContent:
       return .addFrom(Self.modalSheetBackground) { s in
diff --git a/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift b/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift
index dbece4923..13667c4a0 100644
--- a/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift
+++ b/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift
@@ -125,7 +125,7 @@ extension PlacePageStyleSheet: IStyleSheet {
     case .ppBackgroundView:
       return .addFrom(GlobalStyleSheet.modalSheetBackground) { s in
         s.backgroundColor = colors.pressBackground
-        s.maskedCorners = isIPad ? CACornerMask.all : [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        s.maskedCorners = isiPad ? CACornerMask.all : [.layerMinXMinYCorner, .layerMaxXMinYCorner]
         s.clip = false
       }
     case .ppView:
diff --git a/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift b/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift
index 86140be75..33c96f3b6 100644
--- a/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift
+++ b/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift
@@ -130,7 +130,7 @@ final class SearchOnMapTests: XCTestCase {
     searchManager.results = results
 
     interactor.handle(.didSelectResult(results[0], withQuery: query))
-    if isIPad {
+    if isiPad {
       XCTAssertEqual(currentState, .searching)
       XCTAssertEqual(view.viewModel.presentationStep, .fullScreen)
     } else {
@@ -145,7 +145,7 @@ final class SearchOnMapTests: XCTestCase {
 
     interactor.handle(.didSelectPlaceOnMap)
 
-    if isIPad {
+    if isiPad {
       XCTAssertNotEqual(view.viewModel.presentationStep, .hidden)
     } else {
       XCTAssertEqual(view.viewModel.presentationStep, .hidden)
@@ -163,7 +163,7 @@ final class SearchOnMapTests: XCTestCase {
     searchManager.results = results
 
     interactor.handle(.didSelectResult(results[0], withQuery: query))
-    if isIPad {
+    if isiPad {
       XCTAssertEqual(currentState, .searching)
       XCTAssertEqual(view.viewModel.presentationStep, .fullScreen)
     } else {
diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift
index f84ad6231..198f5d5dd 100644
--- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift
+++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift
@@ -48,7 +48,7 @@ final class SearchOnMapInteractor: NSObject {
     case .didSelectResult(let result, let query):
       return processSelectedResult(result, query: query)
     case .didSelectPlaceOnMap:
-      return isIPad ? .none : .setSearchScreenHidden(true)
+      return isiPad ? .none : .setSearchScreenHidden(true)
     case .didDeselectPlaceOnMap:
       return deselectPlaceOnMap()
     case .didStartDraggingMap:
@@ -113,7 +113,7 @@ final class SearchOnMapInteractor: NSObject {
       @unknown default:
         fatalError("Unsupported routingTooltipSearch")
       }
-      return isIPad ? .none : .setSearchScreenHidden(true)
+      return isiPad ? .none : .setSearchScreenHidden(true)
     case .suggestion:
       let suggestionQuery = SearchQuery(result.suggestion,
                                         locale: query.locale,