Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -raa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b -r9050ad5f3a80e630b2fcc092942a40d6343286a0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision aa56a5d7a6ec9f083ce3bd7a65d0c5b06470fd3b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision 9050ad5f3a80e630b2fcc092942a40d6343286a0)
@@ -55,12 +55,12 @@
             AssertAreEqual(1.1, input.ModelFactorSuperCriticalFlow.Mean);
             AssertAreEqual(0.03, input.ModelFactorSuperCriticalFlow.StandardDeviation);
             AssertAreEqual(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation);
-            AssertAreEqual(0.1, input.StorageStructureArea.GetVariationCoefficient());
+            AssertAreEqual(0.1, input.StorageStructureArea.CoefficientOfVariation);
             AssertAreEqual(0.05, input.FlowWidthAtBottomProtection.StandardDeviation);
-            AssertAreEqual(0.15, input.CriticalOvertoppingDischarge.GetVariationCoefficient());
-            AssertAreEqual(0.05, input.WidthFlowApertures.StandardDeviation);
+            AssertAreEqual(0.15, input.CriticalOvertoppingDischarge.CoefficientOfVariation);
+            AssertAreEqual(0.05, input.WidthFlowApertures.CoefficientOfVariation);
             AssertAreEqual(6.0, input.StormDuration.Mean);
-            AssertAreEqual(0.25, input.StormDuration.GetVariationCoefficient());
+            AssertAreEqual(0.25, input.StormDuration.CoefficientOfVariation);
         }
 
         [Test]
@@ -122,19 +122,19 @@
             var input = new HeightStructuresInput();
             var random = new Random(22);
 
-            RoundedDouble defaultStormDurationStandardDeviation = input.StormDuration.StandardDeviation;
-            LogNormalDistribution stormDuration = new LogNormalDistribution(5)
+            RoundedDouble defaultStormDurationCoefficientOfVariation = input.StormDuration.CoefficientOfVariation;
+            var stormDuration = new VariationCoefficientLogNormalDistribution(5)
             {
                 Mean = (RoundedDouble) (0.01 + random.NextDouble()),
-                StandardDeviation = (RoundedDouble) random.NextDouble()
+                CoefficientOfVariation = (RoundedDouble) random.NextDouble()
             };
 
             // Call
             input.StormDuration = stormDuration;
 
             // Assert
             AssertAreEqual(stormDuration.Mean, input.StormDuration.Mean);
-            AssertAreEqual(defaultStormDurationStandardDeviation, input.StormDuration.StandardDeviation);
+            AssertAreEqual(defaultStormDurationCoefficientOfVariation, input.StormDuration.CoefficientOfVariation);
         }
 
         [Test]
@@ -170,7 +170,7 @@
             var input = new HeightStructuresInput();
 
             // Call
-            input.StructureNormalOrientation = (RoundedDouble)orientation;
+            input.StructureNormalOrientation = (RoundedDouble) orientation;
 
             // Assert
             Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces);
@@ -190,7 +190,7 @@
             var input = new HeightStructuresInput();
 
             // Call
-            TestDelegate call = () => input.StructureNormalOrientation = (RoundedDouble)invalidValue;
+            TestDelegate call = () => input.StructureNormalOrientation = (RoundedDouble) invalidValue;
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, "De waarde voor de oriëntatie moet in het bereik tussen [0, 360] graden liggen.");
@@ -224,18 +224,18 @@
             var input = new HeightStructuresInput();
             var random = new Random(22);
 
-            LogNormalDistribution storageStructureArea = new LogNormalDistribution(5)
+            var storageStructureArea = new VariationCoefficientLogNormalDistribution(5)
             {
                 Mean = (RoundedDouble) (0.01 + random.NextDouble()),
-                StandardDeviation = (RoundedDouble) random.NextDouble()
+                CoefficientOfVariation = (RoundedDouble) random.NextDouble()
             };
 
             // Call
             input.StorageStructureArea = storageStructureArea;
 
             // Assert
             AssertAreEqual(storageStructureArea.Mean, input.StorageStructureArea.Mean);
-            AssertAreEqual(storageStructureArea.StandardDeviation, input.StorageStructureArea.StandardDeviation);
+            AssertAreEqual(storageStructureArea.CoefficientOfVariation, input.StorageStructureArea.CoefficientOfVariation);
         }
 
         [Test]
@@ -266,18 +266,18 @@
             var input = new HeightStructuresInput();
             var random = new Random(22);
 
-            LogNormalDistribution criticalOvertoppingDischarge = new LogNormalDistribution(5)
+            var criticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(5)
             {
                 Mean = (RoundedDouble) (0.01 + random.NextDouble()),
-                StandardDeviation = (RoundedDouble) random.NextDouble()
+                CoefficientOfVariation = (RoundedDouble) random.NextDouble()
             };
 
             // Call
             input.CriticalOvertoppingDischarge = criticalOvertoppingDischarge;
 
             // Assert
             AssertAreEqual(criticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.Mean);
-            AssertAreEqual(criticalOvertoppingDischarge.StandardDeviation, input.CriticalOvertoppingDischarge.StandardDeviation);
+            AssertAreEqual(criticalOvertoppingDischarge.CoefficientOfVariation, input.CriticalOvertoppingDischarge.CoefficientOfVariation);
         }
 
         [Test]
@@ -319,18 +319,18 @@
             var input = new HeightStructuresInput();
             var random = new Random(22);
 
-            NormalDistribution widthFlowApertures = new NormalDistribution(5)
+            var widthFlowApertures = new VariationCoefficientNormalDistribution(5)
             {
                 Mean = (RoundedDouble) random.NextDouble(),
-                StandardDeviation = (RoundedDouble) random.NextDouble()
+                CoefficientOfVariation = (RoundedDouble) random.NextDouble()
             };
 
             // Call
             input.WidthFlowApertures = widthFlowApertures;
 
             // Assert
             AssertAreEqual(widthFlowApertures.Mean, input.WidthFlowApertures.Mean);
-            AssertAreEqual(widthFlowApertures.StandardDeviation, input.WidthFlowApertures.StandardDeviation);
+            AssertAreEqual(widthFlowApertures.CoefficientOfVariation, input.WidthFlowApertures.CoefficientOfVariation);
         }
 
         private static void AssertAreEqual(double expectedValue, RoundedDouble actualValue)