Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilCreator.cs
===================================================================
diff -u -r2f475a02ae31bb68d351db98e3e7e82cb7456291 -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilCreator.cs	(.../SoilCreator.cs)	(revision 2f475a02ae31bb68d351db98e3e7e82cb7456291)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilCreator.cs	(.../SoilCreator.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -27,8 +27,8 @@
 using DilatancyType = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.DilatancyType;
 using ShearStrengthModel = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.ShearStrengthModel;
 using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
-using WTIStabilityDilatancyType = Deltares.WTIStability.Data.Geo.DilatancyType;
-using WTIStabilityShearStrengthModel = Deltares.WTIStability.Data.Geo.ShearStrengthModel;
+using WtiStabilityDilatancyType = Deltares.WTIStability.Data.Geo.DilatancyType;
+using WtiStabilityShearStrengthModel = Deltares.WTIStability.Data.Geo.ShearStrengthModel;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
@@ -71,15 +71,15 @@
         }
 
         /// <summary>
-        /// Converts a <see cref="ShearStrengthModel"/> into a <see cref="WTIStabilityShearStrengthModel"/>.
+        /// Converts a <see cref="ShearStrengthModel"/> into a <see cref="WtiStabilityShearStrengthModel"/>.
         /// </summary>
         /// <param name="shearStrengthModel">The <see cref="ShearStrengthModel"/> to convert.</param>
-        /// <returns>A <see cref="WTIStabilityShearStrengthModel"/> based on <paramref name="shearStrengthModel"/>.</returns>
+        /// <returns>A <see cref="WtiStabilityShearStrengthModel"/> based on <paramref name="shearStrengthModel"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="shearStrengthModel"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="shearStrengthModel"/>
         /// is a valid value but unsupported.</exception>
