Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -r9e3639e810a22019da1a9fdf5aa5c433a43520c1 -ra574ad95af2b4a3f862062d11797d3842051e130
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision a574ad95af2b4a3f862062d11797d3842051e130)
@@ -274,10 +274,10 @@
 
             RoundedDouble initialStd = input.ModelFactorSuperCriticalFlow.StandardDeviation;
 
-            //Call
+            // Call
             input.ModelFactorSuperCriticalFlow = modelFactorSuperCriticalFlow;
 
-            //Assert
+            // Assert
             Assert.AreEqual(modelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.Mean);
             AssertEqualValue(initialStd, input.ModelFactorSuperCriticalFlow.StandardDeviation);
         }
@@ -306,10 +306,11 @@
             var input = new ClosingStructuresInput();
             NormalDistribution thresholdHeightOpenWeir = GenerateNormalDistribution();
 
-            //Call
+            // Call
             input.ThresholdHeightOpenWeir = thresholdHeightOpenWeir;
 
-            //Assert
+            // Assert
+            Assert.AreNotSame(thresholdHeightOpenWeir, input.ThresholdHeightOpenWeir);
             Assert.AreEqual(thresholdHeightOpenWeir.Mean, input.ThresholdHeightOpenWeir.Mean);
             Assert.AreEqual(thresholdHeightOpenWeir.StandardDeviation, input.ThresholdHeightOpenWeir.StandardDeviation);
         }
@@ -323,10 +324,10 @@
 
             RoundedDouble initialStd = input.DrainCoefficient.StandardDeviation;
 
-            //Call
+            // Call
             input.DrainCoefficient = drainCoefficient;
 
-            //Assert
+            // Assert
             Assert.AreEqual(drainCoefficient.Mean, input.DrainCoefficient.Mean);
             AssertEqualValue(initialStd, input.DrainCoefficient.StandardDeviation);
         }
@@ -338,10 +339,10 @@
             var input = new ClosingStructuresInput();
             LogNormalDistribution areaFlowApertures = GenerateLogNormalDistribution();
 
-            //Call
+            // Call
             input.AreaFlowApertures = areaFlowApertures;
 
-            //Assert
+            // Assert
             Assert.AreEqual(areaFlowApertures.Mean, input.AreaFlowApertures.Mean);
             AssertEqualValue(areaFlowApertures.StandardDeviation, input.AreaFlowApertures.StandardDeviation);
         }
@@ -433,10 +434,10 @@
             var input = new ClosingStructuresInput();
             NormalDistribution levelCrestStructureNotClosing = GenerateNormalDistribution();
 
-            //Call
+            // Call
             input.LevelCrestStructureNotClosing = levelCrestStructureNotClosing;
 
-            //Assert
+            // Assert
             Assert.AreEqual(levelCrestStructureNotClosing.Mean, input.LevelCrestStructureNotClosing.Mean);
             Assert.AreEqual(levelCrestStructureNotClosing.StandardDeviation, input.LevelCrestStructureNotClosing.StandardDeviation);
         }
@@ -448,10 +449,10 @@
             var input = new ClosingStructuresInput();
             NormalDistribution insideWaterLevel = GenerateNormalDistribution();
 
-            //Call
+            // Call
             input.InsideWaterLevel = insideWaterLevel;
 
-            //Assert
+            // Assert
             Assert.AreEqual(insideWaterLevel.Mean, input.InsideWaterLevel.Mean);
             Assert.AreEqual(insideWaterLevel.StandardDeviation, input.InsideWaterLevel.StandardDeviation);
         }
@@ -463,10 +464,10 @@
             var input = new ClosingStructuresInput();
             LogNormalDistribution allowedIncrease = GenerateLogNormalDistribution();
 
-            //Call
+            // Call
             input.AllowedLevelIncreaseStorage = allowedIncrease;
 
-            //Assert
+            // Assert
             Assert.AreEqual(allowedIncrease.Mean, input.AllowedLevelIncreaseStorage.Mean);
             Assert.AreEqual(allowedIncrease.StandardDeviation, input.AllowedLevelIncreaseStorage.StandardDeviation);
         }
@@ -478,10 +479,10 @@
             var input = new ClosingStructuresInput();
             VariationCoefficientLogNormalDistribution storageStructureArea = GenerateVariationCoefficientLogNormalDistribution();
 
-            //Call
+            // Call
             input.StorageStructureArea = storageStructureArea;
 
