Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs
===================================================================
diff -u -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af -r01fbc7746f48767ff47a19abb8d34b856660c00c
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs	(.../ClosingStructuresInput.cs)	(revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs	(.../ClosingStructuresInput.cs)	(revision 01fbc7746f48767ff47a19abb8d34b856660c00c)
@@ -34,7 +34,7 @@
         private readonly NormalDistribution thresholdHeightOpenWeir;
         private readonly NormalDistribution drainCoefficient;
         private readonly LogNormalDistribution areaFlowApertures;
-        private readonly NormalDistribution levelCrestOfStructureNotClosing;
+        private readonly NormalDistribution levelCrestStructureNotClosing;
         private readonly NormalDistribution insideWaterLevel;
         private readonly LogNormalDistribution storageStructureArea;
         private readonly LogNormalDistribution allowedLevelIncreaseStorage;
@@ -48,13 +48,13 @@
         private double failureProbabilityReparation;
         private double failureProbabilityStructureWithErosion;
         private double probabilityOpenStructureBeforeFlooding;
-        private RoundedDouble wavedirectionDeviation;
+        private RoundedDouble deviationWaveDirection;
 
         public ClosingStructuresInput()
         {
             structureNormalOrientation = new RoundedDouble(2);
             factorStormDurationOpenStructure = new RoundedDouble(2);
-            wavedirectionDeviation = new RoundedDouble(2);
+            deviationWaveDirection = new RoundedDouble(2);
             probabilityOpenStructureBeforeFlooding = 1.0;
 
             modelFactorSuperCriticalFlow = new NormalDistribution(2)
@@ -81,7 +81,7 @@
                 StandardDeviation = (RoundedDouble) 0.01
             };
 
-            levelCrestOfStructureNotClosing = new NormalDistribution(2)
+            levelCrestStructureNotClosing = new NormalDistribution(2)
             {
                 Mean = (RoundedDouble) double.NaN,
                 StandardDeviation = (RoundedDouble) 0.05
@@ -174,7 +174,7 @@
         /// <summary>
         /// Gets or sets the identical apertures to use during the calculation.
         /// </summary>
-        public int IdenticalAperture { get; set; }
+        public int IdenticalApertures { get; set; }
 
         /// <summary>
         /// Gets or sets the failure probability of an open structure.
@@ -240,17 +240,17 @@
         }
 
         /// <summary>
-        /// Gets and sets the deviation of the wave direction.
+        /// Gets or sets the deviation of the wave direction.
         /// </summary>
-        public RoundedDouble WavedirectionDeviation
+        public RoundedDouble DeviationWaveDirection
         {
             get
             {
-                return wavedirectionDeviation;
+                return deviationWaveDirection;
             }
             set
             {
-                wavedirectionDeviation = value.ToPrecision(wavedirectionDeviation.NumberOfDecimalPlaces);
+                deviationWaveDirection = value.ToPrecision(deviationWaveDirection.NumberOfDecimalPlaces);
             }
         }
 
@@ -280,8 +280,9 @@
         #region Probabilistic inputs
 
         /// <summary>
-        /// Gets the drain coefficient normal distribution and sets the the drain coefficient mean.
+        /// Gets or sets the drain coefficient.
         /// </summary>
+        /// <remarks>Only sets the mean</remarks>
         public NormalDistribution DrainCoefficient
         {
             get
@@ -295,8 +296,9 @@
         }
 
         /// <summary>
-        /// Gets the model factor super critical flow normal distribution and sets the mean.
+        /// Gets or sets the model factor super critical flow.
         /// </summary>
+        /// <remarks>Only sets the mean.</remarks>
         public NormalDistribution ModelFactorSuperCriticalFlow
         {
             get
@@ -310,7 +312,7 @@
         }
 
         /// <summary>
-        /// Gets the threshold low weir height normal distribution and sets the threshold low weir height mean.
+        /// Gets or sets the threshold low weir height.
         /// </summary>
         public NormalDistribution ThresholdHeightOpenWeir
         {
@@ -326,7 +328,7 @@
         }
 
         /// <summary>
-        /// Gets and sets the area flow apertures normal distribution.
+        /// Gets or sets the area flow apertures normal distribution.
         /// </summary>
         public LogNormalDistribution AreaFlowApertures
         {
@@ -344,16 +346,16 @@
         /// <summary>
         /// Gets or sets the level crest of structure not closing normal distribution.
         /// </summary>
-        public NormalDistribution LevelCrestOfStructureNotClosing
+        public NormalDistribution LevelCrestStructureNotClosing
         {
             get
             {
-                return levelCrestOfStructureNotClosing;
+                return levelCrestStructureNotClosing;
             }
             set
             {
-                levelCrestOfStructureNotClosing.Mean = value.Mean;
-                levelCrestOfStructureNotClosing.StandardDeviation = value.StandardDeviation;
+                levelCrestStructureNotClosing.Mean = value.Mean;
+                levelCrestStructureNotClosing.StandardDeviation = value.StandardDeviation;
             }
         }
 
@@ -454,8 +456,9 @@
         }
 
         /// <summary>
-        /// Gets the storm duration log normal distribution and sets the storm duration mean.
+        /// Gets or sets the storm duration.
         /// </summary>
+        /// <remarks>Only sets the mean.</remarks>
         public LogNormalDistribution StormDuration
         {
             get
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af -r01fbc7746f48767ff47a19abb8d34b856660c00c
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs	(.../ClosingStructuresInputTest.cs)	(revision 01fbc7746f48767ff47a19abb8d34b856660c00c)
@@ -49,7 +49,7 @@
             AssertEqualValues(1, input.DrainCoefficient.Mean);
             AssertEqualValues(0.2, input.DrainCoefficient.StandardDeviation);
             AssertEqualValues(0.01, input.AreaFlowApertures.StandardDeviation);
-            AssertEqualValues(0.05, input.LevelCrestOfStructureNotClosing.StandardDeviation);
+            AssertEqualValues(0.05, input.LevelCrestStructureNotClosing.StandardDeviation);
             AssertEqualValues(0.1, input.InsideWaterLevel.StandardDeviation);
             AssertEqualValues(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation);
             AssertEqualValues(0.05, input.FlowWidthAtBottomProtection.StandardDeviation);
@@ -235,7 +235,7 @@
         }
 
         [Test]
-        public void Properties_IdenticalAperture_ExpectedValues()
+        public void Properties_IdenticalApertures_ExpectedValues()
         {
             // Setup
             var input = new ClosingStructuresInput();
@@ -244,25 +244,25 @@
             int identicalAperture = random.Next();
 
             // Call
-            input.IdenticalAperture = identicalAperture;
+            input.IdenticalApertures = identicalAperture;
 
             // Assert
-            Assert.AreEqual(identicalAperture, input.IdenticalAperture);
+            Assert.AreEqual(identicalAperture, input.IdenticalApertures);
         }
 
         [Test]
-        public void Properties_LevelCrestOfStructureNotClosing_ExpectedValues()
+        public void Properties_LevelCrestStructureNotClosing_ExpectedValues()
         {
             // Setup
             var input = new ClosingStructuresInput();
-            NormalDistribution levelCrestOfStructureNotClosing = GenerateNormalDistribution();
+            NormalDistribution levelCrestStructureNotClosing = GenerateNormalDistribution();
 
             //Call
-            input.LevelCrestOfStructureNotClosing = levelCrestOfStructureNotClosing;
+            input.LevelCrestStructureNotClosing = levelCrestStructureNotClosing;
 
             //Assert
-            Assert.AreEqual(levelCrestOfStructureNotClosing.Mean, input.LevelCrestOfStructureNotClosing.Mean);
-            Assert.AreEqual(levelCrestOfStructureNotClosing.StandardDeviation, input.LevelCrestOfStructureNotClosing.StandardDeviation);
+            Assert.AreEqual(levelCrestStructureNotClosing.Mean, input.LevelCrestStructureNotClosing.Mean);
+            Assert.AreEqual(levelCrestStructureNotClosing.StandardDeviation, input.LevelCrestStructureNotClosing.StandardDeviation);
         }
 
         [Test]
@@ -387,20 +387,20 @@
         }
 
         [Test]
