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()