Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs
===================================================================
diff -u -r4891 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs	(.../LocationPropertyImporterTest.cs)	(revision 4891)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs	(.../LocationPropertyImporterTest.cs)	(revision 6262)
@@ -91,7 +91,7 @@
             const double doubleTestValue = 111.1;
             const bool boolTestValue = true;
             const PLLineCreationMethod plLineCreationMethodTestValue = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD;
-            const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ForbiddenZone;
+            const StabilityZoneType mstabZonesTypeTestValue = StabilityZoneType.ForbiddenZone;
             const StabilityDesignMethod stabilityDesignMethodTestValue = StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption;
 
             var mockImporter = Substitute.For<LocationPropertyImporter>();
@@ -187,7 +187,7 @@
                 StabilityShoulderGrowDeltaX = doubleInitialValue,
                 StabilitySlopeAdaptionDeltaX = doubleInitialValue,
                 XSoilGeometry2DOrigin = doubleInitialValue,
-                StabilityZoneType = MStabZonesType.NoZones,
+                StabilityZoneType = StabilityZoneType.NoZones,
                 ForbiddenZoneFactor = doubleInitialValue,
                 UseNewDikeTopWidth = boolInitialValue,
                 NewDikeTopWidth = doubleInitialValue,
@@ -301,7 +301,7 @@
             const string stringInitialValue = "someValue";
             const double doubleInitialValue = 99.9;
             const PLLineCreationMethod plLineCreationMethodInitialValue = PLLineCreationMethod.ExpertKnowledgeRRD;
-            const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ForbiddenZone;
+            const StabilityZoneType mstabZonesTypeTestValue = StabilityZoneType.ForbiddenZone;
             const StabilityDesignMethod stabilityDesignMethodTestValue = StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption;
             const IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureTestValue = IntrusionVerticalWaterPressureType.Standard;
             const string stringTestValue = "testValue";
@@ -400,7 +400,7 @@
                 StabilityShoulderGrowDeltaX = doubleInitialValue,
                 StabilitySlopeAdaptionDeltaX = doubleInitialValue,
                 XSoilGeometry2DOrigin = doubleInitialValue,
-                StabilityZoneType = MStabZonesType.NoZones,
+                StabilityZoneType = StabilityZoneType.NoZones,
                 SlopeDampingPiezometricHeightPolderSide = doubleInitialValue,
                 IntrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard,
                 DikeTableHeight = doubleInitialValue,
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r6200 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6200)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6262)
@@ -999,7 +999,7 @@
             {
                 MStabParameters = new MStabParameters
                 {
-                    SearchMethod = MStabSearchMethod.Grid,
+                    SearchMethod = StabilitySearchMethod.Grid,
                     SlipCircleDefinition = new SlipCircleDefinition
                     {
                         UpliftVanGridSizeDetermination = GridSizeDetermination.Specified,
@@ -1104,7 +1104,7 @@
                 }
 
                 location.DikeEmbankmentMaterial = "DikeMat";
-                location.StabilityZoneType = MStabZonesType.NoZones;
+                location.StabilityZoneType = StabilityZoneType.NoZones;
                 location.ForbiddenZoneFactor = 10.0 * i + 0.42;
                 location.TrafficLoad = 10.0 * i + 0.44;
                 location.TL_DegreeOfConsolidation = 10.0 * i + 0.45;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r4539 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 6262)
@@ -318,7 +318,7 @@
         public double? StabilitySlopeAdaptionDeltaX { get; set; }
         public double? SlopeDampingPiezometricHeightPolderSide { get; set; }
         public StabilityDesignMethod? StabilityDesignMethod { get; set; }
-        public MStabZonesType? StabilityZoneType { get; set; }
+        public StabilityZoneType? StabilityZoneType { get; set; }
         public double? ForbiddenZoneFactor { get; set; }
         public double? SlopeAdaptionStartCotangent { get; set; }
         public double? SlopeAdaptionEndCotangent { get; set; }
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r5996 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 5996)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 6262)
@@ -513,9 +513,9 @@
 
             //Check locations
             Assert.That(dike.Locations.Count, Is.EqualTo(2));
-            Assert.That(dike.Locations[0].StabilityZoneType, Is.EqualTo(MStabZonesType.NoZones));
+            Assert.That(dike.Locations[0].StabilityZoneType, Is.EqualTo(StabilityZoneType.NoZones));
             Assert.That(dike.Locations[0].ForbiddenZoneFactor, Is.EqualTo(0.5).Within(cTolerance));
-            Assert.That(dike.Locations[1].StabilityZoneType, Is.EqualTo(MStabZonesType.ForbiddenZone));
+            Assert.That(dike.Locations[1].StabilityZoneType, Is.EqualTo(StabilityZoneType.ForbiddenZone));
             Assert.That(dike.Locations[1].ForbiddenZoneFactor, Is.EqualTo(0.9).Within(cTolerance));
         }
     }
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/FactoryForStabilityTests.cs
===================================================================
diff -u -r6203 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/FactoryForStabilityTests.cs	(.../FactoryForStabilityTests.cs)	(revision 6203)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/FactoryForStabilityTests.cs	(.../FactoryForStabilityTests.cs)	(revision 6262)
@@ -33,9 +33,9 @@
         {
             return new MStabParameters
             {
-                Model = MStabModelType.Bishop,
-                SearchMethod = MStabSearchMethod.Grid,
-                GridPosition = MStabGridPosition.Right
+                Model = StabilityModelType.Bishop,
+                SearchMethod = StabilitySearchMethod.Grid,
+                GridPosition = StabilityGridPosition.Right
             };
         }
     }
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r6207 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6207)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6262)
@@ -250,17 +250,17 @@
     }
 
     [Test]
