Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs
===================================================================
diff -u -r6521 -r6533
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs	(.../MacroStabilityCommonHelperTests.cs)	(revision 6521)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs	(.../MacroStabilityCommonHelperTests.cs)	(revision 6533)
@@ -276,7 +276,7 @@
     }
 
     [Test]
-    public void GivenDamEngineDataModelWhenFillingUpliftVanCalculationGridThenCorrectUpliftVanCalculationGridIsCreated()
+    public void GivenDamEngineDataModelWhenDeterminingUpliftVanCalculationGridThenCorrectUpliftVanCalculationGridIsCreated()
     {
         // Given DamEngine data (DamProjectData)
         DamProjectData expectedDamProjectData = FactoryForDamProjectData.CreateExampleDamProjectData();
@@ -296,7 +296,7 @@
         double xCoordinateLowestUpliftFactorPoint = (expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeTopAtPolder).X +
                                                      expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeToeAtPolder).X) * 0.5;
         UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = FillExpectedUpliftVanCalculationGrid();
-        UpliftVanCalculationGrid createdUpliftVanCalculationGrid = MacroStabilityCommonHelper.FillUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
+        UpliftVanCalculationGrid createdUpliftVanCalculationGrid = MacroStabilityCommonHelper.DetermineUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
         CompareHelper.CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, createdUpliftVanCalculationGrid, true);
     }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r6521 -r6533
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6521)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6533)
@@ -114,7 +114,7 @@
     /// </summary>
     /// <param name="damKernelInput">The dam kernel input.</param>
     /// <returns>Filled grid and tangent lines</returns>
-    public static BishopCalculationGrid FillBishopCalculationGrid(DamKernelInput damKernelInput)
+    public static BishopCalculationGrid DetermineBishopCalculationGrid(DamKernelInput damKernelInput)
     {
         SlipCircleDefinition slipCircleDefinition = damKernelInput.DamFailureMechanismeCalculationSpecification
                                                                   .FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition;
@@ -153,7 +153,7 @@
     /// <param name="damKernelInput"></param>
     /// <param name="xCoordinateLastUpliftPoint"></param>
     /// <returns>Filled UpliftVan calculation grids (left and right) and tangent lines</returns>
-    public static UpliftVanCalculationGrid FillUpliftVanCalculationGrid(DamKernelInput damKernelInput, double xCoordinateLastUpliftPoint)
+    public static UpliftVanCalculationGrid DetermineUpliftVanCalculationGrid(DamKernelInput damKernelInput, double xCoordinateLastUpliftPoint)
     {
         SlipCircleDefinition slipCircleDefinition = damKernelInput.DamFailureMechanismeCalculationSpecification
                                                                   .FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityKernelInputFromEngine.cs
===================================================================
diff -u -r6521 -r6533
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityKernelInputFromEngine.cs	(.../FillMacroStabilityKernelInputFromEngine.cs)	(revision 6521)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityKernelInputFromEngine.cs	(.../FillMacroStabilityKernelInputFromEngine.cs)	(revision 6533)
@@ -69,11 +69,11 @@
         UpliftVanCalculationGrid upliftVanCalculationGrid = null;
         if (mStabParameters.Model == StabilityModelType.Bishop)
         {
-            bishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
+            bishopCalculationGrid = MacroStabilityCommonHelper.DetermineBishopCalculationGrid(damKernelInput);
         }
         if (mStabParameters.Model == StabilityModelType.UpliftVan)
         {
-            upliftVanCalculationGrid = MacroStabilityCommonHelper.FillUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
+            upliftVanCalculationGrid = MacroStabilityCommonHelper.DetermineUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
         }
         var fullInputModelType = new FullInputModelType
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r6501 -r6533
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 6501)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 6533)
@@ -70,11 +70,11 @@
         BishopCalculationGrid bishopCalculationGrid = null;
         if (mStabParameters.Model == StabilityModelType.Bishop)
         {
-            bishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
+            bishopCalculationGrid = MacroStabilityCommonHelper.DetermineBishopCalculationGrid(damKernelInput);
         }
         if (mStabParameters.Model == StabilityModelType.UpliftVan)
         {
-            upliftVanCalculationGrid = MacroStabilityCommonHelper.FillUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
+            upliftVanCalculationGrid = MacroStabilityCommonHelper.DetermineUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
         }
         var macroStabilityInput = new KernelMacroStabilityInput
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r6505 -r6533
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 6505)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 6533)
@@ -85,7 +85,7 @@
         };
         double xCoordinateLowestUpliftFactorPoint = (expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeTopAtPolder).X + 
                                                      expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeToeAtPolder).X) * 0.5;
