Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/LayerPropertiesTest.cs
===================================================================
diff -u -rc875fba42a23b742e55f8798f93fddf2f872e282 -r4d10bc0d4756085a58be2734b2877cead7f47973
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/LayerPropertiesTest.cs	(.../LayerPropertiesTest.cs)	(revision c875fba42a23b742e55f8798f93fddf2f872e282)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/LayerPropertiesTest.cs	(.../LayerPropertiesTest.cs)	(revision 4d10bc0d4756085a58be2734b2877cead7f47973)
@@ -70,42 +70,52 @@
             double isAquifer = random.NextDouble();
             const string materialName = "materialName";
             double color = random.NextDouble();
-            int belowPhreaticLevelDistribution = random.Next();
+
+            int belowPhreaticLevelDistributionType = random.Next();
             double belowPhreaticLevelShift = random.NextDouble();
             double belowPhreaticLevelMean = random.NextDouble();
             double belowPhreaticLevelDeviation = random.NextDouble();
             double belowPhreaticLevelCoefficientOfVariation = random.NextDouble();
-            int diameterD70Distribution = random.Next();
+
+            int diameterD70DistributionType = random.Next();
             double diameterD70Shift = random.NextDouble();
             double diameterD70Mean = random.NextDouble();
             double diameterD70CoefficientOfVariation = random.NextDouble();
-            int permeabilityDistribution = random.Next();
+
+            int permeabilityDistributionType = random.Next();
             double permeabilityShift = random.NextDouble();
             double permeabilityMean = random.NextDouble();
             double permeabilityCoefficientOfVariation = random.NextDouble();
+
             double usePop = random.NextDouble();
             double shearStrengthModel = random.NextDouble();
-            int abovePhreaticLevelDistribution = random.Next();
+
+            int abovePhreaticLevelDistributionType = random.Next();
             double abovePhreaticLevelMean = random.NextDouble();
             double abovePhreaticLevelCoefficientOfVariation = random.NextDouble();
             double abovePhreaticLevelShift = random.NextDouble();
-            int cohesionDistribution = random.Next();
+
+            int cohesionDistributionType = random.Next();
             double cohesionMean = random.NextDouble();
             double cohesionCoefficientOfVariation = random.NextDouble();
             double cohesionShift = random.NextDouble();
+
+            int frictionAngleDistributionType = random.Next();
             double frictionAngleMean = random.NextDouble();
-            int frictionAngleDistribution = random.Next();
             double frictionAngleCoefficientOfVariation = random.NextDouble();
             double frictionAngleShift = random.NextDouble();
-            int shearStrengthRatioDistribution = random.Next();
+
+            int shearStrengthRatioDistributionType = random.Next();
             double shearStrengthRatioMean = random.NextDouble();
             double shearStrengthRatioCoefficientOfVariation = random.NextDouble();
             double shearStrengthRatioShift = random.NextDouble();
-            int strengthIncreaseExponentDistribution = random.Next();
+
+            int strengthIncreaseExponentDistributionType = random.Next();
             double strengthIncreaseExponentMean = random.NextDouble();
             double strengthIncreaseExponentCoefficientOfVariation = random.NextDouble();
             double strengthIncreaseExponentShift = random.NextDouble();
-            int popDistribution = random.Next();
+
+            int popDistributionType = random.Next();
             double popMean = random.NextDouble();
             double popCoefficientOfVariation = random.NextDouble();
             double popShift = random.NextDouble();
