Index: Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r1eeed8168101200ec6bbfb79defc20c67a1f7edb
--- Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj	(.../Core.Components.Gis.Forms.csproj)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj	(.../Core.Components.Gis.Forms.csproj)	(revision 1eeed8168101200ec6bbfb79defc20c67a1f7edb)
@@ -55,7 +55,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Views\IBackgroundMapDataSelectionControl.cs" />
-    <Compile Include="Views\WmtsCapabilityRow.cs" />
     <Compile Include="Views\WmtsConnectionDialog.cs">
       <SubType>Form</SubType>
     </Compile>
Fisheye: Tag 1eeed8168101200ec6bbfb79defc20c67a1f7edb refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis.Forms/Views/WmtsCapabilityRow.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.Gis.Forms/Views/WmtsLocationControl.cs
===================================================================
diff -u -r5be1ab23e8cdc4eacc23d0ba5b4f921d6be4a9c1 -r1eeed8168101200ec6bbfb79defc20c67a1f7edb
--- Core/Components/src/Core.Components.Gis.Forms/Views/WmtsLocationControl.cs	(.../WmtsLocationControl.cs)	(revision 5be1ab23e8cdc4eacc23d0ba5b4f921d6be4a9c1)
+++ Core/Components/src/Core.Components.Gis.Forms/Views/WmtsLocationControl.cs	(.../WmtsLocationControl.cs)	(revision 1eeed8168101200ec6bbfb79defc20c67a1f7edb)
@@ -41,12 +41,12 @@
     /// </summary>
     public partial class WmtsLocationControl : UserControl, IBackgroundMapDataSelectionControl
     {
-        private readonly IWmtsCapabilityFactory wmtsCapabilityFactory;
         private const string wmtsConnectionInfoFileName = "wmtsConnectionInfo.config";
         private static readonly ILog log = LogManager.GetLogger(typeof(WmtsLocationControl));
+        private readonly IWmtsCapabilityFactory wmtsCapabilityFactory;
         private readonly HashSet<WmtsConnectionInfo> wmtsConnectionInfos;
 
-        private readonly List<WmtsCapabilityRow> capabilities;
+        private readonly List<WmtsCapability> capabilities;
         private string wmtsConnectionInfoFilePath;
 
         /// <summary>
@@ -65,7 +65,7 @@
             this.wmtsCapabilityFactory = wmtsCapabilityFactory;
 
             wmtsConnectionInfos = new HashSet<WmtsConnectionInfo>();
-            capabilities = new List<WmtsCapabilityRow>();
+            capabilities = new List<WmtsCapability>();
 
             InitializeComponent();
             InitializeWmtsConnectionInfos();
@@ -90,7 +90,7 @@
         {
             get
             {
-                WmtsCapabilityRow currentRow = GetSelectedWmtsCapabilityRow();
+                WmtsCapability currentRow = GetSelectedWmtsCapability();
                 if (currentRow == null)
                 {
                     return null;
@@ -102,7 +102,7 @@
                     return null;
                 }
 
-                return currentRow.WmtsCapability.ToWmtsMapdata(selectedWmtsConnectionInfo.Name, selectedWmtsConnectionInfo.Url);
+                return currentRow.ToWmtsMapdata(selectedWmtsConnectionInfo.Name, selectedWmtsConnectionInfo.Url);
             }
         }
 
@@ -141,7 +141,7 @@
 
             DataGridViewRow dataGridViewRow = dataGridViewControl.Rows.OfType<DataGridViewRow>()
                                                                  .FirstOrDefault(row => IsMatch(
-                                                                                     (WmtsCapabilityRow) row.DataBoundItem, 
+                                                                                     (WmtsCapability) row.DataBoundItem,
                                                                                      activeWmtsMapData));
             if (dataGridViewRow == null)
             {
@@ -151,10 +151,10 @@
             dataGridViewControl.SetCurrentCell(cell);
         }
 
-        private static bool IsMatch(WmtsCapabilityRow wmtsCapabilityRow, WmtsMapData wmtsMapData)
+        private static bool IsMatch(WmtsCapability wmtsCapability, WmtsMapData wmtsMapData)
         {
-            return string.Equals(wmtsCapabilityRow.Id, wmtsMapData.SelectedCapabilityIdentifier)
-                   && string.Equals(wmtsCapabilityRow.Format, wmtsMapData.PreferredFormat);
+            return string.Equals(wmtsCapability.Id, wmtsMapData.SelectedCapabilityIdentifier)
+                   && string.Equals(wmtsCapability.Format, wmtsMapData.PreferredFormat);
         }
 
         private void InitializeWmtsConnectionInfos()
@@ -212,13 +212,13 @@
 
         private void InitializeDataGridView()
         {
-            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapabilityRow.Id), Resources.WmtsCapability_MapLayer_Id,
+            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapability.Id), Resources.WmtsCapability_MapLayer_Id,
                                                  true);
