Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs
===================================================================
diff -u -r512177cc50d892bede45024499342a94ae867cfb -rda446197cc450be1a44ab272366db2c8c1df61bb
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs	(.../StructuresClosureCalculationInputTest.cs)	(revision 512177cc50d892bede45024499342a94ae867cfb)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs	(.../StructuresClosureCalculationInputTest.cs)	(revision da446197cc450be1a44ab272366db2c8c1df61bb)
@@ -45,35 +45,39 @@
             const double factorStormDurationOpenStructure = 0.1;
             const double failureProbabilityOpenStructure = 0.04;
             const double failureProbabilityReparation = 0.08;
-            const double identicalAperture = 0.4;
-            const double allowableIncreaseOfLevelForStorageMean = 3.3;
-            const double allowableIncreaseOfLevelForStorageStandardDeviation = 0.1;
-            const double modelFactorForStorageVolumeMean = 1.0;
-            const double modelFactorForStorageVolumeStandardDeviation = 0.2;
+            const double identicalApertures = 0.4;
+            const double allowedLevelIncreaseStorageMean = 3.3;
+            const double allowedLevelIncreaseStorageStandardDeviation = 0.1;
+            const double modelFactorStorageVolumeMean = 1.0;
+            const double modelFactorStorageVolumeStandardDeviation = 0.2;
             const double storageStructureAreaMean = 4.4;
-            const double storageStructureAreaStandardDeviation = 0.1;
-            const double modelFactorForIncomingFlowVolume = 1;
+            const double storageStructureAreaVariation = 0.1;
+            const double modelFactorInflowVolume = 1;
             const double flowWidthAtBottomProtectionMean = 5.5;
             const double flowWidthAtBottomProtectionStandardDeviation = 0.05;
             const double criticalOvertoppingDischargeMean = 6.6;
-            const double criticalOvertoppingDischargeMeanStandardDeviation = 0.15;
-            const double failureProbabilityOfStructureGivenErosion = 7.7;
+            const double criticalOvertoppingDischargeVariation = 0.15;
+            const double failureProbabilityStructureWithErosion = 7.7;
             const double stormDurationMean = 7.5;
-            const double stormDurationStandardDeviation = 0.25;
+            const double stormDurationVariation = 0.25;
             const double probabilityOpenStructureBeforeFlooding = 0.04;
 
             // Call
             var input = new TestStructuresClosureCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints,
-                                                                  gravitationalAcceleration, factorStormDurationOpenStructure,
-                                                                  failureProbabilityOpenStructure, failureProbabilityReparation,
-                                                                  identicalAperture, allowableIncreaseOfLevelForStorageMean,
-                                                                  allowableIncreaseOfLevelForStorageStandardDeviation, modelFactorForStorageVolumeMean,
-                                                                  modelFactorForStorageVolumeStandardDeviation, storageStructureAreaMean,
-                                                                  storageStructureAreaStandardDeviation, modelFactorForIncomingFlowVolume,
+                                                                  gravitationalAcceleration,
+                                                                  factorStormDurationOpenStructure,
+                                                                  failureProbabilityOpenStructure,
+                                                                  failureProbabilityReparation,
+                                                                  identicalApertures,
+                                                                  allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation,
+                                                                  modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation,
+                                                                  storageStructureAreaMean, storageStructureAreaVariation,
+                                                                  modelFactorInflowVolume,
                                                                   flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation,
-                                                                  criticalOvertoppingDischargeMean, criticalOvertoppingDischargeMeanStandardDeviation,
-                                                                  failureProbabilityOfStructureGivenErosion, stormDurationMean,
-                                                                  stormDurationStandardDeviation, probabilityOpenStructureBeforeFlooding);
+                                                                  criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation,
+                                                                  failureProbabilityStructureWithErosion,
+                                                                  stormDurationMean, stormDurationVariation,
+                                                                  probabilityOpenStructureBeforeFlooding);
 
             // Assert
             Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(input);