@@ -115,42 +125,42 @@
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.IsAquifer)).Return(isAquifer);
             reader.Expect(r => r.ReadOrDefault<string>(SoilProfileTableDefinitions.MaterialName)).Return(materialName);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.Color)).Return(color);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.BelowPhreaticLevelDistribution)).Return(belowPhreaticLevelDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.BelowPhreaticLevelDistributionType)).Return(belowPhreaticLevelDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.BelowPhreaticLevelShift)).Return(belowPhreaticLevelShift);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.BelowPhreaticLevelMean)).Return(belowPhreaticLevelMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.BelowPhreaticLevelDeviation)).Return(belowPhreaticLevelDeviation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.BelowPhreaticLevelCoefficientOfVariation)).Return(belowPhreaticLevelCoefficientOfVariation);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.DiameterD70Distribution)).Return(diameterD70Distribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.DiameterD70DistributionType)).Return(diameterD70DistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.DiameterD70Shift)).Return(diameterD70Shift);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.DiameterD70Mean)).Return(diameterD70Mean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.DiameterD70CoefficientOfVariation)).Return(diameterD70CoefficientOfVariation);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.PermeabilityDistribution)).Return(permeabilityDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.PermeabilityDistributionType)).Return(permeabilityDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.PermeabilityShift)).Return(permeabilityShift);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.PermeabilityMean)).Return(permeabilityMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.PermeabilityCoefficientOfVariation)).Return(permeabilityCoefficientOfVariation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.UsePop)).Return(usePop);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.ShearStrengthModel)).Return(shearStrengthModel);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.AbovePhreaticLevelDistribution)).Return(abovePhreaticLevelDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.AbovePhreaticLevelDistributionType)).Return(abovePhreaticLevelDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.AbovePhreaticLevelMean)).Return(abovePhreaticLevelMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.AbovePhreaticLevelCoefficientOfVariation)).Return(abovePhreaticLevelCoefficientOfVariation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.AbovePhreaticLevelShift)).Return(abovePhreaticLevelShift);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.CohesionDistribution)).Return(cohesionDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.CohesionDistributionType)).Return(cohesionDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.CohesionMean)).Return(cohesionMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.CohesionCoefficientOfVariation)).Return(cohesionCoefficientOfVariation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.CohesionShift)).Return(cohesionShift);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.FrictionAngleDistribution)).Return(frictionAngleDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.FrictionAngleDistributionType)).Return(frictionAngleDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.FrictionAngleMean)).Return(frictionAngleMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.FrictionAngleCoefficientOfVariation)).Return(frictionAngleCoefficientOfVariation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.FrictionAngleShift)).Return(frictionAngleShift);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.ShearStrengthRatioDistribution)).Return(shearStrengthRatioDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.ShearStrengthRatioDistributionType)).Return(shearStrengthRatioDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.ShearStrengthRatioMean)).Return(shearStrengthRatioMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.ShearStrengthRatioCoefficientOfVariation)).Return(shearStrengthRatioCoefficientOfVariation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.ShearStrengthRatioShift)).Return(shearStrengthRatioShift);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.StrengthIncreaseExponentDistribution)).Return(strengthIncreaseExponentDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.StrengthIncreaseExponentDistributionType)).Return(strengthIncreaseExponentDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.StrengthIncreaseExponentMean)).Return(strengthIncreaseExponentMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.StrengthIncreaseExponentCoefficientOfVariation)).Return(strengthIncreaseExponentCoefficientOfVariation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.StrengthIncreaseExponentShift)).Return(strengthIncreaseExponentShift);
-            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.PopDistribution)).Return(popDistribution);
+            reader.Expect(r => r.ReadOrDefault<long?>(SoilProfileTableDefinitions.PopDistributionType)).Return(popDistributionType);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.PopMean)).Return(popMean);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.PopCoefficientOfVariation)).Return(popCoefficientOfVariation);
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableDefinitions.PopShift)).Return(popShift);
@@ -163,42 +173,42 @@
             Assert.AreEqual(isAquifer, properties.IsAquifer);
             Assert.AreEqual(materialName, properties.MaterialName);
             Assert.AreEqual(color, properties.Color);
-            Assert.AreEqual(belowPhreaticLevelDistribution, properties.BelowPhreaticLevelDistribution);
+            Assert.AreEqual(belowPhreaticLevelDistributionType, properties.BelowPhreaticLevelDistributionType);
             Assert.AreEqual(belowPhreaticLevelShift, properties.BelowPhreaticLevelShift);
             Assert.AreEqual(belowPhreaticLevelMean, properties.BelowPhreaticLevelMean);
             Assert.AreEqual(belowPhreaticLevelDeviation, properties.BelowPhreaticLevelDeviation);
             Assert.AreEqual(belowPhreaticLevelCoefficientOfVariation, properties.BelowPhreaticLevelCoefficientOfVariation);
