Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamFailureMechanismeCalculationSpecificationTest.cs
===================================================================
diff -u -r6436 -r6817
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamFailureMechanismeCalculationSpecificationTest.cs	(.../DamFailureMechanismeCalculationSpecificationTest.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamFailureMechanismeCalculationSpecificationTest.cs	(.../DamFailureMechanismeCalculationSpecificationTest.cs)	(revision 6817)
@@ -110,7 +110,7 @@
         [TestCase(FailureMechanismSystemType.StabilityInside, true)]
         [TestCase(FailureMechanismSystemType.StabilityOutside, false)]
         [TestCase(FailureMechanismSystemType.Piping, false)]
-        public void IsVisible_WithFailureMechanismTypeAndCalledWithFailureMechanismeParamatersMStabProperty_ReturnsExpectedResult(
+        public void IsVisible_WithFailureMechanismTypeAndCalledWithStabilityParametersProperty_ReturnsExpectedResult(
             FailureMechanismSystemType failureMechanismSystemType, bool expectedVisibility)
         {
             // Setup
@@ -120,7 +120,7 @@
             };
 
             // Call
-            bool isVisible = specification.IsVisible(nameof(DamFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab));
+            bool isVisible = specification.IsVisible(nameof(DamFailureMechanismeCalculationSpecification.StabilityParameters));
 
             // Assert
             Assert.That(isVisible, Is.EqualTo(expectedVisibility));
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs
===================================================================
diff -u -r6793 -r6817
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs	(.../ProjectLoader.cs)	(revision 6793)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs	(.../ProjectLoader.cs)	(revision 6817)
@@ -52,7 +52,7 @@
             var damCalculationSpecification = new DamFailureMechanismeCalculationSpecification
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside,
-                FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab
+                StabilityParameters = new StabilityParameters
                 {
                     MStabParameters = mstabParameters
                 }
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs
===================================================================
diff -u -r6436 -r6817
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(.../FailureMechanismeParamatersMStabXmlHandler.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(.../StabilityParametersXmlHandler.cs)	(revision 6817)
@@ -32,7 +32,7 @@
 /// This handler is responsible for handling an object which has been created with the SurfaceLine type.
 /// Since the old SurfaceLine has been refactored, this handler will convert the old SurfaceLine to a SurfaceLine2.
 /// </summary>
-public class FailureMechanismeParamatersMStabXmlHandler : IXmlHandler
+public class StabilityParametersXmlHandler : IXmlHandler
 {
     /// <summary>
     /// Not implemented for this class.
@@ -48,21 +48,21 @@
     public void SetVersion(string version) {}
 
     /// <summary>
-    /// This method returns true for a <see cref="FailureMechanismeParamatersMStab"/> type and the <see cref="FailureMechanismeParamatersMStab.SurfaceLine"/>
+    /// This method returns true for a <see cref="StabilityParameters"/> type and the <see cref="StabilityParameters.SurfaceLine"/>
     /// property.
     /// </summary>
     /// <param name="type">The type to check for.</param>
     /// <param name="property">The property of the type to check for</param>
     /// <returns>True if type is <see cref="Location"/> and property is "SurfaceLine"</returns>
     public bool CanHandle(Type type, string property)
     {
-        return type == typeof(FailureMechanismeParamatersMStab) && property == StaticReflection.GetMemberName<FailureMechanismeParamatersMStab>(x => x.SurfaceLine);
+        return type == typeof(StabilityParameters) && property == StaticReflection.GetMemberName<StabilityParameters>(x => x.SurfaceLine);
     }
 
     /// <summary>
     /// If the <paramref name="value"/> is an old <see cref="BaseSurfaceLine"/> and the <paramref name="target"/> is a
-    /// <see cref="FailureMechanismeParamatersMStab"/>, the <paramref name="value"/> will be converted to the new <see cref="SurfaceLine2"/> 
-    /// and the <see cref="FailureMechanismeParamatersMStab.SurfaceLine"/> property is set for the target.
+    /// <see cref="StabilityParameters"/>, the <paramref name="value"/> will be converted to the new <see cref="SurfaceLine2"/> 
+    /// and the <see cref="StabilityParameters.SurfaceLine"/> property is set for the target.
     /// </summary>
     /// <param name="target">The target to set the handle the value for</param>
     /// <param name="value">The value to handle</param>
@@ -73,7 +73,7 @@
 #pragma warning restore CS0618 // Type or member is obsolete
         if (null != oldSurfaceLine)
         {
-            ((FailureMechanismeParamatersMStab) target).SurfaceLine = (new OldSurfaceLineToNewConverter()).Convert(oldSurfaceLine);
+            ((StabilityParameters) target).SurfaceLine = (new OldSurfaceLineToNewConverter()).Convert(oldSurfaceLine);
         }
     }
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r6793 -r6817
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 6793)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 6817)
@@ -344,26 +344,26 @@
 
     public DamFailureMechanismeCalculationSpecification Specification { get; set; }
 
-    public void Assign(SlipCircleDefinition slipCircleDefinition)
+    public void Assign(SlipCircleDefinition stabilityParameters)
     {
-        XCoordinateLastUpliftPoint = slipCircleDefinition.XCoordinateLastUpliftPoint;
-        UpliftVanTangentLinesDefinition = slipCircleDefinition.UpliftVanTangentLinesDefinition;
-        UpliftVanTangentLinesDistance = slipCircleDefinition.UpliftVanTangentLinesDistance;
-        UpliftVanGridSizeDetermination = slipCircleDefinition.UpliftVanGridSizeDetermination;
-        UpliftVanLeftGridVerticalPointCount = slipCircleDefinition.UpliftVanLeftGridVerticalPointCount;
-        UpliftVanLeftGridVerticalPointDistance = slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance;
-        UpliftVanLeftGridHorizontalPointCount = slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount;
-        UpliftVanLeftGridHorizontalPointDistance = slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance;
-        UpliftVanRightGridVerticalPointCount = slipCircleDefinition.UpliftVanRightGridVerticalPointCount;
-        UpliftVanRightGridVerticalPointDistance = slipCircleDefinition.UpliftVanRightGridVerticalPointDistance;
-        UpliftVanRightGridHorizontalPointCount = slipCircleDefinition.UpliftVanRightGridHorizontalPointCount;
-        UpliftVanRightGridHorizontalPointDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance;
-        BishopSearchAreaDetermination = slipCircleDefinition.BishopSearchAreaDetermination;
-        BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance;
-        BishopGridVerticalPointCount = slipCircleDefinition.BishopGridVerticalPointCount;
-        BishopGridVerticalPointDistance = slipCircleDefinition.BishopGridVerticalPointDistance;
-        BishopGridHorizontalPointCount = slipCircleDefinition.BishopGridHorizontalPointCount;
-        BishopGridHorizontalPointDistance = slipCircleDefinition.BishopGridHorizontalPointDistance;
+        XCoordinateLastUpliftPoint = stabilityParameters.XCoordinateLastUpliftPoint;
+        UpliftVanTangentLinesDefinition = stabilityParameters.UpliftVanTangentLinesDefinition;
+        UpliftVanTangentLinesDistance = stabilityParameters.UpliftVanTangentLinesDistance;
+        UpliftVanGridSizeDetermination = stabilityParameters.UpliftVanGridSizeDetermination;
+        UpliftVanLeftGridVerticalPointCount = stabilityParameters.UpliftVanLeftGridVerticalPointCount;
+        UpliftVanLeftGridVerticalPointDistance = stabilityParameters.UpliftVanLeftGridVerticalPointDistance;
+        UpliftVanLeftGridHorizontalPointCount = stabilityParameters.UpliftVanLeftGridHorizontalPointCount;
+        UpliftVanLeftGridHorizontalPointDistance = stabilityParameters.UpliftVanLeftGridHorizontalPointDistance;
+        UpliftVanRightGridVerticalPointCount = stabilityParameters.UpliftVanRightGridVerticalPointCount;
+        UpliftVanRightGridVerticalPointDistance = stabilityParameters.UpliftVanRightGridVerticalPointDistance;
+        UpliftVanRightGridHorizontalPointCount = stabilityParameters.UpliftVanRightGridHorizontalPointCount;
+        UpliftVanRightGridHorizontalPointDistance = stabilityParameters.UpliftVanRightGridHorizontalPointDistance;
+        BishopSearchAreaDetermination = stabilityParameters.BishopSearchAreaDetermination;
+        BishopTangentLinesDistance = stabilityParameters.BishopTangentLinesDistance;
+        BishopGridVerticalPointCount = stabilityParameters.BishopGridVerticalPointCount;
+        BishopGridVerticalPointDistance = stabilityParameters.BishopGridVerticalPointDistance;
+        BishopGridHorizontalPointCount = stabilityParameters.BishopGridHorizontalPointCount;
+        BishopGridHorizontalPointDistance = stabilityParameters.BishopGridHorizontalPointDistance;
     }
 
     public SlipCircleDefinition Clone()
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r6812 -r6817
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6812)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6817)
@@ -397,13 +397,13 @@
         if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null)
         {
             DamFailureMechanismeCalculationSpecification curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
-            if (curSpec.FailureMechanismeParamatersMStab != null && curSpec.FailureMechanismeParamatersMStab.MStabParameters != null)
+            if (curSpec.StabilityParameters != null && curSpec.StabilityParameters.MStabParameters != null)
             {
-                input.StabilityParameters = new StabilityParameters();
-                input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.FailureMechanismeParamatersMStab.MStabParameters.SearchMethod);
+                input.StabilityParameters = new DamEngine.Io.XmlInput.StabilityParameters();
+                input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.StabilityParameters.MStabParameters.SearchMethod);
                 input.StabilityParameters.IsUpliftVanRunOnlyWhenUpliftOccurs =
