Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs
===================================================================
diff -u -rb519fc798c63691f04bb8008b562a94ed9232d51 -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs	(.../RingtoetsBackgroundMapDataFactoryTest.cs)	(revision b519fc798c63691f04bb8008b562a94ed9232d51)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs	(.../RingtoetsBackgroundMapDataFactoryTest.cs)	(revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4)
@@ -47,10 +47,10 @@
         public void CreateBackgroundMapData_BackgroundMapDataTypeWellKnown_ReturnNull()
         {
             // Setup
-            BackgroundMapData backgroundMapData = BackgroundMapDataTestDataGenerator.GetWellKnownBackgroundMapData();
+            BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWellKnownBackgroundMapData();
 
             // Call
-            WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundMapData);
+            WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
 
             // Assert
             Assert.IsNull(mapData);
@@ -61,10 +61,10 @@
         {
             // Setup
             WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundMapData backgroundMapData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+            BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
 
             // Call
-            WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundMapData);
+            WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
 
             // Assert
             Assert.AreEqual(wmtsMapData.Name, mapData.Name);
@@ -81,10 +81,10 @@
         {
             // Setup
             WmtsMapData wmtsMapData = WmtsMapData.CreateUnconnectedMapData();
-            BackgroundMapData backgroundMapData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+            BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
 
             // Call
-            WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundMapData);
+            WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
 
             // Assert
             Assert.AreEqual(wmtsMapData.Name, mapData.Name);
@@ -100,7 +100,7 @@
         public void UpdateBackgroundMapData_WmtsMapDataNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate test = () => RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(null, new BackgroundMapData());
+            TestDelegate test = () => RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(null, new BackgroundData());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -123,18 +123,18 @@
         {
             // Setup
             WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundMapData backgroundMapData = BackgroundMapDataTestDataGenerator.GetWellKnownBackgroundMapData();
+            BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWellKnownBackgroundMapData();
 
             string originalName = wmtsMapData.Name;
             bool originalVisibility = wmtsMapData.IsVisible;
             RoundedDouble originalTransparancy = wmtsMapData.Transparency;
 
-            backgroundMapData.Name = "new name";
-            backgroundMapData.IsVisible = true;
-            backgroundMapData.Transparency = (RoundedDouble) 0.4;
+            backgroundData.Name = "new name";
+            backgroundData.IsVisible = true;
+            backgroundData.Transparency = (RoundedDouble) 0.4;
 
             // Call
-            RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(wmtsMapData, backgroundMapData);
+            RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(wmtsMapData, backgroundData);
 
             // Assert
             Assert.AreEqual(originalName, wmtsMapData.Name);
@@ -147,18 +147,18 @@
         {
             // Setup
             WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundMapData backgroundMapData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+            BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
 
-            string originalSourceCapabilitiesUrl = backgroundMapData.Parameters["SourceCapabilitiesUrl"];
-            string originalSelectedCapabilityIdentifier = backgroundMapData.Parameters["SelectedCapabilityIdentifier"];
-            string originalPreferredFormat = backgroundMapData.Parameters["PreferredFormat"];
+            string originalSourceCapabilitiesUrl = backgroundData.Parameters["SourceCapabilitiesUrl"];
+            string originalSelectedCapabilityIdentifier = backgroundData.Parameters["SelectedCapabilityIdentifier"];
+            string originalPreferredFormat = backgroundData.Parameters["PreferredFormat"];
 
-            backgroundMapData.Parameters["SourceCapabilitiesUrl"] = "some/url";
-            backgroundMapData.Parameters["SelectedCapabilityIdentifier"] = "identifier";
-            backgroundMapData.Parameters["PreferredFormat"] = "image/format";
+            backgroundData.Parameters["SourceCapabilitiesUrl"] = "some/url";
+            backgroundData.Parameters["SelectedCapabilityIdentifier"] = "identifier";
+            backgroundData.Parameters["PreferredFormat"] = "image/format";
 
             // Call
-            RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(wmtsMapData, backgroundMapData);
+            RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(wmtsMapData, backgroundData);
 
             // Assert
             Assert.AreNotEqual(originalSourceCapabilitiesUrl, wmtsMapData.SourceCapabilitiesUrl);
@@ -171,16 +171,16 @@
         {
             // Given
             WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundMapData backgroundMapData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+            BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
 
             // Precondition
             Assert.IsNotNull(wmtsMapData.SourceCapabilitiesUrl);
             Assert.IsNotNull(wmtsMapData.SelectedCapabilityIdentifier);
             Assert.IsNotNull(wmtsMapData.PreferredFormat);
 
             // When
-            backgroundMapData.IsConfigured = false;
-            RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(wmtsMapData, backgroundMapData);
+            backgroundData.IsConfigured = false;
+            RingtoetsBackgroundMapDataFactory.UpdateBackgroundMapData(wmtsMapData, backgroundData);
 
             // Then
             Assert.IsNull(wmtsMapData.SourceCapabilitiesUrl);