-            Assert.AreEqual(diameterD70Distribution, properties.DiameterD70Distribution);
+            Assert.AreEqual(diameterD70DistributionType, properties.DiameterD70DistributionType);
             Assert.AreEqual(diameterD70Shift, properties.DiameterD70Shift);
             Assert.AreEqual(diameterD70Mean, properties.DiameterD70Mean);
             Assert.AreEqual(diameterD70CoefficientOfVariation, properties.DiameterD70CoefficientOfVariation);
-            Assert.AreEqual(permeabilityDistribution, properties.PermeabilityDistribution);
+            Assert.AreEqual(permeabilityDistributionType, properties.PermeabilityDistributionType);
             Assert.AreEqual(permeabilityShift, properties.PermeabilityShift);
             Assert.AreEqual(permeabilityMean, properties.PermeabilityMean);
             Assert.AreEqual(permeabilityCoefficientOfVariation, properties.PermeabilityCoefficientOfVariation);
             Assert.AreEqual(usePop, properties.UsePop);
             Assert.AreEqual(shearStrengthModel, properties.ShearStrengthModel);
-            Assert.AreEqual(abovePhreaticLevelDistribution, properties.AbovePhreaticLevelDistribution);
+            Assert.AreEqual(abovePhreaticLevelDistributionType, properties.AbovePhreaticLevelDistributionType);
             Assert.AreEqual(abovePhreaticLevelMean, properties.AbovePhreaticLevelMean);
             Assert.AreEqual(abovePhreaticLevelCoefficientOfVariation, properties.AbovePhreaticLevelCoefficientOfVariation);
             Assert.AreEqual(abovePhreaticLevelShift, properties.AbovePhreaticLevelShift);
-            Assert.AreEqual(cohesionDistribution, properties.CohesionDistribution);
+            Assert.AreEqual(cohesionDistributionType, properties.CohesionDistributionType);
             Assert.AreEqual(cohesionMean, properties.CohesionMean);
             Assert.AreEqual(cohesionCoefficientOfVariation, properties.CohesionCoefficientOfVariation);
             Assert.AreEqual(cohesionShift, properties.CohesionShift);
-            Assert.AreEqual(frictionAngleDistribution, properties.FrictionAngleDistribution);
+            Assert.AreEqual(frictionAngleDistributionType, properties.FrictionAngleDistributionType);
             Assert.AreEqual(frictionAngleMean, properties.FrictionAngleMean);
             Assert.AreEqual(frictionAngleCoefficientOfVariation, properties.FrictionAngleCoefficientOfVariation);
             Assert.AreEqual(frictionAngleShift, properties.FrictionAngleShift);
-            Assert.AreEqual(shearStrengthRatioDistribution, properties.ShearStrengthRatioDistribution);
+            Assert.AreEqual(shearStrengthRatioDistributionType, properties.ShearStrengthRatioDistributionType);
             Assert.AreEqual(shearStrengthRatioMean, properties.ShearStrengthRatioMean);
             Assert.AreEqual(shearStrengthRatioCoefficientOfVariation, properties.ShearStrengthRatioCoefficientOfVariation);
             Assert.AreEqual(shearStrengthRatioShift, properties.ShearStrengthRatioShift);
-            Assert.AreEqual(strengthIncreaseExponentDistribution, properties.StrengthIncreaseExponentDistribution);
+            Assert.AreEqual(strengthIncreaseExponentDistributionType, properties.StrengthIncreaseExponentDistributionType);
             Assert.AreEqual(strengthIncreaseExponentMean, properties.StrengthIncreaseExponentMean);
             Assert.AreEqual(strengthIncreaseExponentCoefficientOfVariation, properties.StrengthIncreaseExponentCoefficientOfVariation);
             Assert.AreEqual(strengthIncreaseExponentShift, properties.StrengthIncreaseExponentShift);
-            Assert.AreEqual(popDistribution, properties.PopDistribution);
+            Assert.AreEqual(popDistributionType, properties.PopDistributionType);
             Assert.AreEqual(popMean, properties.PopMean);
             Assert.AreEqual(popCoefficientOfVariation, properties.PopCoefficientOfVariation);
             Assert.AreEqual(popShift, properties.PopShift);
