Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rb2e674342e62c30bb8f78c89ca5cd450c8c6cc2e -rb46eae26095d17798394f93c45d2eac2670eb69f
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision b2e674342e62c30bb8f78c89ca5cd450c8c6cc2e)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision b46eae26095d17798394f93c45d2eac2670eb69f)
@@ -629,7 +629,7 @@
         {
             foreach (ClosingStructure structure in structures)
             {
-                var calculation = new StructuresCalculation<ClosingStructuresInput>
+                var calculation = new StructuresCalculationScenario<ClosingStructuresInput>
                 {
                     Name = NamingHelper.GetUniqueName(calculations, structure.Name, c => c.Name),
                     InputParameters =
@@ -645,7 +645,7 @@
 
         private static void AddCalculation(ClosingStructuresCalculationGroupContext context)
         {
-            var calculation = new StructuresCalculation<ClosingStructuresInput>
+            var calculation = new StructuresCalculationScenario<ClosingStructuresInput>
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RiskeerCommonDataResources.Calculation_DefaultName, c => c.Name)
             };
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs
===================================================================
diff -u -r9b642748438acbabb3f67559e289ec49525aaf4b -rb46eae26095d17798394f93c45d2eac2670eb69f
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs	(.../GrassCoverErosionInwardsScenariosView.cs)	(revision 9b642748438acbabb3f67559e289ec49525aaf4b)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs	(.../GrassCoverErosionInwardsScenariosView.cs)	(revision b46eae26095d17798394f93c45d2eac2670eb69f)
@@ -34,7 +34,9 @@
     /// <summary>
     /// View for configuring grass cover erosion inwards scenarios.
     /// </summary>
-    public partial class GrassCoverErosionInwardsScenariosView : ScenariosView<GrassCoverErosionInwardsCalculationScenario, GrassCoverErosionInwardsInput, GrassCoverErosionInwardsScenarioRow, GrassCoverErosionInwardsFailureMechanism>
+    public partial class GrassCoverErosionInwardsScenariosView : ScenariosView<
+        GrassCoverErosionInwardsCalculationScenario, GrassCoverErosionInwardsInput,
+        GrassCoverErosionInwardsScenarioRow, GrassCoverErosionInwardsFailureMechanism>
     {
         private readonly IAssessmentSection assessmentSection;