-            //Assert
+            // Assert
             Assert.AreEqual(storageStructureArea.Mean, input.StorageStructureArea.Mean);
             Assert.AreEqual(storageStructureArea.CoefficientOfVariation, input.StorageStructureArea.CoefficientOfVariation);
         }
@@ -493,10 +494,10 @@
             var input = new ClosingStructuresInput();
             LogNormalDistribution flowWidthAtBottomProtection = GenerateLogNormalDistribution();
 
-            //Call
+            // Call
             input.FlowWidthAtBottomProtection = flowWidthAtBottomProtection;
 
-            //Assert
+            // Assert
             Assert.AreEqual(flowWidthAtBottomProtection.Mean, input.FlowWidthAtBottomProtection.Mean);
             Assert.AreEqual(flowWidthAtBottomProtection.StandardDeviation, input.FlowWidthAtBottomProtection.StandardDeviation);
         }
@@ -508,10 +509,10 @@
             var input = new ClosingStructuresInput();
             VariationCoefficientLogNormalDistribution criticalOvertoppingDischarge = GenerateVariationCoefficientLogNormalDistribution();
 
-            //Call
+            // Call
             input.CriticalOvertoppingDischarge = criticalOvertoppingDischarge;
 
-            //Assert
+            // Assert
             Assert.AreEqual(criticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.Mean);
             AssertEqualValue(criticalOvertoppingDischarge.CoefficientOfVariation, input.CriticalOvertoppingDischarge.CoefficientOfVariation);
         }
@@ -555,10 +556,10 @@
             var input = new ClosingStructuresInput();
             VariationCoefficientNormalDistribution widthApertures = GenerateVariationCoefficientNormalDistribution();
 
-            //Call
+            // Call
             input.WidthFlowApertures = widthApertures;
 
-            //Assert
+            // Assert
             Assert.AreEqual(widthApertures.Mean, input.WidthFlowApertures.Mean);
             Assert.AreEqual(widthApertures.CoefficientOfVariation, input.WidthFlowApertures.CoefficientOfVariation);
         }
@@ -589,10 +590,10 @@
 
             RoundedDouble initialVariation = input.StormDuration.CoefficientOfVariation;
 
-            //Call
+            // Call
             input.StormDuration = stormDuration;
 
-            //Assert
+            // Assert
             Assert.AreEqual(stormDuration.Mean, input.StormDuration.Mean);
             AssertEqualValue(initialVariation, input.StormDuration.CoefficientOfVariation);
         }
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs
===================================================================
diff -u -rfe34b0dd97d49bb1c426d0c5f9dd3b5d139cf1fe -ra574ad95af2b4a3f862062d11797d3842051e130
--- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs	(.../StructuresParameterRowsValidator.cs)	(revision fe34b0dd97d49bb1c426d0c5f9dd3b5d139cf1fe)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs	(.../StructuresParameterRowsValidator.cs)	(revision a574ad95af2b4a3f862062d11797d3842051e130)
@@ -43,14 +43,14 @@
         /// </summary>
         private const double valueTooCloseToZero = 1e-4;
 
-        private static readonly List<string> closingStructureInflowModelRuleKeywords = new List<string>
+        private static readonly List<string> closingStructureInflowModelTypeRuleKeywords = new List<string>
         {
             "verticalewand",
             "lagedrempel",
             "verdronkenkoker"
         };
 
-        private static readonly List<string> stabilityPointStructureInflowModelRuleKeywords = new List<string>
+        private static readonly List<string> stabilityPointStructureInflowModelTypeRuleKeywords = new List<string>
         {
             "lagedrempel",
             "verdronkenkoker"
@@ -131,7 +131,7 @@
                     StructureFilesKeywords.ClosingStructureParameterKeyword14, ProbabilityRule
                 },
                 {
-                    StructureFilesKeywords.ClosingStructureParameterKeyword15, ClosingStructureInflowModelRule
+                    StructureFilesKeywords.ClosingStructureParameterKeyword15, ClosingStructureInflowModelTypeRule
                 }
             };
 
@@ -214,7 +214,7 @@
                     StructureFilesKeywords.StabilityPointStructureParameterKeyword25, LogNormalDistributionRule
                 },
                 {
-                    StructureFilesKeywords.StabilityPointStructureParameterKeyword26, StabilityPointStructureInflowModelRule
+                    StructureFilesKeywords.StabilityPointStructureParameterKeyword26, StabilityPointStructureInflowModelTypeRule
                 },
             };
 
@@ -407,22 +407,22 @@
             return messages;
         }
 