-                    curSpec.FailureMechanismeParamatersMStab.MStabParameters.IsUpliftVanRunOnlyWhenUpliftOccurs;
-                SlipCircleDefinition slipCircleDefinition = curSpec.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition;
+                    curSpec.StabilityParameters.MStabParameters.IsUpliftVanRunOnlyWhenUpliftOccurs;
+                SlipCircleDefinition slipCircleDefinition = curSpec.StabilityParameters.MStabParameters.SlipCircleDefinition;
                 if (slipCircleDefinition != null)
                 {
                     input.StabilityParameters.UpliftVanGridDetermination = ConversionHelper.ConvertToInputUpliftVanGridDetermination(slipCircleDefinition.UpliftVanGridSizeDetermination);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r6793 -r6817
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 6793)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 6817)
@@ -46,12 +46,12 @@
     {
         //Todo interface
         failureMechanismSystemType = FailureMechanismSystemType.StabilityInside;
-        FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
-        CalculationModel = FailureMechanismeParamatersMStab.MStabParameters.Model;
+        StabilityParameters = new StabilityParameters();
+        CalculationModel = StabilityParameters.MStabParameters.Model;
         ReadUserSettingsSlipCircleDefinition();
     }
 
-    [Browsable(false)] [Validate] public FailureMechanismeParamatersMStab FailureMechanismeParamatersMStab { get; set; }
+    [Browsable(false)] [Validate] public StabilityParameters StabilityParameters { get; set; }
 
     [Label("Failure mechanism")]
     [PropertyOrder(1, 0)]
