Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r935e492135a782b9e63c0924df798ebb358ac7cc -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -478,11 +478,6 @@
       <Name>Core.Common.Utils</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\ClosingStructures\src\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{c6309704-d67b-434c-bc98-9f8910bc1d10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundDataEntityReadExtensions.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundDataEntityReadExtensions.cs	(.../BackgroundDataEntityReadExtensions.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundDataEntityReadExtensions.cs	(.../BackgroundDataEntityReadExtensions.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Base.Data;
-using Core.Components.Gis.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 
 namespace Application.Ringtoets.Storage.Read
@@ -113,7 +112,7 @@
                 backgroundDataMetaEntities.Single(metaEntity => metaEntity.Key.Equals(BackgroundDataIdentifiers.WellKnownTileSource))
                                           .Read();
 
-            var wellKnownTileSource = (WellKnownTileSource) Convert.ToInt32(parameter.Value);
+            var wellKnownTileSource = (RingtoetsWellKnownTileSource) Convert.ToInt32(parameter.Value);
             return new WellKnownBackgroundDataConfiguration(wellKnownTileSource);
         }
     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r935e492135a782b9e63c0924df798ebb358ac7cc -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -252,10 +252,6 @@
       <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
@@ -268,10 +264,6 @@
       <Project>{EFD7E662-5B69-4B71-A448-565B64E9C033}</Project>
       <Name>Migration.Core.Storage</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Migration\Core\test\Migration.Core.Storage.TestUtil\Migration.Core.Storage.TestUtil.csproj">
-      <Project>{92CFD164-3E35-440A-85A7-A7F5A43B1B12}</Project>
-      <Name>Migration.Core.Storage.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Migration\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
       <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
       <Name>Migration.Scripts.Data</Name>
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/BackgroundDataCreateExtensionsTest.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/BackgroundDataCreateExtensionsTest.cs	(.../BackgroundDataCreateExtensionsTest.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/BackgroundDataCreateExtensionsTest.cs	(.../BackgroundDataCreateExtensionsTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -26,7 +26,6 @@
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
-using Core.Components.Gis.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 
@@ -108,12 +107,12 @@
         {
             // Setup
             var random = new Random(21);
-            var wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            var wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
 
             const string name = "background";
             const bool isVisible = true;
             const BackgroundMapDataType backgroundDataType = BackgroundMapDataType.WellKnown;
-            RoundedDouble transparancy = (RoundedDouble)0.3;
+            RoundedDouble transparancy = (RoundedDouble) 0.3;
 
             var configuration = new WellKnownBackgroundDataConfiguration(wellKnownTileSource);
             var backgroundData = new BackgroundData(configuration)
@@ -135,13 +134,12 @@
             var expectedKeyValuePairs = new Dictionary<string, string>
             {
                 {
-                    BackgroundDataIdentifiers.WellKnownTileSource, ((int)wellKnownTileSource).ToString()
+                    BackgroundDataIdentifiers.WellKnownTileSource, ((int) wellKnownTileSource).ToString()
                 }
             };
             var actualKeyValuePairs = entity.BackgroundDataMetaEntities.Select(
                 metaEntity => new KeyValuePair<string, string>(metaEntity.Key, metaEntity.Value));
             CollectionAssert.AreEquivalent(expectedKeyValuePairs, actualKeyValuePairs);
         }
-
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/WellKnownBackgroundDataConfiguration.cs
===================================================================
diff -u -r29229277f338527e1b145a8f38ab032c1027494b -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/WellKnownBackgroundDataConfiguration.cs	(.../WellKnownBackgroundDataConfiguration.cs)	(revision 29229277f338527e1b145a8f38ab032c1027494b)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/WellKnownBackgroundDataConfiguration.cs	(.../WellKnownBackgroundDataConfiguration.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Core.Components.Gis.Data;
-
 namespace Ringtoets.Common.Data.AssessmentSection
 {
     /// <summary>
@@ -32,14 +30,14 @@
         /// Instantiates a <see cref="WellKnownBackgroundDataConfiguration"/>.
         /// </summary>
         /// <param name="wellKnownTileSource">The type of well known tile source.</param>
-        public WellKnownBackgroundDataConfiguration(WellKnownTileSource wellKnownTileSource)
+        public WellKnownBackgroundDataConfiguration(RingtoetsWellKnownTileSource wellKnownTileSource)
         {
             WellKnownTileSource = wellKnownTileSource;
         }
 
         /// <summary>
         /// Gets the type of well known tile source.
         /// </summary>
-        public WellKnownTileSource WellKnownTileSource { get; private set; }
+        public RingtoetsWellKnownTileSource WellKnownTileSource { get; private set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r935e492135a782b9e63c0924df798ebb358ac7cc -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -125,10 +125,6 @@
       <Name>Core.Common.Utils</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/TypeConverters/BackgroundDataConverter.cs
===================================================================
diff -u -ra7c7037989d2ccfa2d482a1f54f7f9f8bac0b9e7 -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/src/Ringtoets.Common.Utils/TypeConverters/BackgroundDataConverter.cs	(.../BackgroundDataConverter.cs)	(revision a7c7037989d2ccfa2d482a1f54f7f9f8bac0b9e7)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/TypeConverters/BackgroundDataConverter.cs	(.../BackgroundDataConverter.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -133,7 +133,7 @@
 
         private static WellKnownBackgroundDataConfiguration CreateWellKnownBackgroundDataConfiguration(WellKnownTileSourceMapData mapData)
         {
-            return new WellKnownBackgroundDataConfiguration(mapData.TileSource);
+            return new WellKnownBackgroundDataConfiguration((RingtoetsWellKnownTileSource) mapData.TileSource);
         }
 
         private static WmtsBackgroundDataConfiguration CreateWmtsBackgroundDataConfiguration(WmtsMapData mapData)
@@ -169,7 +169,7 @@
         /// contains an invalid value for <see cref="WellKnownTileSource"/>.</exception>
         private static WellKnownTileSourceMapData CreateWellKnownMapdata(WellKnownBackgroundDataConfiguration backgroundDataConfiguration)
         {
-            return new WellKnownTileSourceMapData(backgroundDataConfiguration.WellKnownTileSource);
+            return new WellKnownTileSourceMapData((WellKnownTileSource) backgroundDataConfiguration.WellKnownTileSource);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/WellKnownBackgroundDataConfigurationTest.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/WellKnownBackgroundDataConfigurationTest.cs	(.../WellKnownBackgroundDataConfigurationTest.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/WellKnownBackgroundDataConfigurationTest.cs	(.../WellKnownBackgroundDataConfigurationTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -21,7 +21,6 @@
 
 using System;
 using Core.Common.TestUtil;
-using Core.Components.Gis.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 
@@ -35,7 +34,7 @@
         {
             // Setup
             var random = new Random(21);
-            var wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            var wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
 
             // Call
             var configuration = new WellKnownBackgroundDataConfiguration(wellKnownTileSource);
@@ -45,4 +44,4 @@
             Assert.AreEqual(wellKnownTileSource, configuration.WellKnownTileSource);
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r935e492135a782b9e63c0924df798ebb358ac7cc -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -110,10 +110,6 @@
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs	(.../BackgroundDataTestDataGeneratorTest.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs	(.../BackgroundDataTestDataGeneratorTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -80,7 +80,7 @@
         {
             // Setup
             var random = new Random(21);
-            WellKnownTileSource wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            RingtoetsWellKnownTileSource wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
 
             // Call
             BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
@@ -100,7 +100,7 @@
         public void GetWellKnownBackgroundMapData_WithInvalidWellKnownTileSourceValue_ThrowsInvalidEnumArgumentException()
         {
             // Setup
-            const WellKnownTileSource invalidWellKnownTileSource = (WellKnownTileSource) 1337;
+            const RingtoetsWellKnownTileSource invalidWellKnownTileSource = (RingtoetsWellKnownTileSource) 1337;
 
             // Call
             TestDelegate call = () => BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(invalidWellKnownTileSource);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs
===================================================================
diff -u -r935e492135a782b9e63c0924df798ebb358ac7cc -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs	(.../BackgroundDataTestDataGenerator.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs	(.../BackgroundDataTestDataGenerator.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -52,13 +52,13 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="BackgroundData"/> with <see cref="WellKnownTileSource"/>.
+        /// Gets the <see cref="BackgroundData"/> with <see cref="RingtoetsWellKnownTileSource"/>.
         /// </summary>
-        /// <param name="tileSource">The <see cref="WellKnownTileSource"/> to create the background data for.</param>
+        /// <param name="tileSource">The <see cref="RingtoetsWellKnownTileSource"/> to create the background data for.</param>
         /// <returns>The created <see cref="BackgroundData"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="tileSource"/>
-        /// is an invalid <see cref="WellKnownTileSource"/>.</exception>
-        public static BackgroundData GetWellKnownBackgroundMapData(WellKnownTileSource tileSource)
+        /// is an invalid <see cref="RingtoetsWellKnownTileSource"/>.</exception>
+        public static BackgroundData GetWellKnownBackgroundMapData(RingtoetsWellKnownTileSource tileSource)
         {
             return new BackgroundData(new WellKnownBackgroundDataConfiguration(tileSource))
             {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs	(.../RingtoetsBackgroundMapDataFactoryTest.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs	(.../RingtoetsBackgroundMapDataFactoryTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -76,22 +76,22 @@
         {
             // Setup
             var random = new Random(21);
-            WellKnownTileSource wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            RingtoetsWellKnownTileSource wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
             BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
 
             // Call
             ImageBasedMapData backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
 
             // Assert
-            var expectedMapData = new WellKnownTileSourceMapData(wellKnownTileSource);
+            var expectedMapData = new WellKnownTileSourceMapData((WellKnownTileSource) wellKnownTileSource);
             MapDataTestHelper.AssertImageBasedMapData(expectedMapData, backgroundMapData);
         }
 
         [Test]
         public void CreateBackgroundMapData_InvalidWellKnownConfiguredBackgroundData_ThrowsInvalidEnumArgumentException()
         {
             // Setup
-            var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration((WellKnownTileSource) 1337));
+            var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration((RingtoetsWellKnownTileSource) 1337));
 
             // Call
             TestDelegate call = ()=> RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs
===================================================================
diff -u -r29229277f338527e1b145a8f38ab032c1027494b -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 29229277f338527e1b145a8f38ab032c1027494b)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -53,12 +53,12 @@
         {
             get
             {
-                yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(WellKnownTileSource.BingAerial),
+                yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(RingtoetsWellKnownTileSource.BingAerial),
                                               BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData()))
                     .SetName("WellKnownToWmts");
 
                 yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData()),
-                                              BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(WellKnownTileSource.BingAerial))
+                                              BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(RingtoetsWellKnownTileSource.BingAerial))
                     .SetName("WmtsToWellKnown");
             }
         }
@@ -298,8 +298,8 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            const WellKnownTileSource wellKnownTileSource = WellKnownTileSource.BingAerial;
-            var mapData = new WellKnownTileSourceMapData(wellKnownTileSource);
+            const RingtoetsWellKnownTileSource wellKnownTileSource = RingtoetsWellKnownTileSource.BingAerial;
+            var mapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial);
             BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
@@ -315,7 +315,7 @@
                 ImageBasedMapData oldBackgroundMapData = control.BackgroundMapData;
 
                 // When
-                backgroundData.Configuration = new WellKnownBackgroundDataConfiguration(WellKnownTileSource.BingRoads);
+                backgroundData.Configuration = new WellKnownBackgroundDataConfiguration(RingtoetsWellKnownTileSource.BingRoads);
                 backgroundData.NotifyObservers();
 
                 // Then
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs
===================================================================
diff -u -ra7c7037989d2ccfa2d482a1f54f7f9f8bac0b9e7 -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs	(.../BackgroundDataConverterTest.cs)	(revision a7c7037989d2ccfa2d482a1f54f7f9f8bac0b9e7)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs	(.../BackgroundDataConverterTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -161,24 +161,24 @@
         [Test]
         public void ConvertFrom_BackgroundData_ReturnWellKnownMapData()
         {
-            // Setup            
+            // Setup
             var random = new Random(21);
-            WellKnownTileSource wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            RingtoetsWellKnownTileSource wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
             BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
 
             // Call
             ImageBasedMapData convertedMapData = BackgroundDataConverter.ConvertFrom(backgroundData);
 
             // Assert
-            var expectedMapData = new WellKnownTileSourceMapData(wellKnownTileSource);
+            var expectedMapData = new WellKnownTileSourceMapData((WellKnownTileSource) wellKnownTileSource);
             MapDataTestHelper.AssertImageBasedMapData(expectedMapData, convertedMapData);
         }
 
         [Test]
         public void ConvertFrom_BackgroundDataWithInvalidWellKnownTileSourceValue_ThrowsInvalidEnumArgumentException()
         {
             // Setup
-            var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration((WellKnownTileSource) 999));
+            var backgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration((RingtoetsWellKnownTileSource) 999));
 
             // Call
             TestDelegate call = () => BackgroundDataConverter.ConvertFrom(backgroundData);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -rdd2a51d0a110b707de32cca2b00994f33f877c9c -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision dd2a51d0a110b707de32cca2b00994f33f877c9c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -23,14 +23,13 @@
 using System.ComponentModel;
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
-using Core.Components.Gis.Data;
+using Core.Common.Utils.Reflection;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Utils.TypeConverters;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
@@ -50,6 +49,7 @@
     public sealed class AssessmentSection : Observable, IAssessmentSection
     {
         private ReferenceLine referenceLine;
+        private const RingtoetsWellKnownTileSource defaultWellKnownTileSource = RingtoetsWellKnownTileSource.BingAerial;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AssessmentSection"/> class.
@@ -61,10 +61,12 @@
             Name = Resources.AssessmentSection_DisplayName;
             Comments = new Comment();
 
-            var mapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial);
+            BackgroundData = new BackgroundData(new WellKnownBackgroundDataConfiguration(defaultWellKnownTileSource))
+            {
+                IsVisible = true,
+                Name = TypeUtils.GetDisplayName(defaultWellKnownTileSource)
+            };
 
-            BackgroundData = BackgroundDataConverter.ConvertTo(mapData);
-
             PipingFailureMechanism = new PipingFailureMechanism();
             GrassCoverErosionInwards = new GrassCoverErosionInwardsFailureMechanism();
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj
===================================================================
diff -u -r19fb6d61aab057e0e405453c3a180360a48bb3b7 -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj	(.../Ringtoets.Integration.Data.csproj)	(revision 19fb6d61aab057e0e405453c3a180360a48bb3b7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj	(.../Ringtoets.Integration.Data.csproj)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -73,21 +73,15 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\ClosingStructures\src\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Utils\Ringtoets.Common.Utils.csproj">
-      <Project>{6a074d65-a81c-4c1c-8e24-f36c916e4ed7}</Project>
-      <Name>Ringtoets.Common.Utils</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\DuneErosion\src\Ringtoets.DuneErosion.Data\Ringtoets.DuneErosion.Data.csproj">
       <Project>{d1068432-c172-4aa6-847b-d9deb4c6de26}</Project>
       <Name>Ringtoets.DuneErosion.Data</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/BackgroundDataPropertiesTest.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/BackgroundDataPropertiesTest.cs	(.../BackgroundDataPropertiesTest.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/BackgroundDataPropertiesTest.cs	(.../BackgroundDataPropertiesTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -137,8 +137,8 @@
             // Setup
             const string name = "A";
             var mapData = new TestImageBasedMapData(name, false);
-            
-            var backgroundMapData = new BackgroundData(new WellKnownBackgroundDataConfiguration(WellKnownTileSource.BingAerial))
+
+            var backgroundMapData = new BackgroundData(new WellKnownBackgroundDataConfiguration(RingtoetsWellKnownTileSource.BingAerial))
             {
                 Name = mapData.Name,
                 Transparency = mapData.Transparency,
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r0e50500bb017c821970b286992f14b03dca0e69d -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 0e50500bb017c821970b286992f14b03dca0e69d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -153,10 +153,6 @@
       <Project>{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}</Project>
       <Name>Core.Components.DotSpatial.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj">
-      <Project>{AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD}</Project>
-      <Name>Core.Components.DotSpatial</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
       <Project>{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}</Project>
       <Name>Core.Components.Gis.Forms</Name>
@@ -169,10 +165,6 @@
       <Project>{1081336C-D919-4249-AB33-9AF15F4D19EC}</Project>
       <Name>Core.Components.BruTile.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.DotSpatial.TestUtil\Core.Components.DotSpatial.TestUtil.csproj">
-      <Project>{9B6F3987-EAF7-4733-80C1-3DCAB44D87AE}</Project>
-      <Name>Core.Components.DotSpatial.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtils\Core.Components.Gis.TestUtils.csproj">
       <Project>{f0fb401a-3494-4237-9e6d-02cdf77912a8}</Project>
       <Name>Core.Components.Gis.TestUtils</Name>
@@ -185,14 +177,6 @@
       <Project>{BF753DB5-973B-4ADF-B0F6-9437325C3466}</Project>
       <Name>Ringtoets.GrassCoverErosionInwards.Data.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
-      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
-      <Name>Ringtoets.HydraRing.Calculation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\test\Ringtoets.HydraRing.Calculation.TestUtil\Ringtoets.HydraRing.Calculation.TestUtil.csproj">
-      <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
-      <Name>Ringtoets.HydraRing.Calculation.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Piping\test\Ringtoets.Piping.Data.TestUtil\Ringtoets.Piping.Data.TestUtil.csproj">
       <Project>{955E574D-67CE-4347-AA6B-7DF8A04ED754}</Project>
       <Name>Ringtoets.Piping.Data.TestUtil</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs	(.../BackgroundDataPropertyInfoTest .cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs	(.../BackgroundDataPropertyInfoTest .cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -39,14 +39,14 @@
         
         private static IEnumerable<TestCaseData> ValidBackgroundMapDatas()
         {
-            WellKnownTileSourceMapData wellKnownMapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingRoads);
+            var wellKnownMapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingRoads);
             WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
 
             yield return new TestCaseData(
                 new BackgroundData(new TestBackgroundDataConfiguration()))
                 .SetName("Arbitrary BackgroundData Configuration");
             yield return new TestCaseData(
-                new BackgroundData(new WellKnownBackgroundDataConfiguration(wellKnownMapData.TileSource))
+                new BackgroundData(new WellKnownBackgroundDataConfiguration((RingtoetsWellKnownTileSource) wellKnownMapData.TileSource))
             {
                 Name = wellKnownMapData.Name
             }).SetName("WellKnown BingRoads BackgroundData");
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs
===================================================================
diff -u -r92be34a088da8406be8d0cb37aa19b2462acebe0 -rfa68b38773452b965a9ee25db20436446c1a50b8
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision 92be34a088da8406be8d0cb37aa19b2462acebe0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision fa68b38773452b965a9ee25db20436446c1a50b8)
@@ -162,7 +162,7 @@
         {
             // Setup
             var random = new Random(21);
-            var wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            var wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
             var backgroundMapData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
 
             using (var plugin = new RingtoetsPlugin())
@@ -348,7 +348,7 @@
             var assessmentSectionObserver = mockRepository.StrictMock<IObserver>();
             var backgroundMapDataObserver = mockRepository.StrictMock<IObserver>();
 
-            var backgroundMapData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(WellKnownTileSource.BingHybrid);
+            var backgroundMapData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(RingtoetsWellKnownTileSource.BingHybrid);
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
@@ -477,7 +477,7 @@
 
             const WellKnownTileSource wellKnownTileSource = WellKnownTileSource.BingAerial;
             var newMapData = new WellKnownTileSourceMapData(wellKnownTileSource);
-            var newBackgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
+            var newBackgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData((RingtoetsWellKnownTileSource) wellKnownTileSource);
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {