Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs
===================================================================
diff -u -r62cd6e02ab9b63a64de1cc9e3a51ab776c7aab67 -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs	(.../IEffectiveThicknessCalculator.cs)	(revision 62cd6e02ab9b63a64de1cc9e3a51ab776c7aab67)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs	(.../IEffectiveThicknessCalculator.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -60,8 +60,9 @@
         double EffectiveHeight { get; }
 
         /// <summary>
-        /// Performs the effective thickness validation.
+        /// Validates the input for the effective thickness calculation.
         /// </summary>
+        /// <returns>A list of validation strings, or an empty list if there are no validation errors.</returns>
         List<string> Validate();
 
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs
===================================================================
diff -u -r89208074af9e942166875097aa38aa77476a5a3a -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs	(.../IHeaveCalculator.cs)	(revision 89208074af9e942166875097aa38aa77476a5a3a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs	(.../IHeaveCalculator.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -79,7 +79,7 @@
         void Calculate();
 
         /// <summary>
-        /// Performs the heave validation.
+        /// Validates the input for the heave calculation.
         /// </summary>
         /// <returns>A list of validation strings, or an empty list if there are no validation errors.</returns>
         List<string> Validate();
Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs
===================================================================
diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs	(.../ISellmeijerCalculator.cs)	(revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs	(.../ISellmeijerCalculator.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -144,7 +144,7 @@
         void Calculate();
 
         /// <summary>
-        /// Performs the Sellmeijer validation.
+        /// Validates the input for the Sellmeijer calculation.
         /// </summary>
         /// <returns>A list of validation strings, or an empty list if there are no validation errors.</returns>
         List<string> Validate();
Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs
===================================================================
diff -u -r18259e66145f5da6ade4866bee22627fc92b3d71 -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs	(.../IUpliftCalculator.cs)	(revision 18259e66145f5da6ade4866bee22627fc92b3d71)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs	(.../IUpliftCalculator.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -84,7 +84,7 @@
         void Calculate();
 
         /// <summary>
-        /// Performs the uplift validation.
+        /// Validates the input for the uplift calculation.
         /// </summary>
         /// <returns>A list of validation strings, or an empty list if there are no validation errors.</returns>
         List<string> Validate();
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs
===================================================================
diff -u -r556a30a447d1dce978fc2af8c22668119fd7d7ef -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs	(.../PipingCalculatorTest.cs)	(revision 556a30a447d1dce978fc2af8c22668119fd7d7ef)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs	(.../PipingCalculatorTest.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -141,11 +141,10 @@
         public void Validate_ZeroOrNegativeSeepageLength_ValidationMessageForPipingLength(double seepageLength)
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.SeepageLength = seepageLength;
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
@@ -164,11 +163,10 @@
         public void Validate_ZeroOrNegativeAquiferThickness_ValidationMessageForDAquifer(double aquiferThickness)
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.ThicknessAquiferLayer = aquiferThickness;
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
@@ -186,7 +184,7 @@
         public void Validate_NegativeBeddingAngle_ValidationMessageForBeddingAngle(double beddingAngle)
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.BeddingAngle = beddingAngle;
 
             PipingCalculatorInput input = new PipingCalculatorInput(properties);
@@ -205,7 +203,7 @@
         public void Validate_DampingFactorExitZero_TwoValidationMessageForRExit()
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.AssessmentLevel = (RoundedDouble) 0.1;
             properties.DampingFactorExit = 0;
 
@@ -225,11 +223,10 @@
         public void Validate_ThicknessAquiferLayerZero_ValidationMessageForDAquifer()
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.ThicknessAquiferLayer = 0;
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
@@ -245,11 +242,10 @@
         public void Validate_VolumetricWeightWaterZero_ValidationMessageForVolumetricWeightWater()
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.WaterVolumetricWeight = 0;
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
@@ -269,7 +265,7 @@
             double assessmentLevel, double phreaticLevelExit, double sellmeijerReductionFactor, double thicknessCoverageLayer)
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.AssessmentLevel = (RoundedDouble) assessmentLevel;
             properties.PhreaticLevelExit = phreaticLevelExit;
             properties.SellmeijerReductionFactor = sellmeijerReductionFactor;
@@ -291,11 +287,10 @@
         public void Validate_NoSurfaceLineSet_ValidationMessageForHavingNoSurfaceLineSelected()
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.SurfaceLine = null;
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
@@ -315,7 +310,7 @@
         public void Validate_SurfaceLineMissingDitchPoint_ValidationMessageForIncompleteDitch(int missingType)
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.SurfaceLine = new RingtoetsPipingSurfaceLine();
 
             PipingCalculatorInput input = new PipingCalculatorInput(properties);
@@ -364,7 +359,7 @@
             int ditchPolderSidePosition)
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.SurfaceLine = new RingtoetsPipingSurfaceLine();
 
             PipingCalculatorInput input = new PipingCalculatorInput(properties);
@@ -394,11 +389,10 @@
         public void Validate_NoSoilProfileSet_ValidationMessageForHavingNoSoilProfileSelected()
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.SoilProfile = null;
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
@@ -417,7 +411,7 @@
         {
             // Setup
             var top = 0;
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.SoilProfile = new PipingSoilProfile(string.Empty, bottom, new[]
                                                            {
                                                                new PipingSoilLayer(top)
@@ -443,14 +437,13 @@
         public void CalculateThicknessCoverageLayer_SoilProfileWithoutAquiferSet_ThrowsPipingCalculatorException()
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.SoilProfile = new PipingSoilProfile(string.Empty, -1.0, new[]
                                                            {
                                                                new PipingSoilLayer(0)
                                                            }, SoilProfileType.SoilProfile1D, 0);
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
@@ -523,11 +516,10 @@
         public void CalculateThicknessCoverageLayer_WithExitPointLBeyondSurfaceLineInput_ReturnsNaN()
         {
             // Setup
-            var properties = CreateSimpleConstructionProperties();
+            PipingCalculatorInput.ConstructionProperties properties = CreateSimpleConstructionProperties();
             properties.ExitPointXCoordinate = (RoundedDouble) 2.1;
 
-            PipingCalculatorInput input = new PipingCalculatorInput(
-                properties);
+            PipingCalculatorInput input = new PipingCalculatorInput(properties);
 
             var calculation = new PipingCalculator(input, PipingSubCalculatorFactory.Instance);
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs
===================================================================
diff -u -r62cd6e02ab9b63a64de1cc9e3a51ab776c7aab67 -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs	(.../EffectiveThicknessCalculatorStub.cs)	(revision 62cd6e02ab9b63a64de1cc9e3a51ab776c7aab67)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs	(.../EffectiveThicknessCalculatorStub.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -30,15 +30,22 @@
     /// </summary>
     public class EffectiveThicknessCalculatorStub : IEffectiveThicknessCalculator
     {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Calculate"/> was called or not.
+        /// </summary>
+        public bool Calculated { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Validate"/> was called or not.
+        /// </summary>
+        public bool Validated { get; private set; }
+
         public double ExitPointXCoordinate { get; set; }
         public double PhreaticLevel { get; set; }
         public double VolumicWeightOfWater { get; set; }
         public PipingProfile SoilProfile { get; set; }
         public PipingSurfaceLine SurfaceLine { get; set; }
 
-        public bool Calculated { get; private set; }
-        public bool Validated { get; private set; }
-
         public double EffectiveHeight
         {
             get
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs
===================================================================
diff -u -r89208074af9e942166875097aa38aa77476a5a3a -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs	(.../HeaveCalculatorStub.cs)	(revision 89208074af9e942166875097aa38aa77476a5a3a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs	(.../HeaveCalculatorStub.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -29,6 +29,16 @@
     /// </summary>
     public class HeaveCalculatorStub : IHeaveCalculator
     {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Calculate"/> was called or not.
+        /// </summary>
+        public bool Calculated { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Validate"/> was called or not.
+        /// </summary>
+        public bool Validated { get; private set; }
+
         public double DTotal { get; set; }
         public double HExit { get; set; }
         public double Ich { get; set; }
@@ -39,9 +49,6 @@
         public double Zh { get; private set; }
         public double FoSh { get; private set; }
 
-        public bool Calculated { get; private set; }
-        public bool Validated { get; private set; }
-
         public void Calculate()
         {
             Calculated = true;
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs
===================================================================
diff -u -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs	(.../PiezoHeadCalculatorStub.cs)	(revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs	(.../PiezoHeadCalculatorStub.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -28,13 +28,16 @@
     /// </summary>
     public class PiezoHeadCalculatorStub : IPiezoHeadCalculator
     {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Calculate"/> was called or not.
+        /// </summary>
+        public bool Calculated { get; private set; }
+
         public double PhiPolder { get; set; }
         public double RExit { get; set; }
         public double HRiver { get; set; }
         public double PhiExit { get; private set; }
 
-        public bool Calculated { get; private set; }
-
         public void Calculate()
         {
             Calculated = true;
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PipingProfilePropertyCalculatorStub.cs
===================================================================
diff -u -r603e8bd9a029ad240267e5aec4d89aab7709bb06 -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PipingProfilePropertyCalculatorStub.cs	(.../PipingProfilePropertyCalculatorStub.cs)	(revision 603e8bd9a029ad240267e5aec4d89aab7709bb06)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PipingProfilePropertyCalculatorStub.cs	(.../PipingProfilePropertyCalculatorStub.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -30,15 +30,21 @@
     /// </summary>
     public class PipingProfilePropertyCalculatorStub : IPipingProfilePropertyCalculator
     {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Calculate"/> was called or not.
+        /// </summary>
+        public bool Calculated { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Validate"/> was called or not.
+        /// </summary>
+        public bool Validated { get; private set; }
+
         public PipingProfile SoilProfile { get; set; }
         public PipingSurfaceLine SurfaceLine { get; set; }
         public double ExitPointX { get; set; }
-        
         public double BottomAquitardLayerAboveExitPointZ { get; set; }
 
-        public bool Calculated { get; private set; }
-        public bool Validated { get; private set; }
-
         public void Calculate()
         {
             Calculated = true;
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs
===================================================================
diff -u -r603e8bd9a029ad240267e5aec4d89aab7709bb06 -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs	(.../SellmeijerCalculatorStub.cs)	(revision 603e8bd9a029ad240267e5aec4d89aab7709bb06)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs	(.../SellmeijerCalculatorStub.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -29,6 +29,16 @@
     /// </summary>
     public class SellmeijerCalculatorStub : ISellmeijerCalculator
     {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Calculate"/> was called or not.
+        /// </summary>
+        public bool Calculated { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Validate"/> was called or not.
+        /// </summary>
+        public bool Validated { get; private set; }
+
         public double BeddingAngle { get; set; }
         public double D70 { get; set; }
         public double D70Mean { get; set; }
@@ -52,9 +62,6 @@
         public double Zp { get; private set; }
         public double FoSp { get; private set; }
 
-        public bool Calculated { get; private set; }
-        public bool Validated { get; private set; }
-
         public void Calculate()
         {
             Calculated = true;
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs
===================================================================
diff -u -r603e8bd9a029ad240267e5aec4d89aab7709bb06 -rea197b0db15cc3114c4fddd8e893bf78be18d7ba
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs	(.../UpliftCalculatorStub.cs)	(revision 603e8bd9a029ad240267e5aec4d89aab7709bb06)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs	(.../UpliftCalculatorStub.cs)	(revision ea197b0db15cc3114c4fddd8e893bf78be18d7ba)
@@ -29,6 +29,16 @@
     /// </summary>
     public class UpliftCalculatorStub : IUpliftCalculator
     {
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Calculate"/> is called or not.
+        /// </summary>
+        public bool Calculated { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="Validate"/> is called or not.
+        /// </summary>
+        public bool Validated { get; private set; }
+
         public double EffectiveStress { get; set; }
         public double HExit { get; set; }
         public double HRiver { get; set; }
@@ -40,9 +50,6 @@
         public double Zu { get; private set; }
         public double FoSu { get; private set; }
 
-        public bool Calculated { get; private set; }
-        public bool Validated { get; private set; }
-
         public void Calculate()
         {
             Calculated = true;