@@ -250,41 +260,41 @@
             yield return SoilProfileTableDefinitions.IsAquifer;
             yield return SoilProfileTableDefinitions.MaterialName;
             yield return SoilProfileTableDefinitions.Color;
-            yield return SoilProfileTableDefinitions.BelowPhreaticLevelDistribution;
+            yield return SoilProfileTableDefinitions.BelowPhreaticLevelDistributionType;
             yield return SoilProfileTableDefinitions.BelowPhreaticLevelShift;
             yield return SoilProfileTableDefinitions.BelowPhreaticLevelMean;
             yield return SoilProfileTableDefinitions.BelowPhreaticLevelDeviation;
             yield return SoilProfileTableDefinitions.BelowPhreaticLevelCoefficientOfVariation;
-            yield return SoilProfileTableDefinitions.DiameterD70Distribution;
+            yield return SoilProfileTableDefinitions.DiameterD70DistributionType;
             yield return SoilProfileTableDefinitions.DiameterD70Shift;
             yield return SoilProfileTableDefinitions.DiameterD70Mean;
             yield return SoilProfileTableDefinitions.DiameterD70CoefficientOfVariation;
-            yield return SoilProfileTableDefinitions.PermeabilityDistribution;
+            yield return SoilProfileTableDefinitions.PermeabilityDistributionType;
             yield return SoilProfileTableDefinitions.PermeabilityShift;
             yield return SoilProfileTableDefinitions.PermeabilityMean;
             yield return SoilProfileTableDefinitions.PermeabilityCoefficientOfVariation;
             yield return SoilProfileTableDefinitions.UsePop;
-            yield return SoilProfileTableDefinitions.AbovePhreaticLevelDistribution;
+            yield return SoilProfileTableDefinitions.AbovePhreaticLevelDistributionType;
             yield return SoilProfileTableDefinitions.AbovePhreaticLevelMean;
             yield return SoilProfileTableDefinitions.AbovePhreaticLevelCoefficientOfVariation;
             yield return SoilProfileTableDefinitions.AbovePhreaticLevelShift;
-            yield return SoilProfileTableDefinitions.CohesionDistribution;
+            yield return SoilProfileTableDefinitions.CohesionDistributionType;
             yield return SoilProfileTableDefinitions.CohesionMean;
             yield return SoilProfileTableDefinitions.CohesionCoefficientOfVariation;
             yield return SoilProfileTableDefinitions.CohesionShift;
-            yield return SoilProfileTableDefinitions.FrictionAngleDistribution;
+            yield return SoilProfileTableDefinitions.FrictionAngleDistributionType;
             yield return SoilProfileTableDefinitions.FrictionAngleMean;
             yield return SoilProfileTableDefinitions.FrictionAngleCoefficientOfVariation;
             yield return SoilProfileTableDefinitions.FrictionAngleShift;
-            yield return SoilProfileTableDefinitions.ShearStrengthRatioDistribution;
+            yield return SoilProfileTableDefinitions.ShearStrengthRatioDistributionType;
             yield return SoilProfileTableDefinitions.ShearStrengthRatioMean;
             yield return SoilProfileTableDefinitions.ShearStrengthRatioCoefficientOfVariation;
             yield return SoilProfileTableDefinitions.ShearStrengthRatioShift;
-            yield return SoilProfileTableDefinitions.StrengthIncreaseExponentDistribution;
+            yield return SoilProfileTableDefinitions.StrengthIncreaseExponentDistributionType;
             yield return SoilProfileTableDefinitions.StrengthIncreaseExponentMean;
             yield return SoilProfileTableDefinitions.StrengthIncreaseExponentCoefficientOfVariation;
             yield return SoilProfileTableDefinitions.StrengthIncreaseExponentShift;
-            yield return SoilProfileTableDefinitions.PopDistribution;
+            yield return SoilProfileTableDefinitions.PopDistributionType;
             yield return SoilProfileTableDefinitions.PopMean;
             yield return SoilProfileTableDefinitions.PopCoefficientOfVariation;
             yield return SoilProfileTableDefinitions.PopShift;