Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(.../DamMacroStabilityInwardsKernelWrapper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(.../DamMacroStabilityInwardsKernelWrapper.cs)	(revision 2173)
@@ -79,7 +79,7 @@
             // Make sure no riverlevellow is defined, because this will trigger Outside stability code elsewhere
             damKernelInput.RiverLevelLow = null;
 
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Stability)
             {
                 var bishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model ==
                                       MStabModelType.BishopUpliftVan;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2173)
@@ -372,7 +372,46 @@
             return translationTable[failureMechanismSystemType];
         }
 
+        public const int InputSegmentFailureMechanismAll = 0;
+        public const int InputSegmentFailureMechanismStability = 1;
+        public const int InputSegmentFailureMechanismPiping = 2;
+        public const int InputSegmentFailureMechanismLiquefaction = 3;
+        
         /// <summary>
+        /// Converts the Dam segment failure mechanism type to the input segment failure mechanism type .
+        /// </summary>
+        /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
+        /// <returns></returns>
+        public static int ConvertToInputSegmentFailureMechanismSystemType(SegmentFailureMechanismType segmentFailureMechanismType)
+        {
+            var translationTable = new Dictionary<SegmentFailureMechanismType, int>()
+            {
+                {SegmentFailureMechanismType.All, InputSegmentFailureMechanismAll},
+                {SegmentFailureMechanismType.Stability, InputSegmentFailureMechanismStability},
+                {SegmentFailureMechanismType.Piping, InputSegmentFailureMechanismPiping},
+                {SegmentFailureMechanismType.Liquefaction, InputSegmentFailureMechanismLiquefaction}
+            };
+            return translationTable[segmentFailureMechanismType];
+        }
+
+        /// <summary>
+        /// Converts the input segment failure mechanism type to the Dam segment failure mechanism type .
+        /// </summary>
+        /// <param name="segmentFailureMechanismSystemType">Type of the failure mechanism system.</param>
+        /// <returns></returns>
+        public static SegmentFailureMechanismType ConvertToSegmentFailureMechanismSystemType(int segmentFailureMechanismSystemType)
+        {
+            var translationTable = new Dictionary<int, SegmentFailureMechanismType>()
+            {
+                {InputSegmentFailureMechanismAll, SegmentFailureMechanismType.All},
+                {InputSegmentFailureMechanismStability, SegmentFailureMechanismType.Stability},
+                {InputSegmentFailureMechanismPiping, SegmentFailureMechanismType.Piping},
+                {InputSegmentFailureMechanismLiquefaction, SegmentFailureMechanismType.Liquefaction}
+            };
+            return translationTable[segmentFailureMechanismSystemType];
+        }
+
+        /// <summary>
         /// Converts the Dam piping model to the input piping model.
         /// </summary>
         /// <param name="pipingModelType">Type of the piping model.</param>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r1970 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 1970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 2173)
@@ -89,7 +89,7 @@
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
@@ -164,7 +164,7 @@
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
@@ -243,7 +243,7 @@
         
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
Index: DamEngine/trunk/xsd/DamSegment.xsd
===================================================================
diff -u -r972 -r2173
--- DamEngine/trunk/xsd/DamSegment.xsd	(.../DamSegment.xsd)	(revision 972)
+++ DamEngine/trunk/xsd/DamSegment.xsd	(.../DamSegment.xsd)	(revision 2173)
@@ -15,13 +15,13 @@
               </xs:restriction>
             </xs:simpleType>
           </xs:attribute>
-          <xs:attribute name="FailureMechanismSystemType" use="optional">
+          <xs:attribute name="SegmentFailureMechanismType " use="optional">
             <xs:simpleType>
               <xs:restriction base="xs:int">
-                <xs:enumeration value="StabilityInside" />
-                <xs:enumeration value="StabilityOutside" />
+                <xs:enumeration value="All" />
+                <xs:enumeration value="Stability" />
                 <xs:enumeration value="Piping" />
-                <xs:enumeration value="HorizontalBalance" />
+                <xs:enumeration value="Liquefaction" />
               </xs:restriction>
             </xs:simpleType>
           </xs:attribute>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
