Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs
===================================================================
diff -u -rccce1ae96e85aa2603c218de61de03fb14cfae11 -r8d4c470611233c78629a93baaca0661568b42c53
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs	(.../GeneralStabilityPointStructuresInput.cs)	(revision ccce1ae96e85aa2603c218de61de03fb14cfae11)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs	(.../GeneralStabilityPointStructuresInput.cs)	(revision 8d4c470611233c78629a93baaca0661568b42c53)
@@ -42,30 +42,33 @@
 
             GravitationalAcceleration = new RoundedDouble(2, 9.81);
 
-            ModelFactorOvertoppingFlow = new LogNormalDistribution(3);
-            ModelFactorForStorageVolume = new LogNormalDistribution(1)
+            ModelFactorStorageVolume = new LogNormalDistribution(2)
             {
                 Mean = (RoundedDouble) 1,
                 StandardDeviation = (RoundedDouble) 0.2
             };
-            ModelFactorForSubCriticalFlow = new NormalDistribution(1)
+
+            ModelFactorSubCriticalFlow = new NormalDistribution(2)
             {
                 Mean = (RoundedDouble) 1,
-                StandardDeviation = (RoundedDouble) 0.1
             };
-            ModelFactorForCollisionLoad = new NormalDistribution(1)
+            ModelFactorSubCriticalFlow.SetStandardDeviationFromVariationCoefficient(0.1);
+
+            ModelFactorCollisionLoad = new NormalDistribution(1)
             {
                 Mean = (RoundedDouble) 1,
-                StandardDeviation = (RoundedDouble) 0.2
             };
-            ModelFactorLoadEffectMs = new NormalDistribution(2)
+            ModelFactorCollisionLoad.SetStandardDeviationFromVariationCoefficient(0.2);
+
+            ModelFactorLoadEffect = new NormalDistribution(2)
             {
                 Mean = (RoundedDouble) 1,
                 StandardDeviation = (RoundedDouble) 0.05
             };
-            ModelFactorForIncomingFlowVolume = new RoundedDouble(1, 1);
-            ModificationFactor1 = new RoundedDouble(1, 1);
-            ModificationFactor2 = new RoundedDouble(1, 1);
+
+            ModelFactorInflowVolume = new RoundedDouble(1, 1);
+            ModificationFactorWavesSlowlyVaryingPressureComponent = new RoundedDouble(1, 1);
+            ModificationFactorDynamicOrImpulsivePressureComponent = new RoundedDouble(1, 1);
         }
 
         /// <summary>
@@ -101,44 +104,39 @@
         #region Model Factors
 
         /// <summary>
-        /// Gets the model factor overtopping flow.
-        /// </summary>
-        public LogNormalDistribution ModelFactorOvertoppingFlow { get; private set; }
-
-        /// <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>
         /// Gets the model factor for collision load.
         /// </summary>
-        public NormalDistribution ModelFactorForCollisionLoad { get; private set; }
+        public NormalDistribution ModelFactorCollisionLoad { get; private set; }
 
         /// <summary>
-        /// Gets the model factor for load effect mS.
+        /// Gets the model factor for load effect.
         /// </summary>
-        public NormalDistribution ModelFactorLoadEffectMs { get; private set; }
+        public NormalDistribution ModelFactorLoadEffect { get; private set; }
 
         /// <summary>
         /// Gets the model factor for incoming flow volume.
         /// </summary>
-        public RoundedDouble ModelFactorForIncomingFlowVolume { get; private set; }
+        public RoundedDouble ModelFactorInflowVolume { get; private set; }
 
         /// <summary>
-        /// Gets the modification factor for lambda 1.
+        /// Gets the modification factor for wave slowly varying pressure component.
         /// </summary>
-        public RoundedDouble ModificationFactor1 { get; private set; }
+        public RoundedDouble ModificationFactorWavesSlowlyVaryingPressureComponent { get; private set; }
 
         /// <summary>
-        /// Gets the modification factor for lambda 2.
+        /// Gets the modification factor for waves dynamic or impulsive pressure component.
         /// </summary>
-        public RoundedDouble ModificationFactor2 { get; private set; }
+        public RoundedDouble ModificationFactorDynamicOrImpulsivePressureComponent { get; private set; }
 
         #endregion
     }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs
