Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilLayerHelperTest.cs
===================================================================
diff -u -rc875fba42a23b742e55f8798f93fddf2f872e282 -r4d10bc0d4756085a58be2734b2877cead7f47973
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilLayerHelperTest.cs	(.../SoilLayerHelperTest.cs)	(revision c875fba42a23b742e55f8798f93fddf2f872e282)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilLayerHelperTest.cs	(.../SoilLayerHelperTest.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);
@@ -167,50 +177,50 @@
             Assert.AreEqual(properties.MaterialName, soilLayer.MaterialName);
             Assert.AreEqual(properties.Color, soilLayer.Color);
 
-            Assert.AreEqual(properties.BelowPhreaticLevelDistribution, soilLayer.BelowPhreaticLevelDistribution);
+            Assert.AreEqual(properties.BelowPhreaticLevelDistributionType, soilLayer.BelowPhreaticLevelDistributionType);
             Assert.AreEqual(properties.BelowPhreaticLevelShift, soilLayer.BelowPhreaticLevelShift);
             Assert.AreEqual(properties.BelowPhreaticLevelMean, soilLayer.BelowPhreaticLevelMean);
             Assert.AreEqual(properties.BelowPhreaticLevelDeviation, soilLayer.BelowPhreaticLevelDeviation);
             Assert.AreEqual(properties.BelowPhreaticLevelCoefficientOfVariation, soilLayer.BelowPhreaticLevelCoefficientOfVariation);
 
-            Assert.AreEqual(properties.DiameterD70Distribution, soilLayer.DiameterD70Distribution);
+            Assert.AreEqual(properties.DiameterD70DistributionType, soilLayer.DiameterD70DistributionType);
             Assert.AreEqual(properties.DiameterD70Shift, soilLayer.DiameterD70Shift);
             Assert.AreEqual(properties.DiameterD70Mean, soilLayer.DiameterD70Mean);
             Assert.AreEqual(properties.DiameterD70CoefficientOfVariation, soilLayer.DiameterD70CoefficientOfVariation);
 
-            Assert.AreEqual(properties.PermeabilityDistribution, soilLayer.PermeabilityDistribution);
+            Assert.AreEqual(properties.PermeabilityDistributionType, soilLayer.PermeabilityDistributionType);
             Assert.AreEqual(properties.PermeabilityShift, soilLayer.PermeabilityShift);
             Assert.AreEqual(properties.PermeabilityMean, soilLayer.PermeabilityMean);
             Assert.AreEqual(properties.PermeabilityCoefficientOfVariation, soilLayer.PermeabilityCoefficientOfVariation);
 
             Assert.AreEqual(properties.UsePop, soilLayer.UsePop);
             Assert.AreEqual(properties.ShearStrengthModel, soilLayer.ShearStrengthModel);
-            Assert.AreEqual(properties.AbovePhreaticLevelDistribution, soilLayer.AbovePhreaticLevelDistribution);
+            Assert.AreEqual(properties.AbovePhreaticLevelDistributionType, soilLayer.AbovePhreaticLevelDistributionType);
             Assert.AreEqual(properties.AbovePhreaticLevelMean, soilLayer.AbovePhreaticLevelMean);
             Assert.AreEqual(properties.AbovePhreaticLevelCoefficientOfVariation, soilLayer.AbovePhreaticLevelCoefficientOfVariation);
 
             Assert.AreEqual(properties.AbovePhreaticLevelShift, soilLayer.AbovePhreaticLevelShift);
-            Assert.AreEqual(properties.CohesionDistribution, soilLayer.CohesionDistribution);
+            Assert.AreEqual(properties.CohesionDistributionType, soilLayer.CohesionDistributionType);
             Assert.AreEqual(properties.CohesionMean, soilLayer.CohesionMean);
             Assert.AreEqual(properties.CohesionCoefficientOfVariation, soilLayer.CohesionCoefficientOfVariation);
 
             Assert.AreEqual(properties.CohesionShift, soilLayer.CohesionShift);
-            Assert.AreEqual(properties.FrictionAngleDistribution, soilLayer.FrictionAngleDistribution);
+            Assert.AreEqual(properties.FrictionAngleDistributionType, soilLayer.FrictionAngleDistributionType);
             Assert.AreEqual(properties.FrictionAngleMean, soilLayer.FrictionAngleMean);
             Assert.AreEqual(properties.FrictionAngleCoefficientOfVariation, soilLayer.FrictionAngleCoefficientOfVariation);
 
             Assert.AreEqual(properties.FrictionAngleShift, soilLayer.FrictionAngleShift);
-            Assert.AreEqual(properties.ShearStrengthRatioDistribution, soilLayer.ShearStrengthRatioDistribution);
+            Assert.AreEqual(properties.ShearStrengthRatioDistributionType, soilLayer.ShearStrengthRatioDistributionType);
             Assert.AreEqual(properties.ShearStrengthRatioMean, soilLayer.ShearStrengthRatioMean);
             Assert.AreEqual(properties.ShearStrengthRatioCoefficientOfVariation, soilLayer.ShearStrengthRatioCoefficientOfVariation);
 
             Assert.AreEqual(properties.ShearStrengthRatioShift, soilLayer.ShearStrengthRatioShift);