===================================================================
diff -u -r1970 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 1970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 2173)
@@ -65,7 +65,7 @@
             };
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
 
             var damKernelInput = new DamKernelInput
             {
@@ -133,7 +133,7 @@
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
@@ -193,7 +193,7 @@
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs
===================================================================
diff -u -r1970 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs	(.../UpliftHelperTests.cs)	(revision 1970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs	(.../UpliftHelperTests.cs)	(revision 2173)
@@ -86,7 +86,7 @@
             location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1;
 
             var subSoilScenario = new SoilGeometryProbability();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability;
 
             var damKernelInput = new DamKernelInput();
             damKernelInput.Location = location;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs
===================================================================
diff -u -r2107 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs	(.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs)	(revision 2107)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs	(.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs)	(revision 2173)
@@ -71,7 +71,7 @@
             var subSoilScenario = new SoilGeometryProbability
             {
                 SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(),
-                SegmentFailureMechanismType = FailureMechanismSystemType.Piping
+                SegmentFailureMechanismType = SegmentFailureMechanismType.Piping
             };
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
@@ -173,7 +173,7 @@
             var subSoilScenario = new SoilGeometryProbability
             {
                 SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(),
-                SegmentFailureMechanismType = FailureMechanismSystemType.Piping
+                SegmentFailureMechanismType = SegmentFailureMechanismType.Piping
             };
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
@@ -258,7 +258,7 @@
             var subSoilScenario = new SoilGeometryProbability
             {
                 SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(),
-                SegmentFailureMechanismType = FailureMechanismSystemType.Piping
+                SegmentFailureMechanismType = SegmentFailureMechanismType.Piping
             };
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
===================================================================
diff -u -r2166 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(.../DamMacroStabilityOutwardsKernelWrapperTests.cs)	(revision 2166)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(.../DamMacroStabilityOutwardsKernelWrapperTests.cs)	(revision 2173)
@@ -80,7 +80,7 @@
                 FailureMechanismParametersMStab = failureMechanismParametersMStab
             };
             // Set the requested mechanism for this subsoil to Piping to make it irrelevant
-            damKernelInput.SubSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            damKernelInput.SubSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             // Prepare the wrapper. This should fail as the given mechanism is not relevant for this kernel
             IKernelDataInput damStabilityInput;
             IKernelDataOutput kernelOutput;
@@ -259,7 +259,7 @@
             {
                 StiFileName = soilGeometry2DName,
                 SoilProfileType = SoilProfileType.ProfileTypeStiFile,
-                SegmentFailureMechanismType = FailureMechanismSystemType.StabilityOutside
+                SegmentFailureMechanismType = SegmentFailureMechanismType.Stability
             };
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
@@ -476,7 +476,7 @@
             {
                 StiFileName = soilGeometry2DName,
                 SoilProfileType = SoilProfileType.ProfileTypeStiFile,
-                SegmentFailureMechanismType = FailureMechanismSystemType.StabilityOutside
+                SegmentFailureMechanismType = SegmentFailureMechanismType.Stability
             };
 
             var failureMechanismParametersMStab = new FailureMechanismParametersMStab
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs	(.../DamPipingSellmeijerVnkKernelWrapper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs	(.../DamPipingSellmeijerVnkKernelWrapper.cs)	(revision 2173)
@@ -61,7 +61,7 @@
                 FoSp = defaultMaxReturnValue
             };
             kernelDataOutput = damPipingOutput;
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.Piping)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Piping)
             {
                 var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
                 var location = damKernelInput.Location;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 2173)
@@ -83,8 +83,7 @@
             // Note: as segments and thus SubSoilScenario are generally divided into Piping versus Stability,
             // the actual SegmentFailureMechanismType would be set to StabilityInside rather than StabilityOutside
             // So check for both types.
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityOutside ||
-                damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Stability)
             {
                 // Make sure the gridposition is Left.
                 FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapper.cs)	(revision 2173)
@@ -72,7 +72,7 @@
                 CalculationResult = CalculationResult.NoRun
             };
             kernelDataOutput = damMacroStabilityOutput;
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.HorizontalBalance)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Stability)
             {
                 FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.HorizontalBalance;
                 FailureMechanismParametersMStab.ProjectWorkingPath = damKernelInput.CalculationDir;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs	(.../WtiPipingSellmeijerRevisedKernelWrapper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs	(.../WtiPipingSellmeijerRevisedKernelWrapper.cs)	(revision 2173)
@@ -68,7 +68,7 @@
                 FoSh = defaultMaxReturnValue
             };
             kernelDataOutput = damPipingOutput;
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.Piping)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Piping)
             {
                 var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
                 var location = damKernelInput.Location;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 2173)
