Index: Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs
===================================================================
diff -u -rcb3993d6878d38a6199d4d94fb1723d1f879763e -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision cb3993d6878d38a6199d4d94fb1723d1f879763e)
+++ Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -47,7 +47,7 @@
         /// <summary>
         /// Creates an instance of <see cref="WmtsLayerConfiguration"/>.
         /// </summary>
-        /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
+        /// <param name="wmtsCapabilitiesUrl">The capabilities URL of the WMTS.</param>
         /// <param name="capabilityIdentifier">The capability name to get tiles from.</param>
         /// <param name="preferredFormat">The preferred tile image format, as MIME-type.</param>
         /// <param name="persistentCacheDirectoryPath">The directory path to the persistent tile cache.</param>
@@ -69,7 +69,7 @@
         /// <summary>
         /// Creates a new initialized instance of <see cref="WmtsLayerConfiguration"/>.
         /// </summary>
-        /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
+        /// <param name="wmtsCapabilitiesUrl">The capabilities URL of the WMTS.</param>
         /// <param name="tileSource">The tile source.</param>
         /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
         /// cache failed.</exception>
@@ -90,7 +90,7 @@
         /// <summary>
         /// Creates a fully initialized instance of <see cref="WmtsLayerConfiguration"/>.
         /// </summary>
-        /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
+        /// <param name="wmtsCapabilitiesUrl">The capabilities URL of the WMTS.</param>
         /// <param name="capabilityIdentifier">The capability name to get tiles from.</param>
         /// <param name="preferredFormat">The preferred tile image format, as MIME-type.</param>
         /// <returns>The new <see cref="WmtsLayerConfiguration"/>.</returns>
@@ -148,7 +148,7 @@
         /// <summary>
         /// Validate the configuration parameters.
         /// </summary>
-        /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
+        /// <param name="wmtsCapabilitiesUrl">The capabilities URL of the WMTS.</param>
         /// <param name="capabilityIdentifier">The capability name to get tiles from.</param>
         /// <param name="preferredFormat">The preferred tile image format, as MIME-type.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
