Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs
===================================================================
diff -u -r58f549f29af0d4cea483e039843b29483e5dec52 -r49285e2d4b1469c99b962584c656aa2a50471dae
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision 58f549f29af0d4cea483e039843b29483e5dec52)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision 49285e2d4b1469c99b962584c656aa2a50471dae)
@@ -63,7 +63,7 @@
         {
             SurfaceLineCharacteristicPoint[] characteristicPoints = surfaceLine.LocalGeometry.Select(p => new SurfaceLineCharacteristicPoint
             {
-                CharacteristicPoint = CharacteristicPointType.None,
+                CharacteristicPointType = CharacteristicPointType.None,
                 GeometryPoint = new CSharpWrapperPoint2D(p.X, p.Y)
             }).ToArray();
 
@@ -82,62 +82,62 @@
 
             if (ReferenceEquals(surfaceLine.DitchPolderSide, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.DitchPolderSide;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.DitchPolderSide;
             }
 
             if (ReferenceEquals(surfaceLine.BottomDitchPolderSide, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.BottomDitchPolderSide;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.BottomDitchPolderSide;
             }
 
             if (ReferenceEquals(surfaceLine.BottomDitchDikeSide, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.BottomDitchDikeSide;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.BottomDitchDikeSide;
             }
 
             if (ReferenceEquals(surfaceLine.DitchDikeSide, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.DitchDikeSide;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.DitchDikeSide;
             }
 
             if (ReferenceEquals(surfaceLine.DikeToeAtPolder, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.DikeToeAtPolder;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.DikeToeAtPolder;
             }
 
             if (ReferenceEquals(surfaceLine.DikeToeAtRiver, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.DikeToeAtRiver;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.DikeToeAtRiver;
             }
 
             if (ReferenceEquals(surfaceLine.DikeTopAtPolder, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.DikeTopAtPolder;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.DikeTopAtPolder;
             }
 
             if (ReferenceEquals(surfaceLine.ShoulderBaseInside, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.ShoulderBaseInside;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.ShoulderBaseInside;
             }
 
             if (ReferenceEquals(surfaceLine.ShoulderTopInside, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.ShoulderTopInside;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.ShoulderTopInside;
             }
 
             if (ReferenceEquals(surfaceLine.SurfaceLevelInside, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.SurfaceLevelInside;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.SurfaceLevelInside;
             }
 
             if (ReferenceEquals(surfaceLine.SurfaceLevelOutside, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.SurfaceLevelOutside;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.SurfaceLevelOutside;
             }
 
             if (ReferenceEquals(surfaceLine.DikeTopAtRiver, surfaceLinePoint))
             {
-                characteristicPoint.CharacteristicPoint = CharacteristicPointType.DikeTopAtRiver;
+                characteristicPoint.CharacteristicPointType = CharacteristicPointType.DikeTopAtRiver;
             }
         }
     }
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs
===================================================================
diff -u -r58f549f29af0d4cea483e039843b29483e5dec52 -r49285e2d4b1469c99b962584c656aa2a50471dae
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs	(.../SurfaceLineCreatorTest.cs)	(revision 58f549f29af0d4cea483e039843b29483e5dec52)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs	(.../SurfaceLineCreatorTest.cs)	(revision 49285e2d4b1469c99b962584c656aa2a50471dae)
@@ -78,7 +78,7 @@
             // Assert
             CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.X), actual.CharacteristicPoints.Select(p => p.GeometryPoint.X));
             CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z), actual.CharacteristicPoints.Select(p => p.GeometryPoint.Z));
-            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPoint == CharacteristicPointType.None));
+            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPointType == CharacteristicPointType.None));
         }
 
         [Test]
@@ -103,7 +103,7 @@
 
             CollectionAssert.AreEqual(expectedCoordinatesX, actual.CharacteristicPoints.Select(p => p.GeometryPoint.X), new DoubleWithToleranceComparer(1e-2));
             CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z), actual.CharacteristicPoints.Select(p => p.GeometryPoint.Z));
-            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPoint == CharacteristicPointType.None));
+            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPointType == CharacteristicPointType.None));
         }
 
         [Test]
@@ -134,7 +134,7 @@
 
             CollectionAssert.AreEqual(expectedCoordinatesX, actual.CharacteristicPoints.Select(p => p.GeometryPoint.X), new DoubleWithToleranceComparer(1e-2));
             CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z), actual.CharacteristicPoints.Select(p => p.GeometryPoint.Z));
-            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPoint == CharacteristicPointType.None));
+            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPointType == CharacteristicPointType.None));
         }
 
         [Test]
@@ -159,7 +159,7 @@
 
             CollectionAssert.AreEqual(expectedCoordinatesX, actual.CharacteristicPoints.Select(p => p.GeometryPoint.X));
             CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z), actual.CharacteristicPoints.Select(p => p.GeometryPoint.Z));
