Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs
===================================================================
diff -u -r6106 -r6245
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs	(.../SurfaceLine2Tests.cs)	(revision 6106)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs	(.../SurfaceLine2Tests.cs)	(revision 6245)
@@ -45,19 +45,19 @@
         Assert.Multiple(() =>
         {
             Assert.That(surfaceLine.CharacteristicPoints, Has.Count.EqualTo(10));
-            Assert.That(surfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(surfaceLine.Geometry.Points, Has.Count.EqualTo(9));
         });
         // Note: resetting GeometryMustContainPoint to false after filling the surface line will erase all Characteristic Points.
         // So the actual code should NEVER reset the GeometryMustContainPoint for filled surface lines. 
         surfaceLine.CharacteristicPoints.GeometryMustContainPoint = false;
         Assert.That(surfaceLine.CharacteristicPoints, Is.Empty);
         SurfaceLine2 newSurfaceLine = surfaceLine.FullDeepClone();
         surfaceLine.CharacteristicPoints.Clear();
-        surfaceLine.Geometry.CalcPoints.Clear();
+        surfaceLine.Geometry.Points.Clear();
         Assert.Multiple(() =>
         {
             Assert.That(newSurfaceLine.CharacteristicPoints, Is.Empty);
-            Assert.That(newSurfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(newSurfaceLine.Geometry.Points, Has.Count.EqualTo(9));
         });
     }
 
@@ -68,24 +68,24 @@
         Assert.Multiple(() =>
         {
             Assert.That(surfaceLine.CharacteristicPoints, Has.Count.EqualTo(10));
-            Assert.That(surfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(surfaceLine.Geometry.Points, Has.Count.EqualTo(9));
         });
         // Note: resetting GeometryMustContainPoint to true after filling the surface line reset the Characteristic Points to be
         // equal to the amount of geometry points, keeping only one type, possibly making the surface line invalid.
         // So the actual code should NEVER reset the GeometryMustContainPoint for filled surface lines.
         surfaceLine.CharacteristicPoints.GeometryMustContainPoint = true;
         Assert.Multiple(() =>
         {
-            Assert.That(surfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(surfaceLine.Geometry.Points, Has.Count.EqualTo(9));
             Assert.That(surfaceLine.CharacteristicPoints, Has.Count.EqualTo(9));
         });
         SurfaceLine2 newSurfaceLine = surfaceLine.FullDeepClone();
         surfaceLine.CharacteristicPoints.Clear();
-        surfaceLine.Geometry.CalcPoints.Clear();
+        surfaceLine.Geometry.Points.Clear();
         Assert.Multiple(() =>
         {
             Assert.That(newSurfaceLine.CharacteristicPoints, Has.Count.EqualTo(9));
-            Assert.That(newSurfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(newSurfaceLine.Geometry.Points, Has.Count.EqualTo(9));
         });
     }
 
@@ -96,15 +96,15 @@
         Assert.Multiple(() =>
         {
             Assert.That(surfaceLine.CharacteristicPoints, Has.Count.EqualTo(10));
-            Assert.That(surfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(surfaceLine.Geometry.Points, Has.Count.EqualTo(9));
         });
         SurfaceLine2 newSurfaceLine = surfaceLine.FullDeepClone();
         surfaceLine.CharacteristicPoints.Clear();
-        surfaceLine.Geometry.CalcPoints.Clear();
+        surfaceLine.Geometry.Points.Clear();
         Assert.Multiple(() =>
         {
             Assert.That(newSurfaceLine.CharacteristicPoints, Has.Count.EqualTo(10));
-            Assert.That(newSurfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(newSurfaceLine.Geometry.Points, Has.Count.EqualTo(9));
         });
         var tolerance = 1e-8;
         surfaceLine = FillSurfaceLine2();
@@ -160,9 +160,9 @@
         {
             Assert.That(surfaceLine.CharacteristicPoints.Count(cp => Math.Abs(cp.Point.X - 13.0) < tolerance && Math.Abs(cp.Point.Z - 5.4) < tolerance), Is.EqualTo(2));
             // Because TrafficLoadOutside and DikeTopAtPolder are on the same location, 1 point less should be in the geometry
-            Assert.That(surfaceLine.Geometry.CalcPoints, Has.Count.EqualTo(9));
+            Assert.That(surfaceLine.Geometry.Points, Has.Count.EqualTo(9));
         });
-        Assert.That(surfaceLine.Geometry.CalcPoints.Count(cp => Math.Abs(cp.X - 13.0) < tolerance && Math.Abs(cp.Z - 5.4) < tolerance), Is.EqualTo(1));
+        Assert.That(surfaceLine.Geometry.Points.Count(cp => Math.Abs(cp.X - 13.0) < tolerance && Math.Abs(cp.Z - 5.4) < tolerance), Is.EqualTo(1));
     }
 
     private SurfaceLine2 FillSurfaceLine2()