Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs
===================================================================
diff -u -r5c393bc8750c1cea8cc6e28e024f331aeea2ae52 -r9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs)	(revision 5c393bc8750c1cea8cc6e28e024f331aeea2ae52)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioExtensionsTest.cs)	(revision 9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b)
@@ -48,7 +48,7 @@
         public void IsDikeProfileIntersectionWithReferenceLineInSection_LineSegmentsNull_ThrowsArgumentNullException()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1);
+            var calculation = new GrassCoverErosionInwardsCalculationScenario();
 
             // Call
             void Call() => calculation.IsDikeProfileIntersectionWithReferenceLineInSection(null);
@@ -62,7 +62,7 @@
         public void IsDikeProfileIntersectionWithReferenceLineInSection_CalculationWithoutDikeProfile_ReturnsFalse()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1);
+            var calculation = new GrassCoverErosionInwardsCalculationScenario();
 
             // Call
             bool intersects = calculation.IsDikeProfileIntersectionWithReferenceLineInSection(Enumerable.Empty<Segment2D>());
@@ -83,7 +83,7 @@
                 new Point2D(10.0, 0.0)
             });
 
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario()
             {
                 InputParameters =
                 {
@@ -110,7 +110,7 @@
                 new Point2D(10.0, 0.0)
             });
 
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario()
             {
                 InputParameters =
                 {
@@ -139,7 +139,7 @@
                 new Point2D(20.0, 0.0)
             });
 
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario()
             {
                 InputParameters =
                 {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs
===================================================================
diff -u -r9af8b802af77b91ca5a44601170b092eabde5e01 -r9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision 9af8b802af77b91ca5a44601170b092eabde5e01)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision 9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b)
@@ -413,11 +413,11 @@
             {
                 Children =
                 {
-                    new GrassCoverErosionInwardsCalculationScenario(0.1)
+                    new GrassCoverErosionInwardsCalculationScenario
                     {
                         Name = "A"
                     },
-                    new GrassCoverErosionInwardsCalculationScenario(0.1)
+                    new GrassCoverErosionInwardsCalculationScenario
                     {
                         Name = "B"
                     }
@@ -453,15 +453,15 @@
                     {
                         Name = "A"
                     },
-                    new GrassCoverErosionInwardsCalculationScenario(0.1)
+                    new GrassCoverErosionInwardsCalculationScenario
                     {
                         Name = "B"
                     },
                     new CalculationGroup
                     {
                         Name = "C"
                     },
-                    new GrassCoverErosionInwardsCalculationScenario(0.1)
+                    new GrassCoverErosionInwardsCalculationScenario
                     {
                         Name = "D"
                     }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -rae63828db6c6e20bc476fe8adfef362e3966a5ad -r9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision ae63828db6c6e20bc476fe8adfef362e3966a5ad)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision 9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b)
@@ -41,7 +41,7 @@
         public void Create_PersistenceRegistryNull_ThrowArgumentNullException()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1);
+            var calculation = new GrassCoverErosionInwardsCalculationScenario();
 
             // Call
             void Call() => calculation.Create(null, 0);
@@ -60,7 +60,7 @@
             var random = new Random(12);
             int order = random.Next();
             const string name = "GrassCoverErosionInwardsCalculation Name";
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
                 Name = name,
                 Comments =
@@ -146,7 +146,7 @@
             // Setup
             const string name = "A";
             const string comment = "B";
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
                 Name = name,
                 Comments =
@@ -174,7 +174,7 @@
         public void Create_NaNParameters_EntityWithNullFields()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -209,7 +209,7 @@
         {
             // Setup
             DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile();
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -233,7 +233,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 1, 1);
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -260,7 +260,7 @@
             var overtoppingOutput = new OvertoppingOutput(random.NextDouble(), false, random.NextDouble(), null);
             var output = new GrassCoverErosionInwardsOutput(overtoppingOutput, null, null);
 
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
                 Output = output
             };
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r9af8b802af77b91ca5a44601170b092eabde5e01 -r9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 9af8b802af77b91ca5a44601170b092eabde5e01)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b)
@@ -1790,7 +1790,7 @@
                 Name = "GEKB A",
                 Children =
                 {
-                    new GrassCoverErosionInwardsCalculationScenario(assessmentSection.FailureMechanismContribution.Norm)
+                    new GrassCoverErosionInwardsCalculationScenario
                     {
                         Name = "Calculation 1",
                         Comments =
@@ -1813,16 +1813,16 @@
                                 Mean = (RoundedDouble) 1.1,
                                 StandardDeviation = (RoundedDouble) 2.2
                             },
-                            DikeHeightCalculationType = DikeHeightCalculationType.CalculateByAssessmentSectionNorm,
-                            OvertoppingRateCalculationType = OvertoppingRateCalculationType.CalculateByProfileSpecificRequiredProbability,
+                            DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.Norm,
+                            OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.Norm,
                             UseForeshore = true,
                             UseBreakWater = true
                         },
                         Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0.45, true, 1.1, null),
                                                                     new DikeHeightOutput(0.56, 0.05, 2, 0.06, 3, CalculationConvergence.CalculatedConverged, null),
                                                                     new OvertoppingRateOutput(0.57, 0.07, 4, 0.08, 5, CalculationConvergence.CalculatedConverged, null))
                     },
-                    new GrassCoverErosionInwardsCalculationScenario(assessmentSection.FailureMechanismContribution.Norm)
+                    new GrassCoverErosionInwardsCalculationScenario
                     {
                         Name = "Calculation 2",
                         Comments =
@@ -1845,13 +1845,13 @@
                                 Mean = (RoundedDouble) 1.1,
                                 StandardDeviation = (RoundedDouble) 2.2
                             },
-                            DikeHeightCalculationType = DikeHeightCalculationType.CalculateByAssessmentSectionNorm,
-                            OvertoppingRateCalculationType = OvertoppingRateCalculationType.CalculateByProfileSpecificRequiredProbability,
                             UseForeshore = true,
                             UseBreakWater = true,
                             ShouldOvertoppingOutputIllustrationPointsBeCalculated = true,
                             ShouldDikeHeightIllustrationPointsBeCalculated = true,
-                            ShouldOvertoppingRateIllustrationPointsBeCalculated = true
+                            DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.Norm,
+                            ShouldOvertoppingRateIllustrationPointsBeCalculated = true,
+                            OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.Norm
                         },
                         Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0.45, true, 1.1, GetConfiguredGeneralResultFaultTreeIllustrationPoint()),
                                                                     new DikeHeightOutput(0.56, 0.05, 2, 0.06, 3, CalculationConvergence.CalculatedConverged, GetConfiguredGeneralResultFaultTreeIllustrationPoint()),
@@ -1864,12 +1864,17 @@
                 Name = "GEKB B"
             });
             failureMechanism.CalculationsGroup.Children.Add(
-                new GrassCoverErosionInwardsCalculationScenario(assessmentSection.FailureMechanismContribution.Norm)
+                new GrassCoverErosionInwardsCalculationScenario
                 {
                     Name = "Calculation 2",
                     Comments =
                     {
                         Body = "Comments about Calculation 2"
+                    },
+                    InputParameters =
+                    {
+                        DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.Norm,
+                        OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.Norm
                     }
                 });
         }