Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -r71144e484518b806157fb6613779981342542462
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -116,7 +116,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOnDataReversed()
+        public void ChildNodeObjects_Always_ReturnsChildrenOfDataReversed()
         {
             // Setup
             var mapData1 = mocks.StrictMock<MapData>("test data");
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs
===================================================================
diff -u -rab8c9b7b8f4ab2a55a810a32c3e0841dcf517f5e -r71144e484518b806157fb6613779981342542462
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs	(.../GrassCoverErosionInwardsInputView.cs)	(revision ab8c9b7b8f4ab2a55a810a32c3e0841dcf517f5e)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs	(.../GrassCoverErosionInwardsInputView.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -121,9 +121,12 @@
             GrassCoverErosionInwardsChartDataFactory.UpdateForeshoreGeometryChartDataName(foreshoreChartData, input);
             GrassCoverErosionInwardsChartDataFactory.UpdateDikeGeometryChartDataName(dikeGeometryChartData, dikeProfile);
 
-            UpdatePointBasedChartData(foreshoreChartData, GrassCoverErosionInwardsChartDataPointsFactory.CreateForeshoreGeometryPoints(input));
-            UpdatePointBasedChartData(dikeGeometryChartData, GrassCoverErosionInwardsChartDataPointsFactory.CreateDikeGeometryPoints(dikeProfile));
-            UpdatePointBasedChartData(dikeHeightChartData, GrassCoverErosionInwardsChartDataPointsFactory.CreateDikeHeightPoints(input));
+            UpdatePointBasedChartData(foreshoreChartData,
+                                      GrassCoverErosionInwardsChartDataPointsFactory.CreateForeshoreGeometryPoints(input));
+            UpdatePointBasedChartData(dikeGeometryChartData,
+                                      GrassCoverErosionInwardsChartDataPointsFactory.CreateDikeGeometryPoints(dikeProfile));
+            UpdatePointBasedChartData(dikeHeightChartData,
+                                      GrassCoverErosionInwardsChartDataPointsFactory.CreateDikeHeightPoints(input));
 
             chartControl.Data.NotifyObservers();
         }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -114,8 +114,14 @@
 
         private void UpdateMapData()
         {
-            UpdateFeatureBasedMapData(referenceLineMapData, RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(data != null ? data.ReferenceLine : null));
-            UpdateFeatureBasedMapData(hydraulicBoundaryDatabaseMapData, RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(data != null ? data.HydraulicBoundaryDatabase : null));
+            UpdateFeatureBasedMapData(referenceLineMapData,
+                                      RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(data != null
+                                                                                                      ? data.ReferenceLine
+                                                                                                      : null));
+            UpdateFeatureBasedMapData(hydraulicBoundaryDatabaseMapData,
+                                      RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(data != null
+                                                                                                                  ? data.HydraulicBoundaryDatabase
+                                                                                                                  : null));
 
             mapControl.Data.NotifyObservers();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -146,7 +146,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOnData()
+        public void ChildNodeObjects_Always_ReturnsChildrenOfData()
         {
             // Setup
             var failureMechanisms = new IFailureMechanism[]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs	(.../CategoryTreeFolderTreeNodeInfoTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs	(.../CategoryTreeFolderTreeNodeInfoTest.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -157,7 +157,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOnData()
+        public void ChildNodeObjects_Always_ReturnsChildrenOfData()
         {
             // Setup
             mocks.ReplayAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs
===================================================================
diff -u -rf4dd417401193ac7ae205acb1b38ad6155b9134f -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs	(.../RingtoetsProjectTreeNodeInfoTest.cs)	(revision f4dd417401193ac7ae205acb1b38ad6155b9134f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs	(.../RingtoetsProjectTreeNodeInfoTest.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -110,7 +110,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOnData()
+        public void ChildNodeObjects_Always_ReturnsChildrenOfData()
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -132,13 +132,34 @@
 
         private void UpdateMapData()
         {
-            UpdateFeatureBasedMapData(referenceLineMapData, RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(data != null && data.Parent != null ? data.Parent.ReferenceLine : null));
-            UpdateFeatureBasedMapData(sectionsMapData, PipingMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(data != null && data.WrappedData != null ? data.WrappedData.Sections : null));
-            UpdateFeatureBasedMapData(stochasticSoilModelsMapData, PipingMapDataFeaturesFactory.CreateStochasticSoilModelFeatures(data != null && data.WrappedData != null ? data.WrappedData.StochasticSoilModels : null));
-            UpdateFeatureBasedMapData(surfaceLinesMapData, PipingMapDataFeaturesFactory.CreateSurfaceLineFeatures(data != null && data.WrappedData != null ? data.WrappedData.SurfaceLines : null));
-            UpdateFeatureBasedMapData(sectionsStartPointMapData, PipingMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(data != null && data.WrappedData != null ? data.WrappedData.Sections : null));
-            UpdateFeatureBasedMapData(sectionsEndPointMapData, PipingMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(data != null && data.WrappedData != null ? data.WrappedData.Sections : null));
-            UpdateFeatureBasedMapData(hydraulicBoundaryDatabaseMapData, RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(data != null && data.Parent != null ? data.Parent.HydraulicBoundaryDatabase : null));
+            UpdateFeatureBasedMapData(referenceLineMapData,
+                                      RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(data != null && data.Parent != null
+                                                                                                      ? data.Parent.ReferenceLine
+                                                                                                      : null));
+            UpdateFeatureBasedMapData(sectionsMapData,
+                                      PipingMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(data != null && data.WrappedData != null
+                                                                                                             ? data.WrappedData.Sections
+                                                                                                             : null));
+            UpdateFeatureBasedMapData(stochasticSoilModelsMapData,
+                                      PipingMapDataFeaturesFactory.CreateStochasticSoilModelFeatures(data != null && data.WrappedData != null
+                                                                                                         ? data.WrappedData.StochasticSoilModels
+                                                                                                         : null));
+            UpdateFeatureBasedMapData(surfaceLinesMapData,
+                                      PipingMapDataFeaturesFactory.CreateSurfaceLineFeatures(data != null && data.WrappedData != null
+                                                                                                 ? data.WrappedData.SurfaceLines
+                                                                                                 : null));
+            UpdateFeatureBasedMapData(sectionsStartPointMapData,
+                                      PipingMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(data != null && data.WrappedData != null
+                                                                                                                       ? data.WrappedData.Sections
+                                                                                                                       : null));
+            UpdateFeatureBasedMapData(sectionsEndPointMapData,
+                                      PipingMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(data != null && data.WrappedData != null
+                                                                                                                     ? data.WrappedData.Sections
+                                                                                                                     : null));
+            UpdateFeatureBasedMapData(hydraulicBoundaryDatabaseMapData,
+                                      RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(data != null && data.Parent != null
+                                                                                                                  ? data.Parent.HydraulicBoundaryDatabase
+                                                                                                                  : null));
 
             mapControl.Data.NotifyObservers();
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs
===================================================================
diff -u -r78053965aab36c2c21e2706e73d84a9dc2cd5f3a -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 78053965aab36c2c21e2706e73d84a9dc2cd5f3a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -152,15 +152,24 @@
 
             PipingChartDataFactory.UpdateSurfaceLineChartDataName(surfaceLineChartData, surfaceLine);
 
-            UpdatePointBasedChartData(surfaceLineChartData, PipingChartDataPointsFactory.CreateSurfaceLinePoints(surfaceLine));
-            UpdatePointBasedChartData(ditchPolderSideChartData, PipingChartDataPointsFactory.CreateDitchPolderSidePoint(surfaceLine));
-            UpdatePointBasedChartData(bottomDitchPolderSideChartData, PipingChartDataPointsFactory.CreateBottomDitchPolderSidePoint(surfaceLine));
-            UpdatePointBasedChartData(bottomDitchDikeSideChartData, PipingChartDataPointsFactory.CreateBottomDitchDikeSidePoint(surfaceLine));
-            UpdatePointBasedChartData(ditchDikeSideChartData, PipingChartDataPointsFactory.CreateDitchDikeSidePoint(surfaceLine));
-            UpdatePointBasedChartData(dikeToeAtPolderChartData, PipingChartDataPointsFactory.CreateDikeToeAtPolderPoint(surfaceLine));
-            UpdatePointBasedChartData(dikeToeAtRiverChartData, PipingChartDataPointsFactory.CreateDikeToeAtRiverPoint(surfaceLine));
-            UpdatePointBasedChartData(exitPointChartData, PipingChartDataPointsFactory.CreateExitPointPoint(pipingInput));
-            UpdatePointBasedChartData(entryPointChartData, PipingChartDataPointsFactory.CreateEntryPointPoint(pipingInput));
+            UpdatePointBasedChartData(surfaceLineChartData,
+                                      PipingChartDataPointsFactory.CreateSurfaceLinePoints(surfaceLine));
+            UpdatePointBasedChartData(ditchPolderSideChartData,
+                                      PipingChartDataPointsFactory.CreateDitchPolderSidePoint(surfaceLine));
+            UpdatePointBasedChartData(bottomDitchPolderSideChartData,
+                                      PipingChartDataPointsFactory.CreateBottomDitchPolderSidePoint(surfaceLine));
+            UpdatePointBasedChartData(bottomDitchDikeSideChartData,
+                                      PipingChartDataPointsFactory.CreateBottomDitchDikeSidePoint(surfaceLine));
+            UpdatePointBasedChartData(ditchDikeSideChartData,
+                                      PipingChartDataPointsFactory.CreateDitchDikeSidePoint(surfaceLine));
+            UpdatePointBasedChartData(dikeToeAtPolderChartData,
+                                      PipingChartDataPointsFactory.CreateDikeToeAtPolderPoint(surfaceLine));
+            UpdatePointBasedChartData(dikeToeAtRiverChartData,
+                                      PipingChartDataPointsFactory.CreateDikeToeAtRiverPoint(surfaceLine));
+            UpdatePointBasedChartData(exitPointChartData,
+                                      PipingChartDataPointsFactory.CreateExitPointPoint(pipingInput));
+            UpdatePointBasedChartData(entryPointChartData,
+                                      PipingChartDataPointsFactory.CreateEntryPointPoint(pipingInput));
 
             UpdateSoilProfileChartData();
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -135,7 +135,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOnData()
+        public void ChildNodeObjects_Always_ReturnsChildrenOfData()
         {
             // Setup
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs	(.../StochasticSoilModelContextTreeNodeInfoTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs	(.../StochasticSoilModelContextTreeNodeInfoTest.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -148,7 +148,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOnData()
+        public void ChildNodeObjects_Always_ReturnsChildrenOfData()
         {
             // Setup
             var pipingSoilProfile1 = new PipingSoilProfile("pipingSoilProfile1", 0, new List<PipingSoilLayer>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs
===================================================================
diff -u -rd224302850baff3b4d12ce133b7a5a9688ece39c -r71144e484518b806157fb6613779981342542462
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision d224302850baff3b4d12ce133b7a5a9688ece39c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision 71144e484518b806157fb6613779981342542462)
@@ -85,7 +85,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOnData()
+        public void ChildNodeObjects_Always_ReturnsChildrenOfData()
         {
             // Setup
             var stochasticSoilProfile1 = new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1)