-    [TestCase(MStabZonesType.NoZones, LocationStabilityOptionsZoneType.NoZones)]
-    [TestCase(MStabZonesType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones)]
-    public void CanConvertToInputZoneType(MStabZonesType zoneType, LocationStabilityOptionsZoneType inputZoneType)
+    [TestCase(StabilityZoneType.NoZones, LocationStabilityOptionsZoneType.NoZones)]
+    [TestCase(StabilityZoneType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones)]
+    public void CanConvertToInputZoneType(StabilityZoneType zoneType, LocationStabilityOptionsZoneType inputZoneType)
     {
         Assert.That(ConversionHelper.ConvertToInputZoneType(zoneType), Is.EqualTo(inputZoneType));
     }
 
     [Test]
-    [TestCase(LocationStabilityOptionsZoneType.NoZones, MStabZonesType.NoZones)]
-    [TestCase(LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone)]
-    public void CanConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType, MStabZonesType zoneType)
+    [TestCase(LocationStabilityOptionsZoneType.NoZones, StabilityZoneType.NoZones)]
+    [TestCase(LocationStabilityOptionsZoneType.ForbiddenZones, StabilityZoneType.ForbiddenZone)]
+    public void CanConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType, StabilityZoneType zoneType)
     {
         Assert.That(ConversionHelper.ConvertToZoneType(inputZoneType), Is.EqualTo(zoneType));
     }
@@ -287,17 +287,17 @@
     }
 
     [Test]
-    [TestCase(MStabSearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid)]
-    [TestCase(MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm)]
-    public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, StabilityParametersSearchMethod inputSearchMethod)
+    [TestCase(StabilitySearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid)]
+    [TestCase(StabilitySearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm)]
+    public void CanConvertToInputSearchMethod(StabilitySearchMethod searchMethod, StabilityParametersSearchMethod inputSearchMethod)
     {
         Assert.That(ConversionHelper.ConvertToInputSearchMethod(searchMethod), Is.EqualTo(inputSearchMethod));
     }
 
     [Test]
-    [TestCase(StabilityParametersSearchMethod.CalculationGrid, MStabSearchMethod.Grid)]
-    [TestCase(StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm)]
-    public void CanConvertToSearchMethod(StabilityParametersSearchMethod inputSearchMethod, MStabSearchMethod searchMethod)
+    [TestCase(StabilityParametersSearchMethod.CalculationGrid, StabilitySearchMethod.Grid)]
+    [TestCase(StabilityParametersSearchMethod.BeeSwarm, StabilitySearchMethod.BeeSwarm)]
+    public void CanConvertToSearchMethod(StabilityParametersSearchMethod inputSearchMethod, StabilitySearchMethod searchMethod)
     {
         Assert.That(ConversionHelper.ConvertToSearchMethod(inputSearchMethod), Is.EqualTo(searchMethod));
     }
@@ -403,38 +403,38 @@
     }
 
     [Test]
-    [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)]
-    [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
-    [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)]
-    public void CanConvertToInputMStabModelType(MStabModelType mStabModelType, InputStabilityModelType inputMStabModelType)
+    [TestCase(StabilityModelType.Bishop, InputStabilityModelType.Bishop)]
+    [TestCase(StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
+    [TestCase(StabilityModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)]
+    public void CanConvertToInputMStabModelType(StabilityModelType stabilityModelType, InputStabilityModelType inputMStabModelType)
     {
-        Assert.That(ConversionHelper.ConvertToInputMStabModelType(mStabModelType), Is.EqualTo(inputMStabModelType));
+        Assert.That(ConversionHelper.ConvertToInputMStabModelType(stabilityModelType), Is.EqualTo(inputMStabModelType));
     }
 
     [Test]
-    [TestCase(InputStabilityModelType.Bishop, MStabModelType.Bishop)]
-    [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
-    [TestCase(InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)]
-    public void CanConvertToMStabModelType(InputStabilityModelType inputMStabModelType, MStabModelType mStabModelType)
+    [TestCase(InputStabilityModelType.Bishop, StabilityModelType.Bishop)]
+    [TestCase(InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)]
+    [TestCase(InputStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan)]
+    public void CanConvertToMStabModelType(InputStabilityModelType inputMStabModelType, StabilityModelType stabilityModelType)
     {
-        Assert.That(ConversionHelper.ConvertToMStabModelType(inputMStabModelType), Is.EqualTo(mStabModelType));
+        Assert.That(ConversionHelper.ConvertToMStabModelType(inputMStabModelType), Is.EqualTo(stabilityModelType));
     }
 
     [Test]
-    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)]
-    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
-    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)]
+    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, StabilityModelType.Bishop)]
+    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)]
+    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan)]
     public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType,
-                                                     MStabModelType stabilityModelType)
+                                                     StabilityModelType stabilityModelType)
     {
         Assert.That(ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType), Is.EqualTo(outputStabilityModelType));
     }
 
     [Test]
-    [TestCase(MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)]
-    [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)]
-    [TestCase(MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)]
-    public void CanConvertToStabilityModelType(MStabModelType stabilityModelType,
+    [TestCase(StabilityModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)]
+    [TestCase(StabilityModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)]
+    [TestCase(StabilityModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)]
+    public void CanConvertToStabilityModelType(StabilityModelType stabilityModelType,
                                                DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType)
     {
         Assert.That(ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType), Is.EqualTo(stabilityModelType));
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r5379 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 5379)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 6262)
@@ -1483,7 +1483,7 @@
     [Unit(UnitType.None)]
     [PropertyOrder(2, 3)]
     [ReadOnly(true)]
