Index: Core/Common/src/Core.Common.Gui/Forms/ViewHost/DocumentViewController.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r9a273c290e7601aee519c41da49c957de3993750
--- Core/Common/src/Core.Common.Gui/Forms/ViewHost/DocumentViewController.cs	(.../DocumentViewController.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewHost/DocumentViewController.cs	(.../DocumentViewController.cs)	(revision 9a273c290e7601aee519c41da49c957de3993750)
@@ -143,11 +143,11 @@
 
         private static IEnumerable<ViewInfo> FilterOnInheritance(IEnumerable<ViewInfo> compatibleStandaloneViewInfos)
         {
-            ViewInfo[] viewInfos = compatibleStandaloneViewInfos.ToArray();
+            ViewInfo[] viewInfosArray = compatibleStandaloneViewInfos.ToArray();
 
             // filter on inheritance
-            IEnumerable<Type> dataTypes = viewInfos.Select(i => i.DataType);
-            return viewInfos.Where(i => !dataTypes.Any(t => t != i.DataType && t.Implements(i.DataType)));
+            IEnumerable<Type> dataTypes = viewInfosArray.Select(i => i.DataType);
+            return viewInfosArray.Where(i => !dataTypes.Any(t => t != i.DataType && t.Implements(i.DataType)));
         }
 
         private void CreateViewFromViewInfo(object data, ViewInfo viewInfo)
Index: Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs
===================================================================
diff -u -rfcc528ff894c3ef3521a3d4ec8adcda05ea5b54e -r9a273c290e7601aee519c41da49c957de3993750
--- Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs	(.../WellKnownTileSourceLayerConfiguration.cs)	(revision fcc528ff894c3ef3521a3d4ec8adcda05ea5b54e)
+++ Core/Components/src/Core.Components.BruTile/Configurations/WellKnownTileSourceLayerConfiguration.cs	(.../WellKnownTileSourceLayerConfiguration.cs)	(revision 9a273c290e7601aee519c41da49c957de3993750)
@@ -87,10 +87,10 @@
         /// cache failed.</exception>
         public static WellKnownTileSourceLayerConfiguration CreateInitializedConfiguration(WellKnownTileSource wellKnownTileSource)
         {
-            KnownTileSource knownTileSource = WellKnownTileSourceToKnownTileSource(wellKnownTileSource);
+            KnownTileSource knownTileSourceEquivalent = WellKnownTileSourceToKnownTileSource(wellKnownTileSource);
 
-            ITileSource tileSource = TileSourceFactory.Instance.GetKnownTileSource(knownTileSource);
-            return new WellKnownTileSourceLayerConfiguration(knownTileSource, tileSource);
+            ITileSource tileSource = TileSourceFactory.Instance.GetKnownTileSource(knownTileSourceEquivalent);
+            return new WellKnownTileSourceLayerConfiguration(knownTileSourceEquivalent, tileSource);
         }
 
         protected override IConfiguration OnClone()