Index: Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r513615ce4fbc602db6840c6cee5ab886b295c274
--- Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs	(.../IMapControl.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs	(.../IMapControl.cs)	(revision 513615ce4fbc602db6840c6cee5ab886b295c274)
@@ -45,14 +45,14 @@
         bool IsMouseCoordinatesVisible { get; }
 
         /// <summary>
-        /// Gets or sets the data to show in the <see cref="IMapControl"/>.
+        /// Gets the data to show in the <see cref="IMapControl"/>.
         /// </summary>
-        MapDataCollection Data { get; set; }
+        MapDataCollection Data { get; }
 
         /// <summary>
-        /// Gets or sets the data to show in the background of the <see cref="IMapControl"/>.
+        /// Gets the data to show in the background of the <see cref="IMapControl"/>.
         /// </summary>
-        ImageBasedMapData BackgroundMapData { get; set; }
+        ImageBasedMapData BackgroundMapData { get; }
 
         /// <summary>
         /// Removes all the data from the map without redrawing any layers.
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs
===================================================================
diff -u -r05b272ce1fe41ddbb79d367399d1339caec1a06b -r513615ce4fbc602db6840c6cee5ab886b295c274
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 05b272ce1fe41ddbb79d367399d1339caec1a06b)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 513615ce4fbc602db6840c6cee5ab886b295c274)
@@ -167,7 +167,7 @@
         }
 
         [Test]
-        public void Data_ForNull_NullSet()
+        public void Data_Null_NullSet()
         {
             // Setup
             using (var view = new MapLegendView(contextMenuBuilderProvider))
@@ -181,7 +181,7 @@
         }
 
         [Test]
-        public void Data_OtherObject_ThrowsInvalidCastException()
+        public void Data_OtherObjectType_ThrowsInvalidCastException()
         {
             // Setup 
             using (var view = new MapLegendView(contextMenuBuilderProvider))
@@ -200,10 +200,10 @@
         {
             // Setup
             var mapData = new MapDataCollection("A");
-
             var mockRepository = new MockRepository();
             var mapControl = mockRepository.Stub<IMapControl>();
-            mapControl.Data = mapData;
+
+            mapControl.Expect(mc => mc.Data).Return(mapData);
             mockRepository.ReplayAll();
 
             using (var view = new MapLegendView(contextMenuBuilderProvider)
@@ -258,7 +258,7 @@
                 treeViewControl.TrySelectNodeForData(mapData);
 
                 // Call
-                var selection = view.Selection;
+                object selection = view.Selection;
 
                 // Assert
                 Assert.AreSame(mapData, selection);
Index: Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.cs
===================================================================
diff -u -r675771641656abfb56ef89be86bad7bd21684016 -r513615ce4fbc602db6840c6cee5ab886b295c274
--- Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.cs	(.../MapDataView.cs)	(revision 675771641656abfb56ef89be86bad7bd21684016)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.cs	(.../MapDataView.cs)	(revision 513615ce4fbc602db6840c6cee5ab886b295c274)
@@ -46,7 +46,7 @@
             }
             set
             {
-                Map.Data = value as MapDataCollection;
+                mapControl.Data = value as MapDataCollection;
             }
         }