-    public MStabModelType? StabilityModel { get; set; }
+    public StabilityModelType? StabilityModel { get; set; }
 
     [Unit(UnitType.None)]
     [Format("F3")]
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r6220 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 6220)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 6262)
@@ -152,7 +152,7 @@
     private double stabilityShoulderGrowDeltaX = 2.0;
     private double stabilityShoulderGrowSlope = 1.0 / 3;
     private double stabilitySlopeAdaptionDeltaX = 2.0;
-    private MStabZonesType stabilityZoneType = MStabZonesType.NoZones;
+    private StabilityZoneType stabilityZoneType = Data.StabilityZoneType.NoZones;
 
     private SurfaceLine2 surfaceLine2;
     private double trafficLoad;
@@ -1383,7 +1383,7 @@
 
         if (parameterName.Equals(LocationParameterNames.StabilityZoneType))
         {
-            StabilityZoneType = (MStabZonesType) Enum.Parse(typeof(MStabZonesType), parameterValue);
+            StabilityZoneType = (StabilityZoneType) Enum.Parse(typeof(StabilityZoneType), parameterValue);
         }
 
         if (parameterName.Equals(LocationParameterNames.ForbiddenZoneFactor))
@@ -1596,7 +1596,7 @@
     [Description("Type of zone to be used in stability calculations")]
     [PropertyOrder(4, 10)]
     [Category(AllCategory)]
-    public MStabZonesType StabilityZoneType
+    public StabilityZoneType StabilityZoneType
     {
         get
         {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r6260 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 6260)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 6262)
@@ -50,7 +50,7 @@
         failureMechanismSystemType = FailureMechanismSystemType.StabilityInside;
         FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
         CalculationModel = FailureMechanismeParamatersMStab.MStabParameters.Model;
-        FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right;
+        FailureMechanismeParamatersMStab.MStabParameters.GridPosition = StabilityGridPosition.Right;
         ReadUserSettingsSlipCircleDefinition();
     }
 
@@ -84,10 +84,10 @@
                 switch (failureMechanismSystemType)
                 {
                     case FailureMechanismSystemType.StabilityInside:
-                        FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right;
+                        FailureMechanismeParamatersMStab.MStabParameters.GridPosition = StabilityGridPosition.Right;
                         break;
                     case FailureMechanismSystemType.StabilityOutside:
-                        FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
+                        FailureMechanismeParamatersMStab.MStabParameters.GridPosition = StabilityGridPosition.Left;
                         break;
                     case FailureMechanismSystemType.Piping:
                         PipingModelType = oldPipingModelType;
@@ -142,10 +142,10 @@
             }
             else
             {
-                FailureMechanismeParamatersMStab.MStabParameters.Model = (MStabModelType) value;
-                if (FailureMechanismeParamatersMStab.MStabParameters.Model != MStabModelType.Bishop)
+                FailureMechanismeParamatersMStab.MStabParameters.Model = (StabilityModelType) value;
+                if (FailureMechanismeParamatersMStab.MStabParameters.Model != Data.StabilityModelType.Bishop)
                 {
-                    FailureMechanismeParamatersMStab.MStabParameters.SearchMethod = MStabSearchMethod.BeeSwarm;
+                    FailureMechanismeParamatersMStab.MStabParameters.SearchMethod = StabilitySearchMethod.BeeSwarm;
                 }
             }
 
@@ -154,7 +154,7 @@
     }
 
     [Browsable(false)]
-    public MStabModelType StabilityModelType
+    public StabilityModelType StabilityModelType
     {
         get
         {
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs
===================================================================
diff -u -r5794 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs	(.../CsvImporterTests.cs)	(revision 5794)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs	(.../CsvImporterTests.cs)	(revision 6262)
@@ -517,8 +517,8 @@
         Assert.That(locationRecords[1].NewWidthDitchBottom, Is.EqualTo(1.4).Within(tolerance));
         Assert.That(locationRecords[1].NewSlopeAngleDitch, Is.EqualTo(1.5).Within(tolerance));
         Assert.That(locationRecords[1].NewDepthDitch, Is.EqualTo(1.6).Within(tolerance));
-        Assert.That(locationRecords[0].StabilityZoneType, Is.EqualTo(MStabZonesType.NoZones));
-        Assert.That(locationRecords[1].StabilityZoneType, Is.EqualTo(MStabZonesType.ForbiddenZone));
+        Assert.That(locationRecords[0].StabilityZoneType, Is.EqualTo(StabilityZoneType.NoZones));
+        Assert.That(locationRecords[1].StabilityZoneType, Is.EqualTo(StabilityZoneType.ForbiddenZone));
         Assert.That(locationRecords[0].ForbiddenZoneFactor, Is.EqualTo(0.5).Within(tolerance));
         Assert.That(locationRecords[1].ForbiddenZoneFactor, Is.EqualTo(0.9).Within(tolerance));
         Assert.That(locationRecords[0].PlLineOffsetBelowDikeCrestMiddle, Is.EqualTo(1.0).Within(tolerance));
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs
===================================================================
diff -u -r5978 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs	(.../FailureMechanismTests.cs)	(revision 5978)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs	(.../FailureMechanismTests.cs)	(revision 6262)
@@ -51,7 +51,7 @@
                 Assert.That(allCalculationResults[0].IsUplift, Is.EqualTo(false));
                 Assert.That(allCalculationResults[0].ProfileName, Is.EqualTo("DWP_1.stix"));
                 Assert.That(allCalculationResults[0].ProfileProbability, Is.EqualTo(100));
-                Assert.That(allCalculationResults[0].StabilityModel, Is.EqualTo(MStabModelType.Bishop));
+                Assert.That(allCalculationResults[0].StabilityModel, Is.EqualTo(StabilityModelType.Bishop));
                 Assert.That(allCalculationResults[0].SafetyFactor, Is.EqualTo(1.565).Within(tolerance3Decimals));
                 Assert.That(allCalculationResults[0].ShoulderHeight, Is.Null);
                 Assert.That(allCalculationResults[0].ToeAtPolderX, Is.Null);
@@ -112,7 +112,7 @@
                 Assert.That(allCalculationResults[1].IsUplift, Is.EqualTo(false));
                 Assert.That(allCalculationResults[1].ProfileName, Is.EqualTo("Segment_1_1D2"));
                 Assert.That(allCalculationResults[1].ProfileProbability, Is.EqualTo(2.43));
-                Assert.That(allCalculationResults[1].StabilityModel, Is.EqualTo(MStabModelType.Bishop));
+                Assert.That(allCalculationResults[1].StabilityModel, Is.EqualTo(StabilityModelType.Bishop));
                 // In version 19.2.1, the safety factor was 1.079
                 Assert.That(allCalculationResults[1].SafetyFactor, Is.EqualTo(1.129).Within(tolerance3Decimals));
                 Assert.That(allCalculationResults[1].ShoulderHeight, Is.EqualTo(null));
@@ -173,7 +173,7 @@
         /// <returns></returns>
         private static List<CsvExportData> ComputeStabilityOutsideProject(string projectFilename, int expectedLocations)
         {
-            return ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, false, expectedLocations, 1, out List<LogMessage> _);
+            return ComputeHelper.ComputeStabilityProject(projectFilename, StabilityModelType.Bishop, false, expectedLocations, 1, out List<LogMessage> _);
         }
     }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
