Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneConstraintsCreator.cs
===================================================================
diff -u -rd53ecda155e9a1e16f01e74d9b7178f4a0d84046 -red2f9e3483c8bb7b1ee8d71b814fc7dfd907a7b0
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneConstraintsCreator.cs	(.../SlipPlaneConstraintsCreator.cs)	(revision d53ecda155e9a1e16f01e74d9b7178f4a0d84046)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneConstraintsCreator.cs	(.../SlipPlaneConstraintsCreator.cs)	(revision ed2f9e3483c8bb7b1ee8d71b814fc7dfd907a7b0)
@@ -48,12 +48,10 @@
 
             return new SlipPlaneConstraints
             {
-                AutomaticForbiddenZones = input.AutomaticForbiddenZones,
-                CreateZones = input.CreateZones,
                 SlipPlaneMinDepth = input.SlipPlaneMinimumDepth,
                 SlipPlaneMinLength = input.SlipPlaneMinimumLength,
-                XEntryMax = input.ZoneBoundaryRight,
-                XEntryMin = input.ZoneBoundaryLeft
+                XLeftMin = input.ZoneBoundaryLeft,
+                XLeftMax = input.ZoneBoundaryRight
             };
         }
     }
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneConstraintsCreatorTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -red2f9e3483c8bb7b1ee8d71b814fc7dfd907a7b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneConstraintsCreatorTest.cs	(.../SlipPlaneConstraintsCreatorTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneConstraintsCreatorTest.cs	(.../SlipPlaneConstraintsCreatorTest.cs)	(revision ed2f9e3483c8bb7b1ee8d71b814fc7dfd907a7b0)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Deltares.MacroStability.Data;
 using Deltares.WTIStability;
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
@@ -52,12 +53,10 @@
             SlipPlaneConstraints constraints = SlipPlaneConstraintsCreator.Create(upliftVanSlipPlaneConstraints);
 
             // Assert
-            Assert.AreEqual(upliftVanSlipPlaneConstraints.CreateZones, constraints.CreateZones);
-            Assert.AreEqual(upliftVanSlipPlaneConstraints.AutomaticForbiddenZones, constraints.AutomaticForbiddenZones);
             Assert.AreEqual(upliftVanSlipPlaneConstraints.SlipPlaneMinimumLength, constraints.SlipPlaneMinLength);
             Assert.AreEqual(upliftVanSlipPlaneConstraints.SlipPlaneMinimumDepth, constraints.SlipPlaneMinDepth);
-            Assert.AreEqual(upliftVanSlipPlaneConstraints.ZoneBoundaryLeft, constraints.XEntryMin);
-            Assert.AreEqual(upliftVanSlipPlaneConstraints.ZoneBoundaryRight, constraints.XEntryMax);
+            Assert.AreEqual(upliftVanSlipPlaneConstraints.ZoneBoundaryLeft, constraints.XLeftMax);
+            Assert.AreEqual(upliftVanSlipPlaneConstraints.ZoneBoundaryRight, constraints.XRightMax);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -r61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0 -red2f9e3483c8bb7b1ee8d71b814fc7dfd907a7b0
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 61b508a12853e9750e52b3a3b38fbaf8b3d2d9b0)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision ed2f9e3483c8bb7b1ee8d71b814fc7dfd907a7b0)
@@ -299,12 +299,12 @@
             Assert.AreSame(soilProfile2D, stabilityModel.Location.SoilProfile2D);
             Assert.AreSame(surfaceLine, stabilityModel.Location.Surfaceline);
             Assert.IsTrue(stabilityModel.Location.Inwards);
-            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.SoilModel.ModelOption);
+            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.ModelOption);
             Assert.AreSame(stabilityModel, stabilityModel.SlipCircle.StabilityModel);
             Assert.AreSame(soilProfile2D.Geometry, stabilityModel.GeometryData);
             Assert.IsNotNull(stabilityModel.GeotechnicsData);
             Assert.AreSame(soilProfile2D.Geometry, stabilityModel.GeotechnicsData.Geometry);
-            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.SlipPlaneUpliftVan.ModelOption);
+            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.ModelOption);
             Assert.AreSame(stabilityModel, stabilityModel.SlipPlaneUpliftVan.StabilityModel);
             Assert.AreSame(stabilityModel, stabilityModel.SlipPlaneUpliftVan.SlipPlaneTangentLine.StabilityModel);
             Assert.AreEqual(stabilityModel.SlipCircle.Auto, stabilityModel.SlipPlaneUpliftVan.SlipCircleTangentLine.IsAutomaticGrid);