-        public void Properties_WaveDirectionDeviation_ExpectedValues()
+        public void Properties_DeviationWaveDirection_ExpectedValues()
         {
             // Setup
             var input = new ClosingStructuresInput();
             var random = new Random(22);
 
-            var wavedirectionDeviation = new RoundedDouble(5, random.NextDouble());
+            var deviationWaveDirection = new RoundedDouble(5, random.NextDouble());
 
             // Call
-            input.WavedirectionDeviation = wavedirectionDeviation;
+            input.DeviationWaveDirection = deviationWaveDirection;
 
             // Assert
-            Assert.AreEqual(2, input.WavedirectionDeviation.NumberOfDecimalPlaces);
-            AssertEqualValues(wavedirectionDeviation, input.WavedirectionDeviation);
+            Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces);
+            AssertEqualValues(deviationWaveDirection, input.DeviationWaveDirection);
         }
 
         [Test]
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs
===================================================================
diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r01fbc7746f48767ff47a19abb8d34b856660c00c
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs	(.../HeightStructuresInput.cs)	(revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs	(.../HeightStructuresInput.cs)	(revision 01fbc7746f48767ff47a19abb8d34b856660c00c)
@@ -110,6 +110,7 @@
         /// <summary>
         /// Gets or sets the model factor overtopping critical flow.
         /// </summary>
+        /// <remarks>Only sets the mean.</remarks>
         public NormalDistribution ModelFactorOvertoppingSuperCriticalFlow
         {
             get
@@ -149,6 +150,7 @@
         /// <summary>
         /// Gets or sets the storm duration
         /// </summary>
+        /// <remarks>Only sets the mean.</remarks>
         public LogNormalDistribution StormDuration
         {
             get