-            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapabilityRow.Format), Resources.WmtsCapability_MapLayer_Format,
+            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapability.Format), Resources.WmtsCapability_MapLayer_Format,
                                                  true);
-            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapabilityRow.Title), Resources.WmtsCapability_MapLayer_Title,
+            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapability.Title), Resources.WmtsCapability_MapLayer_Title,
                                                  true);
-            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapabilityRow.CoordinateSystem), Resources.WmtsCapability_MapLayer_CoordinateSystem,
+            dataGridViewControl.AddTextBoxColumn(nameof(WmtsCapability.CoordinateSystem), Resources.WmtsCapability_MapLayer_CoordinateSystem,
                                                  true);
         }
 
@@ -232,7 +232,7 @@
             capabilities.Clear();
             foreach (WmtsCapability wmtsCapability in wmtsCapabilities)
             {
-                capabilities.Add(new WmtsCapabilityRow(wmtsCapability));
+                capabilities.Add(wmtsCapability);
             }
 
             UpdateDataGridViewDataSource();
@@ -244,9 +244,9 @@
             dataGridViewControl.ClearCurrentCell();
         }
 
-        private WmtsCapabilityRow GetSelectedWmtsCapabilityRow()
+        private WmtsCapability GetSelectedWmtsCapability()
         {
-            return dataGridViewControl.CurrentRow?.DataBoundItem as WmtsCapabilityRow;
+            return dataGridViewControl.CurrentRow?.DataBoundItem as WmtsCapability;
         }
 
         private void ClearDataGridViewDataSource()
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r1eeed8168101200ec6bbfb79defc20c67a1f7edb
--- Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 1eeed8168101200ec6bbfb79defc20c67a1f7edb)
@@ -61,7 +61,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Views\WmtsCapabilityRowTest.cs" />
     <Compile Include="Views\WmtsConnectionDialogTest.cs" />
     <Compile Include="Views\WmtsLocationControlTest.cs" />
     <Compile Include="WmtsCapabilityTest.cs" />
Fisheye: Tag 1eeed8168101200ec6bbfb79defc20c67a1f7edb refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsCapabilityRowTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -r5be1ab23e8cdc4eacc23d0ba5b4f921d6be4a9c1 -r1eeed8168101200ec6bbfb79defc20c67a1f7edb
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 5be1ab23e8cdc4eacc23d0ba5b4f921d6be4a9c1)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 1eeed8168101200ec6bbfb79defc20c67a1f7edb)
@@ -955,10 +955,10 @@
         {
             WmtsLocationControl control = ShowValidWmtsLocationControl(form, wmtsCapabilityFactory);
 
-            var capabilities = new List<WmtsCapabilityRow>
+            var capabilities = new[]
             {
-                new WmtsCapabilityRow(new WmtsCapability("-", "image/png", "-", "-")),
-                new WmtsCapabilityRow(new WmtsCapability("brtachtergrondkaart(EPSG:28992)", "image/png8", "brtachtergrondkaart", "EPSG:28992"))
+                new WmtsCapability("-", "image/png", "-", "-"),
+                new WmtsCapability("brtachtergrondkaart(EPSG:28992)", "image/png8", "brtachtergrondkaart", "EPSG:28992")
             };
 
             var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;