Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r2970 -r2997
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2997)
@@ -35,8 +35,7 @@
 using MessageType = Deltares.MacroStability.CSharpWrapper.Output.MessageType;
 using ShearStrengthModel = Deltares.DamEngine.Data.Geotechnics.ShearStrengthModel;
 using Soil = Deltares.MacroStability.CSharpWrapper.Input.Soil;
-using StabilityModelOptionInput = Deltares.MacroStability.CSharpWrapper.Output.StabilityModelOptionType;
-using StabilityModelOptionOutput = Deltares.MacroStability.CSharpWrapper.Output.StabilityModelOptionType;
+using StabilityModelOptionType = Deltares.MacroStability.CSharpWrapper.Output.StabilityModelOptionType;
 using WaterPressureInterpolationModelKernel = Deltares.MacroStability.CSharpWrapper.Input.WaterPressureInterpolationModel;
 using ShearStrengthModelKernel = Deltares.MacroStability.CSharpWrapper.Input.ShearStrengthModel;
 
@@ -84,13 +83,13 @@
         /// This comes back from the kernel side so any model that can be matched is OK.
         /// <param name="modelOption">The model option.</param>
         /// <returns>the Dam MStabModelType</returns>
-        public static MStabModelType ConvertToMStabModelType(StabilityModelOptionInput modelOption)
+        public static MStabModelType ConvertToMStabModelType(StabilityModelOptionType modelOption)
         {
             // For the macrostability kernel, the only really supported option for now is UpliftVan. But the other two could be options in future version
-            var translationTable = new Dictionary<StabilityModelOptionInput, MStabModelType>()
+            var translationTable = new Dictionary<StabilityModelOptionType, MStabModelType>()
             {
-                //{StabilityModelOptionInput.Bishop, MStabModelType.BishopWti},
-                {StabilityModelOptionInput.UpliftVan, MStabModelType.UpliftVanWti },
+                //{StabilityModelOptionOutput.Bishop, MStabModelType.BishopWti},
+                {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti },
                 //{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti}
             };
             return translationTable[modelOption];
@@ -100,16 +99,16 @@
         /// <param name="mStabModelType">the MStabModelType.</param>
         /// <returns>the MacroStability ModelOption</returns>
         /// <exception cref="System.ArgumentException"></exception>
-        public static StabilityModelOptionInput ConvertToModelOptions(MStabModelType mStabModelType)
+        public static StabilityModelOptionType ConvertToModelOptions(MStabModelType mStabModelType)
         {
             // For the macrostability kernel, the only supported option for now is UpliftVan.
             if (mStabModelType != MStabModelType.UpliftVanWti)
             {
                 throw new ArgumentException(String.Format("Unsupported MStabModelType: {0}", mStabModelType));
             }
-            var translationTable = new Dictionary<MStabModelType, StabilityModelOptionInput>()
+            var translationTable = new Dictionary<MStabModelType, StabilityModelOptionType>()
             {
-                {MStabModelType.UpliftVanWti, StabilityModelOptionInput.UpliftVan}
+                {MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan}
             };
             return translationTable[mStabModelType];
         }
@@ -118,13 +117,13 @@
         /// This comes back from the kernel side so any model that can be matched is OK.
         /// <param name="modelOption">The model option.</param>
         /// <returns>the Dam MStabModelType</returns>
-        public static MStabModelType ConvertToMStabModelTypeFromOutput(StabilityModelOptionOutput modelOption)
+        public static MStabModelType ConvertToMStabModelTypeFromOutput(StabilityModelOptionType modelOption)
         {
             // For the macrostability kernel, the only really supported option for now is UpliftVan. But the other two could be options in future version
-            var translationTable = new Dictionary<StabilityModelOptionOutput, MStabModelType>()
+            var translationTable = new Dictionary<StabilityModelOptionType, MStabModelType>()
             {
-                {StabilityModelOptionOutput.Bishop, MStabModelType.BishopWti},
-                {StabilityModelOptionOutput.UpliftVan, MStabModelType.UpliftVanWti },
+                {StabilityModelOptionType.Bishop, MStabModelType.BishopWti},
+                {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti },
                 //{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti}
             };
             return translationTable[modelOption];
@@ -134,16 +133,16 @@
         /// <param name="mStabModelType">the MStabModelType.</param>
         /// <returns>the MacroStability ModelOption</returns>
         /// <exception cref="System.ArgumentException"></exception>
-        public static StabilityModelOptionOutput ConvertToModelOptionsOutput(MStabModelType mStabModelType)
+        public static StabilityModelOptionType ConvertToModelOptionsOutput(MStabModelType mStabModelType)
         {
             // For the macrostability kernel, the only supported option for now is UpliftVan.
             if (mStabModelType != MStabModelType.UpliftVanWti)
             {
                 throw new ArgumentException(String.Format("Unsupported MStabModelType: {0}", mStabModelType));
             }
-            var translationTable = new Dictionary<MStabModelType, StabilityModelOptionOutput>()
+            var translationTable = new Dictionary<MStabModelType, StabilityModelOptionType>()
             {
-                {MStabModelType.UpliftVanWti, StabilityModelOptionOutput.UpliftVan}
+                {MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan}
             };
             return translationTable[mStabModelType];
         }