@@ -66,7 +66,7 @@
                 FoSp = defaultMaxReturnValue
             };
             kernelDataOutput = damPipingBlighOutput;
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.Piping)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Piping)
             {
                 var damPipingBlighInput = new DamPipingBlighInput();
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r2158 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 2158)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 2173)
@@ -81,7 +81,7 @@
                     for (int subSoilScenarioIndex = 0; subSoilScenarioIndex < location.Segment.SoilProfileProbabilities.Count; subSoilScenarioIndex++)
                     {
                         if (location.Segment.SoilProfileProbabilities[subSoilScenarioIndex].SegmentFailureMechanismType == 
-                            damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType)
+                            ConversionHelper.ConvertToSegmentFailureMechanismType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType))
                         {
                             var soiProfileProbability = location.Segment.SoilProfileProbabilities[subSoilScenarioIndex];
                             for (int designScenarioIndex = 0; designScenarioIndex < location.Scenarios.Count; designScenarioIndex++)
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Segment.cs
===================================================================
diff -u -r1977 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Segment.cs	(.../Segment.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Segment.cs	(.../Segment.cs)	(revision 2173)
@@ -58,7 +58,7 @@
         /// </summary>
         /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
         /// <returns></returns>
-        public SoilProfile1D GetMostProbableProfile1D(FailureMechanismSystemType? segmentFailureMechanismType)
+        public SoilProfile1D GetMostProbableProfile1D(SegmentFailureMechanismType? segmentFailureMechanismType)
         {
             var mostProbableSoilGeometryProbability = GetMostProbableSoilGeometryProbability(segmentFailureMechanismType);
             if (mostProbableSoilGeometryProbability != null && mostProbableSoilGeometryProbability.SoilProfileType == SoilProfileType.ProfileType1D)
@@ -76,7 +76,7 @@
         /// </summary>
         /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
         /// <returns></returns>
-        public string GetMostProbableProfile2DStiFileName(FailureMechanismSystemType? segmentFailureMechanismType)
+        public string GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType? segmentFailureMechanismType)
         {
             var mostProbableSoilGeometryProbability = GetMostProbableSoilGeometryProbability(segmentFailureMechanismType);
             if (mostProbableSoilGeometryProbability != null && mostProbableSoilGeometryProbability.SoilProfileType == SoilProfileType.ProfileTypeStiFile)
@@ -94,7 +94,7 @@
         /// </summary>
         /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
         /// <returns></returns>
-        public SoilGeometryProbability GetMostProbableSoilGeometryProbability(FailureMechanismSystemType? segmentFailureMechanismType)
+        public SoilGeometryProbability GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType? segmentFailureMechanismType)
         {
             IEnumerable<SoilGeometryProbability> spps = from SoilGeometryProbability spp in this.soilGeometryProbabilities
                                                         where !spp.SegmentFailureMechanismType.HasValue || !segmentFailureMechanismType.HasValue || spp.SegmentFailureMechanismType == segmentFailureMechanismType
@@ -117,7 +117,7 @@
             StringBuilder sb = new StringBuilder();
             sb.Append(this.Name);
             sb.Append(": ");
-            foreach (FailureMechanismSystemType type in Enum.GetValues(typeof(FailureMechanismSystemType)))
+            foreach (SegmentFailureMechanismType type in Enum.GetValues(typeof(SegmentFailureMechanismType)))
             {
                 sb.Append(type.ToString());
                 sb.Append(": ");
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2173)
@@ -200,26 +200,45 @@
         }
 
         [Test]
-        [TestCase(FailureMechanismSystemType.StabilityInside, 0)]
-        [TestCase(FailureMechanismSystemType.StabilityOutside, 1)]
-        [TestCase(FailureMechanismSystemType.Piping, 2)]
-        [TestCase(FailureMechanismSystemType.HorizontalBalance, 3)]
+        [TestCase(FailureMechanismSystemType.StabilityInside, ConversionHelper.InputFailureMechanismStabilityInside)]
+        [TestCase(FailureMechanismSystemType.StabilityOutside, ConversionHelper.InputFailureMechanismStabilityOutside)]
+        [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputFailureMechanismPiping)]
+        [TestCase(FailureMechanismSystemType.HorizontalBalance, ConversionHelper.InputFailureMechanismHorizontalBalance)]
         public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType)
         {
             Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType));
         }
 
         [Test]