===================================================================
diff -u -r6260 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 6260)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 6262)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Deltares.Standard.Attributes;
 
 namespace Deltares.Dam.Data;
@@ -57,17 +56,13 @@
     Piping
 }
 
-public enum MStabModelType
+public enum StabilityModelType
 {
     Bishop,
     UpliftVan,
     BishopUpliftVan
 }
 
-/// <summary>
-/// Both models Sellmeijer and Sellmeijer4Forces are not supported anymore
-/// but still present in this enum to be able to inform the user when opening old files where they were selected.
-/// </summary>
 public enum PipingModelType
 {
     Bligh,
@@ -80,19 +75,19 @@
     SoilProfile2D
 }
 
-public enum MStabSearchMethod
+public enum StabilitySearchMethod
 {
     Grid,
     BeeSwarm
 }
 
-public enum MStabGridPosition
+public enum StabilityGridPosition
 {
     Left,
     Right
 }
 
-public enum MStabZonesType
+public enum StabilityZoneType
 {
     [Label("No zones")]
     NoZones = 0,
@@ -135,12 +130,6 @@
     NotEvaluated
 }
 
-public enum LoadSituation //RWScenarios
-{
-    Dry,
-    Wet
-}
-
 public enum DataSourceTypeSensors //Sensors
 {
     Ignore,
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u -r6199 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 6199)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 6262)
@@ -166,12 +166,12 @@
         }
 
         [Test]
-        [TestCase(MStabModelType.Bishop, "OutputFileStabilityBishop.xml")]
-        [TestCase(MStabModelType.UpliftVan, "OutputFileStabilityUpliftVan.xml")]
-        public void SimpleTestStabilityInside(MStabModelType mStabModelType, string inputFilename)
+        [TestCase(StabilityModelType.Bishop, "OutputFileStabilityBishop.xml")]
+        [TestCase(StabilityModelType.UpliftVan, "OutputFileStabilityUpliftVan.xml")]
+        public void SimpleTestStabilityInside(StabilityModelType stabilityModelType, string inputFilename)
         {
-            DamProjectData inputProjectData = CreateInputProjectDataForStability(mStabModelType);
-            Output output = CreateTestOutputForStability(mStabModelType);
+            DamProjectData inputProjectData = CreateInputProjectDataForStability(stabilityModelType);
+            Output output = CreateTestOutputForStability(stabilityModelType);
 
             DamProjectData combinedDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(inputProjectData, output);
 
@@ -185,7 +185,7 @@
             Assert.That(combinedDamProjectData.DesignCalculations[0].ProfileName, Is.Not.EqualTo(""));
             Assert.That(combinedDamProjectData.DesignCalculations[0].Calculation, Is.Not.EqualTo(null));
             Assert.That(combinedDamProjectData.DesignCalculations[0].Calculation, Is.Not.EqualTo(""));
-            Assert.That(combinedDamProjectData.DesignCalculations[0].StabilityModel, Is.EqualTo(mStabModelType));
+            Assert.That(combinedDamProjectData.DesignCalculations[0].StabilityModel, Is.EqualTo(stabilityModelType));
             Assert.That(combinedDamProjectData.DesignCalculations[0].SafetyFactor, Is.EqualTo(0));
             Assert.That(combinedDamProjectData.DesignCalculations[0].StabilityShoulderHeight, Is.EqualTo(null));
             Assert.That(combinedDamProjectData.DesignCalculations[0].DikeLength, Is.EqualTo(null));
@@ -200,7 +200,7 @@
             Assert.That(combinedDamProjectData.DesignCalculations[1].ProfileName, Is.Not.EqualTo(""));
             Assert.That(combinedDamProjectData.DesignCalculations[1].Calculation, Is.Not.EqualTo(null));
             Assert.That(combinedDamProjectData.DesignCalculations[1].Calculation, Is.Not.EqualTo(""));
-            Assert.That(combinedDamProjectData.DesignCalculations[1].StabilityModel, Is.EqualTo(mStabModelType));
+            Assert.That(combinedDamProjectData.DesignCalculations[1].StabilityModel, Is.EqualTo(stabilityModelType));
             Assert.That(combinedDamProjectData.DesignCalculations[1].SafetyFactor, Is.EqualTo(1.2));
             Assert.That(combinedDamProjectData.DesignCalculations[1].StabilityShoulderHeight, Is.EqualTo(null));
             Assert.That(combinedDamProjectData.DesignCalculations[1].Pl3HeadAdjusted, Is.EqualTo(0.2));
@@ -280,12 +280,12 @@
             return CreateInputProjectData(spec);
         }
 