-        UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = MacroStabilityCommonHelper.FillUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
+        UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = MacroStabilityCommonHelper.DetermineUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
         // get the input for the CSharp wrapper
         MacroStabilityInput expectedMacrostabilityInput =
             fillMacroStabilityWrapperInputFromEngine.CreateMacroStabilityInput(damKernelInput, expectedParametersMStab.MStabParameters, expectedWaternet);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs
===================================================================
diff -u -r6527 -r6533
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs	(.../EngineToMacroStabilityKernelInputTests.cs)	(revision 6527)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs	(.../EngineToMacroStabilityKernelInputTests.cs)	(revision 6533)
@@ -85,12 +85,12 @@
             damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = tangentLinesDefinition;
             xCoordinateLowestUpliftFactorPoint = (expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeTopAtPolder).X +
                                                          expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.DikeToeAtPolder).X) * 0.5;
-            expectedUpliftVanCalculationGrid = MacroStabilityCommonHelper.FillUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
+            expectedUpliftVanCalculationGrid = MacroStabilityCommonHelper.DetermineUpliftVanCalculationGrid(damKernelInput, xCoordinateLowestUpliftFactorPoint);
         }
         else
         {
             //Note: Bishop only uses auto search area setting, not the tangent line definition 
-            expectedBishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
+            expectedBishopCalculationGrid = MacroStabilityCommonHelper.DetermineBishopCalculationGrid(damKernelInput);
         }
         TrafficLoad expectedTrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput);
         
@@ -112,7 +112,7 @@
             SlipCircleDefinition expectedUpliftVanSlipCircleDefinition = expectedParametersMStab.MStabParameters.SlipCircleDefinition;
             CompareUpliftVanCalculationGridSettings(expectedUpliftVanSlipCircleDefinition, fullInputModel.PreprocessingInput.SearchAreaConditions);
             bool areTangentLineSpecified = expectedUpliftVanSlipCircleDefinition.UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified;
-            CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, fullInputModel.StabilityModel.UpliftVanCalculationGrid, areTangentLineSpecified);
+            CompareUpliftVanSlipCircleDefinition(expectedUpliftVanCalculationGrid, fullInputModel.StabilityModel.UpliftVanCalculationGrid, areTangentLineSpecified);
         }
         else
         {
@@ -138,7 +138,7 @@
             Name = "Test Phreatic line"
         };
         waterNet.PhreaticLine = phreaticLine;
-        SetGeometry(phreaticLine, random.Next());
+        FillGeometryPointString(phreaticLine, random.Next());
 
         // Head line
         const int nrOfHeadLines = 10;
@@ -148,7 +148,7 @@
             {
                 Name = $"Test Head line{i}"
             };
-            SetGeometry(headLine, random.Next());
+            FillGeometryPointString(headLine, random.Next());
             waterNet.HeadLineList.Add(headLine);
         }
 
@@ -160,14 +160,14 @@
                 Name = $"Test Waternet line {i}",
                 HeadLine = waterNet.HeadLineList[i]
             };
-            SetGeometry(waternetLine, random.Next());
+            FillGeometryPointString(waternetLine, random.Next());
             waterNet.WaternetLineList.Add(waternetLine);
         }
 
         return waterNet;
     }
 
-    private static void SetGeometry(GeometryPointString geometry, int seed)
+    private static void FillGeometryPointString(GeometryPointString geometry, int seed)
     {
         var random = new Random(seed);
         for (var i = 0; i < 10; i++)
@@ -242,7 +242,7 @@
         });
     }
 
-    private static void CompareUpliftVanCalculationGrid(UpliftVanCalculationGrid expectedSlipPlaneUpliftVan,
+    private static void CompareUpliftVanSlipCircleDefinition(UpliftVanCalculationGrid expectedSlipPlaneUpliftVan,
                                                         UpliftVanCalculationGridType actualSlipPlaneUpliftVan, bool areTangentLineSpecified)
     {
         Assert.Multiple(() =>