-        private static WTIStabilityShearStrengthModel ConvertShearStrengthModel(ShearStrengthModel shearStrengthModel)
+        private static WtiStabilityShearStrengthModel ConvertShearStrengthModel(ShearStrengthModel shearStrengthModel)
         {
             if (!Enum.IsDefined(typeof(ShearStrengthModel), shearStrengthModel))
             {
@@ -91,26 +91,26 @@
             switch (shearStrengthModel)
             {
                 case ShearStrengthModel.SuCalculated:
-                    return WTIStabilityShearStrengthModel.CuCalculated;
+                    return WtiStabilityShearStrengthModel.CuCalculated;
                 case ShearStrengthModel.CPhi:
-                    return WTIStabilityShearStrengthModel.CPhi;
+                    return WtiStabilityShearStrengthModel.CPhi;
                 case ShearStrengthModel.CPhiOrSuCalculated:
-                    return WTIStabilityShearStrengthModel.CPhiOrCuCalculated;
+                    return WtiStabilityShearStrengthModel.CPhiOrCuCalculated;
                 default:
                     throw new NotSupportedException();
             }
         }
 
         /// <summary>
-        /// Converts a <see cref="DilatancyType"/> into a <see cref="WTIStabilityDilatancyType"/>.
+        /// Converts a <see cref="DilatancyType"/> into a <see cref="WtiStabilityDilatancyType"/>.
         /// </summary>
         /// <param name="dilatancyType">The <see cref="DilatancyType"/> to convert.</param>
-        /// <returns>A <see cref="WTIStabilityDilatancyType"/> based on <paramref name="dilatancyType"/>.</returns>
+        /// <returns>A <see cref="WtiStabilityDilatancyType"/> based on <paramref name="dilatancyType"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="dilatancyType"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="dilatancyType"/>
         /// is a valid value but unsupported.</exception>
-        private static WTIStabilityDilatancyType ConvertDilatancyType(DilatancyType dilatancyType)
+        private static WtiStabilityDilatancyType ConvertDilatancyType(DilatancyType dilatancyType)
         {
             if (!Enum.IsDefined(typeof(DilatancyType), dilatancyType))
             {
@@ -122,11 +122,11 @@
             switch (dilatancyType)
             {
                 case DilatancyType.Phi:
-                    return WTIStabilityDilatancyType.Phi;
+                    return WtiStabilityDilatancyType.Phi;
                 case DilatancyType.Zero:
-                    return WTIStabilityDilatancyType.Zero;
+                    return WtiStabilityDilatancyType.Zero;
                 case DilatancyType.MinusPhi:
-                    return WTIStabilityDilatancyType.MinusPhi;
+                    return WtiStabilityDilatancyType.MinusPhi;
                 default:
                     throw new NotSupportedException();
             }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilProfileCreator.cs
===================================================================
diff -u -r2f475a02ae31bb68d351db98e3e7e82cb7456291 -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilProfileCreator.cs	(.../SoilProfileCreator.cs)	(revision 2f475a02ae31bb68d351db98e3e7e82cb7456291)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SoilProfileCreator.cs	(.../SoilProfileCreator.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -30,13 +30,13 @@
 using Point2D = Core.Common.Base.Geometry.Point2D;
 using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
 using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
-using WTIStabilityPoint2D = Deltares.WTIStability.Data.Geo.Point2D;
-using WTIStabilitySoilProfile = Deltares.WTIStability.Data.Geo.SoilProfile;
+using WtiStabilityPoint2D = Deltares.WTIStability.Data.Geo.Point2D;
+using WtiStabilitySoilProfile = Deltares.WTIStability.Data.Geo.SoilProfile;
 
 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 by <see cref="IUpliftVanKernel"/>.
     /// </summary>
     internal static class SoilProfileCreator
     {
@@ -117,14 +117,14 @@
         private static GeometryCurve[] CreateGeometryCurves(Point2D[] points)
         {
             var curves = new List<GeometryCurve>();
-            var firstPoint = new WTIStabilityPoint2D(points[0].X, points[0].Y);
-            WTIStabilityPoint2D lastPoint = null;
+            var firstPoint = new WtiStabilityPoint2D(points[0].X, points[0].Y);
+            WtiStabilityPoint2D lastPoint = null;
 
             for (var i = 0; i < points.Length - 1; i++)
             {
-                WTIStabilityPoint2D headPoint = i == 0 ? firstPoint : lastPoint;
+                WtiStabilityPoint2D headPoint = i == 0 ? firstPoint : lastPoint;
 
-                var endPoint = new WTIStabilityPoint2D(points[i + 1].X, points[i + 1].Y);
+                var endPoint = new WtiStabilityPoint2D(points[i + 1].X, points[i + 1].Y);
 
                 curves.Add(new GeometryCurve
                 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs
===================================================================
diff -u -rcf4437d42715feee4622c9ae57fb9920485fb13f -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs	(.../StabilityLocationCreatorHelper.cs)	(revision cf4437d42715feee4622c9ae57fb9920485fb13f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs	(.../StabilityLocationCreatorHelper.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -25,8 +25,8 @@
 using Ringtoets.MacroStabilityInwards.Primitives;
 using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
 using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
-using WTIStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
-using WTIStabilityWaternetCreationMode = Deltares.WaternetCreator.WaternetCreationMode;
+using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
+using WtiStabilityWaternetCreationMode = Deltares.WaternetCreator.WaternetCreationMode;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
@@ -70,15 +70,15 @@
         }
 
         /// <summary>
-        /// Converts a <see cref="WaternetCreationMode"/> into a <see cref="WTIStabilityWaternetCreationMode"/>.
+        /// Converts a <see cref="WaternetCreationMode"/> into a <see cref="WtiStabilityWaternetCreationMode"/>.
         /// </summary>
         /// <param name="waternetCreationMode">The <see cref="WaternetCreationMode"/> to convert.</param>
-        /// <returns>A <see cref="WTIStabilityWaternetCreationMode"/> based on <paramref name="waternetCreationMode"/>.</returns>
+        /// <returns>A <see cref="WtiStabilityWaternetCreationMode"/> based on <paramref name="waternetCreationMode"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="waternetCreationMode"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="waternetCreationMode"/>
         /// is a valid value but unsupported.</exception>
-        public static WTIStabilityWaternetCreationMode ConvertWaternetCreationMode(WaternetCreationMode waternetCreationMode)
+        public static WtiStabilityWaternetCreationMode ConvertWaternetCreationMode(WaternetCreationMode waternetCreationMode)
         {
             if (!Enum.IsDefined(typeof(WaternetCreationMode), waternetCreationMode))
             {
@@ -90,24 +90,24 @@
             switch (waternetCreationMode)
             {
                 case WaternetCreationMode.CreateWaternet:
-                    return WTIStabilityWaternetCreationMode.CreateWaternet;
+                    return WtiStabilityWaternetCreationMode.CreateWaternet;
                 case WaternetCreationMode.FillInWaternetValues:
-                    return WTIStabilityWaternetCreationMode.FillInWaternetValues;
+                    return WtiStabilityWaternetCreationMode.FillInWaternetValues;
                 default:
                     throw new NotSupportedException();
             }
         }
 
         /// <summary>
-        /// Converts a <see cref="PlLineCreationMethod"/> into a <see cref="WTIStabilityPlLineCreationMethod"/>.
+        /// Converts a <see cref="PlLineCreationMethod"/> into a <see cref="WtiStabilityPlLineCreationMethod"/>.
         /// </summary>
         /// <param name="plLineCreationMethod">The <see cref="PlLineCreationMethod"/> to convert.</param>
-        /// <returns>A <see cref="WTIStabilityPlLineCreationMethod"/> based on <paramref name="plLineCreationMethod"/>.</returns>
+        /// <returns>A <see cref="WtiStabilityPlLineCreationMethod"/> based on <paramref name="plLineCreationMethod"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="plLineCreationMethod"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="plLineCreationMethod"/>
         /// is a valid value but unsupported.</exception>
-        public static WTIStabilityPlLineCreationMethod ConvertPlLineCreationMethod(PlLineCreationMethod plLineCreationMethod)
+        public static WtiStabilityPlLineCreationMethod ConvertPlLineCreationMethod(PlLineCreationMethod plLineCreationMethod)
         {
             if (!Enum.IsDefined(typeof(PlLineCreationMethod), plLineCreationMethod))
             {
@@ -119,19 +119,19 @@
             switch (plLineCreationMethod)
             {
                 case PlLineCreationMethod.ExpertKnowledgeRrd:
-                    return WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd;
+                    return WtiStabilityPlLineCreationMethod.ExpertKnowledgeRrd;
                 case PlLineCreationMethod.ExpertKnowledgeLinearInDike:
-                    return WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike;
+                    return WtiStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike;
                 case PlLineCreationMethod.RingtoetsWti2017:
-                    return WTIStabilityPlLineCreationMethod.RingtoetsWti2017;
+                    return WtiStabilityPlLineCreationMethod.RingtoetsWti2017;
                 case PlLineCreationMethod.DupuitStatic:
-                    return WTIStabilityPlLineCreationMethod.DupuitStatic;
+                    return WtiStabilityPlLineCreationMethod.DupuitStatic;
                 case PlLineCreationMethod.DupuitDynamic:
-                    return WTIStabilityPlLineCreationMethod.DupuitDynamic;
+                    return WtiStabilityPlLineCreationMethod.DupuitDynamic;
                 case PlLineCreationMethod.Sensors:
-                    return WTIStabilityPlLineCreationMethod.Sensors;
+                    return WtiStabilityPlLineCreationMethod.Sensors;
                 case PlLineCreationMethod.None:
-                    return WTIStabilityPlLineCreationMethod.None;
+                    return WtiStabilityPlLineCreationMethod.None;
                 default:
                     throw new NotSupportedException();
             }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -28,7 +28,7 @@
 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;
+using WtiStabilityLandwardDirection = Deltares.WTIStability.Data.Geo.LandwardDirection;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
@@ -81,15 +81,15 @@
         }
 
         /// <summary>
-        /// Converts a <see cref="LandwardDirection"/> into a <see cref="WTIStabilityLandwardDirection"/>.
+        /// Converts a <see cref="LandwardDirection"/> into a <see cref="WtiStabilityLandwardDirection"/>.
         /// </summary>
         /// <param name="landwardDirection">The <see cref="LandwardDirection"/> to convert.</param>
-        /// <returns>A <see cref="WTIStabilityLandwardDirection"/> based on <paramref name="landwardDirection"/>.</returns>
+        /// <returns>A <see cref="WtiStabilityLandwardDirection"/> based on <paramref name="landwardDirection"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="landwardDirection"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="landwardDirection"/>
         /// is a valid value but unsupported.</exception>
-        private static WTIStabilityLandwardDirection ConvertLandwardDirection(LandwardDirection landwardDirection)
+        private static WtiStabilityLandwardDirection ConvertLandwardDirection(LandwardDirection landwardDirection)
         {
             if (!Enum.IsDefined(typeof(LandwardDirection), landwardDirection))
             {
@@ -101,9 +101,9 @@
             switch (landwardDirection)
             {
                 case LandwardDirection.PositiveX:
-                    return WTIStabilityLandwardDirection.PositiveX;
+                    return WtiStabilityLandwardDirection.PositiveX;
                 case LandwardDirection.NegativeX:
-                    return WTIStabilityLandwardDirection.NegativeX;
+                    return WtiStabilityLandwardDirection.NegativeX;
                 default:
                     throw new NotSupportedException();
             }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilCreatorTest.cs
===================================================================
diff -u -r2f475a02ae31bb68d351db98e3e7e82cb7456291 -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilCreatorTest.cs	(.../SoilCreatorTest.cs)	(revision 2f475a02ae31bb68d351db98e3e7e82cb7456291)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilCreatorTest.cs	(.../SoilCreatorTest.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -32,8 +32,8 @@
 using ShearStrengthModel = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.ShearStrengthModel;
 using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
 using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
-using WTIStabilityShearStrengthModel = Deltares.WTIStability.Data.Geo.ShearStrengthModel;
-using WTIStabilityDilatancyType = Deltares.WTIStability.Data.Geo.DilatancyType;
+using WtiStabilityShearStrengthModel = Deltares.WTIStability.Data.Geo.ShearStrengthModel;
+using WtiStabilityDilatancyType = Deltares.WTIStability.Data.Geo.DilatancyType;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
@@ -134,15 +134,15 @@
             CollectionAssert.AreEqual(profile.Layers.Select(l => l.MaterialName), soils.Select(s => s.Name));
             CollectionAssert.AreEqual(new[]
             {
-                WTIStabilityShearStrengthModel.CPhi,
-                WTIStabilityShearStrengthModel.CPhiOrCuCalculated,
-                WTIStabilityShearStrengthModel.CuCalculated
+                WtiStabilityShearStrengthModel.CPhi,
+                WtiStabilityShearStrengthModel.CPhiOrCuCalculated,
+                WtiStabilityShearStrengthModel.CuCalculated
             }, soils.Select(s => s.ShearStrengthModel));
             CollectionAssert.AreEqual(new[]
             {
-                WTIStabilityDilatancyType.Phi,
-                WTIStabilityDilatancyType.Zero,
-                WTIStabilityDilatancyType.MinusPhi
+                WtiStabilityDilatancyType.Phi,
+                WtiStabilityDilatancyType.Zero,
+                WtiStabilityDilatancyType.MinusPhi
             }, soils.Select(s => s.DilatancyType));
             CollectionAssert.AreEqual(profile.Layers.Select(l => l.AbovePhreaticLevel), soils.Select(s => s.AbovePhreaticLevel));
             CollectionAssert.AreEqual(profile.Layers.Select(l => l.BelowPhreaticLevel), soils.Select(s => s.BelowPhreaticLevel));
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilProfileCreatorTest.cs
===================================================================
diff -u -r2f475a02ae31bb68d351db98e3e7e82cb7456291 -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilProfileCreatorTest.cs	(.../SoilProfileCreatorTest.cs)	(revision 2f475a02ae31bb68d351db98e3e7e82cb7456291)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilProfileCreatorTest.cs	(.../SoilProfileCreatorTest.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -33,7 +33,7 @@
 using Point2D = Core.Common.Base.Geometry.Point2D;
 using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
 using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
-using WTIStabilityPoint2D = Deltares.WTIStability.Data.Geo.Point2D;
+using WtiStabilityPoint2D = Deltares.WTIStability.Data.Geo.Point2D;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
@@ -172,15 +172,15 @@
             Assert.AreEqual(layer.IsAquifer, surface.IsAquifer);
             Assert.AreEqual(waterpressureInterpolationModel, surface.WaterpressureInterpolationModel);
 
-            var point1 = new WTIStabilityPoint2D(0, 0);
-            var point2 = new WTIStabilityPoint2D(10, 10);
-            var point3 = new WTIStabilityPoint2D(9, 9);
-            var point4 = new WTIStabilityPoint2D(2, 2);
-            var point5 = new WTIStabilityPoint2D(4, 4);
-            var point6 = new WTIStabilityPoint2D(2.5, 2.5);
-            var point7 = new WTIStabilityPoint2D(3, 3);
-            var point8 = new WTIStabilityPoint2D(5, 5);
-            var point9 = new WTIStabilityPoint2D(3, 3);
+            var point1 = new WtiStabilityPoint2D(0, 0);
+            var point2 = new WtiStabilityPoint2D(10, 10);
+            var point3 = new WtiStabilityPoint2D(9, 9);
+            var point4 = new WtiStabilityPoint2D(2, 2);
+            var point5 = new WtiStabilityPoint2D(4, 4);
+            var point6 = new WtiStabilityPoint2D(2.5, 2.5);
+            var point7 = new WtiStabilityPoint2D(3, 3);
+            var point8 = new WtiStabilityPoint2D(5, 5);
+            var point9 = new WtiStabilityPoint2D(3, 3);
             var outerLoopCurve1 = new GeometryCurve(point1, point2);
             var outerLoopCurve2 = new GeometryCurve(point2, point3);
             var outerLoopCurve3 = new GeometryCurve(point3, point1);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs
===================================================================
diff -u -r4a496868926ff7d3ab5d3080dd833699ec3784fc -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs	(.../StabilityLocationCreatorHelperTest.cs)	(revision 4a496868926ff7d3ab5d3080dd833699ec3784fc)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs	(.../StabilityLocationCreatorHelperTest.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -27,8 +27,8 @@
 using Ringtoets.MacroStabilityInwards.Primitives;
 using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
 using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
-using WTIStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
-using WTIStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
+using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
+using WtiStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
@@ -73,13 +73,13 @@
         }
 
         [Test]
-        [TestCase(WaternetCreationMode.CreateWaternet, WTIStabilityWaternetCreationMethod.CreateWaternet)]
-        [TestCase(WaternetCreationMode.FillInWaternetValues, WTIStabilityWaternetCreationMethod.FillInWaternetValues)]
+        [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
+        [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
         public void ConvertWaternetCreationMode_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
-                                                                                                                          WTIStabilityWaternetCreationMethod expectedWaternetCreationMode)
+                                                                                                                          WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Call
-            WTIStabilityWaternetCreationMethod convertedWaternetCreationMode = StabilityLocationCreatorHelper.ConvertWaternetCreationMode(waternetCreationMode);
+            WtiStabilityWaternetCreationMethod convertedWaternetCreationMode = StabilityLocationCreatorHelper.ConvertWaternetCreationMode(waternetCreationMode);
 
             // Assert
             Assert.AreEqual(expectedWaternetCreationMode, convertedWaternetCreationMode);
@@ -97,18 +97,18 @@
         }
 
         [Test]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
-        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WTIStabilityPlLineCreationMethod.RingtoetsWti2017)]
-        [TestCase(PlLineCreationMethod.DupuitStatic, WTIStabilityPlLineCreationMethod.DupuitStatic)]
-        [TestCase(PlLineCreationMethod.DupuitDynamic, WTIStabilityPlLineCreationMethod.DupuitDynamic)]
-        [TestCase(PlLineCreationMethod.Sensors, WTIStabilityPlLineCreationMethod.Sensors)]
-        [TestCase(PlLineCreationMethod.None, WTIStabilityPlLineCreationMethod.None)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WtiStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WtiStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
+        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
+        [TestCase(PlLineCreationMethod.DupuitStatic, WtiStabilityPlLineCreationMethod.DupuitStatic)]
+        [TestCase(PlLineCreationMethod.DupuitDynamic, WtiStabilityPlLineCreationMethod.DupuitDynamic)]
+        [TestCase(PlLineCreationMethod.Sensors, WtiStabilityPlLineCreationMethod.Sensors)]
+        [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
         public void ConvertPlLineCreationMethod_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
-                                                                                                                          WTIStabilityPlLineCreationMethod expectedPlLineCreationMethod)
+                                                                                                                          WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Call
-            WTIStabilityPlLineCreationMethod actualPlLineCreationMethod = StabilityLocationCreatorHelper.ConvertPlLineCreationMethod(plLineCreationMethod);
+            WtiStabilityPlLineCreationMethod actualPlLineCreationMethod = StabilityLocationCreatorHelper.ConvertPlLineCreationMethod(plLineCreationMethod);
 
             // Assert
             Assert.AreEqual(expectedPlLineCreationMethod, actualPlLineCreationMethod);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs	(.../SurfaceLineCreatorTest.cs)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs	(.../SurfaceLineCreatorTest.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -29,7 +29,7 @@
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input;
 using Ringtoets.MacroStabilityInwards.Primitives;
 using LandwardDirection = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection;
-using WTIStabilityLandwardDirection = Deltares.WTIStability.Data.Geo.LandwardDirection;
+using WtiStabilityLandwardDirection = Deltares.WTIStability.Data.Geo.LandwardDirection;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
@@ -260,10 +260,10 @@
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, message);
         }
 
-        [TestCase(LandwardDirection.PositiveX, WTIStabilityLandwardDirection.PositiveX)]
-        [TestCase(LandwardDirection.NegativeX, WTIStabilityLandwardDirection.NegativeX)]
+        [TestCase(LandwardDirection.PositiveX, WtiStabilityLandwardDirection.PositiveX)]
+        [TestCase(LandwardDirection.NegativeX, WtiStabilityLandwardDirection.NegativeX)]
         public void Create_ValidLandwardDirection_CreateSurfaceLineWithLandwardDirection(LandwardDirection landwardDirection,
-                                                                                         WTIStabilityLandwardDirection expectedLandwardDirection)
+                                                                                         WtiStabilityLandwardDirection expectedLandwardDirection)
         {
             // Setup
             const string name = "Surface line with landward direction";
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanStabilityLocationCreatorTest.cs
===================================================================
diff -u -r177a86fe2d7c3390004138070a95e52b6e3b13ae -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanStabilityLocationCreatorTest.cs	(.../UpliftVanStabilityLocationCreatorTest.cs)	(revision 177a86fe2d7c3390004138070a95e52b6e3b13ae)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanStabilityLocationCreatorTest.cs	(.../UpliftVanStabilityLocationCreatorTest.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -32,8 +32,8 @@
 using Ringtoets.MacroStabilityInwards.Primitives;
 using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
 using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
-using WTIStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
-using WTIStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
+using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
+using WtiStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
@@ -128,10 +128,10 @@
         }
 
         [Test]
-        [TestCase(WaternetCreationMode.CreateWaternet, WTIStabilityWaternetCreationMethod.CreateWaternet)]
-        [TestCase(WaternetCreationMode.FillInWaternetValues, WTIStabilityWaternetCreationMethod.FillInWaternetValues)]
+        [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
+        [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
         public void CreateExtreme_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
-                                                                                                            WTIStabilityWaternetCreationMethod expectedWaternetCreationMode)
+                                                                                                            WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
             var input = new UpliftVanCalculatorInput(
@@ -178,15 +178,15 @@
         }
 
         [Test]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
-        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WTIStabilityPlLineCreationMethod.RingtoetsWti2017)]
-        [TestCase(PlLineCreationMethod.DupuitStatic, WTIStabilityPlLineCreationMethod.DupuitStatic)]
-        [TestCase(PlLineCreationMethod.DupuitDynamic, WTIStabilityPlLineCreationMethod.DupuitDynamic)]
-        [TestCase(PlLineCreationMethod.Sensors, WTIStabilityPlLineCreationMethod.Sensors)]
-        [TestCase(PlLineCreationMethod.None, WTIStabilityPlLineCreationMethod.None)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WtiStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WtiStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
+        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
+        [TestCase(PlLineCreationMethod.DupuitStatic, WtiStabilityPlLineCreationMethod.DupuitStatic)]
+        [TestCase(PlLineCreationMethod.DupuitDynamic, WtiStabilityPlLineCreationMethod.DupuitDynamic)]
+        [TestCase(PlLineCreationMethod.Sensors, WtiStabilityPlLineCreationMethod.Sensors)]
+        [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
         public void CreateExtreme_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
-                                                                                                            WTIStabilityPlLineCreationMethod expectedPlLineCreationMethod)
+                                                                                                            WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
             var input = new UpliftVanCalculatorInput(
@@ -267,8 +267,8 @@
 
             // Assert
             Assert.AreEqual(DikeSoilScenario.SandDikeOnClay, location.DikeSoilScenario);
-            Assert.AreEqual(WTIStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
-            Assert.AreEqual(WTIStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
+            Assert.AreEqual(WtiStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
+            Assert.AreEqual(WtiStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
             Assert.AreEqual(assessmentLevel, location.WaterLevelRiver);
             Assert.AreEqual(assessmentLevel, location.HeadInPlLine3);
             Assert.AreEqual(assessmentLevel, location.HeadInPlLine4);
@@ -384,10 +384,10 @@
         }
 
         [Test]
-        [TestCase(WaternetCreationMode.CreateWaternet, WTIStabilityWaternetCreationMethod.CreateWaternet)]
-        [TestCase(WaternetCreationMode.FillInWaternetValues, WTIStabilityWaternetCreationMethod.FillInWaternetValues)]
+        [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
+        [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
         public void CreateDaily_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
-                                                                                                          WTIStabilityWaternetCreationMethod expectedWaternetCreationMode)
+                                                                                                          WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
             var input = new UpliftVanCalculatorInput(
@@ -434,15 +434,15 @@
         }
 
         [Test]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
-        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WTIStabilityPlLineCreationMethod.RingtoetsWti2017)]
-        [TestCase(PlLineCreationMethod.DupuitStatic, WTIStabilityPlLineCreationMethod.DupuitStatic)]
-        [TestCase(PlLineCreationMethod.DupuitDynamic, WTIStabilityPlLineCreationMethod.DupuitDynamic)]
-        [TestCase(PlLineCreationMethod.Sensors, WTIStabilityPlLineCreationMethod.Sensors)]
-        [TestCase(PlLineCreationMethod.None, WTIStabilityPlLineCreationMethod.None)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WtiStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WtiStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
+        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
+        [TestCase(PlLineCreationMethod.DupuitStatic, WtiStabilityPlLineCreationMethod.DupuitStatic)]
+        [TestCase(PlLineCreationMethod.DupuitDynamic, WtiStabilityPlLineCreationMethod.DupuitDynamic)]
+        [TestCase(PlLineCreationMethod.Sensors, WtiStabilityPlLineCreationMethod.Sensors)]
+        [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
         public void CreateDaily_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
-                                                                                                          WTIStabilityPlLineCreationMethod expectedPlLineCreationMethod)
+                                                                                                          WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
             var input = new UpliftVanCalculatorInput(
@@ -522,8 +522,8 @@
 
             // Assert
             Assert.AreEqual(DikeSoilScenario.SandDikeOnClay, location.DikeSoilScenario);
-            Assert.AreEqual(WTIStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
-            Assert.AreEqual(WTIStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
+            Assert.AreEqual(WtiStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
+            Assert.AreEqual(WtiStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
             Assert.AreEqual(waterLevelRiverAverage, location.WaterLevelRiver);
             Assert.AreEqual(waterLevelRiverAverage, location.HeadInPlLine3);
             Assert.AreEqual(waterLevelRiverAverage, location.HeadInPlLine4);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs
===================================================================
diff -u -rcf4437d42715feee4622c9ae57fb9920485fb13f -r9f35261205f8f664dc06e652f6d264ad9fee7bd9
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs	(.../WaternetStabilityLocationCreatorTest.cs)	(revision cf4437d42715feee4622c9ae57fb9920485fb13f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs	(.../WaternetStabilityLocationCreatorTest.cs)	(revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9)
@@ -32,8 +32,8 @@
 using Ringtoets.MacroStabilityInwards.Primitives;
 using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
 using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
-using WTIStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
-using WTIStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
+using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
+using WtiStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
@@ -125,10 +125,10 @@
         }
 
         [Test]
-        [TestCase(WaternetCreationMode.CreateWaternet, WTIStabilityWaternetCreationMethod.CreateWaternet)]
-        [TestCase(WaternetCreationMode.FillInWaternetValues, WTIStabilityWaternetCreationMethod.FillInWaternetValues)]
+        [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
+        [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
         public void CreateExtreme_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
-                                                                                                            WTIStabilityWaternetCreationMethod expectedWaternetCreationMode)
+                                                                                                            WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
             var input = new WaternetCalculatorInput(
@@ -173,15 +173,15 @@
         }
 
         [Test]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
-        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WTIStabilityPlLineCreationMethod.RingtoetsWti2017)]
-        [TestCase(PlLineCreationMethod.DupuitStatic, WTIStabilityPlLineCreationMethod.DupuitStatic)]
-        [TestCase(PlLineCreationMethod.DupuitDynamic, WTIStabilityPlLineCreationMethod.DupuitDynamic)]
-        [TestCase(PlLineCreationMethod.Sensors, WTIStabilityPlLineCreationMethod.Sensors)]
-        [TestCase(PlLineCreationMethod.None, WTIStabilityPlLineCreationMethod.None)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WtiStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WtiStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
+        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
+        [TestCase(PlLineCreationMethod.DupuitStatic, WtiStabilityPlLineCreationMethod.DupuitStatic)]
+        [TestCase(PlLineCreationMethod.DupuitDynamic, WtiStabilityPlLineCreationMethod.DupuitDynamic)]
+        [TestCase(PlLineCreationMethod.Sensors, WtiStabilityPlLineCreationMethod.Sensors)]
+        [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
         public void CreateExtreme_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
-                                                                                                            WTIStabilityPlLineCreationMethod expectedPlLineCreationMethod)
+                                                                                                            WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
             var input = new WaternetCalculatorInput(
@@ -260,8 +260,8 @@
 
             // Assert
             Assert.AreEqual(DikeSoilScenario.SandDikeOnClay, location.DikeSoilScenario);
-            Assert.AreEqual(WTIStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
-            Assert.AreEqual(WTIStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
+            Assert.AreEqual(WtiStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
+            Assert.AreEqual(WtiStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
             Assert.AreEqual(assessmentLevel, location.WaterLevelRiver);
             Assert.AreEqual(assessmentLevel, location.HeadInPlLine3);
             Assert.AreEqual(assessmentLevel, location.HeadInPlLine4);
@@ -374,10 +374,10 @@
         }
 
         [Test]
-        [TestCase(WaternetCreationMode.CreateWaternet, WTIStabilityWaternetCreationMethod.CreateWaternet)]
-        [TestCase(WaternetCreationMode.FillInWaternetValues, WTIStabilityWaternetCreationMethod.FillInWaternetValues)]
+        [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)]
+        [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)]
         public void CreateDaily_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
-                                                                                                          WTIStabilityWaternetCreationMethod expectedWaternetCreationMode)
+                                                                                                          WtiStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
             var input = new WaternetCalculatorInput(
@@ -422,15 +422,15 @@
         }
 
         [Test]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
-        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
-        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WTIStabilityPlLineCreationMethod.RingtoetsWti2017)]
-        [TestCase(PlLineCreationMethod.DupuitStatic, WTIStabilityPlLineCreationMethod.DupuitStatic)]
-        [TestCase(PlLineCreationMethod.DupuitDynamic, WTIStabilityPlLineCreationMethod.DupuitDynamic)]
-        [TestCase(PlLineCreationMethod.Sensors, WTIStabilityPlLineCreationMethod.Sensors)]
-        [TestCase(PlLineCreationMethod.None, WTIStabilityPlLineCreationMethod.None)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WtiStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WtiStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
+        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)]
+        [TestCase(PlLineCreationMethod.DupuitStatic, WtiStabilityPlLineCreationMethod.DupuitStatic)]
+        [TestCase(PlLineCreationMethod.DupuitDynamic, WtiStabilityPlLineCreationMethod.DupuitDynamic)]
+        [TestCase(PlLineCreationMethod.Sensors, WtiStabilityPlLineCreationMethod.Sensors)]
+        [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)]
         public void CreateDaily_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
-                                                                                                          WTIStabilityPlLineCreationMethod expectedPlLineCreationMethod)
+                                                                                                          WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
             var input = new WaternetCalculatorInput(
@@ -508,8 +508,8 @@
 
             // Assert
             Assert.AreEqual(DikeSoilScenario.SandDikeOnClay, location.DikeSoilScenario);
-            Assert.AreEqual(WTIStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
-            Assert.AreEqual(WTIStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
+            Assert.AreEqual(WtiStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode);
+            Assert.AreEqual(WtiStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod);
             Assert.AreEqual(waterLevelRiverAverage, location.WaterLevelRiver);
             Assert.AreEqual(waterLevelRiverAverage, location.HeadInPlLine3);
             Assert.AreEqual(waterLevelRiverAverage, location.HeadInPlLine4);