Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs
===================================================================
diff -u -r7869115120e7341826283ec22afdf03634d13775 -recb90789988e5dd12d9eeeb7e016b57551121089
--- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 7869115120e7341826283ec22afdf03634d13775)
+++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision ecb90789988e5dd12d9eeeb7e016b57551121089)
@@ -140,7 +140,7 @@
         }
 
         /// <summary>
-        /// Gets the value of a field of an instance.
+        /// Sets the value of a field of an instance.
         /// </summary>
         /// <param name="obj">Instance holding the field. Cannot be <c>null</c>.</param>
         /// <param name="fieldName">Name of the field.</param>
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs
===================================================================
diff -u -r7869115120e7341826283ec22afdf03634d13775 -recb90789988e5dd12d9eeeb7e016b57551121089
--- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs	(.../TypeUtilsTest.cs)	(revision 7869115120e7341826283ec22afdf03634d13775)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs	(.../TypeUtilsTest.cs)	(revision ecb90789988e5dd12d9eeeb7e016b57551121089)
@@ -268,7 +268,7 @@
         }
 
         [Test]
-        public void GetProperty_PrivateProperty_ReturnPropertyValue()
+        public void GetProperty_ProtectedProperty_ReturnPropertyValue()
         {
             // Setup
             var testClass = new TestClass();
@@ -281,7 +281,7 @@
         }
 
         [Test]
