Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IUpliftVanCalculator.cs
===================================================================
diff -u -rd6c2f6364fcba038152ea93e0e420e03989dd35a -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IUpliftVanCalculator.cs	(.../IUpliftVanCalculator.cs)	(revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IUpliftVanCalculator.cs	(.../IUpliftVanCalculator.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -38,8 +38,8 @@
         /// <summary>
         /// Performs the calculation.
         /// </summary>
-        /// <returns>A <see cref="MacroStabilityInwardsCalculatorResult"/>.</returns>
-        MacroStabilityInwardsCalculatorResult Calculate();
+        /// <returns>A <see cref="UpliftVanCalculatorResult"/>.</returns>
+        UpliftVanCalculatorResult Calculate();
 
         /// <summary>
         /// Performs the validation.
Fisheye: Tag 832f344292007108d1e7323891eacce5bd678c0e refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorResult.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj
===================================================================
diff -u -r5278b82071883876afcaa601e722f564c5815aab -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 5278b82071883876afcaa601e722f564c5815aab)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -52,7 +52,7 @@
     <Compile Include="UpliftVanCalculator.cs" />
     <Compile Include="MacroStabilityInwardsCalculatorFactory.cs" />
     <Compile Include="MacroStabilityInwardsCalculatorInput.cs" />
-    <Compile Include="MacroStabilityInwardsCalculatorResult.cs" />
+    <Compile Include="UpliftVanCalculatorResult.cs" />
     <Compile Include="Creators\SoilCreator.cs" />
     <Compile Include="Creators\SoilModelCreator.cs" />
     <Compile Include="Result\MacroStabilityInwardsGridResult.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculator.cs
===================================================================
diff -u -r5278b82071883876afcaa601e722f564c5815aab -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision 5278b82071883876afcaa601e722f564c5815aab)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -58,14 +58,14 @@
             this.factory = factory;
         }
 
