Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r6251 -r6264
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6251)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6264)
@@ -661,18 +661,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];
@@ -683,18 +683,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];
@@ -705,18 +705,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];
@@ -727,18 +727,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];
@@ -787,15 +787,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
             }
         };
         return translationTable[zoneType];
@@ -806,15 +806,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];
@@ -825,15 +825,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];
@@ -844,15 +844,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];
@@ -1366,18 +1366,18 @@
     /// </summary>
     /// <param name="stabilityModelType">Type of failure mechanism.</param>
     /// <returns>Type of the output object.</returns>
-    public static OperationalStaticDataStabilityModel ConvertToOutputOperationalStabilityModel(MStabModelType stabilityModelType)
+    public static OperationalStaticDataStabilityModel ConvertToOutputOperationalStabilityModel(StabilityModelType stabilityModelType)
     {
-        var translationTable = new Dictionary<MStabModelType, OperationalStaticDataStabilityModel>
+        var translationTable = new Dictionary<StabilityModelType, OperationalStaticDataStabilityModel>
         {
             {
-                MStabModelType.Bishop, OperationalStaticDataStabilityModel.Bishop
+                StabilityModelType.Bishop, OperationalStaticDataStabilityModel.Bishop
             },
             {
-                MStabModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan
+                StabilityModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan
             },
             {
-                MStabModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan
+                StabilityModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan
             }
         };
         return translationTable[stabilityModelType];