Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryLoop.cs
===================================================================
diff -u -r6245 -r6253
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryLoop.cs	(.../GeometryLoop.cs)	(revision 6245)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryLoop.cs	(.../GeometryLoop.cs)	(revision 6253)
@@ -194,14 +194,14 @@
             }
             else
             {
-                if (!AddEitherHeadOrEndPointOfCurveToCalcPoints(index, points))
+                if (!AddEitherHeadOrEndPointOfCurveToPoints(index, points))
                 {
                     if (points.Count == 2)
                     {
                         points.Reverse();
                     }
 
-                    AddEitherHeadOrEndPointOfCurveToCalcPoints(index, points);
+                    AddEitherHeadOrEndPointOfCurveToPoints(index, points);
                 }
             }
         }
@@ -210,7 +210,7 @@
         return points;
     }
 
-    private bool AddEitherHeadOrEndPointOfCurveToCalcPoints(int index, List<Point2D> points)
+    private bool AddEitherHeadOrEndPointOfCurveToPoints(int index, List<Point2D> points)
     {
         if (CurveList[index].HeadPoint.LocationEquals(points[points.Count - 1]))
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/LayerDetector.cs
===================================================================
diff -u -r6245 -r6253
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/LayerDetector.cs	(.../LayerDetector.cs)	(revision 6245)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/LayerDetector.cs	(.../LayerDetector.cs)	(revision 6253)
@@ -84,18 +84,18 @@
     {
         var tel = 0;
         var curve = new GeometryCurve();
-        foreach (Point2D loopCalcPoint in loop.Points)
+        foreach (Point2D loopPoint in loop.Points)
         {
             if (tel == 0) //(tel % 2 == 0)
             {
-                curve.HeadPoint = loopCalcPoint;
+                curve.HeadPoint = loopPoint;
             }
             else
             {
-                curve.EndPoint = loopCalcPoint;
+                curve.EndPoint = loopPoint;
                 loop.CurveList.Add(curve);
                 curve = new GeometryCurve();
-                curve.HeadPoint = loopCalcPoint;
+                curve.HeadPoint = loopPoint;
             }
 
             tel++;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs
===================================================================
diff -u -r6087 -r6253
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs	(.../GeometryCurve.cs)	(revision 6087)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs	(.../GeometryCurve.cs)	(revision 6253)
@@ -193,10 +193,10 @@
     /// Clones the curve.
     /// </summary>
     /// <returns>Returns a clone</returns>
-    public GeometryCurve Clone(List<Point2D> calcPoints)
+    public GeometryCurve Clone(List<Point2D> points)
     {
-        Point2D clonedHeadPoint = calcPoints.Find(p => p.LocationEquals(HeadPoint));
-        Point2D clonedEndPoint = calcPoints.Find(p => p.LocationEquals(EndPoint));
+        Point2D clonedHeadPoint = points.Find(p => p.LocationEquals(HeadPoint));
+        Point2D clonedEndPoint = points.Find(p => p.LocationEquals(EndPoint));
         var curve = new GeometryCurve(clonedHeadPoint, clonedEndPoint)
         {
             Name = Name
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporter.cs
===================================================================
diff -u -r6245 -r6253
--- DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporter.cs	(.../GeometryExporter.cs)	(revision 6245)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/GeometryExport/GeometryExporter.cs	(.../GeometryExporter.cs)	(revision 6253)
@@ -125,9 +125,9 @@
         {
             // Export calc points
             writer.WriteLine("[BEGIN CALC POINTS] " + surfaceLine.Points.Count);
-            foreach (Point2D calcPoint in surfaceLine.Points)
+            foreach (Point2D point in surfaceLine.Points)
             {
-                writer.WriteLine($"{calcPoint.X}, {calcPoint.Z}");
+                writer.WriteLine($"{point.X}, {point.Z}");
             }
             writer.WriteLine("[END CALC POINTS]");
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r6245 -r6253
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 6245)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 6253)
@@ -334,14 +334,14 @@
     {
         Assert.That(actualHeadLine.Name, Is.EqualTo(expectedHeadLine.Name));
 
-        List<Point2D> expectedCalcPoints = expectedHeadLine.Points;
-        int expectedNrOfCalcPoints = expectedCalcPoints.Count;
-        List<Point2D> actualCalcPoints = actualHeadLine.Points;
-        Assert.That(actualCalcPoints, Has.Count.EqualTo(expectedNrOfCalcPoints));
-        for (var i = 0; i < expectedNrOfCalcPoints; i++)
+        List<Point2D> expectedPoints = expectedHeadLine.Points;
+        int expectedNrOfPoints = expectedPoints.Count;
+        List<Point2D> actualPoints = actualHeadLine.Points;
+        Assert.That(actualPoints, Has.Count.EqualTo(expectedNrOfPoints));
+        for (var i = 0; i < expectedNrOfPoints; i++)
         {
-            Point2D expectedCoordinate = expectedCalcPoints[i];
-            Point2D actualCoordinate = actualCalcPoints[i];
+            Point2D expectedCoordinate = expectedPoints[i];
+            Point2D actualCoordinate = actualPoints[i];
 
             Assert.That(expectedCoordinate.LocationEquals(actualCoordinate), Is.True);
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs
===================================================================
diff -u -r6086 -r6253
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs	(.../GeometryCurveTests.cs)	(revision 6086)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs	(.../GeometryCurveTests.cs)	(revision 6253)
@@ -139,12 +139,12 @@
     public class GivenGeometryCurve
     {
         private static readonly GeometryCurve geometryCurve = CreateGeometryCurve(); 
-        private static readonly List<Point2D> calcPoints = ClonedPoints(geometryCurve); 
+        private static readonly List<Point2D> points = ClonedPoints(geometryCurve); 
 
         [TestFixture]
         public class WhenCloned : GivenGeometryCurve
         {
-            private static readonly GeometryCurve clonedGeometryCurve = geometryCurve.Clone(calcPoints);
+            private static readonly GeometryCurve clonedGeometryCurve = geometryCurve.Clone(points);
 
             [Test]
             public void ThenCopyOfCurveIsReturned()
@@ -173,7 +173,7 @@
                 geometryCurve.SurfaceAtLeft = null;
                 geometryCurve.SurfaceAtRight = null;
             }
-            private static readonly GeometryCurve clonedGeometryCurve = geometryCurve.Clone(calcPoints);
+            private static readonly GeometryCurve clonedGeometryCurve = geometryCurve.Clone(points);
 
             [Test]
             public void ThenCopyOfCurveIsReturned_WithoutExceptions()