-            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPoint == CharacteristicPointType.None));
+            Assert.IsTrue(actual.CharacteristicPoints.All(cp => cp.CharacteristicPointType == CharacteristicPointType.None));
         }
 
         [Test]
@@ -208,18 +208,18 @@
             CollectionAssert.AreEqual(expectedCoordinatesX, actual.CharacteristicPoints.Select(p => p.GeometryPoint.X));
             CollectionAssert.AreEqual(expectedCoordinatesZ, actual.CharacteristicPoints.Select(p => p.GeometryPoint.Z));
 
-            Assert.AreEqual(CharacteristicPointType.BottomDitchDikeSide, actual.CharacteristicPoints.ElementAt(0).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.BottomDitchPolderSide, actual.CharacteristicPoints.ElementAt(1).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.DikeToeAtPolder, actual.CharacteristicPoints.ElementAt(2).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.DikeToeAtRiver, actual.CharacteristicPoints.ElementAt(3).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.DikeTopAtPolder, actual.CharacteristicPoints.ElementAt(4).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.DitchDikeSide, actual.CharacteristicPoints.ElementAt(5).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.DitchPolderSide, actual.CharacteristicPoints.ElementAt(6).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.SurfaceLevelInside, actual.CharacteristicPoints.ElementAt(7).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.SurfaceLevelOutside, actual.CharacteristicPoints.ElementAt(8).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.ShoulderBaseInside, actual.CharacteristicPoints.ElementAt(9).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.ShoulderTopInside, actual.CharacteristicPoints.ElementAt(10).CharacteristicPoint);
-            Assert.AreEqual(CharacteristicPointType.DikeTopAtRiver, actual.CharacteristicPoints.ElementAt(11).CharacteristicPoint);
+            Assert.AreEqual(CharacteristicPointType.BottomDitchDikeSide, actual.CharacteristicPoints.ElementAt(0).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.BottomDitchPolderSide, actual.CharacteristicPoints.ElementAt(1).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.DikeToeAtPolder, actual.CharacteristicPoints.ElementAt(2).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.DikeToeAtRiver, actual.CharacteristicPoints.ElementAt(3).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.DikeTopAtPolder, actual.CharacteristicPoints.ElementAt(4).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.DitchDikeSide, actual.CharacteristicPoints.ElementAt(5).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.DitchPolderSide, actual.CharacteristicPoints.ElementAt(6).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.SurfaceLevelInside, actual.CharacteristicPoints.ElementAt(7).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.SurfaceLevelOutside, actual.CharacteristicPoints.ElementAt(8).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.ShoulderBaseInside, actual.CharacteristicPoints.ElementAt(9).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.ShoulderTopInside, actual.CharacteristicPoints.ElementAt(10).CharacteristicPointType);
+            Assert.AreEqual(CharacteristicPointType.DikeTopAtRiver, actual.CharacteristicPoints.ElementAt(11).CharacteristicPointType);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs
===================================================================
diff -u -rc8a3baa07e55a09e409c70c1fcaed383f575ed9f -r49285e2d4b1469c99b962584c656aa2a50471dae
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs	(.../KernelInputAssert.cs)	(revision c8a3baa07e55a09e409c70c1fcaed383f575ed9f)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs	(.../KernelInputAssert.cs)	(revision 49285e2d4b1469c99b962584c656aa2a50471dae)
@@ -200,7 +200,7 @@
             Assert.AreEqual(expected.Count, actual.Count);
 
             CollectionAssert.AreEqual(expected.Select(slcp => slcp.GeometryPoint), actual.Select(slcp => slcp.GeometryPoint), new StabilityPointComparer());
-            CollectionAssert.AreEqual(expected.Select(slcp => slcp.CharacteristicPoint), actual.Select(slcp => slcp.CharacteristicPoint));
+            CollectionAssert.AreEqual(expected.Select(slcp => slcp.CharacteristicPointType), actual.Select(slcp => slcp.CharacteristicPointType));
         }
     }
 }
\ No newline at end of file
Index: lib/Plugins/Wti/Deltares.MacroStability.CSharpWrapper.dll
===================================================================
diff -u -r0ec7d1eea6fb0f99ed8f06faf894f4d95e93e3a0 -r49285e2d4b1469c99b962584c656aa2a50471dae
Binary files differ
Index: lib/Plugins/Wti/Deltares.MacroStability.CSharpWrapper.pdb
===================================================================
diff -u -r0ec7d1eea6fb0f99ed8f06faf894f4d95e93e3a0 -r49285e2d4b1469c99b962584c656aa2a50471dae
Binary files differ