-        public void GetProperty_PrivatePropertyOfDerivedClass_ReturnPropertyValue()
+        public void GetProperty_ProtectedPropertyOfDerivedClass_ReturnPropertyValue()
         {
             // Setup
             var testClass = new DerivedTestClass();
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs
===================================================================
diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -recb90789988e5dd12d9eeeb7e016b57551121089
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision ecb90789988e5dd12d9eeeb7e016b57551121089)
@@ -22,14 +22,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Deltares.WTIStability.Data.Geo;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.Waternet;
-using WtiStabilitySoil = Deltares.WTIStability.Data.Geo.Soil;
+using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet
 {
@@ -105,8 +105,8 @@
 
         private void SetInputOnKernel(IWaternetKernel waternetKernel)
         {
-            WtiStabilitySoil[] soils = SoilCreator.Create(Input.SoilProfile);
-            Dictionary<SoilLayer, WtiStabilitySoil> layersWithSoils =
+            Soil[] soils = SoilCreator.Create(Input.SoilProfile);
+            Dictionary<SoilLayer, Soil> layersWithSoils =
                 Input.SoilProfile.Layers
                      .Zip(soils, (layer, soil) => new
                      {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilCreator.cs
===================================================================
diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -recb90789988e5dd12d9eeeb7e016b57551121089
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilCreator.cs	(.../SoilCreator.cs)	(revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilCreator.cs	(.../SoilCreator.cs)	(revision ecb90789988e5dd12d9eeeb7e016b57551121089)
@@ -23,21 +23,20 @@
 using System.ComponentModel;
 using System.Linq;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
 using WtiStabilitySoil = Deltares.WTIStability.Data.Geo.Soil;
 using WtiStabilityDilatancyType = Deltares.WTIStability.Data.Geo.DilatancyType;
 using WtiStabilityShearStrengthModel = Deltares.WTIStability.Data.Geo.ShearStrengthModel;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
     /// <summary>
-    /// Creates <see cref="WtiStabilitySoil"/> instances which are required by <see cref="IUpliftVanKernel"/>.
+    /// Creates <see cref="WtiStabilitySoil"/> instances which are required in a calculation.
     /// </summary>
     internal static class SoilCreator
     {
         /// <summary>
         /// Creates a <see cref="WtiStabilitySoil"/> based on information contained in the profile <paramref name="profile"/>,
-        /// which can be used by <see cref="IUpliftVanKernel"/>.
+        /// which can be used in a calculation.
         /// </summary>
         /// <param name="profile">The <see cref="SoilProfile"/> from which to take the information.</param>
         /// <returns>A new <see cref="WtiStabilitySoil"/> with information taken from the <see cref="profile"/>.</returns>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilModelCreator.cs
===================================================================
diff -u -rd3d8ce69baae082c576e3e3a3fedff5b5b57a1e9 -recb90789988e5dd12d9eeeb7e016b57551121089
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilModelCreator.cs	(.../SoilModelCreator.cs)	(revision d3d8ce69baae082c576e3e3a3fedff5b5b57a1e9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilModelCreator.cs	(.../SoilModelCreator.cs)	(revision ecb90789988e5dd12d9eeeb7e016b57551121089)
@@ -22,18 +22,17 @@
 using System;
 using Deltares.WTIStability.Data.Geo;
 using Deltares.WTIStability.Data.Standard;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
     /// <summary>
-    /// Creates <see cref="SoilModel"/> instances which are required by <see cref="IUpliftVanKernel"/>.
+    /// Creates <see cref="SoilModel"/> instances which are required in a calculation.
     /// </summary>
     internal static class SoilModelCreator
     {
         /// <summary>
         /// Creates a <see cref="SoilModel"/> with the given <paramref name="soils"/>
-        /// which can be used by <see cref="IUpliftVanKernel"/>.
+        /// which can be used in a calculation.
         /// </summary>
         /// <param name="soils">The array of <see cref="Soil"/> to use in the <see cref="SoilModel"/>.</param>
         /// <returns>A new <see cref="SoilModel"/> with the <paramref name="soils"/>.</returns>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilProfileCreator.cs
===================================================================
diff -u -r4a53a1399a74800550fc84ca9c4e67ba61037704 -recb90789988e5dd12d9eeeb7e016b57551121089
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilProfileCreator.cs	(.../SoilProfileCreator.cs)	(revision 4a53a1399a74800550fc84ca9c4e67ba61037704)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilProfileCreator.cs	(.../SoilProfileCreator.cs)	(revision ecb90789988e5dd12d9eeeb7e016b57551121089)
@@ -26,7 +26,6 @@
 using Deltares.WTIStability.Data.Geo;
 using Deltares.WTIStability.Data.Standard;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
 using Point2D = Core.Common.Base.Geometry.Point2D;
 using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
 using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
@@ -36,13 +35,13 @@
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
     /// <summary>
-    /// Creates <see cref="WtiStabilitySoilProfile"/> instances which are required by <see cref="IUpliftVanKernel"/>.
+    /// Creates <see cref="WtiStabilitySoilProfile"/> instances which are required in a calculation.
     /// </summary>
     internal static class SoilProfileCreator
     {
         /// <summary>
         /// Creates a <see cref="SoilProfile2D"/> with the given <paramref name="layersWithSoils"/>
-        /// which can be used by <see cref="IUpliftVanKernel"/>.
+        /// which can be used in a calculation.
         /// </summary>
         /// <param name="soilProfile">The soil profile to create the <see cref="SoilProfile2D"/> for.</param>
         /// <param name="layersWithSoils">The data to use in the <see cref="SoilProfile2D"/>.</param>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs
===================================================================
diff -u -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 -recb90789988e5dd12d9eeeb7e016b57551121089
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision ecb90789988e5dd12d9eeeb7e016b57551121089)
@@ -25,21 +25,20 @@
 using System.Linq;
 using Core.Common.Base.Geometry;
 using Deltares.WTIStability.Data.Geo;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
 using Ringtoets.MacroStabilityInwards.Primitives;
 using LandwardDirection = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection;
 using WtiStabilityLandwardDirection = Deltares.WTIStability.Data.Geo.LandwardDirection;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
     /// <summary>
-    /// Creates <see cref="SurfaceLine2"/> instances which are required by <see cref="IUpliftVanKernel"/>.
+    /// Creates <see cref="SurfaceLine2"/> instances which are required in a calculation.
     /// </summary>
     internal static class SurfaceLineCreator
     {
         /// <summary>
         /// Creates a <see cref="SurfaceLine2"/> based on information of <paramref name="surfaceLine"/>,
-        /// which can be used by <see cref="IUpliftVanKernel"/>.
+        /// which can be used in a calculation.
         /// </summary>
         /// <param name="surfaceLine">The <see cref="MacroStabilityInwardsSurfaceLine"/> from
         /// which to take the information.</param>