-        [TestCase(0, FailureMechanismSystemType.StabilityInside)]
-        [TestCase(1, FailureMechanismSystemType.StabilityOutside)]
-        [TestCase(2, FailureMechanismSystemType.Piping)]
-        [TestCase(3, FailureMechanismSystemType.HorizontalBalance)]
+        [TestCase(ConversionHelper.InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside)]
+        [TestCase(ConversionHelper.InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside)]
+        [TestCase(ConversionHelper.InputFailureMechanismPiping, FailureMechanismSystemType.Piping)]
+        [TestCase(ConversionHelper.InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance)]
         public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType)
         {
             Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType));
         }
+       [Test]
+        [TestCase(SegmentFailureMechanismType.All, ConversionHelper.InputSegmentFailureMechanismAll)]
+        [TestCase(SegmentFailureMechanismType.Stability, ConversionHelper.InputSegmentFailureMechanismStability)]
+        [TestCase(SegmentFailureMechanismType.Piping, ConversionHelper.InputSegmentFailureMechanismPiping)]
+        [TestCase(SegmentFailureMechanismType.Liquefaction, ConversionHelper.InputSegmentFailureMechanismLiquefaction)]
+        public void CanConvertToInputFailureMechanismSystemType(SegmentFailureMechanismType failureMechanismSystemType, int inputFailureMechanismSystemType)
+        {
+            Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(failureMechanismSystemType));
+        }
 
         [Test]
+        [TestCase(ConversionHelper.InputSegmentFailureMechanismAll, SegmentFailureMechanismType.All)]
+        [TestCase(ConversionHelper.InputSegmentFailureMechanismStability, SegmentFailureMechanismType.Stability)]
+        [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping, SegmentFailureMechanismType.Piping)]
+        [TestCase(ConversionHelper.InputSegmentFailureMechanismLiquefaction, SegmentFailureMechanismType.Liquefaction)]
+        public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, SegmentFailureMechanismType failureMechanismSystemType)
+        {
+            Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputFailureMechanismSystemType));
+        }
+
+        [Test]
         [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)]
         [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
         [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 2173)
@@ -71,7 +71,7 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.FullStiFileName = soilGeometry2DName;
             subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile;
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability;
 
             var failureMechanismParametersMStab = new FailureMechanismParametersMStab();
             failureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs
===================================================================
diff -u -r1974 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs	(.../SegmentTests.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs	(.../SegmentTests.cs)	(revision 2173)
@@ -36,57 +36,57 @@
         [Test]
         public void CanGetMostProbableProbableProfile1DForStability()
         {
-            var segment = CreateSegment(FailureMechanismSystemType.StabilityInside, SoilProfileType.ProfileType1D);
-            Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.StabilityInside).SoilProfile1D.Name);
-            Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(FailureMechanismSystemType.StabilityInside).Name);
-            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.StabilityInside));
-            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.Piping));
-            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.Piping));
-            Assert.AreEqual(null, segment.GetMostProbableProfile1D(FailureMechanismSystemType.Piping));
+            var segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType1D);
+            Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name);
+            Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability).Name);
+            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
+            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping));
+            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
+            Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping));
         }
 
         [Test]
         public void CanGetMostProbableProbableProfile1DForPiping()
         {
-            var segment = CreateSegment(FailureMechanismSystemType.Piping, SoilProfileType.ProfileType1D);
-            Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.Piping).SoilProfile1D.Name);
-            Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(FailureMechanismSystemType.Piping).Name);
-            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.Piping));
-            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.StabilityInside));
-            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.StabilityInside));
-            Assert.AreEqual(null, segment.GetMostProbableProfile1D(FailureMechanismSystemType.StabilityInside));
+            var segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType1D);
+            Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name);
+            Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping).Name);
+            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
+            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability));
+            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
+            Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability));
         }
 
         [Test]
         public void CanGetMostProbableProbableProfile2DStiFileNameForStability()
         {
-            var segment = CreateSegment(FailureMechanismSystemType.StabilityInside, SoilProfileType.ProfileTypeStiFile);
-            Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.StabilityInside).FullStiFileName);
-            Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.StabilityInside));
-            Assert.AreEqual(null, segment.GetMostProbableProfile1D(FailureMechanismSystemType.StabilityInside));
-            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.Piping));
-            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.Piping));
-            Assert.AreEqual(null, segment.GetMostProbableProfile1D(FailureMechanismSystemType.Piping));
+            var segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileTypeStiFile);
+            Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).FullStiFileName);
+            Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
+            Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability));
+            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping));
+            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
+            Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping));
         }
 
         [Test]
         public void CanGetMostProbableProbableProfile2DStiFileNameForPiping()
         {
-            var segment = CreateSegment(FailureMechanismSystemType.Piping, SoilProfileType.ProfileTypeStiFile);
-            Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.Piping).FullStiFileName);
-            Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.Piping));
-            Assert.AreEqual(null, segment.GetMostProbableProfile1D(FailureMechanismSystemType.Piping));
-            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(FailureMechanismSystemType.StabilityInside));
-            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(FailureMechanismSystemType.StabilityInside));
-            Assert.AreEqual(null, segment.GetMostProbableProfile1D(FailureMechanismSystemType.StabilityInside));
+            var segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileTypeStiFile);
+            Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).FullStiFileName);
+            Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
+            Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping));
+            Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability));
+            Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
+            Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability));
         }
