Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs
===================================================================
diff -u -r1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs	(.../MacroStabilityInwardsCalculator.cs)	(revision 1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs	(.../MacroStabilityInwardsCalculator.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -62,7 +62,7 @@
 
         public MacroStabilityInwardsCalculatorResult Calculate()
         {
-            IUpliftVanCalculator upliftVanCalculator = CalculateUpliftVan();
+            IUpliftVanKernel upliftVanCalculator = CalculateUpliftVan();
 
             return new MacroStabilityInwardsCalculatorResult(
                 MacroStabilityInwardsSlidingCurveResultCreator.Create(upliftVanCalculator.SlidingCurveResult),
@@ -83,9 +83,9 @@
             return new List<string>();
         }
 
-        private IUpliftVanCalculator CalculateUpliftVan()
+        private IUpliftVanKernel CalculateUpliftVan()
         {
-            IUpliftVanCalculator upliftVanCalculator = CreateUpliftVanCalculator();
+            IUpliftVanKernel upliftVanCalculator = CreateUpliftVanCalculator();
 
             try
             {
@@ -99,9 +99,9 @@
             return upliftVanCalculator;
         }
 
-        private IUpliftVanCalculator CreateUpliftVanCalculator()
+        private IUpliftVanKernel CreateUpliftVanCalculator()
         {
-            IUpliftVanCalculator calculator = factory.CreateUpliftVanCalculator();
+            IUpliftVanKernel calculator = factory.CreateUpliftVanCalculator();
             calculator.MoveGrid = input.MoveGrid;
             calculator.MaximumSliceWidth = input.MaximumSliceWidth;
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj
===================================================================
diff -u -r966dc7335defa901104fd4168d57c08315db2de0 -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 966dc7335defa901104fd4168d57c08315db2de0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -64,7 +64,7 @@
     <Compile Include="Result\MacroStabilityInwardsUpliftVanCalculationGridResult.cs" />
     <Compile Include="Creators\MacroStabilityInwardsUpliftVanCalculationGridResultCreator.cs" />
     <Compile Include="SubCalculator\IMacroStabilityInwardsSubCalculatorFactory.cs" />
-    <Compile Include="SubCalculator\IUpliftVanCalculator.cs" />
+    <Compile Include="SubCalculator\IUpliftVanKernel.cs" />
     <Compile Include="SubCalculator\MacroStabilityInwardsSubCalculatorFactory.cs" />
     <Compile Include="SubCalculator\UpliftVanCalculator.cs" />
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IMacroStabilityInwardsSubCalculatorFactory.cs
===================================================================
diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IMacroStabilityInwardsSubCalculatorFactory.cs	(.../IMacroStabilityInwardsSubCalculatorFactory.cs)	(revision 01bd90d4fab9699280c5619754fc55b4f03be08a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IMacroStabilityInwardsSubCalculatorFactory.cs	(.../IMacroStabilityInwardsSubCalculatorFactory.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -29,7 +29,7 @@
         /// <summary>
         /// Creates the Uplift Van calculator.
         /// </summary>
-        /// <returns>A new <see cref="IUpliftVanCalculator"/>.</returns>
-        IUpliftVanCalculator CreateUpliftVanCalculator();
+        /// <returns>A new <see cref="IUpliftVanKernel"/>.</returns>
+        IUpliftVanKernel CreateUpliftVanCalculator();
     }
 }
\ No newline at end of file
Fisheye: Tag dea4b8c2f53fe77b14bdcf4bce131f47ece21664 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IUpliftVanCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IUpliftVanKernel.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IUpliftVanKernel.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IUpliftVanKernel.cs	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -0,0 +1,147 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.WTIStability;
+using Deltares.WTIStability.Data.Geo;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.SubCalculator
+{
+    /// <summary>
+    /// Interface representing Uplift Van kernel input, methods and output.
+    /// </summary>
+    /// <remarks>
+    /// This interface is introduced for being able to test the conversion of:
+    /// <list type="bullet">
+    /// <item><see cref="MacroStabilityInwardsCalculator"/> input into kernel input;</item>
+    /// <item>kernel output into <see cref="MacroStabilityInwardsCalculator"/> output.</item>
+    /// </list>
+    /// </remarks>
+    public interface IUpliftVanKernel
+    {
+        /// <summary>
+        /// Sets the soil model.
+        /// </summary>
+        SoilModel SoilModel { set; }
+
+        /// <summary>
+        /// Sets the soil profile.
+        /// </summary>
+        SoilProfile2D SoilProfile { set; }
+
+        /// <summary>
+        /// Sets the location.
+        /// </summary>
+        StabilityLocation Location { set; }
+
+        /// <summary>
+        /// Sets the surface line.
+        /// </summary>
+        SurfaceLine2 SurfaceLine { set; }
+
+        /// <summary>
+        /// Sets the move grid property.
+        /// </summary>
+        bool MoveGrid { set; }
+
+        /// <summary>
+        /// Sets the maximum slice width.
+        /// [m]
+        /// </summary>
+        double MaximumSliceWidth { set; }
+
+        /// <summary>
+        /// Sets the slip plane Uplift Van.
+        /// </summary>
+        SlipPlaneUpliftVan SlipPlaneUpliftVan { set; }
+
+        /// <summary>
+        /// Sets whether the grid is automatically determined or not.
+        /// </summary>
+        bool GridAutomaticDetermined { set; }
+
+        /// <summary>
+        /// Sets whether zones should be created.
+        /// </summary>
+        bool CreateZones { set; }
+
+        /// <summary>
+        /// Sets whether forbidden zones are automatically determined or not.
+        /// </summary>
+        bool AutomaticForbiddenZones { set; }
+
+        /// <summary>
+        /// Sets the minimum depth of the slip plane.
+        /// [m]
+        /// </summary>
+        double SlipPlaneMinimumDepth { set; }
+
+        /// <summary>
+        /// Sets the minimum length of the slip plane.
+        /// [m]
+        /// </summary>
+        double SlipPlaneMinimumLength { set; }
+
+        /// <summary>
+        /// Gets the factor of stability.
+        /// </summary>
+        double FactoryOfStability { get; }
+
+        /// <summary>
+        /// Gets the z value.
+        /// </summary>
+        double ZValue { get; }
+
+        /// <summary>
+        /// Gets the forbidden zones x entry min.
+        /// </summary>
+        double ForbiddenZonesXEntryMin { get; }
+
+        /// <summary>
+        /// Gets the forbidden zones x entry max.
+        /// </summary>
+        double ForbiddenZonesXEntryMax { get; }
+
+        /// <summary>
+        /// Gets whether the forbidden zones are automatically calculated.
+        /// </summary>
+        bool ForbiddenZonesAutomaticallyCalculated { get; }
+
+        /// <summary>
+        /// Gets whether the grid is automatically calculated.
+        /// </summary>
+        bool GridAutomaticallyCalculated { get; }
+
+        /// <summary>
+        /// Gets the sliding curve result.
+        /// </summary>
+        SlidingDualCircle SlidingCurveResult { get; }
+
+        /// <summary>
+        /// Gets the slip plane result.
+        /// </summary>
+        SlipPlaneUpliftVan SlipPlaneResult { get; }
+
+        /// <summary>
+        /// Performs the Uplift Van calculation.
+        /// </summary>
+        void Calculate();
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/MacroStabilityInwardsSubCalculatorFactory.cs
===================================================================
diff -u -r4304327f96a967967877c287ed20f85d51255b41 -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/MacroStabilityInwardsSubCalculatorFactory.cs	(.../MacroStabilityInwardsSubCalculatorFactory.cs)	(revision 4304327f96a967967877c287ed20f85d51255b41)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/MacroStabilityInwardsSubCalculatorFactory.cs	(.../MacroStabilityInwardsSubCalculatorFactory.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -45,7 +45,7 @@
             }
         }
 
-        public IUpliftVanCalculator CreateUpliftVanCalculator()
+        public IUpliftVanKernel CreateUpliftVanCalculator()
         {
             return new UpliftVanCalculator();
         }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/UpliftVanCalculator.cs
===================================================================
diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision 01bd90d4fab9699280c5619754fc55b4f03be08a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -32,7 +32,7 @@
     /// <summary>
     /// Class for performing an Uplift Van calculation based on <see cref="WTIStabilityCalculation"/>.
     /// </summary>
-    public class UpliftVanCalculator : IUpliftVanCalculator
+    public class UpliftVanCalculator : IUpliftVanKernel
     {
         private readonly WTIStabilityCalculation wrappedCalculator;
         private readonly StabilityModel calculatorInput;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryTest.cs
===================================================================
diff -u -r1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryTest.cs	(.../MacroStabilityInwardsSubCalculatorFactoryTest.cs)	(revision 1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryTest.cs	(.../MacroStabilityInwardsSubCalculatorFactoryTest.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -73,7 +73,7 @@
             IMacroStabilityInwardsSubCalculatorFactory factory = MacroStabilityInwardsSubCalculatorFactory.Instance;
 
             // Call
-            IUpliftVanCalculator subCalculator = factory.CreateUpliftVanCalculator();
+            IUpliftVanKernel subCalculator = factory.CreateUpliftVanCalculator();
 
             // Assert
             Assert.IsNotNull(subCalculator);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r815d6acccf30d1310d695a0b4a90d33a6cdd497a -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 815d6acccf30d1310d695a0b4a90d33a6cdd497a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -34,7 +34,7 @@
             var calculator = new UpliftVanCalculator();
 
             // Assert
-            Assert.IsInstanceOf<IUpliftVanCalculator>(calculator);
+            Assert.IsInstanceOf<IUpliftVanKernel>(calculator);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactoryTest.cs
===================================================================
diff -u -r4304327f96a967967877c287ed20f85d51255b41 -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactoryTest.cs	(.../TestMacroStabilityInwardsSubCalculatorFactoryTest.cs)	(revision 4304327f96a967967877c287ed20f85d51255b41)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactoryTest.cs	(.../TestMacroStabilityInwardsSubCalculatorFactoryTest.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -46,7 +46,7 @@
             var factory = new TestMacroStabilityInwardsSubCalculatorFactory();
 
             // Call
-            IUpliftVanCalculator subCalculator = factory.CreateUpliftVanCalculator();
+            IUpliftVanKernel subCalculator = factory.CreateUpliftVanCalculator();
 
             // Assert
             Assert.AreSame(factory.LastCreatedUpliftVanCalculator, subCalculator);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactory.cs
===================================================================
diff -u -r4304327f96a967967877c287ed20f85d51255b41 -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactory.cs	(.../TestMacroStabilityInwardsSubCalculatorFactory.cs)	(revision 4304327f96a967967877c287ed20f85d51255b41)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactory.cs	(.../TestMacroStabilityInwardsSubCalculatorFactory.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -39,7 +39,7 @@
 
         public UpliftVanCalculatorStub LastCreatedUpliftVanCalculator { get; }
 
-        public IUpliftVanCalculator CreateUpliftVanCalculator()
+        public IUpliftVanKernel CreateUpliftVanCalculator()
         {
             return LastCreatedUpliftVanCalculator;
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/UpliftVanCalculatorStub.cs
===================================================================
diff -u -rfed1915e1f165e844339d8cf21479f4639cfe546 -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/UpliftVanCalculatorStub.cs	(.../UpliftVanCalculatorStub.cs)	(revision fed1915e1f165e844339d8cf21479f4639cfe546)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/UpliftVanCalculatorStub.cs	(.../UpliftVanCalculatorStub.cs)	(revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664)
@@ -28,7 +28,7 @@
     /// <summary>
     /// Stub for the real Uplift Van sub calculator of macro stability inwards.
     /// </summary>
-    public class UpliftVanCalculatorStub : IUpliftVanCalculator
+    public class UpliftVanCalculatorStub : IUpliftVanKernel
     {
         /// <summary>
         /// Gets a value indicating whether <see cref="Calculate"/> was called or not.