Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r6222 -r6264
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6222)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6264)
@@ -234,23 +234,23 @@
     }
 
     [Test]
-    [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)]
-    [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
-    [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)]
-    [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
-    public void CanConvertToInputStabilityModelType(MStabModelType mStabModelType, InputStabilityModelType inputStabilityModelType)
+    [TestCase(StabilityModelType.Bishop, InputStabilityModelType.Bishop)]
+    [TestCase(StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
+    [TestCase(StabilityModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)]
+    [TestCase(StabilityModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
+    public void CanConvertToInputStabilityModelType(StabilityModelType stabilityModelType, InputStabilityModelType inputStabilityModelType)
     {
-        Assert.That(ConversionHelper.ConvertToInputStabilityModelType(mStabModelType), Is.EqualTo(inputStabilityModelType));
+        Assert.That(ConversionHelper.ConvertToInputStabilityModelType(stabilityModelType), Is.EqualTo(inputStabilityModelType));
     }
 
     [Test]
-    [TestCase(InputStabilityModelType.Bishop, MStabModelType.Bishop)]
-    [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
-    [TestCase(InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)]
-    [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
-    public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, MStabModelType mStabModelType)
+    [TestCase(InputStabilityModelType.Bishop, StabilityModelType.Bishop)]
+    [TestCase(InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)]
+    [TestCase(InputStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan)]
+    [TestCase(InputStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)]
+    public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, StabilityModelType stabilityModelType)
     {
-        Assert.That(ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType), Is.EqualTo(mStabModelType));
+        Assert.That(ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType), Is.EqualTo(stabilityModelType));
     }
 
     [Test]
@@ -270,33 +270,33 @@
     }
 
     [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));
     }
 
     [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));
     }
@@ -423,22 +423,22 @@
     }
 
     [Test]
-    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)]
-    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
-    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)]
-    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
+    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, StabilityModelType.Bishop)]
+    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)]
+    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, StabilityModelType.BishopUpliftVan)]
+    [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, StabilityModelType.UpliftVan)]
     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)]
-    [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)]
-    public void CanConvertToStabilityModelType(MStabModelType stabilityModelType,
+    [TestCase(StabilityModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)]
+    [TestCase(StabilityModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)]
+    [TestCase(StabilityModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)]
+    [TestCase(StabilityModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)]
+    public void CanConvertToStabilityModelType(StabilityModelType stabilityModelType,
                                                DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType)
     {
         Assert.That(ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType), Is.EqualTo(stabilityModelType));
@@ -535,10 +535,10 @@
         Assert.Throws<NotImplementedException>(() => ConversionHelper.ConvertToOutputOperationalFailureMechanismSystemType(FailureMechanismSystemType.Piping));
     }
 
-    [TestCase(MStabModelType.Bishop, OperationalStaticDataStabilityModel.Bishop)]    
-    [TestCase(MStabModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan)]    
-    [TestCase(MStabModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan)]    
-    public void CanConvertToOutputOperationalStabilityModel(MStabModelType stabilityModelType, OperationalStaticDataStabilityModel expectedStabilityModel)
+    [TestCase(StabilityModelType.Bishop, OperationalStaticDataStabilityModel.Bishop)]    
+    [TestCase(StabilityModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan)]    
+    [TestCase(StabilityModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan)]    
+    public void CanConvertToOutputOperationalStabilityModel(StabilityModelType stabilityModelType, OperationalStaticDataStabilityModel expectedStabilityModel)
     {
         Assert.That(ConversionHelper.ConvertToOutputOperationalStabilityModel(stabilityModelType), Is.EqualTo(expectedStabilityModel));
     }