-        private static Segment CreateSegment(FailureMechanismSystemType failureMechanismSystemType, SoilProfileType soilProfileType)
+        private static Segment CreateSegment(SegmentFailureMechanismType segmentFailureMechanismType, SoilProfileType soilProfileType)
         {
             var segment = new Segment();
             segment.SoilProfileProbabilities.Add(new SoilGeometryProbability()
             {
                 Probability = 0.1,
-                SegmentFailureMechanismType = failureMechanismSystemType,
+                SegmentFailureMechanismType = segmentFailureMechanismType,
                 SoilProfileType = soilProfileType,
                 FullStiFileName = "sti filename 1",
                 SoilProfile1D = new SoilProfile1D()
@@ -97,7 +97,7 @@
             segment.SoilProfileProbabilities.Add(new SoilGeometryProbability()
             {
                 Probability = 0.4,
-                SegmentFailureMechanismType = failureMechanismSystemType,
+                SegmentFailureMechanismType = segmentFailureMechanismType,
                 SoilProfileType = soilProfileType,
                 FullStiFileName = "sti filename 2",
                 SoilProfile1D = new SoilProfile1D()
@@ -108,7 +108,7 @@
             segment.SoilProfileProbabilities.Add(new SoilGeometryProbability()
             {
                 Probability = 0.3,
-                SegmentFailureMechanismType = failureMechanismSystemType,
+                SegmentFailureMechanismType = segmentFailureMechanismType,
                 SoilProfileType = soilProfileType,
                 FullStiFileName = "sti filename 3",
                 SoilProfile1D = new SoilProfile1D()
@@ -119,7 +119,7 @@
             segment.SoilProfileProbabilities.Add(new SoilGeometryProbability()
             {
                 Probability = 0.2,
-                SegmentFailureMechanismType = failureMechanismSystemType,
+                SegmentFailureMechanismType = segmentFailureMechanismType,
                 SoilProfileType = soilProfileType,
                 FullStiFileName = "sti filename 4",
                 SoilProfile1D = new SoilProfile1D()
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r2172 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2172)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2173)
@@ -79,7 +79,7 @@
                 CalculationResult = CalculationResult.NoRun
             };
             kernelDataOutput = macroStabilityOutput;
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Stability)
             {
                 try
                 {
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r2157 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 2157)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 2173)
@@ -758,9 +758,9 @@
                     var soilGeometryProbability = new SoilGeometryProbability();
                     var inputSoilGeometryProbability = inputSegment.SoilGeometryProbability[i];
                     soilGeometryProbability.Probability = inputSoilGeometryProbability.Probability;
-                    if (inputSoilGeometryProbability.FailureMechanismSystemTypeSpecified)
+                    if (inputSoilGeometryProbability.SegmentFailureMechanismTypeSpecified)
                     {
-                        soilGeometryProbability.SegmentFailureMechanismType = ConversionHelper.ConvertToFailureMechanismSystemType(inputSoilGeometryProbability.FailureMechanismSystemType);
+                        soilGeometryProbability.SegmentFailureMechanismType = ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputSoilGeometryProbability.SegmentFailureMechanismType);
                     }
                     else
                     {
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2157 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2157)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2173)
@@ -805,12 +805,12 @@
                     inputSoilGeometryProbability.Probability = soilGeometryProbability.Probability;
                     if (soilGeometryProbability.SegmentFailureMechanismType.HasValue)
                     {
-                        inputSoilGeometryProbability.FailureMechanismSystemType = ConversionHelper.ConvertToInputFailureMechanismSystemType(soilGeometryProbability.SegmentFailureMechanismType.Value);
-                        inputSoilGeometryProbability.FailureMechanismSystemTypeSpecified = true;
+                        inputSoilGeometryProbability.SegmentFailureMechanismType = ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(soilGeometryProbability.SegmentFailureMechanismType.Value);
+                        inputSoilGeometryProbability.SegmentFailureMechanismTypeSpecified = true;
                     }
                     else
                     {
-                        inputSoilGeometryProbability.FailureMechanismSystemTypeSpecified = false;
+                        inputSoilGeometryProbability.SegmentFailureMechanismTypeSpecified = false;
                     }
                     inputSoilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryProbability.SoilProfileType);
                     switch (soilGeometryProbability.SoilProfileType)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r1970 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 1970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 2173)
@@ -103,7 +103,7 @@
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.StiFileName = soilGeometry2DName;
             subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile;
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability;
 
             var damKernelInput = new DamKernelInput();
             damKernelInput.Location = location;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
===================================================================
diff -u -r2111 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 2173)
@@ -63,7 +63,7 @@
                 FoSp = defaultMaxReturnValue
             };
             kernelDataOutput = damPipingOutput;
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.Piping)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == SegmentFailureMechanismType.Piping)
             {
                 var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
                 var location = damKernelInput.Location;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs
===================================================================
diff -u -r1970 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 1970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 2173)
@@ -67,8 +67,8 @@
             {
                 FailureMechanismParametersMStab = failureMechanismParametersMStab
             };
