Index: Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -rac5af9efc458b60781a04bdb6b53c42de9c39dae -rf8a9c7de978ae1b7a7838af1936ad9782f6d37e5
--- Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision ac5af9efc458b60781a04bdb6b53c42de9c39dae)
+++ Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision f8a9c7de978ae1b7a7838af1936ad9782f6d37e5)
@@ -633,7 +633,7 @@
                 CreateDemoStabilityPointStructure()
             }, "stabilityPointStructurePath");
 
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.NotifyObservers();
Index: Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -rac5af9efc458b60781a04bdb6b53c42de9c39dae -rf8a9c7de978ae1b7a7838af1936ad9782f6d37e5
--- Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision ac5af9efc458b60781a04bdb6b53c42de9c39dae)
+++ Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision f8a9c7de978ae1b7a7838af1936ad9782f6d37e5)
@@ -479,10 +479,10 @@
         {
             Assert.AreEqual(1, demoAssessmentSection.StabilityPointStructures.CalculationsGroup.Children.Count);
             AssertExpectedStabilityPointStructureValues(demoAssessmentSection.StabilityPointStructures.StabilityPointStructures[0]);
-            StructuresCalculation<StabilityPointStructuresInput> calculation = demoAssessmentSection.StabilityPointStructures
-                                                                                                    .Calculations
-                                                                                                    .OfType<StructuresCalculation<StabilityPointStructuresInput>>()
-                                                                                                    .First();
+            StructuresCalculationScenario<StabilityPointStructuresInput> calculation = demoAssessmentSection.StabilityPointStructures
+                                                                                                            .Calculations
+                                                                                                            .OfType<StructuresCalculationScenario<StabilityPointStructuresInput>>()
+                                                                                                            .First();
             AssertExpectedStabilityPointStructuresInput(calculation.InputParameters);
         }