Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs
===================================================================
diff -u -r64553ee5bb2b3c27b0bcfa5eb79aec9e75b9942b -re06f0a61842b0e10e51de08c4c54b424c56e54a6
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision 64553ee5bb2b3c27b0bcfa5eb79aec9e75b9942b)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision e06f0a61842b0e10e51de08c4c54b424c56e54a6)
@@ -74,57 +74,68 @@
         /// <summary>
         /// Sets the slip plane Uplift Van.
         /// </summary>
+        /// <param name="slipPlaneUpliftVan">The slip plane Uplift Van to set.</param>
         void SetSlipPlaneUpliftVan(SlipPlaneUpliftVan slipPlaneUpliftVan);
 
         /// <summary>
         /// Sets the slip plane constraints.
         /// </summary>
+        /// <param name="slipPlaneConstraints">The slip plane constraints to set.</param>
         void SetSlipPlaneConstraints(SlipPlaneConstraints slipPlaneConstraints);
 
         /// <summary>
         /// Sets the soil model.
         /// </summary>
+        /// <param name="soilModel">The soil model to set.</param>
         void SetSoilModel(IList<Soil> soilModel);
 
         /// <summary>
         /// Sets the soil profile.
         /// </summary>
+        /// <param name="soilProfile">The soil profile to set.</param>
         void SetSoilProfile(SoilProfile2D soilProfile);
 
         /// <summary>
-        /// Sets the location under daily circumstances.
+        /// Sets the Waternet under daily circumstances.
         /// </summary>
+        /// <param name="waternetDaily">The daily Waternet to set.</param>
         void SetWaternetDaily(WtiStabilityWaternet waternetDaily);
 
         /// <summary>
-        /// Sets the location under extreme circumstances.
+        /// Sets the Waternet under extreme circumstances.
         /// </summary>
+        /// <param name="waternetExtreme">The extreme Waternet to set.</param>
         void SetWaternetExtreme(WtiStabilityWaternet waternetExtreme);
 
         /// <summary>
         /// Sets the move grid property.
         /// </summary>
+        /// <param name="moveGrid">The move grid value to set.</param>
         void SetMoveGrid(bool moveGrid);
 
         /// <summary>
         /// Sets the maximum slice width.
         /// [m]
         /// </summary>
+        /// <param name="maximumSliceWidth">The maximum slice width to set.</param>
         void SetMaximumSliceWidth(double maximumSliceWidth);
 
         /// <summary>
         /// Sets the surface line.
         /// </summary>
+        /// <param name="surfaceLine">The surface line to set.</param>
         void SetSurfaceLine(SurfaceLine2 surfaceLine);
 
         /// <summary>
         /// Sets whether the grid is automatically determined or not.
         /// </summary>
+        /// <param name="gridAutomaticDetermined">The grid automatic determined value to set.</param>
         void SetGridAutomaticDetermined(bool gridAutomaticDetermined);
 
         /// <summary>
         /// Sets whether the tangent lines are automatically determined or not.
         /// </summary>
+        /// <param name="tangentLinesAutomaticDetermined">The tangent automatic lines determined value to set.</param>
         void SetTangentLinesAutomaticDetermined(bool tangentLinesAutomaticDetermined);
 
         /// <summary>
@@ -155,7 +166,7 @@
         /// <summary>
         /// Validates the input for the Uplift Van calculation.
         /// </summary>
-        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ValidationResult"/> objects.</returns>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="IValidationResult"/> objects.</returns>
         /// <exception cref="UpliftVanKernelWrapperException">Thrown when 
         /// an error occurs when performing the validation.</exception>
         IEnumerable<IValidationResult> Validate();
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs
===================================================================
diff -u -rc6996ad66595632f63ed3deedf6fc5494071a405 -re06f0a61842b0e10e51de08c4c54b424c56e54a6
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs	(.../IWaternetKernel.cs)	(revision c6996ad66595632f63ed3deedf6fc5494071a405)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/IWaternetKernel.cs	(.../IWaternetKernel.cs)	(revision e06f0a61842b0e10e51de08c4c54b424c56e54a6)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using Deltares.MacroStability.Geometry;
-using Deltares.MacroStability.WaternetCreator;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Waternet;
 using WtiStabilityWaternet = Deltares.MacroStability.Geometry.Waternet;
 
@@ -54,6 +53,9 @@
         /// </summary>
         void SetSurfaceLine(SurfaceLine2 surfaceLine);
 
