Index: Core/Components/src/Core.Components.BruTile/Configurations/ITileSourceFactory.cs
===================================================================
diff -u -rfcf14f1da32f6de8d99c7f446ec27fbe30a6abe8 -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Core/Components/src/Core.Components.BruTile/Configurations/ITileSourceFactory.cs	(.../ITileSourceFactory.cs)	(revision fcf14f1da32f6de8d99c7f446ec27fbe30a6abe8)
+++ Core/Components/src/Core.Components.BruTile/Configurations/ITileSourceFactory.cs	(.../ITileSourceFactory.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -47,9 +47,9 @@
         /// <summary>
         /// Returns the tile source for <paramref name="knownTileSource"/>.
         /// </summary>
-        /// <param name="knownTileSource">The known tile services to get the tile source for.</param>
+        /// <param name="knownTileSource">The known tile service to get the tile source for.</param>
         /// <returns>The tile source for <paramref name="knownTileSource"/>.</returns>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="knownTileSource"/> is not supported.</exception>
-        ITileSource GetKnownTileSources(KnownTileSource knownTileSource);
+        ITileSource GetKnownTileSource(KnownTileSource knownTileSource);
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.BruTile/Configurations/TileSourceFactory.cs
===================================================================
diff -u -rfcf14f1da32f6de8d99c7f446ec27fbe30a6abe8 -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Core/Components/src/Core.Components.BruTile/Configurations/TileSourceFactory.cs	(.../TileSourceFactory.cs)	(revision fcf14f1da32f6de8d99c7f446ec27fbe30a6abe8)
+++ Core/Components/src/Core.Components.BruTile/Configurations/TileSourceFactory.cs	(.../TileSourceFactory.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -65,17 +65,17 @@
             return wmtsTileSources;
         }
 
-        public ITileSource GetKnownTileSources(KnownTileSource knownTileSource)
+        public ITileSource GetKnownTileSource(KnownTileSource knownTileSource)
         {
             return KnownTileSources.Create(knownTileSource);
         }
 
         /// <summary>
         /// Parses the capabilities XML provided by the WMTS.
         /// </summary>
-        /// <param name="capabilitiesUrl">The WMTS url.</param>
+        /// <param name="capabilitiesUrl">The WMTS URL.</param>
         /// <returns>The tile sources offered by the service.</returns>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotFindTileSourceException">Thrown when unable to connect
+        /// <exception cref="CannotFindTileSourceException">Thrown when unable to connect
         /// to the WMTS and parse the response.</exception>
         private static IEnumerable<ITileSource> ParseWmtsTileSources(string capabilitiesUrl)
         {
Index: Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs
===================================================================
diff -u -rd95413945eef87315850dbd426cdf8dcf81d4493 -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs	(.../WellKnownTileSourceLayerConfiguration.cs)	(revision d95413945eef87315850dbd426cdf8dcf81d4493)
+++ Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs	(.../WellKnownTileSourceLayerConfiguration.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -23,7 +23,6 @@
 using System.IO;
 using BruTile;
 using BruTile.Predefined;
-using BruTile.Web;
 using Core.Components.BruTile.Data;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Exceptions;
@@ -47,7 +46,7 @@
         /// <param name="knownTileSource">The built-in tile provider to be used.</param>
         /// <param name="persistentCacheDirectoryPath">The directory path to the persistent tile cache.</param>
         /// <exception cref="ArgumentException">Thrown when <paramref name="persistentCacheDirectoryPath"/>
-        /// is an invalid folder path</exception>
+        /// is an invalid folder path.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="knownTileSource"/>
         /// isn't a supported member.</exception>
         /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
@@ -57,7 +56,7 @@
         {
             this.knownTileSource = knownTileSource;
 
-            ITileSource tileSource = TileSourceFactory.Instance.GetKnownTileSources(knownTileSource);
+            ITileSource tileSource = TileSourceFactory.Instance.GetKnownTileSource(knownTileSource);
             InitializeFromTileSource(tileSource);
         }
 
@@ -79,43 +78,58 @@
         /// <summary>
         /// Creates a fully initialized instance of <see cref="WellKnownTileSourceLayerConfiguration"/>.
         /// </summary>
-        /// <param name="knownTileSource">The built-in tile provider to be used.</param>
+        /// <param name="wellKnownTileSource">The tile provider to be used.</param>
         /// <returns>The new <see cref="WellKnownTileSourceLayerConfiguration"/>.</returns>
-        /// <exception cref="NotSupportedException">Thrown when <paramref name="knownTileSource"/>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="wellKnownTileSource"/>
         /// isn't a supported member.</exception>
         /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
         /// cache failed.</exception>
-        public static WellKnownTileSourceLayerConfiguration CreateInitializedConfiguration(KnownTileSource knownTileSource)
+        public static WellKnownTileSourceLayerConfiguration CreateInitializedConfiguration(WellKnownTileSource wellKnownTileSource)
         {
-            ITileSource tileSource = TileSourceFactory.Instance.GetKnownTileSources(knownTileSource);
+            return CreateInitializedConfiguration(WellKnownTileSourceToKnownTileSource(wellKnownTileSource));
+        }
 
-            return new WellKnownTileSourceLayerConfiguration(knownTileSource, tileSource);
+        public override IConfiguration Clone()
+        {
+            ThrowExceptionIfDisposed();
+
+            return new WellKnownTileSourceLayerConfiguration(PersistentCacheDirectoryPath, knownTileSource);
         }
 
+        public override void Initialize()
+        {
+            ThrowExceptionIfDisposed();
+
+            Initialized = true;
+        }
+
         /// <summary>
         /// Creates a fully initialized instance of <see cref="WellKnownTileSourceLayerConfiguration"/>.
         /// </summary>
-        /// <param name="wellKnownTileSource">The tile provider to be used.</param>
+        /// <param name="knownTileSource">The built-in tile provider to be used.</param>
         /// <returns>The new <see cref="WellKnownTileSourceLayerConfiguration"/>.</returns>
-        /// <exception cref="NotSupportedException">Thrown when <paramref name="wellKnownTileSource"/>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="knownTileSource"/>
         /// isn't a supported member.</exception>
         /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
         /// cache failed.</exception>
-        public static WellKnownTileSourceLayerConfiguration CreateInitializedConfiguration(WellKnownTileSource wellKnownTileSource)
+        private static WellKnownTileSourceLayerConfiguration CreateInitializedConfiguration(KnownTileSource knownTileSource)
         {
-            return CreateInitializedConfiguration(WellKnownTileSourceToKnownTileSource(wellKnownTileSource));
+            ITileSource tileSource = TileSourceFactory.Instance.GetKnownTileSource(knownTileSource);
+
+            return new WellKnownTileSourceLayerConfiguration(knownTileSource, tileSource);
         }
 
         /// <summary>
         /// Returns the <see cref="KnownTileSource"/> equivalent of <see cref="WellKnownTileSource"/>.
         /// </summary>
-        /// <param name="wellKnownTileSource"></param>
+        /// <param name="wellKnownTileSource">The tile provider to be used.</param>
         /// <returns>The <see cref="KnownTileSource"/> equivalent of the <paramref name="wellKnownTileSource"/>.</returns>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="wellKnownTileSource"/>
         /// is not a supported member.</exception>
-        public static KnownTileSource WellKnownTileSourceToKnownTileSource(WellKnownTileSource wellKnownTileSource)
+        private static KnownTileSource WellKnownTileSourceToKnownTileSource(WellKnownTileSource wellKnownTileSource)
         {
-            switch (wellKnownTileSource) {
+            switch (wellKnownTileSource)
+            {
                 case WellKnownTileSource.BingAerial:
                     return KnownTileSource.BingAerial;
                 case WellKnownTileSource.BingHybrid:
@@ -133,20 +147,6 @@
             }
         }
 
-        public override IConfiguration Clone()
-        {
-            ThrowExceptionIfDisposed();
-
-            return new WellKnownTileSourceLayerConfiguration(PersistentCacheDirectoryPath, knownTileSource);
-        }
-
-        public override void Initialize()
-        {
-            ThrowExceptionIfDisposed();
-
-            Initialized = true;
-        }
-
         private static string SuggestTileCachePath(ITileSource tileSource, KnownTileSource knownTileSource)
         {
             ITileSchema tileSchema = tileSource.Schema;
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs
===================================================================
diff -u -r3204fdab2e01e8fcb73ca38d74adfde8fa8d369a -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs	(.../WellKnownTileSourceLayerConfigurationTest.cs)	(revision 3204fdab2e01e8fcb73ca38d74adfde8fa8d369a)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs	(.../WellKnownTileSourceLayerConfigurationTest.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -21,7 +21,6 @@
 
 using System;
 using BruTile;
-using BruTile.Predefined;
 using Core.Common.Gui.TestUtil.Settings;
 using Core.Common.TestUtil;
 using Core.Components.BruTile.Configurations;
@@ -39,10 +38,10 @@
         private TestSettingsHelper testSettingsHelper;
 
         [Test]
-        public void CreateInitializedConfiguration_InvalidKnownTileSource_ThrowNotSupportedException()
+        public void CreateInitializedConfiguration_InvalidWellKnownTileSource_ThrowNotSupportedException()
         {
             // Setup
-            const KnownTileSource invalidValue = (KnownTileSource) 9999;
+            const WellKnownTileSource invalidValue = (WellKnownTileSource) 9999;
 
             // Call
             TestDelegate call = () => WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(invalidValue);
@@ -52,48 +51,24 @@
         }
 
         [Test]
-        public void WellKnownTileSourceToKnownTileSource_InvalidWellKnownTileSource_ThrowsNotSupportedException()
-        {
-            // Setup
-            const WellKnownTileSource invalidValue = (WellKnownTileSource) 9999;
-
-            // Call
-            TestDelegate call = () => WellKnownTileSourceLayerConfiguration.WellKnownTileSourceToKnownTileSource(invalidValue);
-
-            // Assert
-            string message = Assert.Throws<NotSupportedException>(call).Message;
-            Assert.AreEqual($"Unknown value '{invalidValue}' for 'wellKnownTileSource'", message);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(ValidWellKnownTileSourceToCorrespondingKnownTileSource))]
-        public void WellKnownTileSourceToKnownTileSource_ValidWellKnownTileSource_ReturnsCorrespondingKnownTileSource(
-            WellKnownTileSource wellKnownTileSource, KnownTileSource expectedKnownTileSource)
-        {
-            // Call
-            KnownTileSource knownTileSource = WellKnownTileSourceLayerConfiguration.WellKnownTileSourceToKnownTileSource(wellKnownTileSource);
-
-            // Assert
-            Assert.AreEqual(expectedKnownTileSource, knownTileSource);
-        }
-
-        [Test]
         public void GivenAllAvailableKnownTileSources_WhenCreatingInitializedConfiguration_ThenConfigurationHasExpectedValues()
         {
             // Given
             using (new UseCustomSettingsHelper(testSettingsHelper))
-            using (new UseCustomTileSourceFactoryConfig(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)))
             {
-                foreach (KnownTileSource knownTileSource in Enum.GetValues(typeof(KnownTileSource)))
-                {
-                    // When
-                    using (WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(knownTileSource))
+                foreach (WellKnownTileSource wellKnownTileSource in Enum.GetValues(typeof(WellKnownTileSource)))
+                { 
+                    using (new UseCustomTileSourceFactoryConfig(new WellKnownTileSourceMapData(wellKnownTileSource)))
                     {
-                        // Then
-                        Assert.IsTrue(configuration.Initialized);
+                        // When
+                        using (WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(wellKnownTileSource))
+                        {
+                            // Then
+                            Assert.IsTrue(configuration.Initialized);
 
-                        Assert.IsNotNull(configuration.TileSource);
-                        Assert.IsInstanceOf<AsyncTileFetcher>(configuration.TileFetcher);
+                            Assert.IsNotNull(configuration.TileSource);
+                            Assert.IsInstanceOf<AsyncTileFetcher>(configuration.TileFetcher);
+                        }
                     }
                 }
             }
@@ -103,9 +78,9 @@
         public void Clone_FromFullyInitializedConfiguration_ReturnInitializedConfiguration()
         {
             // Setup
-            const KnownTileSource knownTileSource = KnownTileSource.BingAerial;
+            const WellKnownTileSource knownTileSource = WellKnownTileSource.BingAerial;
             using (new UseCustomSettingsHelper(testSettingsHelper))
-            using (new UseCustomTileSourceFactoryConfig(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)))
+            using (new UseCustomTileSourceFactoryConfig(new WellKnownTileSourceMapData(knownTileSource)))
             using (WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(knownTileSource))
             {
                 // Call
@@ -131,7 +106,7 @@
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)))
             {
-                WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(KnownTileSource.BingAerial);
+                WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(WellKnownTileSource.BingAerial);
                 configuration.Dispose();
 
                 // Call
@@ -149,7 +124,7 @@
             // Setup
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)))
-            using (WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(KnownTileSource.BingAerial))
+            using (WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(WellKnownTileSource.BingAerial))
             {
                 configuration.GetType()
                              .GetProperty(nameof(configuration.Initialized))
@@ -170,7 +145,7 @@
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)))
             {
-                WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(KnownTileSource.BingAerial);
+                WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(WellKnownTileSource.BingAerial);
                 configuration.Dispose();
 
                 // Call
@@ -199,19 +174,6 @@
             directoryDisposeHelper.Dispose();
         }
 