-            // Set the requested mechanism for this subsoil to StabilityInside to make it irrelevant
-            damKernelInput.SubSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
+            // Set the requested mechanism for this subsoil to Piping to make it irrelevant
+            damKernelInput.SubSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             // Prepare the wrapper. This should fail as the given mechanism is not relevant for this kernel
             IKernelDataInput damStabilityInput;
             IKernelDataOutput kernelOutput;
@@ -121,7 +121,7 @@
             {
                 SoilProfile1D = soilProfile,
                 SoilProfileType = SoilProfileType.ProfileType1D,
-                SegmentFailureMechanismType = FailureMechanismSystemType.HorizontalBalance
+                SegmentFailureMechanismType = SegmentFailureMechanismType.Stability
             };
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification
             {
@@ -287,7 +287,7 @@
             {
                 StiFileName = soilGeometry2DName,
                 SoilProfileType = SoilProfileType.ProfileTypeStiFile,
-                SegmentFailureMechanismType = FailureMechanismSystemType.HorizontalBalance
+                SegmentFailureMechanismType = SegmentFailureMechanismType.Stability
             };
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs
===================================================================
diff -u -r1970 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 1970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 2173)
@@ -66,7 +66,7 @@
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
@@ -137,7 +137,7 @@
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
@@ -207,7 +207,7 @@
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2166 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2166)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2173)
@@ -2144,9 +2144,9 @@
         
         private int soilProfileTypeField;
         
-        private int failureMechanismSystemTypeField;
+        private int segmentFailureMechanismTypeField;
         
-        private bool failureMechanismSystemTypeFieldSpecified;
+        private bool segmentFailureMechanismTypeFieldSpecified;
         
         private double probabilityField;
         
