Index: Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r1f8f494adb4d542c0a8c385dcf6917ea5e99cde0 -rac5af9efc458b60781a04bdb6b53c42de9c39dae
--- Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision 1f8f494adb4d542c0a8c385dcf6917ea5e99cde0)
+++ Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision ac5af9efc458b60781a04bdb6b53c42de9c39dae)
@@ -438,7 +438,7 @@
                 heightStructure
             }, "heightStructurePath");
 
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.Structure = heightStructure;
Index: Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r1f8f494adb4d542c0a8c385dcf6917ea5e99cde0 -rac5af9efc458b60781a04bdb6b53c42de9c39dae
--- Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 1f8f494adb4d542c0a8c385dcf6917ea5e99cde0)
+++ Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision ac5af9efc458b60781a04bdb6b53c42de9c39dae)
@@ -254,10 +254,10 @@
             AssertExpectedHeightStructureValues(demoAssessmentSection.HeightStructures.HeightStructures[0]);
 
             Assert.AreEqual(1, demoAssessmentSection.HeightStructures.CalculationsGroup.Children.Count);
-            StructuresCalculation<HeightStructuresInput> calculation = demoAssessmentSection.HeightStructures
-                                                                                            .Calculations
-                                                                                            .OfType<StructuresCalculation<HeightStructuresInput>>()
-                                                                                            .First();
+            StructuresCalculationScenario<HeightStructuresInput> calculation = demoAssessmentSection.HeightStructures
+                                                                                                    .Calculations
+                                                                                                    .OfType<StructuresCalculationScenario<HeightStructuresInput>>()
+                                                                                                    .First();
             AssertExpectedHeightStructuresInput(calculation.InputParameters);
         }