-        private static TestCaseData[] ValidWellKnownTileSourceToCorrespondingKnownTileSource()
-        {
-            return new[]
-            {
-                new TestCaseData(WellKnownTileSource.EsriWorldTopo, KnownTileSource.EsriWorldTopo),
-                new TestCaseData(WellKnownTileSource.EsriWorldShadedRelief, KnownTileSource.EsriWorldShadedRelief),
-                new TestCaseData(WellKnownTileSource.BingAerial, KnownTileSource.BingAerial),
-                new TestCaseData(WellKnownTileSource.BingHybrid, KnownTileSource.BingHybrid),
-                new TestCaseData(WellKnownTileSource.BingRoads, KnownTileSource.BingRoads),
-                new TestCaseData(WellKnownTileSource.OpenStreetMap, KnownTileSource.OpenStreetMap)
-            };
-        }
-
         private static void AssertAttribution(Attribution expectedAttribution, Attribution actualAttribution)
         {
             if (expectedAttribution == null)
Index: Core/Components/test/Core.Components.BruTile.TestUtil.Test/TestTileSourceFactoryTest.cs
===================================================================
diff -u -r5d1ba8e775518ad95b38ec59c147d939bca4ee49 -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Core/Components/test/Core.Components.BruTile.TestUtil.Test/TestTileSourceFactoryTest.cs	(.../TestTileSourceFactoryTest.cs)	(revision 5d1ba8e775518ad95b38ec59c147d939bca4ee49)
+++ Core/Components/test/Core.Components.BruTile.TestUtil.Test/TestTileSourceFactoryTest.cs	(.../TestTileSourceFactoryTest.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -107,7 +107,7 @@
             var factory = new TestTileSourceFactory(mapData);
 
             // Call
-            TestDelegate test = () => factory.GetKnownTileSources(KnownTileSource.BingHybrid);
+            TestDelegate test = () => factory.GetKnownTileSource(KnownTileSource.BingHybrid);
 
             // Assert
             string message = Assert.Throws<NotSupportedException>(test).Message;
@@ -126,7 +126,7 @@
             var factory = new TestTileSourceFactory(mapData);
 
             // Call
-            ITileSource tileSource = factory.GetKnownTileSources(new Random(341).NextEnumValue<KnownTileSource>());
+            ITileSource tileSource = factory.GetKnownTileSource(new Random(341).NextEnumValue<KnownTileSource>());
 
             // Assert
             Assert.IsInstanceOf<TestWellKnownTileSource>(tileSource);
Index: Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs
===================================================================
diff -u -r5d1ba8e775518ad95b38ec59c147d939bca4ee49 -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs	(.../TestTileSourceFactory.cs)	(revision 5d1ba8e775518ad95b38ec59c147d939bca4ee49)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs	(.../TestTileSourceFactory.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -69,7 +69,7 @@
             }
         }
 
-        public ITileSource GetKnownTileSources(KnownTileSource knownTileSource)
+        public ITileSource GetKnownTileSource(KnownTileSource knownTileSource)
         {
             if (wellKnownTileSource == null)
             {
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs
===================================================================
diff -u -r1f74d23ddb19c459145cbb9aa93294695b033f5e -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 1f74d23ddb19c459145cbb9aa93294695b033f5e)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -1956,7 +1956,7 @@
         private static IEnumerable<TestCaseData> GetProblematicKnownTileSourceFactoryTestCaseData(string prefix)
         {
             var factoryThrowingNotSupportedException = MockRepository.GenerateStub<ITileSourceFactory>();
-            factoryThrowingNotSupportedException.Stub(f => f.GetKnownTileSources(Arg<KnownTileSource>.Is.NotNull))
+            factoryThrowingNotSupportedException.Stub(f => f.GetKnownTileSource(Arg<KnownTileSource>.Is.NotNull))
                                                 .Throw(new NotSupportedException());
 
             yield return new TestCaseData(factoryThrowingNotSupportedException)
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs
===================================================================
diff -u -rf372658df422303abcebd8206c8127b420a3ccc2 -r0f778d2d9cc904175274baf4d6a21996ccef8d54
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision f372658df422303abcebd8206c8127b420a3ccc2)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
@@ -185,7 +185,7 @@
 
             tileSourceFactory.Expect(tsf => tsf.GetWmtsTileSources(sourceCapabilitiesUrl))
                              .Return(Enumerable.Empty<ITileSource>());
-            tileSourceFactory.Expect(tsf => tsf.GetKnownTileSources(KnownTileSource.BingAerial)).Return(testWellKnownTileSource);
+            tileSourceFactory.Expect(tsf => tsf.GetKnownTileSource(KnownTileSource.BingAerial)).Return(testWellKnownTileSource);
             mocks.ReplayAll();
 
             using (new UseCustomSettingsHelper(testSettingsHelper))