Index: Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs
===================================================================
diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rb909f6664a8d22063cb0516befb25f8935c12478
--- Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs	(.../MapMultiLineData.cs)	(revision 287b1b719a43b0de337f8149dfa3a2a3220a375a)
+++ Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs	(.../MapMultiLineData.cs)	(revision b909f6664a8d22063cb0516befb25f8935c12478)
@@ -32,23 +32,23 @@
     public class MapMultiLineData : MapData
     {
         /// <summary>
-        /// Creates a new instance of <see cref="MapLineData"/>.
+        /// Creates a new instance of <see cref="MapMultiLineData"/>.
         /// </summary>
         /// <param name="lines">A <see cref="IEnumerable{T}"/> of <see cref="Point2D"/> as (X,Y) lines.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="lines"/> is <c>null</c>.</exception>
         public MapMultiLineData(IEnumerable<IEnumerable<Point2D>> lines)
         {
             if (lines == null)
             {
-                var message = String.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData));
+                var message = String.Format("A lines collection is required when creating a subclass of {0}.", typeof(MapMultiLineData));
                 throw new ArgumentNullException("lines", message);
             }
             Lines = lines.ToArray();
             IsVisible = true;
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the <see cref="PointBasedMapData"/> is visible.
+        /// Gets or sets a value indicating whether the <see cref="MapMultiLineData"/> is visible.
         /// </summary>
         public bool IsVisible { get; set; }
 
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs
===================================================================
diff -u -r3607710d80a1f77bf97f81b10869074b765686a0 -rb909f6664a8d22063cb0516befb25f8935c12478
--- Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs	(.../MapMultiLineDataTest.cs)	(revision 3607710d80a1f77bf97f81b10869074b765686a0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs	(.../MapMultiLineDataTest.cs)	(revision b909f6664a8d22063cb0516befb25f8935c12478)
@@ -20,7 +20,7 @@
             TestDelegate test = () => new MapMultiLineData(null);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)));
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A lines collection is required when creating a subclass of {0}.", typeof(MapMultiLineData)));
         }
 
         [Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r3607710d80a1f77bf97f81b10869074b765686a0 -rb909f6664a8d22063cb0516befb25f8935c12478
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 3607710d80a1f77bf97f81b10869074b765686a0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision b909f6664a8d22063cb0516befb25f8935c12478)
@@ -108,36 +108,36 @@
             {
                 if (HasReferenceLinePoints())
                 {
-                    mapDataList.Add(GetReferenceLineData());
+                    mapDataList.Add(GetReferenceLineMapData());
                 }
 
                 if (HasHydraulicBoundaryLocations())
                 {
-                    mapDataList.Add(GetHydraulicBoundaryLocations());
+                    mapDataList.Add(GetHydraulicBoundaryLocationsMapData());
                 }
 
                 if (HasSurfaceLines())
                 {
-                    mapDataList.Add(GetSurfaceLines());
+                    mapDataList.Add(GetSurfaceLinesMapData());
                 }
             }
 
             map.Data = new MapDataCollection(mapDataList);
         }
 
-        private MapData GetReferenceLineData()
+        private MapData GetReferenceLineMapData()
         {
             Point2D[] referenceLinePoints = data.Parent.ReferenceLine.Points.ToArray();
             return new MapLineData(referenceLinePoints);
         }
 
-        private MapData GetHydraulicBoundaryLocations()
+        private MapData GetHydraulicBoundaryLocationsMapData()
         {
             Point2D[] hrLocations = data.Parent.HydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray();
             return new MapPointData(hrLocations);
         }
 
-        private MapData GetSurfaceLines()
+        private MapData GetSurfaceLinesMapData()
         {
             IEnumerable<IEnumerable<Point2D>> surfaceLines = data.WrappedData.SurfaceLines.Select(sl => sl.Points.Select(p => new Point2D(p.X, p.Y)));
             return new MapMultiLineData(surfaceLines);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r3607710d80a1f77bf97f81b10869074b765686a0 -rb909f6664a8d22063cb0516befb25f8935c12478
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 3607710d80a1f77bf97f81b10869074b765686a0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision b909f6664a8d22063cb0516befb25f8935c12478)
@@ -113,18 +113,11 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
             };
             assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0));
-            assessmentSectionBase.Attach(observer);
 
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
@@ -141,7 +134,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -151,12 +143,6 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 ReferenceLine = new ReferenceLine()
@@ -166,7 +152,6 @@
                 new Point2D(1.0, 2.0),
                 new Point2D(2.0, 1.0)
             });
-            assessmentSectionBase.Attach(observer);
 
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
@@ -186,7 +171,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -196,15 +180,8 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase();
             var pipingFailureMechanism = new PipingFailureMechanism();
-            ((IObservable)pipingFailureMechanism.SurfaceLines).Attach(observer);
 
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
 
@@ -225,7 +202,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -235,12 +211,6 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(),
@@ -252,7 +222,6 @@
                 new Point2D(1.0, 2.0),
                 new Point2D(2.0, 1.0)
             });
-            assessmentSectionBase.Attach(observer);
 
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
@@ -270,15 +239,13 @@
                 new Point2D(2.0, 1.0),
                 new Point2D(4.0, 3.0)
             });
-            assessmentSectionBase2.Attach(observer);
 
             // Call
             assessmentSectionBase2.NotifyObservers();
 
             // Assert
             Assert.AreEqual(pipingContext, view.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -288,12 +255,6 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(),
@@ -311,8 +272,6 @@
 
             view.Data = pipingContext;
 
-            assessmentSectionBase.Attach(observer);
-
             view.Data = null;
             MapData dataBeforeUpdate = map.Data;
 
@@ -328,7 +287,6 @@
 
             // Assert
             Assert.AreEqual(dataBeforeUpdate, map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]