Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r3689 -r3760
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3689)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3760)
@@ -62,11 +62,11 @@
         /// Creates the macro stability input.
         /// </summary>
         /// <param name="damKernelInput">The dam kernel input.</param>
-        /// <param name="failureMechanismParametersMStab">The failure mechanism parameters for MStab.</param>
+        /// <param name="mStabParameters">The parameters for MStab.</param>
         /// <param name="waterNet">The WaterNet.</param>
         /// <returns></returns>
         public MacroStabilityInput CreateMacroStabilityInput(DamKernelInput damKernelInput,
-            FailureMechanismParametersMStab failureMechanismParametersMStab, Waternet waterNet)
+            MStabParameters mStabParameters, Waternet waterNet)
         {
             soilsDictionary.Clear();
             var macroStabilityInput = new KernelMacroStabilityInput
@@ -75,9 +75,8 @@
                 PreprocessingInput = new PreprocessingInput()
             };
             macroStabilityInput.StabilityModel.UpliftVanCalculationGrid = new KernelUpliftVanCalculationGrid();
-
-            failureMechanismParametersMStab.MStabParameters.Model = failureMechanismParametersMStab.MStabParameters.Model;
-            TransferStabilityModelProperties(failureMechanismParametersMStab, macroStabilityInput.StabilityModel);
+            
+            TransferStabilityModelProperties(mStabParameters, macroStabilityInput.StabilityModel);
             TransferSoils(damKernelInput.Location.SoilList, macroStabilityInput.StabilityModel.Soils);
 
             macroStabilityInput.StabilityModel.ConstructionStages.Add(new ConstructionStage());
@@ -100,7 +99,7 @@
                 .FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition;
             
             SearchAreaConditions preprocessingSearchAreaConditions = macroStabilityInput.PreprocessingInput.SearchAreaConditions;
-            switch (failureMechanismParametersMStab.MStabParameters.Model)
+            switch (mStabParameters.Model)
             {
                 case MStabModelType.Bishop:
                     TransferBishopCalculationGridSettings(slipCircleDefinition, top, bottom,
@@ -117,26 +116,25 @@
                         preprocessingSearchAreaConditions.AutoTangentLines);
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(failureMechanismParametersMStab.MStabParameters.Model));
+                    throw new ArgumentOutOfRangeException(nameof(mStabParameters.Model));
             }
 
             lastStage.UniformLoads = new List<UniformLoad>();
             TransferUniformLoads(TrafficLoad, lastStage.UniformLoads);
             return macroStabilityInput;
         }
 
-        private void TransferStabilityModelProperties(FailureMechanismParametersMStab damFailureMechanismParametersMStab,
-            StabilityInput kernelStabilityInput)
+        private void TransferStabilityModelProperties(MStabParameters mStabParameters, StabilityInput kernelStabilityInput)
         {
             kernelStabilityInput.MoveGrid = true; // is not in DamEngine but MUST be true as we use the brute force approach.
             kernelStabilityInput.MaximumSliceWidth = 1.0; // is not in DamEngine datamodel
-            kernelStabilityInput.SearchAlgorithm = ConversionHelper.ConvertToMacroStabilitySearchMethod(damFailureMechanismParametersMStab.MStabParameters.SearchMethod);
+            kernelStabilityInput.SearchAlgorithm = ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabParameters.SearchMethod);
             if (kernelStabilityInput.SearchAlgorithm == SearchAlgorithm.Beeswarm)
             {
                 CreateDefaultBeeSwarmOptions(kernelStabilityInput);
             }
-            kernelStabilityInput.ModelOption = ConversionHelper.ConvertToModelOptions(damFailureMechanismParametersMStab.MStabParameters.Model);
-            kernelStabilityInput.Orientation = ConversionHelper.ConvertToGridOrientation(damFailureMechanismParametersMStab.MStabParameters.GridPosition);
+            kernelStabilityInput.ModelOption = ConversionHelper.ConvertToModelOptions(mStabParameters.Model);
+            kernelStabilityInput.Orientation = ConversionHelper.ConvertToGridOrientation(mStabParameters.GridPosition);
         }
 
         private void CreateDefaultBeeSwarmOptions(StabilityInput kernelStabilityInput)
@@ -371,8 +369,7 @@
             }
         }
         private void TransferUpliftVanCalculationGrid(UpliftVanCalculationGrid damUpliftVanCalculationGrid,
-            KernelUpliftVanCalculationGrid kernelUpliftVanCalculationGrid,
-            bool isAutoTangentLines)
+            KernelUpliftVanCalculationGrid kernelUpliftVanCalculationGrid, bool isAutoTangentLines)
         {
             if (damUpliftVanCalculationGrid == null) throw new ArgumentNullException(nameof(damUpliftVanCalculationGrid));
             if (kernelUpliftVanCalculationGrid == null) throw new ArgumentNullException(nameof(kernelUpliftVanCalculationGrid));
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r3694 -r3760
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3694)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3760)
@@ -108,7 +108,7 @@
             };
             // get the input for the CSharp wrapper
             var expectedMacrostabilityInput =
-                fillMacroStabilityWrapperInputFromEngine.CreateMacroStabilityInput(damKernelInput, expectedParametersMStab, expectedWaternet);
+                fillMacroStabilityWrapperInputFromEngine.CreateMacroStabilityInput(damKernelInput, expectedParametersMStab.MStabParameters, expectedWaternet);
             // reverse that input to the engine data
             var fillEngineFromMacroStabilityWrapperInput = new FillEngineFromMacroStabilityWrapperInput();
             fillEngineFromMacroStabilityWrapperInput.FillDamProjectDataFromKernelModel(expectedMacrostabilityInput);