Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -rd6fe8399e8398224cf1bda9259052232d85b85a4
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision d6fe8399e8398224cf1bda9259052232d85b85a4)
@@ -140,7 +140,7 @@
             mocks.ReplayAll();
 
             var groupContext = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
@@ -173,7 +173,7 @@
             mocks.ReplayAll();
 
             var nodeData = new PipingCalculationGroupContext(group,
-                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                             Enumerable.Empty<PipingSurfaceLine>(),
                                                              Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanism,
                                                              assessmentSection);
@@ -209,12 +209,12 @@
             var pipingFailureMechanism = new TestPipingFailureMechanism();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var nodeData = new PipingCalculationGroupContext(group,
-                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                             Enumerable.Empty<PipingSurfaceLine>(),
                                                              Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanism,
                                                              assessmentSection);
             var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                   Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                                    pipingFailureMechanism,
                                                                    assessmentSection);
@@ -336,7 +336,7 @@
             var pipingFailureMechanism = new TestPipingFailureMechanism();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var nodeData = new PipingCalculationGroupContext(group,
-                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                             Enumerable.Empty<PipingSurfaceLine>(),
                                                              Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanism,
                                                              assessmentSection);
@@ -455,7 +455,7 @@
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  new[]
                                                                  {
                                                                      new TestStochasticSoilModel()
@@ -497,7 +497,7 @@
                 var nodeData = new PipingCalculationGroupContext(group,
                                                                  new[]
                                                                  {
-                                                                     new RingtoetsPipingSurfaceLine()
+                                                                     new PipingSurfaceLine()
                                                                  },
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
@@ -539,7 +539,7 @@
                 var nodeData = new PipingCalculationGroupContext(group,
                                                                  new[]
                                                                  {
-                                                                     new RingtoetsPipingSurfaceLine()
+                                                                     new PipingSurfaceLine()
                                                                  },
                                                                  new[]
                                                                  {
@@ -586,7 +586,7 @@
                 };
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
@@ -635,7 +635,7 @@
                 };
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
@@ -677,7 +677,7 @@
                 var group = new CalculationGroup();
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
@@ -718,7 +718,7 @@
                 };
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
@@ -760,7 +760,7 @@
                 };
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
@@ -803,7 +803,7 @@
                 };
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
@@ -840,12 +840,12 @@
                 var pipingFailureMechanism = new PipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSection);
@@ -898,12 +898,12 @@
                 var pipingFailureMechanism = new PipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSection);
@@ -971,12 +971,12 @@
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSection);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSection);
@@ -1037,12 +1037,12 @@
                 IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(
                     pipingFailureMechanism, mocks);
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSectionStub);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSectionStub);
@@ -1113,12 +1113,12 @@
                     pipingFailureMechanism, mocks);
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSectionStub);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSectionStub);
@@ -1177,11 +1177,11 @@
 
                 var surfaceLines = new[]
                 {
-                    new RingtoetsPipingSurfaceLine
+                    new PipingSurfaceLine
                     {
                         Name = "surfaceLine1"
                     },
-                    new RingtoetsPipingSurfaceLine
+                    new PipingSurfaceLine
                     {
                         Name = "surfaceLine2"
                     }
@@ -1238,7 +1238,7 @@
                 var pipingFailureMechanism = new PipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
 
-                var surfaceLine1 = new RingtoetsPipingSurfaceLine
+                var surfaceLine1 = new PipingSurfaceLine
                 {
                     Name = "Surface line 1",
                     ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0)
@@ -1251,7 +1251,7 @@
                     new Point3D(0.0, -5.0, 0.0)
                 });
 
-                var surfaceLine2 = new RingtoetsPipingSurfaceLine
+                var surfaceLine2 = new PipingSurfaceLine
                 {
                     Name = "Surface line 2",
                     ReferenceLineIntersectionWorldPoint = new Point2D(5.0, 0.0)
@@ -1350,7 +1350,7 @@
                 var pipingFailureMechanism = new PipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
 
-                var surfaceLine1 = new RingtoetsPipingSurfaceLine
+                var surfaceLine1 = new PipingSurfaceLine
                 {
                     Name = "Surface line 1",
                     ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0)
@@ -1363,7 +1363,7 @@
                     new Point3D(0.0, -5.0, 0.0)
                 });
 
-                var surfaceLine2 = new RingtoetsPipingSurfaceLine
+                var surfaceLine2 = new PipingSurfaceLine
                 {
                     Name = "Surface line 2",
                     ReferenceLineIntersectionWorldPoint = new Point2D(5.0, 0.0)
@@ -1461,15 +1461,15 @@
             mocks.ReplayAll();
 
             var nodeData = new PipingCalculationGroupContext(group,
-                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                             Enumerable.Empty<PipingSurfaceLine>(),
                                                              Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanism,
                                                              assessmentSection);
 
             var parentGroup = new CalculationGroup();
             parentGroup.Children.Add(group);
             var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                   Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                                    pipingFailureMechanism,
                                                                    assessmentSection);
@@ -1493,7 +1493,7 @@
             observer.Expect(o => o.UpdateObserver());
             var group = new CalculationGroup();
             TestPipingFailureMechanism pipingFailureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
-            RingtoetsPipingSurfaceLine[] surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray();
+            PipingSurfaceLine[] surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray();
 
             var calculation = new PipingCalculationScenario(new GeneralPipingInput())
             {
@@ -1509,15 +1509,15 @@
             mocks.ReplayAll();
 
             var nodeData = new PipingCalculationGroupContext(group,
-                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                             Enumerable.Empty<PipingSurfaceLine>(),
                                                              Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanism,
                                                              assessmentSection);
 
             CalculationGroup parentGroup = pipingFailureMechanism.CalculationsGroup;
             parentGroup.Children.Add(group);
             var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                   Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                                    pipingFailureMechanism,
                                                                    assessmentSection);
@@ -1550,7 +1550,7 @@
                 calculation1InputObserver.Expect(obs => obs.UpdateObserver());
                 calculation2InputObserver.Expect(obs => obs.UpdateObserver());
 
-                var surfaceLine = new RingtoetsPipingSurfaceLine();
+                var surfaceLine = new PipingSurfaceLine();
                 surfaceLine.SetGeometry(new[]
                 {
                     new Point3D(1, 2, 3),
@@ -1597,12 +1597,12 @@
                     pipingFailureMechanism, mocks);
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSectionStub);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSectionStub);
@@ -1643,7 +1643,7 @@
                 var calculation2Observer = mocks.StrictMock<IObserver>();
                 var calculation2InputObserver = mocks.StrictMock<IObserver>();
 
-                var surfaceLine = new RingtoetsPipingSurfaceLine();
+                var surfaceLine = new PipingSurfaceLine();
                 surfaceLine.SetGeometry(new[]
                 {
                     new Point3D(1, 2, 3),
@@ -1694,12 +1694,12 @@
                     pipingFailureMechanism, mocks);
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSectionStub);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSectionStub);
@@ -1759,7 +1759,7 @@
                 calculation2Observer.Expect(obs => obs.UpdateObserver());
                 calculation2InputObserver.Expect(obs => obs.UpdateObserver());
 
-                var surfaceLine = new RingtoetsPipingSurfaceLine();
+                var surfaceLine = new PipingSurfaceLine();
                 surfaceLine.SetGeometry(new[]
                 {
                     new Point3D(1, 2, 3),
@@ -1810,12 +1810,12 @@
                     pipingFailureMechanism, mocks);
 
                 var nodeData = new PipingCalculationGroupContext(group,
-                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                 Enumerable.Empty<PipingSurfaceLine>(),
                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanism,
                                                                  assessmentSectionStub);
                 var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                       Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                       Enumerable.Empty<PipingSurfaceLine>(),
                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                        pipingFailureMechanism,
                                                                        assessmentSectionStub);
@@ -1859,7 +1859,7 @@
             }
         }
 
-        private static void ChangeSurfaceLine(RingtoetsPipingSurfaceLine surfaceLine)
+        private static void ChangeSurfaceLine(PipingSurfaceLine surfaceLine)
         {
             surfaceLine.SetGeometry(new[]
             {