===================================================================
diff -u -ref9afe23c21b5d7f43619638a593b8869ec15793 -r8d4c470611233c78629a93baaca0661568b42c53
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs	(.../GeneralStabilityPointStructuresInputTest.cs)	(revision ef9afe23c21b5d7f43619638a593b8869ec15793)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs	(.../GeneralStabilityPointStructuresInputTest.cs)	(revision 8d4c470611233c78629a93baaca0661568b42c53)
@@ -43,26 +43,30 @@
             Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces);
             Assert.AreEqual(9.81, inputParameters.GravitationalAcceleration, inputParameters.GravitationalAcceleration.GetAccuracy());
 
-            Assert.AreEqual(new RoundedDouble(1, 1), inputParameters.ModelFactorForStorageVolume.Mean);
-            Assert.AreEqual(new RoundedDouble(1, 0.2), inputParameters.ModelFactorForStorageVolume.StandardDeviation);
+            Assert.IsInstanceOf<LogNormalDistribution>(inputParameters.ModelFactorStorageVolume);
+            Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorStorageVolume.Mean);
+            Assert.AreEqual(new RoundedDouble(2, 0.2), inputParameters.ModelFactorStorageVolume.StandardDeviation);
 
-            Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorForSubCriticalFlow.Mean);
-            Assert.AreEqual(new RoundedDouble(2, 0.1), inputParameters.ModelFactorForSubCriticalFlow.StandardDeviation);
+            Assert.IsInstanceOf<NormalDistribution>(inputParameters.ModelFactorSubCriticalFlow);
+            Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorSubCriticalFlow.Mean);
+            Assert.AreEqual(new RoundedDouble(2, 0.1), inputParameters.ModelFactorSubCriticalFlow.GetVariationCoefficient());
 
-            Assert.AreEqual(new RoundedDouble(1, 1), inputParameters.ModelFactorForCollisionLoad.Mean);
-            Assert.AreEqual(new RoundedDouble(1, 0.2), inputParameters.ModelFactorForCollisionLoad.StandardDeviation);
+            Assert.IsInstanceOf<NormalDistribution>(inputParameters.ModelFactorCollisionLoad);
+            Assert.AreEqual(new RoundedDouble(1, 1), inputParameters.ModelFactorCollisionLoad.Mean);
+            Assert.AreEqual(new RoundedDouble(2, 0.2), inputParameters.ModelFactorCollisionLoad.GetVariationCoefficient());
 
-            Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorLoadEffectMs.Mean);
-            Assert.AreEqual(new RoundedDouble(2, 0.05), inputParameters.ModelFactorLoadEffectMs.StandardDeviation);
+            Assert.IsInstanceOf<NormalDistribution>(inputParameters.ModelFactorLoadEffect);
+            Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorLoadEffect.Mean);
+            Assert.AreEqual(new RoundedDouble(2, 0.05), inputParameters.ModelFactorLoadEffect.StandardDeviation);
 
-            Assert.AreEqual(1, inputParameters.ModelFactorForIncomingFlowVolume.NumberOfDecimalPlaces);
-            Assert.AreEqual(1, inputParameters.ModelFactorForIncomingFlowVolume, inputParameters.ModelFactorForIncomingFlowVolume.GetAccuracy());
+            Assert.AreEqual(1, inputParameters.ModelFactorInflowVolume.NumberOfDecimalPlaces);
+            Assert.AreEqual(1, inputParameters.ModelFactorInflowVolume, inputParameters.ModelFactorInflowVolume.GetAccuracy());
 
-            Assert.AreEqual(1, inputParameters.ModificationFactor1.NumberOfDecimalPlaces);
-            Assert.AreEqual(1, inputParameters.ModificationFactor1, inputParameters.ModificationFactor1.GetAccuracy());
+            Assert.AreEqual(1, inputParameters.ModificationFactorWavesSlowlyVaryingPressureComponent.NumberOfDecimalPlaces);
+            Assert.AreEqual(1, inputParameters.ModificationFactorWavesSlowlyVaryingPressureComponent, inputParameters.ModificationFactorWavesSlowlyVaryingPressureComponent.GetAccuracy());
 
-            Assert.AreEqual(1, inputParameters.ModificationFactor2.NumberOfDecimalPlaces);
-            Assert.AreEqual(1, inputParameters.ModificationFactor2, inputParameters.ModificationFactor2.GetAccuracy());
+            Assert.AreEqual(1, inputParameters.ModificationFactorDynamicOrImpulsivePressureComponent.NumberOfDecimalPlaces);
+            Assert.AreEqual(1, inputParameters.ModificationFactorDynamicOrImpulsivePressureComponent, inputParameters.ModificationFactorDynamicOrImpulsivePressureComponent.GetAccuracy());
         }
 
         [Test]