@@ -108,27 +112,35 @@
         {
             public TestStructuresClosureCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section,
                                                          IEnumerable<HydraRingForelandPoint> forelandPoints,
-                                                         double hydraRingGravitationalAcceleration, double hydraRingFactorStormDurationOpenStructure,
-                                                         double hydraRingFailureProbabilityOpenStructure, double hydraRingFailureProbabilityReparation,
-                                                         double hydraRingIdenticalApertures, double hydraRingAllowableIncreaseOfLevelForStorageMean,
-                                                         double hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, double hydraRingModelFactorForStorageVolumeMean,
-                                                         double hydraRingModelFactorForStorageVolumeStandardDeviation, double hydraRingStorageStructureAreaMean,
-                                                         double hydraRingStorageStructureAreaVariation, double hydraRingModelFactorForIncomingFlowVolume,
-                                                         double hydraRingFlowWidthAtBottomProtectionMean, double hydraRingFlowWidthAtBottomProtectionStandardDeviation,
-                                                         double hydraRingCriticalOvertoppingDischargeMean, double hydraRingCriticalOvertoppingDischargeVariation,
-                                                         double hydraRingFailureProbabilityOfStructureGivenErosion, double hydraRingStormDurationMean,
-                                                         double hydraRingStormDurationVariation, double hydraRingProbabilityOpenStructureBeforeFlooding)
+                                                         double gravitationalAcceleration,
+                                                         double factorStormDurationOpenStructure,
+                                                         double failureProbabilityOpenStructure,
+                                                         double failureProbabilityReparation,
+                                                         double identicalApertures,
+                                                         double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation,
+                                                         double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation,
+                                                         double storageStructureAreaMean, double storageStructureAreaVariation,
+                                                         double modelFactorInflowVolume,
+                                                         double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation,
+                                                         double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation,
+                                                         double failureProbabilityStructureWithErosion,
+                                                         double stormDurationMean, double stormDurationVariation,
+                                                         double probabilityOpenStructureBeforeFlooding)
                 : base(hydraulicBoundaryLocationId, section, forelandPoints,
-                       hydraRingGravitationalAcceleration, hydraRingFactorStormDurationOpenStructure,
-                       hydraRingFailureProbabilityOpenStructure, hydraRingFailureProbabilityReparation,
-                       hydraRingIdenticalApertures, hydraRingAllowableIncreaseOfLevelForStorageMean,
-                       hydraRingAllowableIncreaseOfLevelForStorageStandardDeviation, hydraRingModelFactorForStorageVolumeMean,
-                       hydraRingModelFactorForStorageVolumeStandardDeviation, hydraRingStorageStructureAreaMean,
-                       hydraRingStorageStructureAreaVariation, hydraRingModelFactorForIncomingFlowVolume,
-                       hydraRingFlowWidthAtBottomProtectionMean, hydraRingFlowWidthAtBottomProtectionStandardDeviation,
-                       hydraRingCriticalOvertoppingDischargeMean, hydraRingCriticalOvertoppingDischargeVariation,
-                       hydraRingFailureProbabilityOfStructureGivenErosion, hydraRingStormDurationMean,
-                       hydraRingStormDurationVariation, hydraRingProbabilityOpenStructureBeforeFlooding) {}
+                       gravitationalAcceleration,
+                       factorStormDurationOpenStructure,
+                       failureProbabilityOpenStructure,
+                       failureProbabilityReparation,
+                       identicalApertures,
+                       allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation,
+                       modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation,
+                       storageStructureAreaMean, storageStructureAreaVariation,
+                       modelFactorInflowVolume,
+                       flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation,
+                       criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation,
+                       failureProbabilityStructureWithErosion,
+                       stormDurationMean, stormDurationVariation,
+                       probabilityOpenStructureBeforeFlooding) {}
 
             public override int? GetSubMechanismModelId(int subMechanismId)
             {