Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r3654 -r3689
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3654)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3689)
@@ -36,6 +36,7 @@
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.TestHelpers;
 using Deltares.DamEngine.TestHelpers.Factories;
+using Deltares.MacroStability.CSharpWrapper.Output;
 using NUnit.Framework;
 using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
 using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage;
@@ -93,17 +94,26 @@
         [Test]
         public void TestValidate()
         {
-            var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            kernelWrapper.FailureMechanismParametersMStab = new FailureMechanismParametersMStab();
+            var kernelWrapper = new MacroStabilityInwardsKernelWrapper
+            {
+                FailureMechanismParametersMStab = new FailureMechanismParametersMStab
+                {
+                    MStabParameters =
+                    {
+                        Model = MStabModelType.UpliftVan
+                    }
+                }
+            };
 
             // Validate without setting values. Expected error messages.
-            var macroStabilityInput1 = new MacroStabilityKernelDataInput();
-            var macroStabilityOutput1 = new MacroStabilityOutput();
-            macroStabilityOutput1.CalculationResult = CalculationResult.NoRun;
-            List<LogMessage> messages;
-            var errorCount = kernelWrapper.Validate(macroStabilityInput1, macroStabilityOutput1, out messages);
+            var macroStabilityInput = new MacroStabilityKernelDataInput();
+            var macroStabilityOutput = new MacroStabilityOutput
+            {
+                CalculationResult = CalculationResult.NoRun
+            };
+            var errorCount = kernelWrapper.Validate(macroStabilityInput, macroStabilityOutput, out var messages);
             Assert.IsTrue(errorCount > 0);
-            Assert.AreEqual(CalculationResult.InvalidInputData, macroStabilityOutput1.CalculationResult);
+            Assert.AreEqual(CalculationResult.InvalidInputData, macroStabilityOutput.CalculationResult);
 
             // Validate the input when valid input is provided. Expected no messages.
             var kernelInput = CreateDamKernelInputForTest();
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r3653 -r3689
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3653)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3689)
@@ -312,12 +312,12 @@
         {
             kernelSearchAreaConditions.AutoSearchArea =
                 slipCircleDefinition.GridSizeDetermination == GridSizeDetermination.Automatic;
-            kernelSearchAreaConditions.AutoTangentLines = slipCircleDefinition.UpliftVanTangentLinesDefinition ==
-                                                          TangentLinesDefinition.OnBoundaryLines;
+            kernelSearchAreaConditions.AutoTangentLines = 
+                slipCircleDefinition.BishopTangentLinesDefinition == TangentLinesDefinition.OnBoundaryLines;
             if (kernelSearchAreaConditions.AutoTangentLines)
             {
                 kernelSearchAreaConditions.TangentLineNumber =
-                    Convert.ToInt32(Math.Floor((top - bottom) / slipCircleDefinition.UpliftVanTangentLinesDistance) + 1);
+                    Convert.ToInt32(Math.Floor((top - bottom) / slipCircleDefinition.BishopTangentLinesDistance) + 1);
                 kernelSearchAreaConditions.TangentLineZTop = top;
                 kernelSearchAreaConditions.TangentLineZBottom = bottom;
             }
@@ -332,8 +332,8 @@
         {
             kernelSearchAreaConditions.AutoSearchArea =
                 slipCircleDefinition.GridSizeDetermination == GridSizeDetermination.Automatic;
-            kernelSearchAreaConditions.AutoTangentLines = slipCircleDefinition.UpliftVanTangentLinesDefinition ==
-                TangentLinesDefinition.OnBoundaryLines;
+            kernelSearchAreaConditions.AutoTangentLines = 
+                slipCircleDefinition.UpliftVanTangentLinesDefinition == TangentLinesDefinition.OnBoundaryLines;
             if (kernelSearchAreaConditions.AutoTangentLines)
             {
                 kernelSearchAreaConditions.TangentLineNumber =