-            Assert.AreEqual(properties.StrengthIncreaseExponentDistribution, soilLayer.StrengthIncreaseExponentDistribution);
+            Assert.AreEqual(properties.StrengthIncreaseExponentDistributionType, soilLayer.StrengthIncreaseExponentDistributionType);
             Assert.AreEqual(properties.StrengthIncreaseExponentMean, soilLayer.StrengthIncreaseExponentMean);
             Assert.AreEqual(properties.StrengthIncreaseExponentCoefficientOfVariation, soilLayer.StrengthIncreaseExponentCoefficientOfVariation);
 
             Assert.AreEqual(properties.StrengthIncreaseExponentShift, soilLayer.StrengthIncreaseExponentShift);
-            Assert.AreEqual(properties.PopDistribution, soilLayer.PopDistribution);
+            Assert.AreEqual(properties.PopDistributionType, soilLayer.PopDistributionType);
             Assert.AreEqual(properties.PopMean, soilLayer.PopMean);
             Assert.AreEqual(properties.PopCoefficientOfVariation, soilLayer.PopCoefficientOfVariation);
             Assert.AreEqual(properties.PopShift, soilLayer.PopShift);
@@ -240,51 +250,51 @@
             Assert.IsNull(soilLayer.IsAquifer);
             Assert.IsNull(soilLayer.Color);
 
-            Assert.IsNull(soilLayer.BelowPhreaticLevelDistribution);
+            Assert.IsNull(soilLayer.BelowPhreaticLevelDistributionType);
             Assert.IsNaN(soilLayer.BelowPhreaticLevelMean);
             Assert.IsNaN(soilLayer.BelowPhreaticLevelDeviation);
             Assert.IsNaN(soilLayer.BelowPhreaticLevelCoefficientOfVariation);
             Assert.IsNaN(soilLayer.BelowPhreaticLevelShift);
 
-            Assert.IsNull(soilLayer.DiameterD70Distribution);
+            Assert.IsNull(soilLayer.DiameterD70DistributionType);
             Assert.IsNaN(soilLayer.DiameterD70Mean);
             Assert.IsNaN(soilLayer.DiameterD70CoefficientOfVariation);
             Assert.IsNaN(soilLayer.DiameterD70Shift);
 
-            Assert.IsNull(soilLayer.PermeabilityDistribution);
+            Assert.IsNull(soilLayer.PermeabilityDistributionType);
             Assert.IsNaN(soilLayer.PermeabilityMean);
             Assert.IsNaN(soilLayer.PermeabilityCoefficientOfVariation);
             Assert.IsNaN(soilLayer.PermeabilityShift);
 
             Assert.IsNull(soilLayer.UsePop);
             Assert.IsNull(soilLayer.ShearStrengthModel);
 
-            Assert.IsNull(soilLayer.AbovePhreaticLevelDistribution);
+            Assert.IsNull(soilLayer.AbovePhreaticLevelDistributionType);
             Assert.IsNaN(soilLayer.AbovePhreaticLevelMean);
             Assert.IsNaN(soilLayer.AbovePhreaticLevelCoefficientOfVariation);
             Assert.IsNaN(soilLayer.AbovePhreaticLevelShift);
 
-            Assert.IsNull(soilLayer.CohesionDistribution);
+            Assert.IsNull(soilLayer.CohesionDistributionType);
             Assert.IsNaN(soilLayer.CohesionMean);
             Assert.IsNaN(soilLayer.CohesionCoefficientOfVariation);
             Assert.IsNaN(soilLayer.CohesionShift);
 
-            Assert.IsNull(soilLayer.FrictionAngleDistribution);
+            Assert.IsNull(soilLayer.FrictionAngleDistributionType);
             Assert.IsNaN(soilLayer.FrictionAngleMean);
             Assert.IsNaN(soilLayer.FrictionAngleCoefficientOfVariation);
             Assert.IsNaN(soilLayer.FrictionAngleShift);
 
-            Assert.IsNull(soilLayer.ShearStrengthRatioDistribution);
+            Assert.IsNull(soilLayer.ShearStrengthRatioDistributionType);
             Assert.IsNaN(soilLayer.ShearStrengthRatioMean);
             Assert.IsNaN(soilLayer.ShearStrengthRatioCoefficientOfVariation);
             Assert.IsNaN(soilLayer.ShearStrengthRatioShift);
 
-            Assert.IsNull(soilLayer.StrengthIncreaseExponentDistribution);
+            Assert.IsNull(soilLayer.StrengthIncreaseExponentDistributionType);
             Assert.IsNaN(soilLayer.StrengthIncreaseExponentMean);
             Assert.IsNaN(soilLayer.StrengthIncreaseExponentCoefficientOfVariation);
             Assert.IsNaN(soilLayer.StrengthIncreaseExponentShift);
 
-            Assert.IsNull(soilLayer.PopDistribution);
+            Assert.IsNull(soilLayer.PopDistributionType);
             Assert.IsNaN(soilLayer.PopMean);
             Assert.IsNaN(soilLayer.PopCoefficientOfVariation);
             Assert.IsNaN(soilLayer.PopShift);