Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -r23a37b025a5d0358c1f30fb31de41a2c284519a5
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision c5f90c4f9b42d985f16f99ad8732576b9217267a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 23a37b025a5d0358c1f30fb31de41a2c284519a5)
@@ -195,7 +195,7 @@
             // Assert
             Assert.AreEqual(group.Children.Count, children.Length);
             Assert.AreSame(calculationItem, children[0]);
-            var returnedCalculationContext = (PipingCalculationContext) children[1];
+            var returnedCalculationContext = (PipingCalculationScenarioContext) children[1];
             Assert.AreSame(childCalculation, returnedCalculationContext.WrappedData);
             Assert.AreSame(pipingFailureMechanismMock, returnedCalculationContext.PipingFailureMechanism);
             var returnedCalculationGroupContext = (PipingCalculationGroupContext) children[2];
@@ -710,7 +710,7 @@
                                                              assessmentSectionMock);
 
             var calculationItem = mocks.Stub<ICalculationBase>();
-            calculationItem.Name = "Nieuwe map";
+            calculationItem.Stub(ci => ci.Name).Return("Nieuwe map");
 
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
@@ -761,7 +761,7 @@
                                                              assessmentSectionMock);
 
             var calculationItem = mocks.Stub<ICalculationBase>();
-            calculationItem.Name = "Nieuwe berekening";
+            calculationItem.Stub(ci => ci.Name).Return("Nieuwe berekening");
 
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
@@ -1736,7 +1736,7 @@
             CreatePipingCalculationAndContext(draggedItemType, out draggedItem, out draggedItemContext, pipingFailureMechanismMock, assessmentSection, name);
 
             var existingItemStub = mocks.Stub<ICalculationBase>();
-            existingItemStub.Name = "";
+            existingItemStub.Stub(ci => ci.Name).Return("");
 
             CalculationGroup originalOwnerGroup;
             PipingCalculationGroupContext originalOwnerGroupContext;
@@ -1794,7 +1794,7 @@
             CreatePipingCalculationGroupAndContext(out newOwnerGroup, out newOwnerGroupContext, pipingFailureMechanismMock, assessmentSection);
 
             var sameNamedItem = mocks.Stub<ICalculationBase>();
-            sameNamedItem.Name = draggedItem.Name;
+            sameNamedItem.Stub(sni => sni.Name).Return(draggedItem.Name);
 
             var originalOwnerObserver = mocks.StrictMock<IObserver>();
             originalOwnerObserver.Expect(o => o.UpdateObserver());
@@ -1885,7 +1885,7 @@
                         calculation.Name = initialName;
                     }
                     data = calculation;
-                    dataContext = new PipingCalculationContext(calculation,
+                    dataContext = new PipingCalculationScenarioContext(calculation,
                                                                Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                pipingFailureMechanism,