-        private DamProjectData CreateInputProjectDataForStability(MStabModelType mStabModelType)
+        private DamProjectData CreateInputProjectDataForStability(StabilityModelType stabilityModelType)
         {
             var spec = new DamFailureMechanismeCalculationSpecification
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside,
-                CalculationModel = mStabModelType
+                CalculationModel = stabilityModelType
             };
             return CreateInputProjectData(spec);
         }
@@ -351,14 +351,14 @@
             return output;
         }
 
-        private Output CreateTestOutputForStability(MStabModelType mStabModelType)
+        private Output CreateTestOutputForStability(StabilityModelType stabilityModelType)
         {
             Output output = CreateTestOutput();
             for (var i = 0; i < 4; i++)
             {
                 SurfaceLine surfaceLine = CreateSurfaceLine();
                 UpliftSituation upliftSituation = CreateUpliftSituation(i);
-                DesignResultStabilityDesignResults stabilityResults = CreateDesignResultStability(i, surfaceLine, upliftSituation, mStabModelType);
+                DesignResultStabilityDesignResults stabilityResults = CreateDesignResultStability(i, surfaceLine, upliftSituation, stabilityModelType);
                 output.Results.CalculationResults[i].StabilityDesignResults = stabilityResults;
             }
 
@@ -423,7 +423,7 @@
             return pipingdesignResults;
         }
 
-        private static DesignResultStabilityDesignResults CreateDesignResultStability(int i, SurfaceLine surfaceline, UpliftSituation upliftSituation, MStabModelType mStabModelType)
+        private static DesignResultStabilityDesignResults CreateDesignResultStability(int i, SurfaceLine surfaceline, UpliftSituation upliftSituation, StabilityModelType stabilityModelType)
         {
             var stabilityResults = new DesignResultStabilityDesignResults
             {
@@ -435,12 +435,12 @@
                 RedesignedSurfaceLine = surfaceline,
                 UpliftSituation = upliftSituation,
                 StabilityModelTypeSpecified = true,
-                StabilityModelType = ConversionHelper.ConvertToOutputStabilityModelType(mStabModelType)
+                StabilityModelType = ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType)
             };
 
-            switch (mStabModelType)
+            switch (stabilityModelType)
             {
-                case MStabModelType.Bishop:
+                case StabilityModelType.Bishop:
                     var sl = new SlidingCircleMinimumSafetyCurveType();
                     sl.Center = new Point2DType
                     {
@@ -450,7 +450,7 @@
                     sl.Radius = 101.1 * (i + 1);
                     stabilityResults.SlipCircleDefinition = sl;
                     break;
-                case MStabModelType.UpliftVan:
+                case StabilityModelType.UpliftVan:
                     var dsl = new DualSlidingCircleMinimumSafetyCurveType();
                     dsl.ActiveCircleCenter = new Point2DType
                     {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs
===================================================================
diff -u -r4539 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs	(.../ConfigurationManager.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs	(.../ConfigurationManager.cs)	(revision 6262)
@@ -117,7 +117,7 @@
                         break;
                     case FailureMechanismSystemType.StabilityInside:
                     case FailureMechanismSystemType.StabilityOutside:
-                        availableList.Add((MStabModelType) i);
+                        availableList.Add((StabilityModelType) i);
                         break;
                 }
             }
@@ -158,20 +158,20 @@
         }
 
         // This is the place to enable new possible failure mechanisms and models
-        this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
-        this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
-        this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.BishopUpliftVan] = ConfigurationStatus.Available;
-        this[DamProjectType.Design, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+        this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available;
+        this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.UpliftVan] = ConfigurationStatus.Available;
+        this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.BishopUpliftVan] = ConfigurationStatus.Available;
+        this[DamProjectType.Design, FailureMechanismSystemType.StabilityOutside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available;
         this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
         this[DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available;
 
-        this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
-        this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
-        this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+        this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available;
+        this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.UpliftVan] = ConfigurationStatus.Available;
+        this[DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available;
         this[DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
 
-        this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
-        this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
+        this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.Bishop] = ConfigurationStatus.Available;
+        this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) StabilityModelType.UpliftVan] = ConfigurationStatus.Available;
         this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available;
     }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r6203 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 6203)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 6262)
@@ -458,21 +458,21 @@
     {
         return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
                  Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
-                (MStabModelType) Specification.CalculationModel == MStabModelType.Bishop);
+                (StabilityModelType) Specification.CalculationModel == StabilityModelType.Bishop);
     }
 
     private bool IsStabilityUpliftVan()
     {
         return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
                  Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
-                (MStabModelType) Specification.CalculationModel == MStabModelType.UpliftVan);
+                (StabilityModelType) Specification.CalculationModel == StabilityModelType.UpliftVan);
     }
 
     private bool IsStabilityBishopUpliftVan()
     {
         return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
                  Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
-                (MStabModelType) Specification.CalculationModel == MStabModelType.BishopUpliftVan);
+                (StabilityModelType) Specification.CalculationModel == StabilityModelType.BishopUpliftVan);
     }
 }
 