-        private static List<string> ClosingStructureInflowModelRule(StructuresParameterRow row)
+        private static List<string> ClosingStructureInflowModelTypeRule(StructuresParameterRow row)
         {
             var messages = new List<string>();
             string value = row.AlphanumericValue.ToLower();
-            if (!closingStructureInflowModelRuleKeywords.Contains(value))
+            if (!closingStructureInflowModelTypeRuleKeywords.Contains(value))
             {
                 messages.Add(string.Format(Resources.StructuresParameterRowsValidator_Line_0_ColumnName_1_value_invalid, row.LineNumber, alphanumericalValueColumn));
             }
             return messages;
         }
 
-        private static List<string> StabilityPointStructureInflowModelRule(StructuresParameterRow row)
+        private static List<string> StabilityPointStructureInflowModelTypeRule(StructuresParameterRow row)
         {
             var messages = new List<string>();
             string value = row.AlphanumericValue.ToLower();
-            if (!stabilityPointStructureInflowModelRuleKeywords.Contains(value))
+            if (!stabilityPointStructureInflowModelTypeRuleKeywords.Contains(value))
             {
                 messages.Add(string.Format(Resources.StructuresParameterRowsValidator_Line_0_ColumnName_1_value_invalid, row.LineNumber, alphanumericalValueColumn));
             }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs
===================================================================
diff -u -r6525572c5945b9df76079c4be2d8b3b2e1827fca -ra574ad95af2b4a3f862062d11797d3842051e130
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs	(.../GeneralHeightStructuresInputTest.cs)	(revision 6525572c5945b9df76079c4be2d8b3b2e1827fca)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs	(.../GeneralHeightStructuresInputTest.cs)	(revision a574ad95af2b4a3f862062d11797d3842051e130)
@@ -24,7 +24,6 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Probabilistics;
-using Ringtoets.Common.Data.Properties;
 using Ringtoets.Common.Data.TestUtil;
 
 namespace Ringtoets.HeightStructures.Data.Test
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs
===================================================================
diff -u -r63b0f1800d86c219732bf730d0137e7711b00b47 -ra574ad95af2b4a3f862062d11797d3842051e130
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision 63b0f1800d86c219732bf730d0137e7711b00b47)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision a574ad95af2b4a3f862062d11797d3842051e130)
@@ -291,7 +291,7 @@
             // Call
             input.Orientation = (RoundedDouble) orientation;
 
-            //Assert
+            // Assert
             Assert.AreEqual(2, input.Orientation.NumberOfDecimalPlaces);
             Assert.AreEqual(orientation, input.Orientation, input.Orientation.GetAccuracy());
         }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs
===================================================================
diff -u -r9e3639e810a22019da1a9fdf5aa5c433a43520c1 -ra574ad95af2b4a3f862062d11797d3842051e130
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs	(.../StabilityPointStructuresInputTest.cs)	(revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs	(.../StabilityPointStructuresInputTest.cs)	(revision a574ad95af2b4a3f862062d11797d3842051e130)
@@ -296,10 +296,10 @@
             var input = new StabilityPointStructuresInput();
             NormalDistribution insideWaterLevelFailureConstruction = GenerateNormalDistribution();
 
-            //Call
+            // Call
             input.InsideWaterLevelFailureConstruction = insideWaterLevelFailureConstruction;
 
-            //Assert
+            // Assert
             Assert.AreEqual(insideWaterLevelFailureConstruction.Mean, input.InsideWaterLevelFailureConstruction.Mean);
             Assert.AreEqual(insideWaterLevelFailureConstruction.StandardDeviation, input.InsideWaterLevelFailureConstruction.StandardDeviation);
         }
@@ -311,10 +311,10 @@
             var input = new StabilityPointStructuresInput();
             NormalDistribution insideWaterLevel = GenerateNormalDistribution();
 
-            //Call
+            // Call
             input.InsideWaterLevel = insideWaterLevel;
 
-            //Assert
+            // Assert
             Assert.AreEqual(insideWaterLevel.Mean, input.InsideWaterLevel.Mean);
             Assert.AreEqual(insideWaterLevel.StandardDeviation, input.InsideWaterLevel.StandardDeviation);
         }
@@ -328,10 +328,10 @@
 
             RoundedDouble initialVariation = input.StormDuration.CoefficientOfVariation;
 
-            //Call
+            // Call
             input.StormDuration = stormDuration;
 
-            //Assert
+            // Assert
             Assert.AreEqual(stormDuration.Mean, input.StormDuration.Mean);
             AssertEqualValue(initialVariation, input.StormDuration.CoefficientOfVariation);
         }