Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r574 -r582
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 574)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 582)
@@ -297,13 +297,13 @@
                     }
                     if (soilGeometryProbability.SoilGeometryType == SoilGeometryType.SoilGeometry1D)
                     {
-                        inputSoilGeometryProbability.SoilGeometryName = soilGeometryProbability.SoilGeometryName;
+                        inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilGeometryName;
                     }
                     else
                     {
-                        inputSoilGeometryProbability.SoilGeometryName = soilGeometryProbability.SoilGeometry2DName;
+                        inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilGeometry2DName;
                     }
-                    inputSoilGeometryProbability.SoilGeometryType = ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryProbability.SoilGeometryType);
+                    inputSoilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryProbability.SoilGeometryType);
                     inputSegment.SoilGeometryProbability[i] = inputSoilGeometryProbability;
                 }
             }
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r574 -r582
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 574)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 582)
@@ -241,17 +241,17 @@
                 {
                     soilGeometryProbability.SegmentFailureMechanismType = null;
                 }
-                if (inputSoilGeometryProbability.SoilGeometryType == SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D)
+                if (inputSoilGeometryProbability.SoilProfileType == 0)
                 {
-                    soilGeometryProbability.SoilProfile = FindSoilProfile1DByName(dikeSoilProfiles, inputSoilGeometryProbability.SoilGeometryName);
+                    soilGeometryProbability.SoilProfile = FindSoilProfile1DByName(dikeSoilProfiles, inputSoilGeometryProbability.SoilProfileName);
                 }
                 else
                 {
-                    soilGeometryProbability.SoilGeometry2DName = inputSoilGeometryProbability.SoilGeometryName;
+                    soilGeometryProbability.SoilGeometry2DName = inputSoilGeometryProbability.SoilProfileName;
                 }
-                if (soilGeometryProbability.SoilGeometryType != ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryProbability.SoilGeometryType))
+                if (soilGeometryProbability.SoilGeometryType != ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryProbability.SoilProfileType))
                 {
-                    throw new ConversionException(typeof(SegmentSoilGeometryProbabilitySoilGeometryType), soilGeometryProbability.SoilGeometryType);
+                    throw new ConversionException(typeof(SegmentSoilGeometryProbability), soilGeometryProbability.SoilGeometryType);
                 }
                 segment.SoilProfileProbabilities.Add(soilGeometryProbability);
             }
Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r568 -r582
--- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 568)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 582)
@@ -189,37 +189,37 @@
         }
 
         [Test]
-        [TestCase(SoilGeometryType.SoilGeometry1D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D)]
-        [TestCase(SoilGeometryType.SoilGeometry2D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D)]
-        public void CanConvertToInputSoilGeometryType(SoilGeometryType soilGeometryType, SegmentSoilGeometryProbabilitySoilGeometryType inputSoilGeometryType)
+        [TestCase(SoilGeometryType.SoilGeometry1D, 0)]
+        [TestCase(SoilGeometryType.SoilGeometry2D, 2)]
+        public void CanConvertToInputSoilGeometryType(SoilGeometryType soilGeometryType, int inputSoilGeometryType)
         {
             Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilGeometryType(soilGeometryType));
         }
 
         [Test]
-        [TestCase(SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D, SoilGeometryType.SoilGeometry1D)]
-        [TestCase(SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D, SoilGeometryType.SoilGeometry2D)]
-        public void CanConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilGeometryType inputSoilGeometryType, SoilGeometryType soilGeometryType)
+        [TestCase(0, SoilGeometryType.SoilGeometry1D)]
+        [TestCase(2, SoilGeometryType.SoilGeometry2D)]
+        public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilGeometryType soilGeometryType)
         {
             Assert.AreEqual(soilGeometryType, ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType));
         }
 
         [Test]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside)]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside)]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping)]
-        [TestCase(SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance, FailureMechanismSystemType.HorizontalBalance)]
-        public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, SegmentSoilGeometryProbabilityFailureMechanismSystemType inputFailureMechanismSystemType)
+        [TestCase(0, FailureMechanismSystemType.StabilityInside)]
+        [TestCase(1, FailureMechanismSystemType.StabilityOutside)]
+        [TestCase(2, FailureMechanismSystemType.Piping)]
+        [TestCase(3, FailureMechanismSystemType.HorizontalBalance)]
+        public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType)
         {
             Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType));
         }
 
         [Test]
