Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupExtensionsTest.cs
===================================================================
diff -u -rd148009f276fb1d4a7a4cbacb730c31114b7e4ae -r2dfa240103a7c54e4dde46bbb64357a51c27173e
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupExtensionsTest.cs	(.../CalculationGroupExtensionsTest.cs)	(revision d148009f276fb1d4a7a4cbacb730c31114b7e4ae)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupExtensionsTest.cs	(.../CalculationGroupExtensionsTest.cs)	(revision 2dfa240103a7c54e4dde46bbb64357a51c27173e)
@@ -36,7 +36,7 @@
             CalculationGroup groupWithoutChildren = new CalculationGroup();
 
             // Call
-            IEnumerable<ICalculationScenario> result = groupWithoutChildren.GetCalculations();
+            IEnumerable<ICalculation> result = groupWithoutChildren.GetCalculations();
 
             // Assert
             CollectionAssert.IsEmpty(result);
@@ -54,7 +54,7 @@
             CalculationGroup groupsWithoutChildren = rootGroup;
 
             // Call
-            IEnumerable<ICalculationScenario> result = groupsWithoutChildren.GetCalculations();
+            IEnumerable<ICalculation> result = groupsWithoutChildren.GetCalculations();
 
             // Assert
             CollectionAssert.IsEmpty(result);
@@ -65,10 +65,10 @@
         {
             // Setup
             var mocks = new MockRepository();
-            ICalculationBase calculation1 = mocks.StrictMock<ICalculationScenario>();
-            ICalculationBase calculation2 = mocks.StrictMock<ICalculationScenario>();
-            ICalculationBase calculation3 = mocks.StrictMock<ICalculationScenario>();
-            ICalculationBase calculation4 = mocks.StrictMock<ICalculationScenario>();
+            ICalculationBase calculation1 = mocks.StrictMock<ICalculation>();
+            ICalculationBase calculation2 = mocks.StrictMock<ICalculation>();
+            ICalculationBase calculation3 = mocks.StrictMock<ICalculation>();
+            ICalculationBase calculation4 = mocks.StrictMock<ICalculation>();
             mocks.ReplayAll();
 
             var subsubGroup = new CalculationGroup();
@@ -89,7 +89,7 @@
             CalculationGroup groupWithoutChildren = rootGroup;
 
             // Call
-            IEnumerable<ICalculationScenario> result = groupWithoutChildren.GetCalculations();
+            IEnumerable<ICalculation> result = groupWithoutChildren.GetCalculations();
 
             // Assert
             var itemsThatShouldBeFound = new[]