diff --git a/Marlin/Marlin/DataSources/DFRS/DFRS+Decodable.swift b/Marlin/Marlin/DataSources/DFRS/DFRS+Decodable.swift
index c7f77e1b..a9e3e9fb 100644
--- a/Marlin/Marlin/DataSources/DFRS/DFRS+Decodable.swift
+++ b/Marlin/Marlin/DataSources/DFRS/DFRS+Decodable.swift
@@ -165,13 +165,10 @@ struct DFRSProperties: Decodable {
     static func parsePosition(position: String) -> CLLocationCoordinate2D {
         var latitude = 0.0
         var longitude = 0.0
-        
-        let pattern = #"""
-            (?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"\
-            (?<latdirection>[NS])\
-            \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"\
-            (?<londirection>[EW])
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"(?<latdirection>[NS]) \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"(?<londirection>[EW])"#
+        // swiftlint:enable line_length
+
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(position.startIndex..<position.endIndex,
                               in: position)
diff --git a/Marlin/Marlin/DataSources/DifferentialGPSStation/DifferentialGPSStationModel.swift b/Marlin/Marlin/DataSources/DifferentialGPSStation/DifferentialGPSStationModel.swift
index efc348b7..e4d85535 100644
--- a/Marlin/Marlin/DataSources/DifferentialGPSStation/DifferentialGPSStationModel.swift
+++ b/Marlin/Marlin/DataSources/DifferentialGPSStation/DifferentialGPSStationModel.swift
@@ -232,13 +232,9 @@ struct DifferentialGPSStationModel: Locatable, Bookmarkable, Codable, GeoJSONExp
     static func parsePosition(position: String) -> CLLocationCoordinate2D {
         var latitude = 0.0
         var longitude = 0.0
-        
-        let pattern = #"""
-            (?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"\
-            (?<latdirection>[NS])\
-            \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"\
-            (?<londirection>[EW])
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"(?<latdirection>[NS]) \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"(?<londirection>[EW])"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(position.startIndex..<position.endIndex,
                               in: position)
diff --git a/Marlin/Marlin/DataSources/Light/Light+Decodable.swift b/Marlin/Marlin/DataSources/Light/Light+Decodable.swift
index de68bbb7..adc6d63c 100644
--- a/Marlin/Marlin/DataSources/Light/Light+Decodable.swift
+++ b/Marlin/Marlin/DataSources/Light/Light+Decodable.swift
@@ -206,13 +206,9 @@ struct LightsProperties: Codable {
     static func parsePosition(position: String) -> CLLocationCoordinate2D {
         var latitude = 0.0
         var longitude = 0.0
-        
-        let pattern = #"""
-            (?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"\
-            (?<latdirection>[NS])\
-            \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"\
-            (?<londirection>[EW])
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"(?<latdirection>[NS]) \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"(?<londirection>[EW])"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(position.startIndex..<position.endIndex,
                               in: position)
diff --git a/Marlin/Marlin/DataSources/Light/LightProtocol.swift b/Marlin/Marlin/DataSources/Light/LightProtocol.swift
index c97d057a..74bf297c 100644
--- a/Marlin/Marlin/DataSources/Light/LightProtocol.swift
+++ b/Marlin/Marlin/DataSources/Light/LightProtocol.swift
@@ -264,12 +264,9 @@ struct LightModel: Locatable, Bookmarkable, Codable, CustomStringConvertible {
         var latitude = 0.0
         var longitude = 0.0
         
-        let pattern = #"""
-            (?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"\
-            (?<latdirection>[NS])\
-            \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"\
-            (?<londirection>[EW])
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"(?<latdirection>[NS]) \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"(?<londirection>[EW])"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(position.startIndex..<position.endIndex,
                               in: position)
@@ -407,10 +404,9 @@ struct LightModel: Locatable, Bookmarkable, Codable, CustomStringConvertible {
         }
         var sectors: [ImageSector] = []
         //        Azimuth coverage 270^-170^.
-        let pattern = #"""
-            (?<azimuth>(Azimuth coverage)?).?((?<startdeg>(\d*))\°)?\
-            ((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))\°)?(?<endminutes>[0-9]*)[\`']?\..*
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<azimuth>(Azimuth coverage)?).?((?<startdeg>(\d*))\°)?((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))\°)?(?<endminutes>[0-9]*)[\`']?\..*"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(remarks.startIndex..<remarks.endIndex,
                               in: remarks)
@@ -545,12 +541,9 @@ struct LightModel: Locatable, Bookmarkable, Codable, CustomStringConvertible {
         }
         var sectors: [ImageSector] = []
         
-        let pattern = #"""
-            (?<visible>(Visible)?)(?<fullLightObscured>(bscured)?)((?<color>[A-Z]+)?)\.?\
-            (?<unintensified>(\(unintensified\))?)(?<obscured>(\(bscured\))?)\
-            ( (?<startdeg>(\d*))°)?((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))°)\
-            (?<endminutes>[0-9]*)[\`']?
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<visible>(Visible)?)(?<fullLightObscured>(bscured)?)((?<color>[A-Z]+)?)\.?(?<unintensified>(\(unintensified\))?)(?<obscured>(\(bscured\))?)( (?<startdeg>(\d*))°)?((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))°)(?<endminutes>[0-9]*)[\`']?"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(remarks.startIndex..<remarks.endIndex,
                               in: remarks)
@@ -1133,11 +1126,9 @@ extension LightProtocol {
         }
         var sectors: [ImageSector] = []
         //        Azimuth coverage 270^-170^.
-        let pattern = #"""
-            (?<azimuth>(Azimuth coverage)?).?\
-            ((?<startdeg>(\d*))\°)?((?<startminutes>[0-9]*)[\`'])?\
-            (-(?<enddeg>(\d*))\°)?(?<endminutes>[0-9]*)[\`']?\..*
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<azimuth>(Azimuth coverage)?).?((?<startdeg>(\d*))\°)?((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))\°)?(?<endminutes>[0-9]*)[\`']?\..*"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(remarks.startIndex..<remarks.endIndex,
                               in: remarks)
@@ -1272,12 +1263,9 @@ extension LightProtocol {
         }
         var sectors: [ImageSector] = []
         
-        let pattern = #"""
-            (?<visible>(Visible)?)(?<fullLightObscured>(bscured)?)\
-            ((?<color>[A-Z]+)?)\.?(?<unintensified>(\(unintensified\))?)\
-            (?<obscured>(\(bscured\))?)( (?<startdeg>(\d*))°)?((?<startminutes>[0-9]*)[\`'])?\
-            (-(?<enddeg>(\d*))°)(?<endminutes>[0-9]*)[\`']?
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<visible>(Visible)?)(?<fullLightObscured>(bscured)?)((?<color>[A-Z]+)?)\.?(?<unintensified>(\(unintensified\))?)(?<obscured>(\(bscured\))?)( (?<startdeg>(\d*))°)?((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))°)(?<endminutes>[0-9]*)[\`']?"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(remarks.startIndex..<remarks.endIndex,
                               in: remarks)
diff --git a/Marlin/Marlin/DataSources/RadioBeacon/RadioBeacon+CoreDataClass.swift b/Marlin/Marlin/DataSources/RadioBeacon/RadioBeacon+CoreDataClass.swift
index 2be16297..0c4388a3 100644
--- a/Marlin/Marlin/DataSources/RadioBeacon/RadioBeacon+CoreDataClass.swift
+++ b/Marlin/Marlin/DataSources/RadioBeacon/RadioBeacon+CoreDataClass.swift
@@ -90,10 +90,9 @@ class RadioBeacon: NSManagedObject {
             return nil
         }
         var sectors: [ImageSector] = []
-        let pattern = #"""
-            (?<azimuth>(Azimuth coverage)?).?((?<startdeg>(\d*))\^)?((?<startminutes>[0-9]*)[\`'])?\
-            (-(?<enddeg>(\d*))\^)?(?<endminutes>[0-9]*)[\`']?\.
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<azimuth>(Azimuth coverage)?).?((?<startdeg>(\d*))\^)?((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))\^)?(?<endminutes>[0-9]*)[\`']?\."#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(remarks.startIndex..<remarks.endIndex,
                               in: remarks)
diff --git a/Marlin/Marlin/DataSources/RadioBeacon/RadioBeaconModel.swift b/Marlin/Marlin/DataSources/RadioBeacon/RadioBeaconModel.swift
index 0690863a..44e1487d 100644
--- a/Marlin/Marlin/DataSources/RadioBeacon/RadioBeaconModel.swift
+++ b/Marlin/Marlin/DataSources/RadioBeacon/RadioBeaconModel.swift
@@ -214,12 +214,9 @@ struct RadioBeaconModel: Codable, Bookmarkable, Locatable, GeoJSONExportable, Cu
         var latitude = 0.0
         var longitude = 0.0
         
-        let pattern = #"""
-            (?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"\
-            (?<latdirection>[NS])\
-            \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"\
-            (?<londirection>[EW])
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<latdeg>[0-9]*)°(?<latminutes>[0-9]*)'(?<latseconds>[0-9]*\.?[0-9]*)\"(?<latdirection>[NS]) \n(?<londeg>[0-9]*)°(?<lonminutes>[0-9]*)'(?<lonseconds>[0-9]*\.?[0-9]*)\"(?<londirection>[EW])"#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(position.startIndex..<position.endIndex,
                               in: position)
@@ -359,11 +356,9 @@ struct RadioBeaconModel: Codable, Bookmarkable, Locatable, GeoJSONExportable, Cu
             return nil
         }
         var sectors: [ImageSector] = []
-        let pattern = #"""
-            (?<azimuth>(Azimuth coverage)?).?\
-            ((?<startdeg>(\d*))\^)?((?<startminutes>[0-9]*)[\`'])?\
-            (-(?<enddeg>(\d*))\^)?(?<endminutes>[0-9]*)[\`']?\.
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<azimuth>(Azimuth coverage)?).?((?<startdeg>(\d*))\^)?((?<startminutes>[0-9]*)[\`'])?(-(?<enddeg>(\d*))\^)?(?<endminutes>[0-9]*)[\`']?\."#
+        // swiftlint:enable line_length
         let regex = try? NSRegularExpression(pattern: pattern, options: [])
         let nsrange = NSRange(remarks.startIndex..<remarks.endIndex,
                               in: remarks)
diff --git a/Marlin/Marlin/Extensions/CLLocationCoordinate2DExtensions.swift b/Marlin/Marlin/Extensions/CLLocationCoordinate2DExtensions.swift
index 0484a1bd..d441895b 100644
--- a/Marlin/Marlin/Extensions/CLLocationCoordinate2DExtensions.swift
+++ b/Marlin/Marlin/Extensions/CLLocationCoordinate2DExtensions.swift
@@ -731,13 +731,9 @@ extension CLLocationCoordinate2D {
             return nil
         }
         
-        let pattern = #"""
-            (?<latdeg>-?[0-9]*\.?\d+)[\s°-]*(?<latminutes>\d{1,2}\.?\d+)?\
-            [\s\`'-]*(?<latseconds>\d{1,2}\.?\d+)?[\s\"\
-            ]?(?<latdirection>([NOEWS])?)[\s,]*(?<londeg>-?[0-9]*\.?\d+)\
-            [\s°-]*(?<lonminutes>\d{1,2}\.?\d+)?[\s\`'-]*\
-            (?<lonseconds>\d{1,2}\.?\d+)?[\s\" ]*(?<londirection>([NOEWS])?)
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<latdeg>-?[0-9]*\.?\d+)[\s°-]*(?<latminutes>\d{1,2}\.?\d+)?[\s\`'-]*(?<latseconds>\d{1,2}\.?\d+)?[\s\" ]?(?<latdirection>([NOEWS])?)[\s,]*(?<londeg>-?[0-9]*\.?\d+)[\s°-]*(?<lonminutes>\d{1,2}\.?\d+)?[\s\`'-]*(?<lonseconds>\d{1,2}\.?\d+)?[\s\" ]*(?<londirection>([NOEWS])?)"#
+        // swiftlint:enable line_length
 
         var foundLat: Bool = false
         var foundLon: Bool = false
@@ -811,10 +807,9 @@ extension CLLocationCoordinate2D {
 extension Double {
     
     init?(coordinateString: String) {
-        let pattern = #"""
-            (?<deg>-?[0-9]*\.?\d+)[\s°-]*(?<minutes>\d{1,2}\.?\d+)?[\s\`'-]*\
-            (?<seconds>\d{1,2}\.?\d+)?[\s\" ]?(?<direction>([NOEWS])?)
-        """#
+        // swiftlint:disable line_length
+        let pattern = #"(?<deg>-?[0-9]*\.?\d+)[\s°-]*(?<minutes>\d{1,2}\.?\d+)?[\s\`'-]*(?<seconds>\d{1,2}\.?\d+)?[\s\" ]?(?<direction>([NOEWS])?)"#
+        // swiftlint:enable line_length
 
         var found: Bool = false
         var degrees: Double = 0.0
diff --git a/Marlin/Marlin/Marlin-Bridging-Header.h b/Marlin/Marlin/Marlin-Bridging-Header.h
index 58fd4d51..80a990a0 100644
--- a/Marlin/Marlin/Marlin-Bridging-Header.h
+++ b/Marlin/Marlin/Marlin-Bridging-Header.h
@@ -15,6 +15,7 @@
 #import "SFGeometry.h"
 #import "SFPoint.h"
 #import "SFGeometryCollection.h"
+#import "SFGeometryUtils.h"
 
 //#import "sf-ios-umbrella.h"
 
diff --git a/Marlin/MarlinTests/MarlinFullFlowTest.swift b/Marlin/MarlinTests/MarlinFullFlowTest.swift
index c65f7860..d3e90439 100644
--- a/Marlin/MarlinTests/MarlinFullFlowTest.swift
+++ b/Marlin/MarlinTests/MarlinFullFlowTest.swift
@@ -35,7 +35,7 @@ final class MarlinFullFlowTest: XCTestCase {
             .removeDuplicates()
             .sink { output in
                 TestHelpers.clearData()
-                for dataSource in MSI.shared.masterDataList {
+                for dataSource in MSI.shared.mainDataList {
                     switch dataSource {
                     case let mapImage as MapImage.Type:
                         mapImage.imageCache.clearCache()
@@ -67,7 +67,7 @@ final class MarlinFullFlowTest: XCTestCase {
             return
         }
         
-        for dataSource in MSI.shared.masterDataList {
+        for dataSource in MSI.shared.mainDataList {
             switch dataSource {
             case let mapImage as MapImage.Type:
                 mapImage.imageCache.clearCache()
@@ -252,7 +252,7 @@ final class MarlinFullFlowTest: XCTestCase {
             return
         }
         
-        for dataSource in MSI.shared.masterDataList {
+        for dataSource in MSI.shared.mainDataList {
             switch dataSource {
             case let mapImage as MapImage.Type:
                 mapImage.imageCache.clearCache()
diff --git a/Marlin/MarlinTests/Views/BadgeTests.swift b/Marlin/MarlinTests/Views/BadgeTests.swift
index 3a0a169c..a95db52f 100644
--- a/Marlin/MarlinTests/Views/BadgeTests.swift
+++ b/Marlin/MarlinTests/Views/BadgeTests.swift
@@ -21,7 +21,7 @@ final class BadgeTests: XCTestCase {
     }
     
     func testCheckBadge() {
-        let badge = CheckBadge(on: Binding.constant(true))
+        let badge = CheckBadge(checked: Binding.constant(true))
         let controller = UIHostingController(rootView: badge)
         let window = TestHelpers.getKeyWindowVisible()
         window.rootViewController = controller
diff --git a/Marlin/MarlinTests/Views/DataLoadedNotificationBannerTests.swift b/Marlin/MarlinTests/Views/DataLoadedNotificationBannerTests.swift
index 4b00e10d..85798b40 100644
--- a/Marlin/MarlinTests/Views/DataLoadedNotificationBannerTests.swift
+++ b/Marlin/MarlinTests/Views/DataLoadedNotificationBannerTests.swift
@@ -20,7 +20,7 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
     
     func testShowNotification() {
         let appState = AppState()
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 3)]
         ]
         appState.loadingDataSource[MockDataSourceNonMappable.key] = false
@@ -36,7 +36,7 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
     
     func testExpandNotification() {
         let appState = AppState()
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 3)],
             Modu.key : [DataSourceUpdatedNotification(key: Modu.key, updates: 1, inserts: 3)],
             Light.key : [DataSourceUpdatedNotification(key: Light.key, updates: 1, inserts: 3)],
@@ -61,7 +61,7 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
     
     func testClearNotification() {
         let appState = AppState()
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 3)]
         ]
         appState.loadingDataSource[MockDataSourceNonMappable.key] = false
@@ -74,20 +74,20 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
         let controller = UIHostingController(rootView: view)
         let window = TestHelpers.getKeyWindowVisible()
         window.rootViewController = controller
-        XCTAssertFalse(appState.dataSourceBatchImportNotificationsPending.isEmpty)
+        XCTAssertFalse(appState.dsBatchImportNotificationsPending.isEmpty)
         tester().waitForView(withAccessibilityLabel: "3 new \(Asam.fullDataSourceName)")
         tester().waitForView(withAccessibilityLabel: "Clear")
         let lastDate = appState.lastNotificationRequestDate
         appState.consolidatedDataLoadedNotification = ""
         tester().tapView(withAccessibilityLabel: "Clear")
         XCTAssertNotEqual(lastDate, appState.lastNotificationRequestDate)
-        XCTAssertTrue(appState.dataSourceBatchImportNotificationsPending.isEmpty)
+        XCTAssertTrue(appState.dsBatchImportNotificationsPending.isEmpty)
         tester().waitForAbsenceOfView(withAccessibilityLabel: "3 new \(Asam.fullDataSourceName)")
     }
     
     func testShowNotificationAddExtra() {
         let appState = AppState()
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 3)]
         ]
         appState.consolidatedDataLoadedNotification = "3 new \(Asam.fullDataSourceName)"
@@ -99,7 +99,7 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
         window.rootViewController = controller
         tester().waitForView(withAccessibilityLabel: "3 new \(Asam.fullDataSourceName)")
         
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 12)]
         ]
         appState.consolidatedDataLoadedNotification = "15 new \(Asam.fullDataSourceName)"
@@ -109,7 +109,7 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
     
     func testOnlyShowDataSourcesWithInserts() {
         let appState = AppState()
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 3)],
             Modu.key : [DataSourceUpdatedNotification(key: Modu.key, updates: 2, inserts: 0)]
         ]
@@ -125,7 +125,7 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
     
     func testShowPreviousInsertsIfNewWithOnlyUpdatesComesIn() {
         let appState = AppState()
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 3)]
         ]
         appState.consolidatedDataLoadedNotification = "3 new \(Asam.fullDataSourceName)"
@@ -137,7 +137,7 @@ final class DataLoadedNotificationBannerTests: XCTestCase {
         window.rootViewController = controller
         tester().waitForView(withAccessibilityLabel: "3 new \(Asam.fullDataSourceName)")
         
-        appState.dataSourceBatchImportNotificationsPending = [
+        appState.dsBatchImportNotificationsPending = [
             Asam.key : [DataSourceUpdatedNotification(key: Asam.key, updates: 1, inserts: 0)]
         ]
         appState.consolidatedDataLoadedNotification = "3 new \(Asam.fullDataSourceName)"