Index: Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj
===================================================================
diff -u -rc0f10b1f5b785709615b03e442128e351fe54a30 -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision c0f10b1f5b785709615b03e442128e351fe54a30)
+++ Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -104,6 +104,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Core/Components/src/Core.Components.BruTile/Properties/Resources.Designer.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/src/Core.Components.BruTile/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.BruTile/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -120,7 +120,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Niet in staat om de databronnen op te halen bij de WMTS url &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Niet in staat om de databronnen op te halen bij de WMTS URL &apos;{0}&apos;..
         /// </summary>
         internal static string TileSourceFactory_ParseWmtsTileSources_Cannot_connect_to_WMTS_0_ {
             get {
@@ -129,7 +129,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Niet in staat om de databron met naam &apos;{0}&apos; te kunnen vinden bij de WMTS url &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Niet in staat om de databron met naam &apos;{0}&apos; te kunnen vinden bij de WMTS URL &apos;{1}&apos;..
         /// </summary>
         internal static string WmtsLayerConfiguration_GetConfiguredTileSource_Cannot_find_LayerId_0_at_WmtsUrl_1_ {
             get {
Index: Core/Components/src/Core.Components.BruTile/Properties/Resources.resx
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/src/Core.Components.BruTile/Properties/Resources.resx	(.../Resources.resx)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.BruTile/Properties/Resources.resx	(.../Resources.resx)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -130,10 +130,10 @@
     <value>Een databron is niet volgens het WMTS protocol aangeleverd.</value>
   </data>
   <data name="TileSourceFactory_ParseWmtsTileSources_Cannot_connect_to_WMTS_0_" xml:space="preserve">
-    <value>Niet in staat om de databronnen op te halen bij de WMTS url '{0}'.</value>
+    <value>Niet in staat om de databronnen op te halen bij de WMTS URL '{0}'.</value>
   </data>
   <data name="WmtsLayerConfiguration_GetConfiguredTileSource_Cannot_find_LayerId_0_at_WmtsUrl_1_" xml:space="preserve">
-    <value>Niet in staat om de databron met naam '{0}' te kunnen vinden bij de WMTS url '{1}'.</value>
+    <value>Niet in staat om de databron met naam '{0}' te kunnen vinden bij de WMTS URL '{1}'.</value>
   </data>
   <data name="WmtsLayerConfiguration_ValidateConfigurationParameters_PreferredFormat_must_be_mimetype" xml:space="preserve">
     <value>Afbeelding formaat moet opgegeven worden als MIME-type.</value>
Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -r11eb517ba7a480b4a415855798a7fadefc0cfe54 -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -24,8 +24,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Components.BruTile.Configurations;
-using Core.Components.BruTile.Forms;
 using Core.Components.DotSpatial.Forms.Properties;
 using Core.Components.DotSpatial.Layer;
 using Core.Components.DotSpatial.Layer.BruTile;
@@ -66,7 +64,7 @@
         /// </summary>
         public MapControl()
         {
-            InitializeMapView();
+            InitializeMap();
             TogglePanning();
 
             mapDataCollectionObserver = new RecursiveObserver<MapDataCollection, MapDataCollection>(HandleMapDataCollectionChange, mdc => mdc.Collection);
@@ -146,7 +144,7 @@
             }
         }
 
-        private void InitializeMapView()
+        private void InitializeMap()
         {
             map = new DotSpatialMap
             {
Index: Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs
===================================================================
diff -u -r9c1789fd6fa33b6ea18339bf2474102471ef4510 -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs	(.../WmtsMapData.cs)	(revision 9c1789fd6fa33b6ea18339bf2474102471ef4510)
+++ Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs	(.../WmtsMapData.cs)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -32,28 +32,28 @@
         /// <summary>
         /// Creates a new instance of <see cref="WmtsMapData"/>.
         /// </summary>
-        /// <param name="displayName">The name of the source (for visualization purposes only).</param>
+        /// <param name="name">The name of the map data.</param>
         /// <param name="sourceCapabilitiesUrl">The URL to the capabilities of the WMTS.</param>
         /// <param name="selectedCapabilityName">The name of the capability to use.</param>
         /// <param name="preferredFormat">The type of image format. It should be for formatted
         /// in MIME.</param>
         /// <exception cref="ArgumentException">Thrown when 
         /// <list type="bullet">
-        /// <item><paramref name="displayName"/> is <c>null</c> or only whitespace.</item>
+        /// <item><paramref name="name"/> is <c>null</c> or only whitespace.</item>
         /// <item><paramref name="preferredFormat"/> is not stated as a MIME-type.</item>
         /// </list></exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sourceCapabilitiesUrl"/>, 
         /// <paramref name="selectedCapabilityName"/> or <paramref name="preferredFormat"/> is <c>null</c>.</exception>
-        public WmtsMapData(string displayName, string sourceCapabilitiesUrl, string selectedCapabilityName,
-                           string preferredFormat) : this(displayName)
+        public WmtsMapData(string name, string sourceCapabilitiesUrl, string selectedCapabilityName,
+                           string preferredFormat) : this(name)
         {
             Configure(sourceCapabilitiesUrl, selectedCapabilityName, preferredFormat);
         }
 
         /// <summary>
         /// Creates a new instance of <see cref="WmtsMapData"/> that hasn't been configured.
         /// </summary>
-        /// <param name="name">The name of the source.</param>
+        /// <param name="name">The name of the map data.</param>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is <c>null</c> or only whitespace.</exception>
         private WmtsMapData(string name) : base(name)
         {
Index: Core/Components/test/Core.Components.BruTile.Forms.Test/BruTileWmtsCapabilityFactoryTest.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/test/Core.Components.BruTile.Forms.Test/BruTileWmtsCapabilityFactoryTest.cs	(.../BruTileWmtsCapabilityFactoryTest.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.BruTile.Forms.Test/BruTileWmtsCapabilityFactoryTest.cs	(.../BruTileWmtsCapabilityFactoryTest.cs)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -54,7 +54,7 @@
 
             // Assert
             CannotFindTileSourceException exception = Assert.Throws<CannotFindTileSourceException>(call);
-            Assert.AreEqual($"Niet in staat om de databronnen op te halen bij de WMTS url '{url}'.", exception.Message);
+            Assert.AreEqual($"Niet in staat om de databronnen op te halen bij de WMTS URL '{url}'.", exception.Message);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/WmtsLayerConfigurationTest.cs
===================================================================
diff -u -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f -r74efc36a4db93f588a262a08735fb1fb0f6c096b
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/WmtsLayerConfigurationTest.cs	(.../WmtsLayerConfigurationTest.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/WmtsLayerConfigurationTest.cs	(.../WmtsLayerConfigurationTest.cs)	(revision 74efc36a4db93f588a262a08735fb1fb0f6c096b)
@@ -105,7 +105,7 @@
 
                 // Assert
                 string message = Assert.Throws<CannotFindTileSourceException>(call).Message;
-                string expectedMessage = $"Niet in staat om de databron met naam '{id}' te kunnen vinden bij de WMTS url '{url}'.";
+                string expectedMessage = $"Niet in staat om de databron met naam '{id}' te kunnen vinden bij de WMTS URL '{url}'.";
                 Assert.AreEqual(expectedMessage, message);
             }
             mocks.VerifyAll();