Index: Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r7760cbdbca3b12aa69c4c8df2db8fc05fd93b575 -r1f8f494adb4d542c0a8c385dcf6917ea5e99cde0
--- Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision 7760cbdbca3b12aa69c4c8df2db8fc05fd93b575)
+++ Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision 1f8f494adb4d542c0a8c385dcf6917ea5e99cde0)
@@ -70,13 +70,7 @@
             this.viewCommands = viewCommands;
         }
 
-        public bool Checked
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool Checked => false;
 
         public void Execute()
         {
@@ -507,7 +501,7 @@
                 closingStructure
             }, "closingStructurePath");
 
-            var calculation = new StructuresCalculation<ClosingStructuresInput>();
+            var calculation = new StructuresCalculationScenario<ClosingStructuresInput>();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.Structure = closingStructure;
Index: Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r7760cbdbca3b12aa69c4c8df2db8fc05fd93b575 -r1f8f494adb4d542c0a8c385dcf6917ea5e99cde0
--- Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 7760cbdbca3b12aa69c4c8df2db8fc05fd93b575)
+++ Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 1f8f494adb4d542c0a8c385dcf6917ea5e99cde0)
@@ -298,10 +298,10 @@
             AssertExpectedClosingStructureValues(demoAssessmentSection.ClosingStructures.ClosingStructures[0]);
 
             Assert.AreEqual(1, demoAssessmentSection.ClosingStructures.CalculationsGroup.Children.Count);
-            StructuresCalculation<ClosingStructuresInput> calculation = demoAssessmentSection.ClosingStructures
-                                                                                             .Calculations
-                                                                                             .OfType<StructuresCalculation<ClosingStructuresInput>>()
-                                                                                             .First();
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = demoAssessmentSection.ClosingStructures
+                                                                                                     .Calculations
+                                                                                                     .OfType<StructuresCalculationScenario<ClosingStructuresInput>>()
+                                                                                                     .First();
             AssertExpectedClosingStructuresInput(calculation.InputParameters);
         }