Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs
===================================================================
diff -u -re649822ccb64af259adda08b8aa096bf08bf1a87 -rb17eb09f96cdd37af57cb0c615d36366298abc07
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs	(.../DesignWaterLevelLocationContext.cs)	(revision e649822ccb64af259adda08b8aa096bf08bf1a87)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs	(.../DesignWaterLevelLocationContext.cs)	(revision b17eb09f96cdd37af57cb0c615d36366298abc07)
@@ -35,11 +35,10 @@
         /// </summary>
         /// <param name="wrappedData">The <see cref="HydraulicBoundaryLocation"/> which the <see cref="DesignWaterLevelLocationContext"/>
         /// belongs to.</param>
-        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
-        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
+        /// <param name="calculation">The <see cref="HydraulicBoundaryLocationCalculation"/> at stake.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public DesignWaterLevelLocationContext(HydraulicBoundaryLocation wrappedData,
-                                               Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
-            : base(wrappedData, getCalculationFunc) {}
+                                               HydraulicBoundaryLocationCalculation calculation)
+            : base(wrappedData, calculation) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationContext.cs
===================================================================
diff -u -rad4eba236aac060e0713c9304aaeb5d8b1eb2236 -rb17eb09f96cdd37af57cb0c615d36366298abc07
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationContext.cs	(.../HydraulicBoundaryLocationContext.cs)	(revision ad4eba236aac060e0713c9304aaeb5d8b1eb2236)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationContext.cs	(.../HydraulicBoundaryLocationContext.cs)	(revision b17eb09f96cdd37af57cb0c615d36366298abc07)
@@ -35,25 +35,23 @@
         /// </summary>
         /// <param name="wrappedData">The <see cref="HydraulicBoundaryLocation"/> which the <see cref="HydraulicBoundaryLocationContext"/>
         /// belongs to.</param>
-        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
-        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
+        /// <param name="calculation">The <see cref="HydraulicBoundaryLocationCalculation"/> at stake.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         protected HydraulicBoundaryLocationContext(HydraulicBoundaryLocation wrappedData,
-                                                   Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
+                                                   HydraulicBoundaryLocationCalculation calculation)
             : base(wrappedData)
         {
-            if (getCalculationFunc == null)
+            if (calculation == null)
             {
-                throw new ArgumentNullException(nameof(getCalculationFunc));
+                throw new ArgumentNullException(nameof(calculation));
             }
 
-            GetCalculationFunc = getCalculationFunc;
+            Calculation = calculation;
         }
 
         /// <summary>
-        /// Gets the <see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
-        /// based on <see cref="HydraulicBoundaryLocation"/>.
+        /// Gets the <see cref="HydraulicBoundaryLocationCalculation"/> at stake.
         /// </summary>
-        public Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> GetCalculationFunc { get; }
+        public HydraulicBoundaryLocationCalculation Calculation { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs
===================================================================
diff -u -re649822ccb64af259adda08b8aa096bf08bf1a87 -rb17eb09f96cdd37af57cb0c615d36366298abc07
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs	(.../WaveHeightLocationContext.cs)	(revision e649822ccb64af259adda08b8aa096bf08bf1a87)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs	(.../WaveHeightLocationContext.cs)	(revision b17eb09f96cdd37af57cb0c615d36366298abc07)
@@ -35,11 +35,10 @@
         /// </summary>
         /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> which the <see cref="WaveHeightLocationContext"/>
         /// belongs to.</param>
-        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
-        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
+        /// <param name="calculation">The <see cref="HydraulicBoundaryLocationCalculation"/> at stake.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public WaveHeightLocationContext(HydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                         Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
-            : base(hydraulicBoundaryLocation, getCalculationFunc) {}
+                                         HydraulicBoundaryLocationCalculation calculation)
+            : base(hydraulicBoundaryLocation, calculation) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs
===================================================================
diff -u -re649822ccb64af259adda08b8aa096bf08bf1a87 -rb17eb09f96cdd37af57cb0c615d36366298abc07
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs	(.../DesignWaterLevelLocationContextTest.cs)	(revision e649822ccb64af259adda08b8aa096bf08bf1a87)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs	(.../DesignWaterLevelLocationContextTest.cs)	(revision b17eb09f96cdd37af57cb0c615d36366298abc07)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Integration.Forms.PresentationObjects;
@@ -34,15 +33,15 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2.0, 3.0);
-            Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc = hbl => null;
+            var calculation = new HydraulicBoundaryLocationCalculation();
 
             // Call