@@ -2174,23 +2174,23 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int FailureMechanismSystemType {
+        public int SegmentFailureMechanismType {
             get {
-                return this.failureMechanismSystemTypeField;
+                return this.segmentFailureMechanismTypeField;
             }
             set {
-                this.failureMechanismSystemTypeField = value;
+                this.segmentFailureMechanismTypeField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool FailureMechanismSystemTypeSpecified {
+        public bool SegmentFailureMechanismTypeSpecified {
             get {
-                return this.failureMechanismSystemTypeFieldSpecified;
+                return this.segmentFailureMechanismTypeFieldSpecified;
             }
             set {
-                this.failureMechanismSystemTypeFieldSpecified = value;
+                this.segmentFailureMechanismTypeFieldSpecified = value;
             }
         }
         
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r2050 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 2050)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 2173)
@@ -360,7 +360,7 @@
             subSoilScenario.StiFileName = "";
             subSoilScenario.FullStiFileName = "";
             subSoilScenario.SoilProfile2D = DamMacroStabilityTestHelper.CreateSoilProfile2D();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
+            subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability;
 
             subSoilScenario.SoilProfile1D = DamMacroStabilityTestHelper.CreateSoilProfile1D();
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs
===================================================================
diff -u -r1974 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs	(.../SoilGeometryProbability.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometryProbability.cs	(.../SoilGeometryProbability.cs)	(revision 2173)
@@ -84,7 +84,7 @@
         /// <value>
         /// The type of the segment failure mechanism.
         /// </value>
-        public virtual FailureMechanismSystemType? SegmentFailureMechanismType { get; set; }
+        public virtual SegmentFailureMechanismType? SegmentFailureMechanismType { get; set; }
 
         /// <summary>
         /// Gets or sets the probability of occurance; number between 0.0 and 100.0.
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r2172 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 2172)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 2173)
@@ -589,7 +589,7 @@
                 var soilProfileProbability = new SoilGeometryProbability();
                 if (i == 0)
                 {
-                    soilProfileProbability.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
+                    soilProfileProbability.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability;
                     soilProfileProbability.SoilProfile2DName = "Profile2D " + (i + 1).ToString();
                     soilProfileProbability.SoilProfile2D = FillDamFromXmlInput.FindSoilProfile2DByName(damProjectData.Dike.SoilProfiles2D,
                         soilProfileProbability.SoilProfile2DName);
@@ -604,7 +604,7 @@
                 }
                 else
                 {
-                    soilProfileProbability.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+                    soilProfileProbability.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
                     soilProfileProbability.SoilProfile1DName = "Profile1D " + (i + 1).ToString();
                     soilProfileProbability.SoilProfile1D = FillDamFromXmlInput.FindSoilProfile1DByName(damProjectData.Dike.SoilProfiles,
                         soilProfileProbability.SoilProfile1DName);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r2113 -r2173
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2113)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2173)
@@ -137,14 +137,8 @@
                     if (!ContainsMissingValues(sensorValues, series.MissVal))
                     {
                         FailureMechanismSystemType soilProbabilityFailureMechanismSystemType = damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType;
-                        if (soilProbabilityFailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)
-                        {
-                            // Note: as segments and thus SubSoilScenario are generally divided into Piping versus Stability,
-                            // the actual SegmentFailureMechanismType would be set to StabilityInside rather than StabilityOutside
-                            // So for StabilityOutside lookup the StabilityInside profile 
-                            soilProbabilityFailureMechanismSystemType = FailureMechanismSystemType.StabilityInside;
-                        }
-                        var soiProfileProbability = location.Segment.GetMostProbableSoilGeometryProbability(soilProbabilityFailureMechanismSystemType);
+                        var soiProfileProbability = location.Segment.GetMostProbableSoilGeometryProbability(
+                            ConversionHelper.ConvertToSegmentFailureMechanismType(soilProbabilityFailureMechanismSystemType));
                         var projectPath = damProjectData.ProjectPath != "" ? damProjectData.ProjectPath : Directory.GetCurrentDirectory();
                         var calculationMessages = new List<LogMessage>();
                         operationalCalculatorTasks.Add(new OperationalCalculatorTask()