-        [TestCase(FailureMechanismSystemType.StabilityInside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside)]
-        [TestCase(FailureMechanismSystemType.StabilityOutside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside)]
-        [TestCase(FailureMechanismSystemType.Piping, SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping)]
-        [TestCase(FailureMechanismSystemType.HorizontalBalance, SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance)]
-        public void CanConvertToFailureMechanismSystemType(SegmentSoilGeometryProbabilityFailureMechanismSystemType inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType)
+        [TestCase(FailureMechanismSystemType.StabilityInside, 0)]
+        [TestCase(FailureMechanismSystemType.StabilityOutside, 1)]
+        [TestCase(FailureMechanismSystemType.Piping,2)]
+        [TestCase(FailureMechanismSystemType.HorizontalBalance, 3)]
+        public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType)
         {
             Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType));
         }
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r568 -r582
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 568)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 582)
@@ -301,12 +301,12 @@
         /// </summary>
         /// <param name="soilGeometryType">Type of the soil geometry.</param>
         /// <returns></returns>
-        public static SegmentSoilGeometryProbabilitySoilGeometryType ConvertToInputSoilGeometryType(SoilGeometryType soilGeometryType)
+        public static int ConvertToInputSoilGeometryType(SoilGeometryType soilGeometryType)
         {
-            var translationTable = new Dictionary<SoilGeometryType, SegmentSoilGeometryProbabilitySoilGeometryType>()
+            var translationTable = new Dictionary<SoilGeometryType, int>()
                                                {
-                                                   {SoilGeometryType.SoilGeometry1D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D},
-                                                   {SoilGeometryType.SoilGeometry2D, SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D}
+                                                   {SoilGeometryType.SoilGeometry1D, 0},
+                                                   {SoilGeometryType.SoilGeometry2D, 2}
                                                };
             return translationTable[soilGeometryType];
         }
@@ -316,12 +316,12 @@
         /// </summary>
         /// <param name="soilGeometryType">Type of the soil geometry.</param>
         /// <returns></returns>
-        public static SoilGeometryType ConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilGeometryType soilGeometryType)
+        public static SoilGeometryType ConvertToSoilGeometryType(int soilGeometryType)
         {
-            var translationTable = new Dictionary<SegmentSoilGeometryProbabilitySoilGeometryType, SoilGeometryType>()
+            var translationTable = new Dictionary<int, SoilGeometryType>()
                                                {
-                                                   {SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry1D, SoilGeometryType.SoilGeometry1D},
-                                                   {SegmentSoilGeometryProbabilitySoilGeometryType.SoilGeometry2D, SoilGeometryType.SoilGeometry2D}
+                                                   {0, SoilGeometryType.SoilGeometry1D},
+                                                   {2, SoilGeometryType.SoilGeometry2D}
                                                };
             return translationTable[soilGeometryType];
         }
@@ -331,14 +331,14 @@
         /// </summary>
         /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
         /// <returns></returns>
-        public static SegmentSoilGeometryProbabilityFailureMechanismSystemType ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType segmentFailureMechanismType)
+        public static int ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType segmentFailureMechanismType)
         {
-            var translationTable = new Dictionary<FailureMechanismSystemType, SegmentSoilGeometryProbabilityFailureMechanismSystemType>()
+            var translationTable = new Dictionary<FailureMechanismSystemType, int>()
                                                {
-                                                   {FailureMechanismSystemType.StabilityInside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside},
-                                                   {FailureMechanismSystemType.StabilityOutside, SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside},
-                                                   {FailureMechanismSystemType.Piping, SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping},
-                                                   {FailureMechanismSystemType.HorizontalBalance, SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance}
+                                                   {FailureMechanismSystemType.StabilityInside, 0},
+                                                   {FailureMechanismSystemType.StabilityOutside, 1},
+                                                   {FailureMechanismSystemType.Piping, 2},
+                                                   {FailureMechanismSystemType.HorizontalBalance, 3}
                                                };
             return translationTable[segmentFailureMechanismType];
         }
@@ -348,14 +348,14 @@
         /// </summary>
         /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
         /// <returns></returns>
-        public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(SegmentSoilGeometryProbabilityFailureMechanismSystemType failureMechanismSystemType)
+        public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(int failureMechanismSystemType)
         {
-            var translationTable = new Dictionary<SegmentSoilGeometryProbabilityFailureMechanismSystemType, FailureMechanismSystemType>()
+            var translationTable = new Dictionary<int, FailureMechanismSystemType>()
                                                {
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside},
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside},
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping},
-                                                   {SegmentSoilGeometryProbabilityFailureMechanismSystemType.HorizontalBalance, FailureMechanismSystemType.HorizontalBalance}
+                                                   {0, FailureMechanismSystemType.StabilityInside},
+                                                   {1, FailureMechanismSystemType.StabilityOutside},
+                                                   {2, FailureMechanismSystemType.Piping},
+                                                   {3, FailureMechanismSystemType.HorizontalBalance}
                                                };
             return translationTable[failureMechanismSystemType];
         }