Index: Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rc7dcfeb120035a08adfe115275512e1e6c5b4931
--- Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs	(.../WellKnownTileSourceLayerConfiguration.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs	(.../WellKnownTileSourceLayerConfiguration.cs)	(revision c7dcfeb120035a08adfe115275512e1e6c5b4931)
@@ -25,6 +25,7 @@
 using BruTile.Predefined;
 using BruTile.Web;
 using Core.Components.BruTile.Data;
+using Core.Components.Gis.Exceptions;
 
 namespace Core.Components.BruTile.Configurations
 {
@@ -48,7 +49,7 @@
         /// is an invalid folder path</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="knownTileSource"/>
         /// isn't a supported member.</exception>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotCreateTileCacheException">Thrown when creating the file
+        /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
         /// cache failed.</exception>
         private WellKnownTileSourceLayerConfiguration(string persistentCacheDirectoryPath, KnownTileSource knownTileSource)
             : base(persistentCacheDirectoryPath)
@@ -64,7 +65,7 @@
         /// </summary>
         /// <param name="knownTileSource">The built-in tile provider to be used.</param>
         /// <param name="tileSource">The tile source corresponding to <paramref name="knownTileSource"/>.</param>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotCreateTileCacheException">Thrown when creating the file
+        /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
         /// cache failed.</exception>
         private WellKnownTileSourceLayerConfiguration(KnownTileSource knownTileSource, ITileSource tileSource)
             : base(SuggestTileCachePath(tileSource, knownTileSource))
@@ -81,7 +82,7 @@
         /// <returns>The new <see cref="WellKnownTileSourceLayerConfiguration"/>.</returns>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="knownTileSource"/>
         /// isn't a supported member.</exception>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotCreateTileCacheException">Thrown when creating the file
+        /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
         /// cache failed.</exception>
         public static WellKnownTileSourceLayerConfiguration CreateInitializedConfiguration(KnownTileSource knownTileSource)
         {
Index: Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rc7dcfeb120035a08adfe115275512e1e6c5b4931
--- Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision c7dcfeb120035a08adfe115275512e1e6c5b4931)
@@ -71,9 +71,9 @@
         /// </summary>
         /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
         /// <param name="tileSource">The tile source.</param>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotCreateTileCacheException">Thrown when creating the file
+        /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
         /// cache failed.</exception>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotReceiveTilesException">Thrown when <paramref name="tileSource"/>
+        /// <exception cref="CannotReceiveTilesException">Thrown when <paramref name="tileSource"/>
         /// doesn't contain a <see cref="WmtsTileSchema"/>.</exception>
         private WmtsLayerConfiguration(string wmtsCapabilitiesUrl, ITileSource tileSource)
             : base(SuggestTileCachePath(ValidateTileSource(tileSource)))
@@ -95,7 +95,7 @@
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="preferredFormat"/>
         /// is not an image MIME-type.</exception>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotFindTileSourceException">Thrown when it has become impossible
+        /// <exception cref="CannotFindTileSourceException">Thrown when it has become impossible
         /// to create an <see cref="ITileSource"/> based on the given information (for example:
         /// unable to connect to server).</exception>
         public static WmtsLayerConfiguration CreateInitializedConfiguration(string wmtsCapabilitiesUrl, string capabilityIdentifier, string preferredFormat)
@@ -132,7 +132,7 @@
         /// </summary>
         /// <param name="tileSource">The source to be validated.</param>
         /// <returns>Returns <paramref name="tileSource"/>.</returns>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotCreateTileCacheException">Thrown when <paramref name="tileSource"/>
+        /// <exception cref="CannotCreateTileCacheException">Thrown when <paramref name="tileSource"/>
         /// doesn't contain a <see cref="WmtsTileSchema"/>.</exception>
         private static ITileSource ValidateTileSource(ITileSource tileSource)
         {
@@ -180,7 +180,7 @@
         /// <param name="capabilityIdentifier">The identifier of the tile source.</param>
         /// <param name="preferredFormat">The preferred tile image format, as MIME-type.</param>
         /// <returns>The tile source with <see cref="WmtsTileSchema"/>.</returns>
-        /// <exception cref="Core.Components.Gis.Exceptions.CannotFindTileSourceException">Thrown when unable to retrieve
+        /// <exception cref="CannotFindTileSourceException">Thrown when unable to retrieve
         /// the configured tile source.</exception>
         private static ITileSource GetConfiguredTileSource(string capabilitiesUri, string capabilityIdentifier, string preferredFormat)
         {
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rc7dcfeb120035a08adfe115275512e1e6c5b4931
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision c7dcfeb120035a08adfe115275512e1e6c5b4931)
@@ -115,7 +115,7 @@
         /// Creates an instance of this class using some tile source configuration.
         /// </summary>
         /// <param name="configuration">The tile source configuration. If the configuration
-        /// hasn't been initialized yet, <see cref="Core.Components.BruTile.Configurations.IConfiguration.Initialize"/> will
+        /// hasn't been initialized yet, <see cref="IConfiguration.Initialize"/> will
         /// be called.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="configuration"/>
         /// is <c>null</c>.</exception>
Index: Core/Components/src/Core.Components.Gis.Forms/Views/WmtsConnectionDialog.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rc7dcfeb120035a08adfe115275512e1e6c5b4931
--- Core/Components/src/Core.Components.Gis.Forms/Views/WmtsConnectionDialog.cs	(.../WmtsConnectionDialog.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.Gis.Forms/Views/WmtsConnectionDialog.cs	(.../WmtsConnectionDialog.cs)	(revision c7dcfeb120035a08adfe115275512e1e6c5b4931)
@@ -28,7 +28,7 @@
 namespace Core.Components.Gis.Forms.Views
 {
     /// <summary>
-    /// A dialog allowing the user to create an instance of <see cref="Core.Components.DotSpatial.Forms.WmtsConnectionInfo"/>.
+    /// A dialog allowing the user to create an instance of <see cref="WmtsConnectionInfo"/>.
     /// </summary>
     public partial class WmtsConnectionDialog : DialogBase
     {
Index: Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rc7dcfeb120035a08adfe115275512e1e6c5b4931
--- Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs	(.../WmtsConnectionInfoReader.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs	(.../WmtsConnectionInfoReader.cs)	(revision c7dcfeb120035a08adfe115275512e1e6c5b4931)
@@ -106,7 +106,7 @@
         }
 
         /// <summary>
-        /// Validates if the reader points to the <see cref="Core.Components.DotSpatial.Forms.IO.WmtsConnectionInfoXmlDefinitions.WmtsConnectionElement"/> element.
+        /// Validates if the reader points to the <see cref="WmtsConnectionInfoXmlDefinitions.WmtsConnectionElement"/> element.
         /// </summary>
         /// <param name="reader">The reader to use.</param>
         /// <returns><c>true</c> if the reader points to the WMTS connection element, <c>false</c> otherwise.</returns>
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rc7dcfeb120035a08adfe115275512e1e6c5b4931
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision c7dcfeb120035a08adfe115275512e1e6c5b4931)
@@ -25,7 +25,6 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using BruTile;
 using BruTile.Wmts;
 using Core.Common.Controls.DataGrid;
 using Core.Common.Gui.Settings;
@@ -152,12 +151,12 @@
                 Assert.IsInstanceOf<ICollection<WmtsConnectionInfo>>(urlLocations.DataSource);
                 Assert.AreEqual("Name", urlLocations.DisplayMember);
                 Assert.AreEqual("Url", urlLocations.ValueMember);
-                Assert.IsTrue((bool) urlLocations.Sorted);
+                Assert.IsTrue(urlLocations.Sorted);
                 Assert.IsNull(urlLocations.SelectedItem);
 
                 var buttonConnectTo = (Button) new ButtonTester("connectToButton", form).TheObject;
                 Assert.AreEqual("Verbinding maken", buttonConnectTo.Text);
-                Assert.IsFalse((bool) buttonConnectTo.Enabled);
+                Assert.IsFalse(buttonConnectTo.Enabled);
 
                 var buttonAddLocation = new ButtonTester("addLocationButton", form);
                 Assert.AreEqual("Locatie toevoegen...", buttonAddLocation.Text);