@@ -520,22 +520,22 @@
 
 public class MStabParameters : ICloneable<MStabParameters>, IVisibleEnabled, IDomain
 {
-    private MStabGridPosition gridPosition;
+    private StabilityGridPosition gridPosition;
 
     public MStabParameters()
     {
-        Model = MStabModelType.UpliftVan;
-        SearchMethod = MStabSearchMethod.BeeSwarm;
-        gridPosition = MStabGridPosition.Right;
+        Model = StabilityModelType.UpliftVan;
+        SearchMethod = StabilitySearchMethod.BeeSwarm;
+        gridPosition = StabilityGridPosition.Right;
         SlipCircleDefinition = new SlipCircleDefinition();
     }
     
-    [Label("Model")] public MStabModelType Model { get; set; }
+    [Label("Model")] public StabilityModelType Model { get; set; }
 
-    public MStabSearchMethod SearchMethod { get; set; }
+    public StabilitySearchMethod SearchMethod { get; set; }
     public string ProjectFileName { get; set; }
     [Validate] public SlipCircleDefinition SlipCircleDefinition { get; set; }
-    public MStabGridPosition GridPosition
+    public StabilityGridPosition GridPosition
     {
         get
         {
@@ -602,7 +602,7 @@
                 return
                     (SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
                      SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
-                    (Model == MStabModelType.BishopUpliftVan || Model == MStabModelType.UpliftVan);
+                    (Model == StabilityModelType.BishopUpliftVan || Model == StabilityModelType.UpliftVan);
             case "ZonesType": return false; // Is set per location!
             case "GridPosition": return false; // position depends on failuremechanisme type (inside or outside)
             default: return true;
@@ -619,26 +619,26 @@
         if (property == "SearchMethod")
         {
             if (SlipCircleDefinition.Specification.FailureMechanismSystemType ==
-                FailureMechanismSystemType.StabilityInside && (Model == MStabModelType.UpliftVan || Model == MStabModelType.BishopUpliftVan))
+                FailureMechanismSystemType.StabilityInside && (Model == StabilityModelType.UpliftVan || Model == StabilityModelType.BishopUpliftVan))
             {
                 return new[]
                 {
-                    MStabSearchMethod.BeeSwarm,
-                    MStabSearchMethod.Grid
+                    StabilitySearchMethod.BeeSwarm,
+                    StabilitySearchMethod.Grid
                 };
             }
 
             // Make sure that grid is reset and updated too when needed.
-            if (SearchMethod != MStabSearchMethod.Grid)
+            if (SearchMethod != StabilitySearchMethod.Grid)
             {
                 DataEventPublisher.BeforeChange(this, "SearchMethod");
-                SearchMethod = MStabSearchMethod.Grid;
+                SearchMethod = StabilitySearchMethod.Grid;
                 DataEventPublisher.AfterChange(this, "SearchMethod");
             }
 
             return new[]
             {
-                MStabSearchMethod.Grid
+                StabilitySearchMethod.Grid
             };
         }
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r6207 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6207)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6262)
@@ -694,18 +694,18 @@
     /// </summary>
     /// <param name="stabilityModelType">Type of the stability model.</param>
     /// <returns></returns>
-    public static InputStabilityModelType ConvertToInputStabilityModelType(MStabModelType stabilityModelType)
+    public static InputStabilityModelType ConvertToInputStabilityModelType(StabilityModelType stabilityModelType)
     {
-        var translationTable = new Dictionary<MStabModelType, InputStabilityModelType>
+        var translationTable = new Dictionary<StabilityModelType, InputStabilityModelType>
         {
             {
-                MStabModelType.Bishop, InputStabilityModelType.Bishop
+                StabilityModelType.Bishop, InputStabilityModelType.Bishop
             },
             {
-                MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan
+                StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan
             },
             {
-                MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan
+                StabilityModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan
             }
         };
         return translationTable[stabilityModelType];
@@ -716,18 +716,18 @@
     /// </summary>
     /// <param name="inputStabilityModelType">Type of the input stability model.</param>
     /// <returns></returns>
-    public static MStabModelType ConvertToStabilityModelType(InputStabilityModelType inputStabilityModelType)
+    public static StabilityModelType ConvertToStabilityModelType(InputStabilityModelType inputStabilityModelType)
     {
-        var translationTable = new Dictionary<InputStabilityModelType, MStabModelType>
+        var translationTable = new Dictionary<InputStabilityModelType, StabilityModelType>
         {
             {
-                InputStabilityModelType.Bishop, MStabModelType.Bishop
+                InputStabilityModelType.Bishop, StabilityModelType.Bishop
             },
             {
-                InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan
+                InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan
             },
             {
-                InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan
+                InputStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan
             }
         };
         return translationTable[inputStabilityModelType];
@@ -738,18 +738,18 @@
     /// </summary>
     /// <param name="stabilityModelType">Type of the stability model.</param>
     /// <returns></returns>
-    public static DesignResultStabilityDesignResultsStabilityModelType ConvertToOutputStabilityModelType(MStabModelType stabilityModelType)
+    public static DesignResultStabilityDesignResultsStabilityModelType ConvertToOutputStabilityModelType(StabilityModelType stabilityModelType)
     {
-        var translationTable = new Dictionary<MStabModelType, DesignResultStabilityDesignResultsStabilityModelType>
+        var translationTable = new Dictionary<StabilityModelType, DesignResultStabilityDesignResultsStabilityModelType>
         {
             {
-                MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop
+                StabilityModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop
             },
             {
-                MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan
+                StabilityModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan
             },
             {
-                MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan
+                StabilityModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan
             }
         };
         return translationTable[stabilityModelType];
@@ -760,18 +760,18 @@
     /// </summary>
     /// <param name="outputStabilityModelType">Type of the output stability model.</param>
     /// <returns></returns>
-    public static MStabModelType ConvertToStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType)
+    public static StabilityModelType ConvertToStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType)
     {
-        var translationTable = new Dictionary<DesignResultStabilityDesignResultsStabilityModelType, MStabModelType>
+        var translationTable = new Dictionary<DesignResultStabilityDesignResultsStabilityModelType, StabilityModelType>
         {
             {
-                DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop
+                DesignResultStabilityDesignResultsStabilityModelType.Bishop, StabilityModelType.Bishop
             },
             {
-                DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan
+                DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, StabilityModelType.UpliftVan
             },
             {
-                DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan
+                DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan
             }
         };
         return translationTable[outputStabilityModelType];
@@ -820,15 +820,15 @@
     /// </summary>
     /// <param name="zoneType">Type of the zone.</param>
     /// <returns></returns>
-    public static LocationStabilityOptionsZoneType ConvertToInputZoneType(MStabZonesType zoneType)
+    public static LocationStabilityOptionsZoneType ConvertToInputZoneType(StabilityZoneType zoneType)
     {
-        var translationTable = new Dictionary<MStabZonesType, LocationStabilityOptionsZoneType>
+        var translationTable = new Dictionary<StabilityZoneType, LocationStabilityOptionsZoneType>
         {
             {
-                MStabZonesType.NoZones, LocationStabilityOptionsZoneType.NoZones
+                StabilityZoneType.NoZones, LocationStabilityOptionsZoneType.NoZones
             },
             {
-                MStabZonesType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones
+                StabilityZoneType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones
             }
         };
 
@@ -840,15 +840,15 @@
     /// </summary>
     /// <param name="inputZoneType">Type of the input zone.</param>
     /// <returns></returns>
-    public static MStabZonesType ConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType)
+    public static StabilityZoneType ConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType)
     {
-        var translationTable = new Dictionary<LocationStabilityOptionsZoneType, MStabZonesType>
+        var translationTable = new Dictionary<LocationStabilityOptionsZoneType, StabilityZoneType>
         {
             {
-                LocationStabilityOptionsZoneType.NoZones, MStabZonesType.NoZones
+                LocationStabilityOptionsZoneType.NoZones, StabilityZoneType.NoZones
             },
             {
-                LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone
+                LocationStabilityOptionsZoneType.ForbiddenZones, StabilityZoneType.ForbiddenZone
             }
         };
         return translationTable[inputZoneType];
@@ -912,15 +912,15 @@
     /// </summary>
     /// <param name="searchMethod">The search method.</param>
     /// <returns></returns>
-    public static StabilityParametersSearchMethod ConvertToInputSearchMethod(MStabSearchMethod searchMethod)
+    public static StabilityParametersSearchMethod ConvertToInputSearchMethod(StabilitySearchMethod searchMethod)
     {
-        var translationTable = new Dictionary<MStabSearchMethod, StabilityParametersSearchMethod>
+        var translationTable = new Dictionary<StabilitySearchMethod, StabilityParametersSearchMethod>
         {
             {
-                MStabSearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid
+                StabilitySearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid
             },
             {
-                MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm
+                StabilitySearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm
             }
         };
         return translationTable[searchMethod];
@@ -931,15 +931,15 @@
     /// </summary>
     /// <param name="searchMethod">The search method.</param>
     /// <returns></returns>
-    public static MStabSearchMethod ConvertToSearchMethod(StabilityParametersSearchMethod searchMethod)
+    public static StabilitySearchMethod ConvertToSearchMethod(StabilityParametersSearchMethod searchMethod)
     {
-        var translationTable = new Dictionary<StabilityParametersSearchMethod, MStabSearchMethod>
+        var translationTable = new Dictionary<StabilityParametersSearchMethod, StabilitySearchMethod>
         {
             {
-                StabilityParametersSearchMethod.CalculationGrid, MStabSearchMethod.Grid
+                StabilityParametersSearchMethod.CalculationGrid, StabilitySearchMethod.Grid
             },
             {
-                StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm
+                StabilityParametersSearchMethod.BeeSwarm, StabilitySearchMethod.BeeSwarm
             }
         };
         return translationTable[searchMethod];
@@ -1229,18 +1229,18 @@
     /// </summary>
     /// <param name="inputMStabModelType">The input MStabModelType.</param>
     /// <returns></returns>
-    public static MStabModelType ConvertToMStabModelType(InputStabilityModelType inputMStabModelType)
+    public static StabilityModelType ConvertToMStabModelType(InputStabilityModelType inputMStabModelType)
     {
-        var translationTable = new Dictionary<InputStabilityModelType, MStabModelType>
+        var translationTable = new Dictionary<InputStabilityModelType, StabilityModelType>
         {
             {
-                InputStabilityModelType.Bishop, MStabModelType.Bishop
+                InputStabilityModelType.Bishop, StabilityModelType.Bishop
             },
             {
-                InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan
+                InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan
             },
             {
-                InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan
+                InputStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan
             }
         };
         return translationTable[inputMStabModelType];
@@ -1249,23 +1249,23 @@
     /// <summary>
     /// Converts to input stability model type.
     /// </summary>
-    /// <param name="mStabModelType">The stability model type.</param>
+    /// <param name="stabilityModelType">The stability model type.</param>
     /// <returns></returns>
-    public static InputStabilityModelType ConvertToInputMStabModelType(MStabModelType mStabModelType)
+    public static InputStabilityModelType ConvertToInputMStabModelType(StabilityModelType stabilityModelType)
     {
-        var translationTable = new Dictionary<MStabModelType, InputStabilityModelType>
+        var translationTable = new Dictionary<StabilityModelType, InputStabilityModelType>
         {
             {
-                MStabModelType.Bishop, InputStabilityModelType.Bishop
+                StabilityModelType.Bishop, InputStabilityModelType.Bishop
             },
             {
-                MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan
+                StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan
             },
             {
-                MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan
+                StabilityModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan
             }
         };
-        return translationTable[mStabModelType];
+        return translationTable[stabilityModelType];
     }
 
     /// <summary>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs
===================================================================
diff -u -r5978 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs	(.../ComputeHelper.cs)	(revision 5978)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs	(.../ComputeHelper.cs)	(revision 6262)
@@ -43,7 +43,7 @@
         /// <param name="logMessages"></param>
         /// <param name="maxCores"></param>
         /// <returns></returns>
-        public static List<CsvExportData> ComputeStabilityProject(string projectFilename, MStabModelType modelType, bool isStabilityInside,
+        public static List<CsvExportData> ComputeStabilityProject(string projectFilename, StabilityModelType modelType, bool isStabilityInside,
                                                                   int expectedLocations, int maxCores, out List<LogMessage> logMessages)
         {
             using DamProjectData damProjectData = ProjectLoader.LoadProjectData(projectFilename);
@@ -55,17 +55,17 @@
             damProjectData.MaxCalculationCores = maxCores;
             damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = modelType;
             damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab
-                          .MStabParameters.SearchMethod = MStabSearchMethod.Grid;
+                          .MStabParameters.SearchMethod = StabilitySearchMethod.Grid;
             if (isStabilityInside)
             {
                 damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab
-                              .MStabParameters.GridPosition = MStabGridPosition.Right;
+                              .MStabParameters.GridPosition = StabilityGridPosition.Right;
                 damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside;
             }
             else
             {
                 damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab
-                              .MStabParameters.GridPosition = MStabGridPosition.Left;
+                              .MStabParameters.GridPosition = StabilityGridPosition.Left;
                 damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside;
             }
             damProjectData.LocationJobs[0].Run = true;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/MStabParametersTest.cs
===================================================================
diff -u -r5845 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/MStabParametersTest.cs	(.../MStabParametersTest.cs)	(revision 5845)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/MStabParametersTest.cs	(.../MStabParametersTest.cs)	(revision 6262)
@@ -39,9 +39,9 @@
 
         Assert.Multiple(() =>
         {
-            Assert.That(parameters.Model, Is.EqualTo(MStabModelType.UpliftVan));
-            Assert.That(parameters.SearchMethod, Is.EqualTo(MStabSearchMethod.BeeSwarm));
-            Assert.That(parameters.GridPosition, Is.EqualTo(MStabGridPosition.Right));
+            Assert.That(parameters.Model, Is.EqualTo(StabilityModelType.UpliftVan));
+            Assert.That(parameters.SearchMethod, Is.EqualTo(StabilitySearchMethod.BeeSwarm));
+            Assert.That(parameters.GridPosition, Is.EqualTo(StabilityGridPosition.Right));
             Assert.That(parameters.SlipCircleDefinition, Is.Not.Null);
         });
     }
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs
===================================================================
diff -u -r4539 -r6262
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs	(.../ProjectLoader.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs	(.../ProjectLoader.cs)	(revision 6262)
@@ -47,8 +47,8 @@
             DamProjectData damProjectData)
         {
             MStabParameters mstabParameters = FactoryForStabilityTests.CreateMStabParameters();
-            mstabParameters.GridPosition = MStabGridPosition.Left;
-            mstabParameters.SearchMethod = MStabSearchMethod.Grid;
+            mstabParameters.GridPosition = StabilityGridPosition.Left;
+            mstabParameters.SearchMethod = StabilitySearchMethod.Grid;
 
             var damCalculationSpecification = new DamFailureMechanismeCalculationSpecification
             {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs
===================================================================
diff -u -r6226 -r6262
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs	(.../LocationImportHelper.cs)	(revision 6226)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs	(.../LocationImportHelper.cs)	(revision 6262)
@@ -104,7 +104,7 @@
         return key.ToEnumType(translationTable);
     }
 
-    internal static MStabZonesType ToMStabZonesTypeMethod(object value)
+    internal static StabilityZoneType ToMStabZonesTypeMethod(object value)
     {
         if (value == null)
         {
@@ -119,23 +119,23 @@
     /// </summary>
     /// <param name="value">The value.</param>
     /// <returns></returns>
-    internal static MStabZonesType ToMStabZonesTypeMethod(string value)
+    internal static StabilityZoneType ToMStabZonesTypeMethod(string value)
     {
         if (string.IsNullOrEmpty(value) || value.Trim() == "")
         {
             throw new ArgumentException("value");
         }
 
-        var translationTable = new Dictionary<string, MStabZonesType>
+        var translationTable = new Dictionary<string, StabilityZoneType>
         {
             {
-                "nozones", MStabZonesType.NoZones
+                "nozones", StabilityZoneType.NoZones
             },
             {
-                "zoneareas", MStabZonesType.NoZones // ZoneAreas is no longer supported, it is replaced by NoZones
+                "zoneareas", StabilityZoneType.NoZones // ZoneAreas is no longer supported, it is replaced by NoZones
             },
             {
-                "forbiddenzone", MStabZonesType.ForbiddenZone
+                "forbiddenzone", StabilityZoneType.ForbiddenZone
             }
         };
         string key = value.ToLowerInvariant();