@@ -131,10 +131,10 @@
             }
             else
             {
-                FailureMechanismeParamatersMStab.MStabParameters.Model = (StabilityModelType) value;
-                if (FailureMechanismeParamatersMStab.MStabParameters.Model != StabilityModelType.Bishop)
+                StabilityParameters.MStabParameters.Model = (StabilityModelType) value;
+                if (StabilityParameters.MStabParameters.Model != StabilityModelType.Bishop)
                 {
-                    FailureMechanismeParamatersMStab.MStabParameters.SearchMethod = StabilitySearchMethod.BeeSwarm;
+                    StabilityParameters.MStabParameters.SearchMethod = StabilitySearchMethod.BeeSwarm;
                 }
             }
 
@@ -147,11 +147,11 @@
     {
         get
         {
-            return FailureMechanismeParamatersMStab.MStabParameters.Model;
+            return StabilityParameters.MStabParameters.Model;
         }
         set
         {
-            FailureMechanismeParamatersMStab.MStabParameters.Model = value;
+            StabilityParameters.MStabParameters.Model = value;
             if (failureMechanismSystemType != FailureMechanismSystemType.Piping)
             {
                 CalculationModel = value;
@@ -164,7 +164,7 @@
         failureMechanismSystemType = damFailureMechanismeCalculation.FailureMechanismSystemType;
         calculationModel = damFailureMechanismeCalculation.CalculationModel;
         pipingModelType = damFailureMechanismeCalculation.pipingModelType;
-        FailureMechanismeParamatersMStab.Assign(damFailureMechanismeCalculation.FailureMechanismeParamatersMStab);
+        StabilityParameters.Assign(damFailureMechanismeCalculation.StabilityParameters);
         StabilityModelType = damFailureMechanismeCalculation.StabilityModelType;
         //assign interface
     }
@@ -183,28 +183,28 @@
     /// </summary>
     private void ReadUserSettingsSlipCircleDefinition()
     {
-        if (FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition == null)
+        if (StabilityParameters.MStabParameters.SlipCircleDefinition == null)
         {
-            FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition = new SlipCircleDefinition();
+            StabilityParameters.MStabParameters.SlipCircleDefinition = new SlipCircleDefinition();
         }
 
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = Settings.Default.SlipCircleUpliftVanTangentLinesDefinition;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDistance = Settings.Default.SlipCircleUpliftVanTangentLinesDistance;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopSearchAreaDetermination = Settings.Default.SlipCircleBishopSearchAreaDetermination;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDistance = Settings.Default.SlipCircleBishopTangentLinesDistance;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanGridSizeDetermination = Settings.Default.SlipCircleUpliftVanGridSizeDetermination;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointDistance;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointCount = Settings.Default.SlipCircleUpliftVanRightGridVerticalPointCount;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointCount = Settings.Default.SlipCircleBishopGridVerticalPointCount;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointDistance = Settings.Default.SlipCircleBishopGridVerticalPointDistance;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointCount = Settings.Default.SlipCircleBishopGridHorizontalPointCount;
-        FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointDistance = Settings.Default.SlipCircleBishopGridHorizontalPointDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = Settings.Default.SlipCircleUpliftVanTangentLinesDefinition;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDistance = Settings.Default.SlipCircleUpliftVanTangentLinesDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.BishopSearchAreaDetermination = Settings.Default.SlipCircleBishopSearchAreaDetermination;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.BishopTangentLinesDistance = Settings.Default.SlipCircleBishopTangentLinesDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanGridSizeDetermination = Settings.Default.SlipCircleUpliftVanGridSizeDetermination;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointCount = Settings.Default.SlipCircleUpliftVanRightGridVerticalPointCount;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointCount = Settings.Default.SlipCircleBishopGridVerticalPointCount;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointDistance = Settings.Default.SlipCircleBishopGridVerticalPointDistance;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointCount = Settings.Default.SlipCircleBishopGridHorizontalPointCount;
+        StabilityParameters.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointDistance = Settings.Default.SlipCircleBishopGridHorizontalPointDistance;
     }
 
     public override string ToString()
@@ -215,7 +215,7 @@
             (FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside))
         {
             //interface?
-            description += $" ({FailureMechanismeParamatersMStab.MStabParameters.Model})";
+            description += $" ({StabilityParameters.MStabParameters.Model})";
         }
 
         return description;
@@ -250,7 +250,7 @@
 
     public bool IsVisible(string property)
     {
-        if (Equals(property, nameof(FailureMechanismeParamatersMStab)))
+        if (Equals(property, nameof(StabilityParameters)))
         {
             switch (FailureMechanismSystemType)
             {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
===================================================================
diff -u -r6793 -r6817
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs	(.../FailureMechanismeParamatersMStab.cs)	(revision 6793)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs	(.../StabilityParameters.cs)	(revision 6817)
@@ -26,12 +26,12 @@
 
 namespace Deltares.Dam.Data;
 
-public class FailureMechanismeParamatersMStab : IAssignable<FailureMechanismeParamatersMStab>, ICloneable<FailureMechanismeParamatersMStab>
+public class StabilityParameters : IAssignable<StabilityParameters>, ICloneable<StabilityParameters>
 {
     /// <summary>
-    /// Additinal specifications/settings of calculation using MStab
+    /// Additional specifications/settings of stability calculation
     /// </summary>
-    public FailureMechanismeParamatersMStab()
+    public StabilityParameters()
     {
         MStabParameters = new MStabParameters();
         IsStabilityCheckOnUplift = false;
@@ -43,7 +43,7 @@
     public string SoilGeometry2DName { get; set; }
 
     /// <summary>
-    /// Indicates whether in stability calculation a check on uplift will be performed before performin UpliftVan calculation.
+    /// Indicates whether in stability calculation a check on uplift will be performed before performing UpliftVan calculation.
     /// Default it is false (set in constructor)
     /// </summary>
     public bool IsStabilityCheckOnUplift { get; set; }
@@ -55,28 +55,28 @@
     /// <summary>
     /// Performs the Assignment
     /// </summary>
-    /// <param name="failureMechanismeParametersMStab"></param>
-    public void Assign(FailureMechanismeParamatersMStab failureMechanismeParametersMStab)
+    /// <param name="stabilityParameters"></param>
+    public void Assign(StabilityParameters stabilityParameters)
     {
-        Location = failureMechanismeParametersMStab.Location;
-        SurfaceLine = failureMechanismeParametersMStab.SurfaceLine;
-        SoilProfile = failureMechanismeParametersMStab.SoilProfile;
-        SoilGeometry2DName = failureMechanismeParametersMStab.SoilGeometry2DName;
-        Design = failureMechanismeParametersMStab.Design;
+        Location = stabilityParameters.Location;
+        SurfaceLine = stabilityParameters.SurfaceLine;
+        SoilProfile = stabilityParameters.SoilProfile;
+        SoilGeometry2DName = stabilityParameters.SoilGeometry2DName;
+        Design = stabilityParameters.Design;
 
-        MStabParameters.Assign(failureMechanismeParametersMStab.MStabParameters);
+        MStabParameters.Assign(stabilityParameters.MStabParameters);
     }
 
     /// <summary>
     /// Clones the object.
     /// </summary>
-    /// <returns>FailureMechanismeParamatersMStab</returns>
-    public FailureMechanismeParamatersMStab Clone()
+    /// <returns>StabilityParameters</returns>
+    public StabilityParameters Clone()
     {
-        var failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
-        failureMechanismeParamatersMStab.MStabParameters = MStabParameters.Clone();
-        failureMechanismeParamatersMStab.Assign(this);
+        var stabilityParameters = new StabilityParameters();
+        stabilityParameters.MStabParameters = MStabParameters.Clone();
+        stabilityParameters.Assign(this);
 
-        return failureMechanismeParamatersMStab;
+        return stabilityParameters;
     }
 }
\ No newline at end of file
Fisheye: Tag 6817 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r6812 -r6817
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6812)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6817)
@@ -43,6 +43,7 @@
 using Soil = Deltares.Geotechnics.Soils.Soil;
 using SoilProfile1D = Deltares.Geotechnics.Soils.SoilProfile1D;
 using SoilProfile2D = Deltares.DamEngine.Io.XmlInput.SoilProfile2D;
+using StabilityParameters = Deltares.Dam.Data.StabilityParameters;
 using TimeSerie = Deltares.Dam.Data.TimeSerie;
 
 namespace Deltares.Dam.Tests.DamEngineIo
@@ -958,7 +959,7 @@
         {
             // Note: DamProjectCalculationSpecification created and filled by FillAnalysisSpecification
             DamFailureMechanismeCalculationSpecification curspec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
-            curspec.FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab
+            curspec.StabilityParameters = new StabilityParameters
             {
                 MStabParameters = new MStabParameters
                 {
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs
===================================================================
diff -u -r6734 -r6817
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 6734)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 6817)
@@ -81,8 +81,8 @@
                 if (value is DamFailureMechanismeCalculationSpecification specification)
                 {
                     currentSpecification = specification;
-                    BindSupport.Assign(SearchMethodPanelControl, currentSpecification.FailureMechanismeParamatersMStab.MStabParameters);
-                    BindSupport.Assign(CircleDefinitionPanelControl, currentSpecification.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition);
+                    BindSupport.Assign(SearchMethodPanelControl, currentSpecification.StabilityParameters.MStabParameters);
+                    BindSupport.Assign(CircleDefinitionPanelControl, currentSpecification.StabilityParameters.MStabParameters.SlipCircleDefinition);
                 }
             }
         }
@@ -114,26 +114,26 @@
         {
             if (currentSpecification != null)
             {
-                currentSpecification.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.Specification =
+                currentSpecification.StabilityParameters.MStabParameters.SlipCircleDefinition.Specification =
                     currentSpecification;
                 if (SearchMethodPanelControl.InvokeRequired)
                 {
-                    Action action = () => BindSupport.Assign(SearchMethodPanelControl, currentSpecification.FailureMechanismeParamatersMStab.MStabParameters);
+                    Action action = () => BindSupport.Assign(SearchMethodPanelControl, currentSpecification.StabilityParameters.MStabParameters);
                     SearchMethodPanelControl.Invoke(action);
                 }
                 else
                 {
-                    BindSupport.Assign(SearchMethodPanelControl, currentSpecification.FailureMechanismeParamatersMStab.MStabParameters);
+                    BindSupport.Assign(SearchMethodPanelControl, currentSpecification.StabilityParameters.MStabParameters);
                 }
 
                 if (CircleDefinitionPanelControl.InvokeRequired)
                 {
-                    Action action = () => BindSupport.Assign(CircleDefinitionPanelControl, currentSpecification.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition);
+                    Action action = () => BindSupport.Assign(CircleDefinitionPanelControl, currentSpecification.StabilityParameters.MStabParameters.SlipCircleDefinition);
                     CircleDefinitionPanelControl.Invoke(action);
                 }
                 else
                 {
-                    BindSupport.Assign(CircleDefinitionPanelControl, currentSpecification.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition);
+                    BindSupport.Assign(CircleDefinitionPanelControl, currentSpecification.StabilityParameters.MStabParameters.SlipCircleDefinition);
                 }
 
 //                if (selection.FailureMechanismSystemType != FailureMechanismSystemType.Piping && firstEdit)
Fisheye: Tag 6817 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs
===================================================================
diff -u -r6750 -r6817
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs	(.../DamProjectCalculationSpecificationPropertyControl.cs)	(revision 6750)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs	(.../DamProjectCalculationSpecificationPropertyControl.cs)	(revision 6817)
@@ -66,7 +66,7 @@
             DamFailureMechanismeCalculationSpecification selection = damProjectCalculationSpecification.CurrentSpecification;
             if (selection != null)
             {
-                selection.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.Specification = selection;
+                selection.StabilityParameters.MStabParameters.SlipCircleDefinition.Specification = selection;
                 BindSupport.Assign(damProjectCalculationOptionsPropertyControl1, selection);
                 if (firstEdit)
                 {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IAssignable.cs
===================================================================
diff -u -r6436 -r6817
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IAssignable.cs	(.../IAssignable.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IAssignable.cs	(.../IAssignable.cs)	(revision 6817)
@@ -26,5 +26,5 @@
 [ComVisible(true)]
 public interface IAssignable<T>
 {
-    void Assign(T t);
+    void Assign(T stabilityParameters);
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs
===================================================================
diff -u -r6436 -r6817
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs	(.../FailureMechanismeParamatersMStabXmlHandlerTest.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs	(.../StabilityParametersXmlHandlerTest.cs)	(revision 6817)
@@ -29,23 +29,23 @@
 
 namespace Deltares.Dam.Tests.IO
 {
-    public class FailureMechanismeParamatersMStabXmlHandlerTest
+    public class StabilityParametersXmlHandlerTest
     {
-        private FailureMechanismeParamatersMStabXmlHandler target;
+        private StabilityParametersXmlHandler target;
 
         [SetUp]
         public void SetUp()
         {
-            target = new FailureMechanismeParamatersMStabXmlHandler();
+            target = new StabilityParametersXmlHandler();
         }
 
         [Test]
         public void CanHandle_ForLocationAndSurfacelineProperty_ReturnsTrue()
         {
             // setup
-            string propertyName = StaticReflection.GetMemberName<FailureMechanismeParamatersMStab>(x => x.SurfaceLine);
+            string propertyName = StaticReflection.GetMemberName<StabilityParameters>(x => x.SurfaceLine);
             // call
-            bool result = target.CanHandle(typeof(FailureMechanismeParamatersMStab), propertyName);
+            bool result = target.CanHandle(typeof(StabilityParameters), propertyName);
 
             // assert
             Assert.That(result, Is.True);
@@ -79,7 +79,7 @@
         public void HandleObject_LocationTargetWithIncorrectValueType_NoChange()
         {
             // setup
-            var failureMechanism = new FailureMechanismeParamatersMStab();
+            var failureMechanism = new StabilityParameters();
             string locationSurfaceLineProperty = failureMechanism.GetMemberName(x => x.SurfaceLine);
             var surfaceLine2 = new SurfaceLine2();
 
@@ -98,7 +98,7 @@
         public void HandleObject_LocationTargetWithSurfaceLineValueType_ChangeToConvertedSurfaceLine2()
         {
             // setup
-            var failureMechanism = new FailureMechanismeParamatersMStab();
+            var failureMechanism = new StabilityParameters();
             string locationSurfaceLineProperty = failureMechanism.GetMemberName(x => x.SurfaceLine);
 #pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine();
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs
===================================================================
diff -u -r6802 -r6817
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs	(.../ComputeHelper.cs)	(revision 6802)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs	(.../ComputeHelper.cs)	(revision 6817)
@@ -66,7 +66,7 @@
             // Specify calculation
             damProjectData.MaxCalculationCores = computeStabilityProjectParameters.MaxCores;
             damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = computeStabilityProjectParameters.ModelType;
-            damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab
+            damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityParameters
                           .MStabParameters.SearchMethod = StabilitySearchMethod.Grid;
             if (computeStabilityProjectParameters.IsStabilityInside)
             {
Fisheye: Tag 6817 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r6815 -r6817
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6815)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6817)
@@ -221,7 +221,7 @@
             LocalizationManager.CultureChanged += (sender, args) => UpdateNavigatorTopItem();
 
             // for backward compatibility
-            XmlHandler.RegisterObjectHandler(new FailureMechanismeParamatersMStabXmlHandler());
+            XmlHandler.RegisterObjectHandler(new StabilityParametersXmlHandler());
 
             // This is to force the version type (Alpha, Pre-Alpha etc.) to be updated 
             mainForm.ReloadManager.ApplyCurrentUiCultureToAll();
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r6812 -r6817
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 6812)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 6817)
@@ -220,9 +220,9 @@
                 DamFailureMechanismeCalculationSpecification curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
                 if (curSpec != null)
                 {
-                    curSpec.FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
-                    curSpec.FailureMechanismeParamatersMStab.MStabParameters = new MStabParameters();
-                    MStabParameters curStabParamas = curSpec.FailureMechanismeParamatersMStab.MStabParameters;
+                    curSpec.StabilityParameters = new StabilityParameters();
+                    curSpec.StabilityParameters.MStabParameters = new MStabParameters();
+                    MStabParameters curStabParamas = curSpec.StabilityParameters.MStabParameters;
                     curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod);
                     curStabParamas.IsUpliftVanRunOnlyWhenUpliftOccurs = input.StabilityParameters.IsUpliftVanRunOnlyWhenUpliftOccurs;
                     curStabParamas.SlipCircleDefinition = new SlipCircleDefinition();