-            var presentationObject = new DesignWaterLevelLocationContext(hydraulicBoundaryLocation, getCalculationFunc);
+            var presentationObject = new DesignWaterLevelLocationContext(hydraulicBoundaryLocation, calculation);
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationContext>(presentationObject);
             Assert.AreSame(hydraulicBoundaryLocation, presentationObject.WrappedData);
-            Assert.AreSame(getCalculationFunc, presentationObject.GetCalculationFunc);
+            Assert.AreSame(calculation, presentationObject.Calculation);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationContextTest.cs
===================================================================
diff -u -rad4eba236aac060e0713c9304aaeb5d8b1eb2236 -rb17eb09f96cdd37af57cb0c615d36366298abc07
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationContextTest.cs	(.../HydraulicBoundaryLocationContextTest.cs)	(revision ad4eba236aac060e0713c9304aaeb5d8b1eb2236)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/HydraulicBoundaryLocationContextTest.cs	(.../HydraulicBoundaryLocationContextTest.cs)	(revision b17eb09f96cdd37af57cb0c615d36366298abc07)
@@ -31,7 +31,7 @@
     public class HydraulicBoundaryLocationContextTest
     {
         [Test]
-        public void Constructor_GetCalculationFuncNull_ThrowsArgumentNullException()
+        public void Constructor_CalculationNull_ThrowsArgumentNullException()
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 2.0, 3.0);
@@ -41,30 +41,30 @@
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("getCalculationFunc", paramName);
+            Assert.AreEqual("calculation", paramName);
         }
 
         [Test]
         public void Constructor_ValidParameters_ExpectedValues()
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 2.0, 3.0);
-            Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc = hbl => null;
+            var calculation = new HydraulicBoundaryLocationCalculation();
 
             // Call
-            var context = new TestHydraulicBoundaryLocationContext(hydraulicBoundaryLocation, getCalculationFunc);
+            var context = new TestHydraulicBoundaryLocationContext(hydraulicBoundaryLocation, calculation);
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<HydraulicBoundaryLocation>>(context);
             Assert.AreSame(hydraulicBoundaryLocation, context.WrappedData);
-            Assert.AreSame(getCalculationFunc, context.GetCalculationFunc);
+            Assert.AreSame(calculation, context.Calculation);
         }
 
         private class TestHydraulicBoundaryLocationContext : HydraulicBoundaryLocationContext
         {
             public TestHydraulicBoundaryLocationContext(HydraulicBoundaryLocation wrappedData,
-                                                        Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
-                : base(wrappedData, getCalculationFunc) {}
+                                                        HydraulicBoundaryLocationCalculation calculation)
+                : base(wrappedData, calculation) {}
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs
===================================================================
diff -u -re649822ccb64af259adda08b8aa096bf08bf1a87 -rb17eb09f96cdd37af57cb0c615d36366298abc07
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs	(.../WaveHeightLocationContextTest.cs)	(revision e649822ccb64af259adda08b8aa096bf08bf1a87)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs	(.../WaveHeightLocationContextTest.cs)	(revision b17eb09f96cdd37af57cb0c615d36366298abc07)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Integration.Forms.PresentationObjects;
@@ -34,15 +33,15 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2.0, 3.0);
-            Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc = hbl => null;
+            var calculation = new HydraulicBoundaryLocationCalculation();
 
             // Call
-            var presentationObject = new WaveHeightLocationContext(hydraulicBoundaryLocation, getCalculationFunc);
+            var presentationObject = new WaveHeightLocationContext(hydraulicBoundaryLocation, calculation);
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationContext>(presentationObject);
             Assert.AreSame(hydraulicBoundaryLocation, presentationObject.WrappedData);
-            Assert.AreSame(getCalculationFunc, presentationObject.GetCalculationFunc);
+            Assert.AreSame(calculation, presentationObject.Calculation);
         }
     }
 }
\ No newline at end of file