-        public MacroStabilityInwardsCalculatorResult Calculate()
+        public UpliftVanCalculatorResult Calculate()
         {
             IUpliftVanKernel upliftVanKernel = CalculateUpliftVan();
 
-            return new MacroStabilityInwardsCalculatorResult(
+            return new UpliftVanCalculatorResult(
                 MacroStabilityInwardsSlidingCurveResultCreator.Create(upliftVanKernel.SlidingCurveResult),
                 MacroStabilityInwardsUpliftVanCalculationGridResultCreator.Create(upliftVanKernel.SlipPlaneResult),
-                new MacroStabilityInwardsCalculatorResult.ConstructionProperties
+                new UpliftVanCalculatorResult.ConstructionProperties
                 {
                     FactorOfStability = upliftVanKernel.FactoryOfStability,
                     ZValue = upliftVanKernel.ZValue,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculatorResult.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculatorResult.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculatorResult.cs	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -0,0 +1,158 @@
+// 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 System;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Result;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper
+{
+    /// <summary>
+    /// This class contains the results of an Uplift Van calculation.
+    /// </summary>
+    public class UpliftVanCalculatorResult
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="UpliftVanCalculatorResult"/>.
+        /// </summary>
+        /// <param name="slidingCurveResult">The sliding curve result.</param>
+        /// <param name="calculationGridResult">The calculation grid result.</param>
+        /// <param name="properties">The container of the properties for the <see cref="UpliftVanCalculatorResult"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        internal UpliftVanCalculatorResult(MacroStabilityInwardsSlidingCurveResult slidingCurveResult,
+                                           MacroStabilityInwardsUpliftVanCalculationGridResult calculationGridResult,
+                                           ConstructionProperties properties)
+        {
+            if (slidingCurveResult == null)
+            {
+                throw new ArgumentNullException(nameof(slidingCurveResult));
+            }
+            if (calculationGridResult == null)
+            {
+                throw new ArgumentNullException(nameof(calculationGridResult));
+            }
+            if (properties == null)
+            {
+                throw new ArgumentNullException(nameof(properties));
+            }
+
+            SlidingCurveResult = slidingCurveResult;
+            CalculationGridResult = calculationGridResult;
+
+            FactorOfStability = properties.FactorOfStability;
+            ZValue = properties.ZValue;
+            ForbiddenZonesXEntryMin = properties.ForbiddenZonesXEntryMin;
+            ForbiddenZonesXEntryMax = properties.ForbiddenZonesXEntryMax;
+            ForbiddenZonesAutomaticallyCalculated = properties.ForbiddenZonesAutomaticallyCalculated;
+            GridAutomaticallyCalculated = properties.GridAutomaticallyCalculated;
+        }
+
+        /// <summary>
+        /// Container for properties for constructing a <see cref="UpliftVanCalculatorResult"/>.
+        /// </summary>
+        public class ConstructionProperties
+        {
+            /// <summary>
+            /// Creates a new instance of <see cref="ConstructionProperties"/>.
+            /// </summary>
+            public ConstructionProperties()
+            {
+                FactorOfStability = double.NaN;
+                ZValue = double.NaN;
+                ForbiddenZonesXEntryMin = double.NaN;
+                ForbiddenZonesXEntryMax = double.NaN;
+            }
+
+            /// <summary>
+            /// Gets or sets the factor of stability.
+            /// </summary>
+            public double FactorOfStability { internal get; set; }
+
+            /// <summary>
+            /// Gets or sets the z value.
+            /// </summary>
+            public double ZValue { internal get; set; }
+
+            /// <summary>
+            /// Gets or sets the forbidden zones x entry min.
+            /// </summary>
+            public double ForbiddenZonesXEntryMin { internal get; set; }
+
+            /// <summary>
+            /// Gets or sets the forbidden zones x entry max.
+            /// </summary>
+            public double ForbiddenZonesXEntryMax { internal get; set; }
+
+            /// <summary>
+            /// Gets or sets whether the forbidden zones are automatically calculated.
+            /// </summary>
+            public bool ForbiddenZonesAutomaticallyCalculated { internal get; set; }
+
+            /// <summary>
+            /// Gets or sets whether the grid is automatically calculated.
+            /// </summary>
+            public bool GridAutomaticallyCalculated { internal get; set; }
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the sliding curve result.
+        /// </summary>
+        public MacroStabilityInwardsSlidingCurveResult SlidingCurveResult { get; }
+
+        /// <summary>
+        /// Gets the calculation grid result.
+        /// </summary>
+        public MacroStabilityInwardsUpliftVanCalculationGridResult CalculationGridResult { get; }
+
+        /// <summary>
+        /// Gets the factor of stability.
+        /// </summary>
+        public double FactorOfStability { get; }
+
+        /// <summary>
+        /// Gets the z value.
+        /// </summary>
+        public double ZValue { get; }
+
+        /// <summary>
+        /// Gets the forbidden zones x entry min.
+        /// </summary>
+        public double ForbiddenZonesXEntryMin { get; }
+
+        /// <summary>
+        /// Gets the forbidden zones x entry max.
+        /// </summary>
+        public double ForbiddenZonesXEntryMax { get; }
+
+        /// <summary>
+        /// Gets whether the forbidden zones are automatically calculated.
+        /// </summary>
+        public bool ForbiddenZonesAutomaticallyCalculated { get; }
+
+        /// <summary>
+        /// Gets whether the grid is automatically calculated.
+        /// </summary>
+        public bool GridAutomaticallyCalculated { get; }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -r5278b82071883876afcaa601e722f564c5815aab -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision 5278b82071883876afcaa601e722f564c5815aab)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -94,11 +94,11 @@
             try
             {
                 IUpliftVanCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateCalculator(CreateInputFromData(calculation.InputParameters), MacroStabilityInwardsKernelWrapperFactory.Instance);
-                MacroStabilityInwardsCalculatorResult macroStabilityInwardsResult = calculator.Calculate();
+                UpliftVanCalculatorResult macroStabilityInwardsResult = calculator.Calculate();
 
                 calculation.Output = new MacroStabilityInwardsOutput(
-                    MacroStabilityInwardsSlidingCurveConverter.Convert(macroStabilityInwardsResult.SlidingCurve),
-                    MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(macroStabilityInwardsResult.UpliftVanCalculationGrid),
+                    MacroStabilityInwardsSlidingCurveConverter.Convert(macroStabilityInwardsResult.SlidingCurveResult),
+                    MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(macroStabilityInwardsResult.CalculationGridResult),
                     new MacroStabilityInwardsOutput.ConstructionProperties
                 {
                     FactorOfStability = macroStabilityInwardsResult.FactorOfStability,
Fisheye: Tag 832f344292007108d1e7323891eacce5bd678c0e refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/MacroStabilityInwardsCalculatorResultTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj
===================================================================
diff -u -r5278b82071883876afcaa601e722f564c5815aab -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj)	(revision 5278b82071883876afcaa601e722f564c5815aab)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -65,7 +65,7 @@
     <Compile Include="Creators\StabilityLocationCreatorTest.cs" />
     <Compile Include="Creators\SurfaceLineCreatorTest.cs" />
     <Compile Include="MacroStabilityInwardsCalculatorInputTest.cs" />
-    <Compile Include="MacroStabilityInwardsCalculatorResultTest.cs" />
+    <Compile Include="UpliftVanCalculatorResultTest.cs" />
     <Compile Include="UpliftVanCalculatorTest.cs" />
     <Compile Include="Creators\SoilCreatorTest.cs" />
     <Compile Include="Creators\SoilModelCreatorTest.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorResultTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorResultTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorResultTest.cs	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -0,0 +1,158 @@
+// 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 System;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Result;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Result;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test
+{
+    [TestFixture]
+    public class UpliftVanCalculatorResultTest
+    {
+        [Test]
+        public void Constructor_SlidingCurveResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                new double[0]);
+
+            // Call
+            TestDelegate call = () => new UpliftVanCalculatorResult(null, calculationGridResult, new UpliftVanCalculatorResult.ConstructionProperties());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("slidingCurveResult", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_CalculationGridResultNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create();
+
+            // Call
+            TestDelegate call = () => new UpliftVanCalculatorResult(slidingCurveResult, null, new UpliftVanCalculatorResult.ConstructionProperties());
+            ;
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("calculationGridResult", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ConstructionPropertiesNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create();
+            var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                new double[0]);
+
+            // Call
+            TestDelegate call = () => new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("properties", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WithParameters_ExpectedValues()
+        {
+            // Setup
+            MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create();
+            var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                new double[0]);
+
+            // Call
+            var result = new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, new UpliftVanCalculatorResult.ConstructionProperties());
+
+            // Assert
+            Assert.AreSame(slidingCurveResult, result.SlidingCurveResult);
+            Assert.AreSame(calculationGridResult, result.CalculationGridResult);
+        }
+
+        [Test]
+        public void Constructor_EmptyConstructionProperties_ExpectedValues()
+        {
+            // Setup
+            MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create();
+            var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                new double[0]);
+
+            // Call
+            var result = new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, new UpliftVanCalculatorResult.ConstructionProperties());
+
+            // Assert
+            Assert.IsNaN(result.FactorOfStability);
+            Assert.IsNaN(result.ZValue);
+            Assert.IsNaN(result.ForbiddenZonesXEntryMin);
+            Assert.IsNaN(result.ForbiddenZonesXEntryMax);
+            Assert.IsFalse(result.ForbiddenZonesAutomaticallyCalculated);
+            Assert.IsFalse(result.GridAutomaticallyCalculated);
+        }
+
+        [Test]
+        public void Constructor_ConstructionPropertiesWithData_ExcpectedValues()
+        {
+            // Setup
+            var random = new Random(21);
+            double factorOfStability = random.NextDouble();
+            double zValue = random.NextDouble();
+            double xEntryMin = random.NextDouble();
+            double xEntryMax = random.NextDouble();
+            bool forbiddenZonesAutomaticallyCalculated = random.NextBoolean();
+            bool gridAutomaticallyCalculated = random.NextBoolean();
+
+            var constructionProperties = new UpliftVanCalculatorResult.ConstructionProperties
+            {
+                FactorOfStability = factorOfStability,
+                ZValue = zValue,
+                ForbiddenZonesXEntryMin = xEntryMin,
+                ForbiddenZonesXEntryMax = xEntryMax,
+                ForbiddenZonesAutomaticallyCalculated = forbiddenZonesAutomaticallyCalculated,
+                GridAutomaticallyCalculated = gridAutomaticallyCalculated
+            };
+
+            MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create();
+            var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                MacroStabilityInwardsGridResultTestFactory.Create(),
+                                                                                                new double[0]);
+
+            // Call
+            var result = new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, constructionProperties);
+
+            // Assert
+            Assert.AreEqual(factorOfStability, result.FactorOfStability);
+            Assert.AreEqual(zValue, result.ZValue);
+            Assert.AreEqual(xEntryMin, result.ForbiddenZonesXEntryMin);
+            Assert.AreEqual(xEntryMax, result.ForbiddenZonesXEntryMax);
+            Assert.AreEqual(forbiddenZonesAutomaticallyCalculated, result.ForbiddenZonesAutomaticallyCalculated);
+            Assert.AreEqual(gridAutomaticallyCalculated, result.GridAutomaticallyCalculated);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r5278b82071883876afcaa601e722f564c5815aab -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 5278b82071883876afcaa601e722f564c5815aab)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -104,7 +104,7 @@
             upliftVanKernel.SlipPlaneResult = SlipPlaneUpliftVanTestFactory.Create();
 
             // Call
-            MacroStabilityInwardsCalculatorResult actual = new UpliftVanCalculator(input, testMacroStabilityInwardsKernelFactory).Calculate();
+            UpliftVanCalculatorResult actual = new UpliftVanCalculator(input, testMacroStabilityInwardsKernelFactory).Calculate();
 
             // Assert
             Assert.IsNotNull(actual);
@@ -115,9 +115,9 @@
             Assert.AreEqual(upliftVanKernel.ForbiddenZonesAutomaticallyCalculated, actual.ForbiddenZonesAutomaticallyCalculated);
             Assert.AreEqual(upliftVanKernel.GridAutomaticallyCalculated, actual.GridAutomaticallyCalculated);
             MacroStabilityInwardsCalculatorResultHelper.AssertSlidingCurve(MacroStabilityInwardsSlidingCurveResultCreator.Create(upliftVanKernel.SlidingCurveResult),
-                                                                             actual.SlidingCurve);
+                                                                             actual.SlidingCurveResult);
             MacroStabilityInwardsCalculatorResultHelper.AssertSlipPlaneGrid(MacroStabilityInwardsUpliftVanCalculationGridResultCreator.Create(upliftVanKernel.SlipPlaneResult),
-                                                                            actual.UpliftVanCalculationGrid);
+                                                                            actual.CalculationGridResult);
 
             Assert.IsTrue(testMacroStabilityInwardsKernelFactory.LastCreatedUpliftVanKernel.Calculated);
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorResultTestFactoryTest.cs
===================================================================
diff -u -r37b140fe95b895b99d5d93a853b9bc1b4e96d5e4 -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorResultTestFactoryTest.cs	(.../MacroStabilityInwardsCalculatorResultTestFactoryTest.cs)	(revision 37b140fe95b895b99d5d93a853b9bc1b4e96d5e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorResultTestFactoryTest.cs	(.../MacroStabilityInwardsCalculatorResultTestFactoryTest.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -32,7 +32,7 @@
         public void Create_Always_ReturnResultWithDefaultValues()
         {
             // Call
-            MacroStabilityInwardsCalculatorResult result = MacroStabilityInwardsCalculatorResultTestFactory.Create();
+            UpliftVanCalculatorResult result = MacroStabilityInwardsCalculatorResultTestFactory.Create();
 
             // Assert
             Assert.AreEqual(0.1, result.FactorOfStability);
@@ -42,8 +42,8 @@
             Assert.IsTrue(result.GridAutomaticallyCalculated);
             Assert.IsTrue(result.ForbiddenZonesAutomaticallyCalculated);
 
-            AssertSlidingCurve(result.SlidingCurve);
-            AssertUpliftVanCalculationGrid(result.UpliftVanCalculationGrid);
+            AssertSlidingCurve(result.SlidingCurveResult);
+            AssertUpliftVanCalculationGrid(result.CalculationGridResult);
         }
 
         private static void AssertSlidingCurve(MacroStabilityInwardsSlidingCurveResult slidingCurve)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorStubTest.cs
===================================================================
diff -u -rd6c2f6364fcba038152ea93e0e420e03989dd35a -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorStubTest.cs	(.../MacroStabilityInwardsCalculatorStubTest.cs)	(revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorStubTest.cs	(.../MacroStabilityInwardsCalculatorStubTest.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -59,15 +59,15 @@
             var calculator = new MacroStabilityInwardsCalculatorStub();
             
             // Call
-            MacroStabilityInwardsCalculatorResult result = calculator.Calculate();
+            UpliftVanCalculatorResult result = calculator.Calculate();
 
             // Assert
             Assert.AreEqual(0.1, result.FactorOfStability);
             Assert.AreEqual(0.2, result.ZValue);
             Assert.AreEqual(0.3, result.ForbiddenZonesXEntryMin);
             Assert.AreEqual(0.4, result.ForbiddenZonesXEntryMax);
-            Assert.IsNotNull(result.SlidingCurve);
-            Assert.IsNotNull(result.UpliftVanCalculationGrid);
+            Assert.IsNotNull(result.SlidingCurveResult);
+            Assert.IsNotNull(result.CalculationGridResult);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorResultTestFactory.cs
===================================================================
diff -u -r37b140fe95b895b99d5d93a853b9bc1b4e96d5e4 -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorResultTestFactory.cs	(.../MacroStabilityInwardsCalculatorResultTestFactory.cs)	(revision 37b140fe95b895b99d5d93a853b9bc1b4e96d5e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorResultTestFactory.cs	(.../MacroStabilityInwardsCalculatorResultTestFactory.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -25,18 +25,18 @@
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil
 {
     /// <summary>
-    /// Factory to create simple <see cref="MacroStabilityInwardsCalculatorResult"/>
+    /// Factory to create simple <see cref="UpliftVanCalculatorResult"/>
     /// instances that can be used for testing.
     /// </summary>
     public static class MacroStabilityInwardsCalculatorResultTestFactory
     {
         /// <summary>
-        /// Creates a new <see cref="MacroStabilityInwardsCalculatorResult"/>.
+        /// Creates a new <see cref="UpliftVanCalculatorResult"/>.
         /// </summary>
-        /// <returns>The created <see cref="MacroStabilityInwardsCalculatorResult"/>.</returns>
-        public static MacroStabilityInwardsCalculatorResult Create()
+        /// <returns>The created <see cref="UpliftVanCalculatorResult"/>.</returns>
+        public static UpliftVanCalculatorResult Create()
         {
-            return new MacroStabilityInwardsCalculatorResult(
+            return new UpliftVanCalculatorResult(
                 MacroStabilityInwardsSlidingCurveResultTestFactory.Create(),
                 new MacroStabilityInwardsUpliftVanCalculationGridResult(
                     MacroStabilityInwardsGridResultTestFactory.Create(),
@@ -47,7 +47,7 @@
                         2,
                         1.5
                     }),
-                new MacroStabilityInwardsCalculatorResult.ConstructionProperties
+                new UpliftVanCalculatorResult.ConstructionProperties
                 {
                     FactorOfStability = 0.1,
                     ZValue = 0.2,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorStub.cs
===================================================================
diff -u -rd6c2f6364fcba038152ea93e0e420e03989dd35a -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorStub.cs	(.../MacroStabilityInwardsCalculatorStub.cs)	(revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorStub.cs	(.../MacroStabilityInwardsCalculatorStub.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -30,9 +30,9 @@
     {
         public MacroStabilityInwardsCalculatorInput Input { get; set; }
 
-        public MacroStabilityInwardsCalculatorResult Output { get; private set; }
+        public UpliftVanCalculatorResult Output { get; private set; }
 
-        public MacroStabilityInwardsCalculatorResult Calculate()
+        public UpliftVanCalculatorResult Calculate()
         {
             return Output ?? (Output = MacroStabilityInwardsCalculatorResultTestFactory.Create());
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e -r832f344292007108d1e7323891eacce5bd678c0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 832f344292007108d1e7323891eacce5bd678c0e)
@@ -384,16 +384,16 @@
             Assert.AreEqual(originalInput.SlipPlaneMinimumLength, actualInput.SlipPlaneMinimumLength);
         }
 
-        private static void AssertOutput(MacroStabilityInwardsCalculatorResult expectedOutput, MacroStabilityInwardsOutput actualOutput)
+        private static void AssertOutput(UpliftVanCalculatorResult expectedOutput, MacroStabilityInwardsOutput actualOutput)
         {
             Assert.AreEqual(expectedOutput.FactorOfStability, actualOutput.FactorOfStability);
             Assert.AreEqual(expectedOutput.ZValue, actualOutput.ZValue);
             Assert.AreEqual(expectedOutput.ForbiddenZonesXEntryMin, actualOutput.ForbiddenZonesXEntryMin);
             Assert.AreEqual(expectedOutput.ForbiddenZonesXEntryMax, actualOutput.ForbiddenZonesXEntryMax);
             Assert.AreEqual(expectedOutput.GridAutomaticallyCalculated, actualOutput.GridAutomaticallyCalculated);
             Assert.AreEqual(expectedOutput.ForbiddenZonesAutomaticallyCalculated, actualOutput.ForbiddenZonesAutomaticallyCalculated);
-            AssertSlidingCurve(expectedOutput.SlidingCurve, actualOutput.SlidingCurve);
-            AssertSlipPlane(expectedOutput.UpliftVanCalculationGrid, actualOutput.SlipPlane);
+            AssertSlidingCurve(expectedOutput.SlidingCurveResult, actualOutput.SlidingCurve);
+            AssertSlipPlane(expectedOutput.CalculationGridResult, actualOutput.SlipPlane);
         }
 
         private static void AssertSlidingCurve(MacroStabilityInwardsSlidingCurveResult expected, MacroStabilityInwardsSlidingCurve actual)