Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfc38d18fc6ff1749476da0ea43281d5d80568283 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision fc38d18fc6ff1749476da0ea43281d5d80568283)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -66,7 +66,7 @@
             // Setup
             var testname = "testName";
             var group = new PipingCalculationGroup { Name = testname };
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             mocks.ReplayAll();
@@ -99,7 +99,7 @@
         {
             // Setup
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -125,7 +125,7 @@
         {
             // Setup
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -157,7 +157,7 @@
             group.Children.Add(childCalculation);
             group.Children.Add(childGroup);
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             mocks.ReplayAll();
@@ -176,10 +176,10 @@
             Assert.AreSame(calculationItem, children[0]);
             var returnedCalculationContext = (PipingCalculationContext) children[1];
             Assert.AreSame(childCalculation, returnedCalculationContext.WrappedData);
-            Assert.AreSame(pipingFailureMechanismMock, returnedCalculationContext.Piping);
+            Assert.AreSame(pipingFailureMechanismMock, returnedCalculationContext.PipingFailureMechanism);
             var returnedCalculationGroupContext = (PipingCalculationGroupContext)children[2];
             Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData);
-            Assert.AreSame(pipingFailureMechanismMock, returnedCalculationGroupContext.Piping);
+            Assert.AreSame(pipingFailureMechanismMock, returnedCalculationGroupContext.PipingFailureMechanism);
             Assert.AreSame(assessmentSectionMock, returnedCalculationGroupContext.AssessmentSection);
             mocks.VerifyAll();
         }
@@ -199,7 +199,7 @@
                 Output = new TestPipingOutput()
             });
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var parentData = new PipingCalculationGroupContext(parentGroup,
@@ -317,7 +317,7 @@
                 Output = new TestPipingOutput()
             });
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var parentData = new object();
@@ -424,7 +424,7 @@
                 Output = new TestPipingOutput()
             });
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var parentData = new PipingFailureMechanismContext(pipingFailureMechanismMock, assessmentSectionMock);
@@ -524,7 +524,7 @@
             var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var group = new PipingCalculationGroup();
             
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var parentData = new PipingFailureMechanismContext(pipingFailureMechanismMock, assessmentSectionMock);
@@ -564,7 +564,7 @@
             var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var group = new PipingCalculationGroup();
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var parentData = new PipingFailureMechanismContext(pipingFailureMechanismMock, assessmentSectionMock);
@@ -604,7 +604,7 @@
             var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var group = new PipingCalculationGroup();
             
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var parentData = new PipingFailureMechanismContext(pipingFailureMechanismMock, assessmentSectionMock);
@@ -647,8 +647,8 @@
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             var group = new PipingCalculationGroup();
-            var parentData = new Data.Piping();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var parentData = new PipingFailureMechanism();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
@@ -683,7 +683,7 @@
             var gui = mocks.StrictMock<IGui>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
@@ -734,7 +734,7 @@
             var gui = mocks.StrictMock<IGui>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
