Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelSegmentTest.cs
===================================================================
diff -u -r25dd6ff5b74aec73e47df4488c05439a143711e1 -r3bf7e84ac84de7dd0be38be7e9f2372878e733f6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelSegmentTest.cs	(.../StochasticSoilModelSegmentTest.cs)	(revision 25dd6ff5b74aec73e47df4488c05439a143711e1)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelSegmentTest.cs	(.../StochasticSoilModelSegmentTest.cs)	(revision 3bf7e84ac84de7dd0be38be7e9f2372878e733f6)
@@ -35,14 +35,14 @@
         public void Constructor_Always_ExpectedValues(long segmentSoilModelId, string segmentSoilModelName, string segmentName)
         {
             // Call
-            StochasticSoilModelSegment stochasticSoilModelSegment = new StochasticSoilModelSegment(segmentSoilModelId, segmentSoilModelName, segmentName);
+            StochasticSoilModel stochasticSoilModelSegment = new StochasticSoilModel(segmentSoilModelId, segmentSoilModelName, segmentName);
 
             // Assert
-            Assert.IsInstanceOf<StochasticSoilModelSegment>(stochasticSoilModelSegment);
+            Assert.IsInstanceOf<StochasticSoilModel>(stochasticSoilModelSegment);
             Assert.AreEqual(segmentSoilModelId, stochasticSoilModelSegment.SegmentSoilModelId);
             Assert.AreEqual(segmentSoilModelName, stochasticSoilModelSegment.SegmentSoilModelName);
             Assert.AreEqual(segmentName, stochasticSoilModelSegment.SegmentName);
-            CollectionAssert.IsEmpty(stochasticSoilModelSegment.SegmentPoints);
+            CollectionAssert.IsEmpty(stochasticSoilModelSegment.Geometry);
             CollectionAssert.IsEmpty(stochasticSoilModelSegment.StochasticSoilProfileProbabilities);
         }
 
@@ -53,18 +53,18 @@
             const long expectedSegmentSoilModelId = 1234L;
             const string expectedSegmentSoilModelName = "someSegmentSoilModelName";
             const string expectedSegmentName = "someSegmentName";
-            StochasticSoilModelSegment stochasticSoilModelSegment = new StochasticSoilModelSegment(expectedSegmentSoilModelId, expectedSegmentSoilModelName, expectedSegmentName);
+            StochasticSoilModel stochasticSoilModelSegment = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName, expectedSegmentName);
             var point2D = new Point2D(1.0, 2.0);
 
             // Call
-            stochasticSoilModelSegment.SegmentPoints.Add(point2D);
+            stochasticSoilModelSegment.Geometry.Add(point2D);
 
             // Assert
             Assert.AreEqual(expectedSegmentSoilModelId, stochasticSoilModelSegment.SegmentSoilModelId);
             Assert.AreEqual(expectedSegmentSoilModelName, stochasticSoilModelSegment.SegmentSoilModelName);
             Assert.AreEqual(expectedSegmentName, stochasticSoilModelSegment.SegmentName);
-            Assert.AreEqual(1, stochasticSoilModelSegment.SegmentPoints.Count);
-            Assert.AreEqual(point2D, stochasticSoilModelSegment.SegmentPoints[0]);
+            Assert.AreEqual(1, stochasticSoilModelSegment.Geometry.Count);
+            Assert.AreEqual(point2D, stochasticSoilModelSegment.Geometry[0]);
         }
 
         [Test]
@@ -74,10 +74,10 @@
             const long expectedSegmentSoilModelId = 1234L;
             const string expectedSegmentSoilModelName = "someSegmentSoilModelName";
             const string expectedSegmentName = "someSegmentName";
-            StochasticSoilModelSegment stochasticSoilModelSegment = new StochasticSoilModelSegment(expectedSegmentSoilModelId, expectedSegmentSoilModelName, expectedSegmentName);
+            StochasticSoilModel stochasticSoilModelSegment = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName, expectedSegmentName);
 
             MockRepository mockRepository = new MockRepository();
-            var stochasticSoilProfileProbabilityMock = mockRepository.StrictMock<StochasticSoilProfileProbability>(1.0, null, null);
+            var stochasticSoilProfileProbabilityMock = mockRepository.StrictMock<StochasticSoilProfile>(1.0, null, null);
             mockRepository.ReplayAll();
 
             // Call