+        /// <summary>
+        /// Sets the soil model.
+        /// </summary>
         void SetSoilModel(IList<Soil> soilModel);
 
         /// <summary>
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanLocationCreatorTest.cs
===================================================================
diff -u -r2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39 -re06f0a61842b0e10e51de08c4c54b424c56e54a6
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanLocationCreatorTest.cs	(.../UpliftVanLocationCreatorTest.cs)	(revision 2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanLocationCreatorTest.cs	(.../UpliftVanLocationCreatorTest.cs)	(revision e06f0a61842b0e10e51de08c4c54b424c56e54a6)
@@ -79,7 +79,7 @@
         [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)]
-        public void CreateExtreme_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
+        public void CreateExtreme_ValidDikeSoilScenario_ReturnLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
                                                                                                     DikeSoilScenario expectedDikeSoilScenario)
         {
             // Setup
@@ -129,7 +129,7 @@
         [Test]
         [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
         [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
-        public void CreateExtreme_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
+        public void CreateExtreme_ValidWaternetCreationMode_ReturnLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
                                                                                                             WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
@@ -179,7 +179,7 @@
         [Test]
         [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
         [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
-        public void CreateExtreme_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
+        public void CreateExtreme_ValidPlLineCreationMethod_ReturnLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
                                                                                                             WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
@@ -204,7 +204,7 @@
 
         [Test]
         [Combinatorial]
-        public void CreateExtreme_WithInput_ReturnStabilityLocation([Values(true, false)] bool drainageConstructionPresent,
+        public void CreateExtreme_WithInput_ReturnLocation([Values(true, false)] bool drainageConstructionPresent,
                                                                     [Values(true, false)] bool useDefaultOffsets)
         {
             // Setup
@@ -301,7 +301,7 @@
         [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)]
-        public void CreateDaily_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
+        public void CreateDaily_ValidDikeSoilScenario_ReturnLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
                                                                                                   DikeSoilScenario expectedDikeSoilScenario)
         {
             // Setup
@@ -351,7 +351,7 @@
         [Test]
         [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
         [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
-        public void CreateDaily_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
+        public void CreateDaily_ValidWaternetCreationMode_ReturnLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
                                                                                                           WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
@@ -401,7 +401,7 @@
         [Test]
         [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
         [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
-        public void CreateDaily_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
+        public void CreateDaily_ValidPlLineCreationMethod_ReturnLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
                                                                                                           WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
@@ -426,7 +426,7 @@
 
         [Test]
         [Combinatorial]
-        public void CreateDaily_WithInput_ReturnStabilityLocation([Values(true, false)] bool drainageConstructionPresent,
+        public void CreateDaily_WithInput_ReturnLocation([Values(true, false)] bool drainageConstructionPresent,
                                                                   [Values(true, false)] bool useDefaultOffsets)
         {
             // Setup
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetLocationCreatorTest.cs
===================================================================
diff -u -r2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39 -re06f0a61842b0e10e51de08c4c54b424c56e54a6
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetLocationCreatorTest.cs	(.../WaternetLocationCreatorTest.cs)	(revision 2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetLocationCreatorTest.cs	(.../WaternetLocationCreatorTest.cs)	(revision e06f0a61842b0e10e51de08c4c54b424c56e54a6)
@@ -77,7 +77,7 @@
         [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)]
-        public void Create_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
+        public void Create_ValidDikeSoilScenario_ReturnLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
                                                                                              DikeSoilScenario expectedDikeSoilScenario)
         {
             // Setup
@@ -123,7 +123,7 @@
         [Test]
         [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
         [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
-        public void Create_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
+        public void Create_ValidWaternetCreationMode_ReturnLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
                                                                                                      WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
@@ -169,7 +169,7 @@
         [Test]
         [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
         [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
-        public void Create_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
+        public void Create_ValidPlLineCreationMethod_ReturnLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
                                                                                                      WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
@@ -192,7 +192,7 @@
 
         [Test]
         [Combinatorial]
-        public void Create_WithInput_ReturnStabilityLocation([Values(true, false)] bool drainageConstructionPresent,
+        public void Create_WithInput_ReturnLocation([Values(true, false)] bool drainageConstructionPresent,
                                                              [Values(true, false)] bool useDefaultOffsets)
         {
             // Setup
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs
===================================================================
diff -u -rc6996ad66595632f63ed3deedf6fc5494071a405 -re06f0a61842b0e10e51de08c4c54b424c56e54a6
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision c6996ad66595632f63ed3deedf6fc5494071a405)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision e06f0a61842b0e10e51de08c4c54b424c56e54a6)
@@ -51,9 +51,9 @@
 
         public WtiStabilityWaternet Waternet { get; set; }
 
-        public void SetLocation(Location stabilityLocation)
+        public void SetLocation(Location location)
         {
-            Location = stabilityLocation;
+            Location = location;
         }
 
         public void SetSoilProfile(SoilProfile2D soilProfile)