@@ -801,7 +801,7 @@
             group.Children.Add(emptyChildGroup);
             group.Children.Add(invalidCalculation);
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var nodeData = new PipingCalculationGroupContext(group,
@@ -860,7 +860,7 @@
             group.Children.Add(emptyChildGroup);
             group.Children.Add(invalidCalculation);
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var nodeData = new PipingCalculationGroupContext(group,
@@ -928,7 +928,7 @@
             group.Children.Add(emptyChildGroup);
             group.Children.Add(calculation2);
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var nodeData = new PipingCalculationGroupContext(group,
@@ -989,7 +989,7 @@
 
             var group = new PipingCalculationGroup();
 
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var mainWindow = mocks.Stub<IMainWindow>();
@@ -1049,7 +1049,7 @@
         public void CanRenameNode_ParentIsPipingFailureMechanismContext_ReturnFalse()
         {
             // Setup
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var pipingFailureMechanismContextMock = mocks.StrictMock<PipingFailureMechanismContext>(pipingFailureMechanismMock, assessmentSectionMock);
 
@@ -1081,7 +1081,7 @@
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -1106,7 +1106,7 @@
         {
             // Setup
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -1116,7 +1116,7 @@
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
-            var parentNodeData = new Data.Piping();
+            var parentNodeData = new PipingFailureMechanism();
             parentNodeData.CalculationsGroup.Children.Add(group);
 
             mocks.ReplayAll();
@@ -1134,7 +1134,7 @@
         {
             // Setup
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -1167,7 +1167,7 @@
         {
             // Setup
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -1201,7 +1201,7 @@
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -1236,7 +1236,7 @@
         {
             // Setup
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
@@ -1258,7 +1258,7 @@
         {
             // Setup
             var group = new PipingCalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var pipingFailureMechanismContextMock = mocks.StrictMock<PipingFailureMechanismContext>(pipingFailureMechanismMock, assessmentSectionMock);
 
@@ -1287,7 +1287,7 @@
             IPipingCalculationItem draggedItem;
             object draggedItemContext;
 
-            var failureMechanism = new Data.Piping();
+            var failureMechanism = new PipingFailureMechanism();
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             mocks.ReplayAll();
@@ -1334,14 +1334,14 @@
             IPipingCalculationItem draggedItem;
             object draggedItemContext;
 
-            var targetFailureMechanism = new Data.Piping();
+            var targetFailureMechanism = new PipingFailureMechanism();
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             mocks.ReplayAll();
 
             CreatePipingCalculationItemAndContext(draggedItemType, out draggedItem, out draggedItemContext, targetFailureMechanism, assessmentSection);
 
-            var sourceFailureMechanism = new Data.Piping();
+            var sourceFailureMechanism = new PipingFailureMechanism();
             sourceFailureMechanism.CalculationsGroup.Children.Add(draggedItem);
 
             PipingCalculationGroup targetGroup;
@@ -1380,7 +1380,7 @@
         {
             // Setup
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             IPipingCalculationItem draggedItem;
@@ -1431,7 +1431,7 @@
         {
             // Setup
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             const string name = "Very cool name";
@@ -1481,7 +1481,7 @@
         {
             // Setup
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var pipingFailureMechanismMock = mocks.StrictMock<Data.Piping>();
+            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             IPipingCalculationItem draggedItem;
@@ -1548,16 +1548,16 @@
         /// </summary>
         /// <param name="data">The created group without any children.</param>
         /// <param name="dataContext">The context object for <paramref name="data"/>, without any other data.</param>
-        /// <param name="piping">The piping failure mechanism the item and context belong to.</param>
+        /// <param name="pipingFailureMechanism">The piping failure mechanism the item and context belong to.</param>
         /// <param name="assessmentSection">The assessment section the item and context belong to.</param>
-        private void CreatePipingCalculationGroupAndContext(out PipingCalculationGroup data, out PipingCalculationGroupContext dataContext, Data.Piping piping, IAssessmentSection assessmentSection)
+        private void CreatePipingCalculationGroupAndContext(out PipingCalculationGroup data, out PipingCalculationGroupContext dataContext, PipingFailureMechanism pipingFailureMechanism, IAssessmentSection assessmentSection)
         {
             data = new PipingCalculationGroup();
 
             dataContext = new PipingCalculationGroupContext(data,
                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                             Enumerable.Empty<StochasticSoilModel>(),
-                                                            piping,
+                                                            pipingFailureMechanism,
                                                             assessmentSection);
         }
 
@@ -1567,11 +1567,11 @@
         /// <param name="type">Defines the implementation of <see cref="IPipingCalculationItem"/> to be constructed.</param>
         /// <param name="data">Output: The concrete create class based on <paramref name="type"/>.</param>
         /// <param name="dataContext">Output: The <see cref="PipingContext{T}"/> corresponding with <paramref name="data"/>.</param>
-        /// <param name="piping">The piping failure mechanism the item and context belong to.</param>
+        /// <param name="pipingFailureMechanism">The piping failure mechanism the item and context belong to.</param>
         /// <param name="assessmentSection">The assessment section the item and context belong to.</param>
         /// <param name="initialName">Optional: The name of <paramref name="data"/>.</param>
         /// <exception cref="System.NotSupportedException"></exception>
-        private void CreatePipingCalculationItemAndContext(PipingCalculationItemType type, out IPipingCalculationItem data, out object dataContext, Data.Piping piping, IAssessmentSection assessmentSection, string initialName = null)
+        private void CreatePipingCalculationItemAndContext(PipingCalculationItemType type, out IPipingCalculationItem data, out object dataContext, PipingFailureMechanism pipingFailureMechanism, IAssessmentSection assessmentSection, string initialName = null)
         {
             switch (type)
             {
@@ -1585,7 +1585,7 @@
                     dataContext = new PipingCalculationContext(calculation,
                                                                Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                                Enumerable.Empty<StochasticSoilModel>(),
-                                                               piping,
+                                                               pipingFailureMechanism,
                                                                assessmentSection);
                     break;
                 case PipingCalculationItemType.Group:
@@ -1598,7 +1598,7 @@
                     dataContext = new PipingCalculationGroupContext(group,
                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                                     Enumerable.Empty<StochasticSoilModel>(),
-                                                                    piping,
+                                                                    pipingFailureMechanism,
                                                                     assessmentSection);
                     break;
                 default: