Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs
===================================================================
diff -u -r2db4a1395f34e5251c2a73f63f36250cdf7e769f -r516d8aa614cb162c87b4ea643977500c7ac99023
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs	(.../GeneralClosingStructuresInput.cs)	(revision 2db4a1395f34e5251c2a73f63f36250cdf7e769f)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs	(.../GeneralClosingStructuresInput.cs)	(revision 516d8aa614cb162c87b4ea643977500c7ac99023)
@@ -48,17 +48,17 @@
                 StandardDeviation = (RoundedDouble) 0.06
             };
 
-            ModelFactorForStorageVolume = new LogNormalDistribution(2)
+            ModelFactorStorageVolume = new LogNormalDistribution(2)
             {
                 Mean = (RoundedDouble) 1,
                 StandardDeviation = (RoundedDouble) 0.2
             };
 
-            ModelFactorForSubCriticalFlow = new NormalDistribution(1)
+            ModelFactorSubCriticalFlow = new NormalDistribution(1)
             {
                 Mean = (RoundedDouble) 1,
             };
-            ModelFactorForSubCriticalFlow.SetStandardDeviationFromVariationCoefficient(0.1);
+            ModelFactorSubCriticalFlow.SetStandardDeviationFromVariationCoefficient(0.1);
 
             ModelFactorInflowVolume = new RoundedDouble(2, 1);
         }
@@ -117,12 +117,12 @@
         /// <summary>
         /// Gets the model factor for storage volume.
         /// </summary>
-        public LogNormalDistribution ModelFactorForStorageVolume { get; private set; }
+        public LogNormalDistribution ModelFactorStorageVolume { get; private set; }
 
         /// <summary>
         /// Gets the model factor for sub critical flow.
         /// </summary>
-        public NormalDistribution ModelFactorForSubCriticalFlow { get; private set; }
+        public NormalDistribution ModelFactorSubCriticalFlow { get; private set; }
 
         /// <summary>
         /// Get the model factor for incoming flow volume.
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs
===================================================================
diff -u -r40faad2af75fe729a6247c635c3833018c8bf209 -r516d8aa614cb162c87b4ea643977500c7ac99023
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs	(.../GeneralClosingStructuresInputTest.cs)	(revision 40faad2af75fe729a6247c635c3833018c8bf209)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs	(.../GeneralClosingStructuresInputTest.cs)	(revision 516d8aa614cb162c87b4ea643977500c7ac99023)
@@ -47,14 +47,17 @@
             Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces);
             AssertEqualValues(9.81, inputParameters.GravitationalAcceleration);
 
+            Assert.IsInstanceOf<LogNormalDistribution>(inputParameters.ModelFactorOvertoppingFlow);
             AssertEqualValues(0.09, inputParameters.ModelFactorOvertoppingFlow.Mean);
             AssertEqualValues(0.06, inputParameters.ModelFactorOvertoppingFlow.StandardDeviation);
             
-            AssertEqualValues(1, inputParameters.ModelFactorForSubCriticalFlow.Mean);
-            AssertEqualValues(0.1, inputParameters.ModelFactorForSubCriticalFlow.GetVariationCoefficient());
+            Assert.IsInstanceOf<NormalDistribution>(inputParameters.ModelFactorSubCriticalFlow);
+            AssertEqualValues(1, inputParameters.ModelFactorSubCriticalFlow.Mean);
+            AssertEqualValues(0.1, inputParameters.ModelFactorSubCriticalFlow.GetVariationCoefficient());
 
-            AssertEqualValues(1.0, inputParameters.ModelFactorForStorageVolume.Mean);
-            AssertEqualValues(0.2, inputParameters.ModelFactorForStorageVolume.StandardDeviation);
+            Assert.IsInstanceOf<LogNormalDistribution>(inputParameters.ModelFactorStorageVolume);
+            AssertEqualValues(1.0, inputParameters.ModelFactorStorageVolume.Mean);
+            AssertEqualValues(0.2, inputParameters.ModelFactorStorageVolume.StandardDeviation);
 
             Assert.AreEqual(2, inputParameters.ModelFactorInflowVolume.NumberOfDecimalPlaces);
             AssertEqualValues(1.0, inputParameters.ModelFactorInflowVolume);