Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r915d8a66e5d294a18f9452775406e36a3f8fbdc0 -r887b289acf19a81f62d78f371ab70c3f82812b95
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 915d8a66e5d294a18f9452775406e36a3f8fbdc0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 887b289acf19a81f62d78f371ab70c3f82812b95)
@@ -709,7 +709,7 @@
                                                              assessmentSectionMock);
 
             var calculationItem = mocks.Stub<ICalculationBase>();
-            calculationItem.Expect(ci => ci.Name).Return("Nieuwe map");
+            calculationItem.Name = "Nieuwe map";
 
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
@@ -760,7 +760,7 @@
                                                              assessmentSectionMock);
 
             var calculationItem = mocks.Stub<ICalculationBase>();
-            calculationItem.Expect(ci => ci.Name).Return("Nieuwe berekening");
+            calculationItem.Name = "Nieuwe berekening";
 
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
@@ -1681,7 +1681,7 @@
             CreatePipingCalculationAndContext(draggedItemType, out draggedItem, out draggedItemContext, pipingFailureMechanismMock, assessmentSection, name);
 
             var existingItemStub = mocks.Stub<ICalculationBase>();
-            existingItemStub.Stub(i => i.Name).Return("");
+            existingItemStub.Name = "";
 
             CalculationGroup originalOwnerGroup;
             PipingCalculationGroupContext originalOwnerGroupContext;
@@ -1739,7 +1739,7 @@
             CreatePipingCalculationGroupAndContext(out newOwnerGroup, out newOwnerGroupContext, pipingFailureMechanismMock, assessmentSection);
 
             var sameNamedItem = mocks.Stub<ICalculationBase>();
-            sameNamedItem.Stub(i => i.Name).Return(draggedItem.Name);
+            sameNamedItem.Name = draggedItem.Name;
 
             var originalOwnerObserver = mocks.StrictMock<IObserver>();
             originalOwnerObserver.Expect(o => o.UpdateObserver());