Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -r144184f501703e05c66062fa44040fa89d99f694 -rac8210d13cf16c93f754711d885e8694fd116818
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 144184f501703e05c66062fa44040fa89d99f694)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision ac8210d13cf16c93f754711d885e8694fd116818)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -34,7 +33,7 @@
 namespace Ringtoets.Integration.Forms.Views
 {
     /// <summary>
-    /// View for presenting and calculating design water level calculations.
+    /// View for presenting and performing design water level calculations.
     /// </summary>
     public partial class DesignWaterLevelLocationsView : HydraulicBoundaryLocationsView
     {
@@ -44,21 +43,18 @@
         /// <summary>
         /// Creates a new instance of <see cref="DesignWaterLevelLocationsView"/>.
         /// </summary>
-        /// <param name="locations">The locations to show in the view.</param>
-        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
-        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
-        /// <param name="assessmentSection">The assessment section which the locations belong to.</param>
+        /// <param name="calculations">The calculations to show in the view.</param>
+        /// <param name="assessmentSection">The assessment section which the calculations belong to.</param>
         /// <param name="getNormFunc"><see cref="Func{TResult}"/> for getting the norm to use during calculations.</param>
         /// <param name="categoryBoundaryName">The name of the category boundary.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="locations"/>, <paramref name="getCalculationFunc"/>,
-        /// <paramref name="assessmentSection"/> or <paramref name="getNormFunc"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/>, <paramref name="assessmentSection"/>
+        /// or <paramref name="getNormFunc"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
-        public DesignWaterLevelLocationsView(ObservableList<HydraulicBoundaryLocation> locations,
-                                             Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc,
+        public DesignWaterLevelLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
                                              IAssessmentSection assessmentSection,
                                              Func<double> getNormFunc,
                                              string categoryBoundaryName)
-            : base(locations, getCalculationFunc, assessmentSection)
+            : base(calculations, assessmentSection)
         {
             if (getNormFunc == null)
             {
@@ -78,19 +74,17 @@
 
             if (currentRow != null)
             {
-                HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject;
-
-                return new DesignWaterLevelCalculationContext(GetCalculationFunc(hydraulicBoundaryLocation));
+                return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject);
             }
 
             return null;
         }
 
-        protected override void HandleCalculateSelectedLocations(IEnumerable<HydraulicBoundaryLocation> locations)
+        protected override void PerformSelectedCalculations(IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
         {
             CalculationGuiService.CalculateDesignWaterLevels(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
                                                              AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
-                                                             locations.Select(l => GetCalculationFunc(l)),
+                                                             calculations,
                                                              getNormFunc(),
                                                              messageProvider);
         }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs
===================================================================
diff -u -r277474bff827855e198867eb1a794ec7f44d54b2 -rac8210d13cf16c93f754711d885e8694fd116818
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 277474bff827855e198867eb1a794ec7f44d54b2)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision ac8210d13cf16c93f754711d885e8694fd116818)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -34,7 +33,7 @@
 namespace Ringtoets.Integration.Forms.Views
 {
     /// <summary>
-    /// View for presenting and calculating wave height calculations.
+    /// View for presenting and performing wave height calculations.
     /// </summary>
     public partial class WaveHeightLocationsView : HydraulicBoundaryLocationsView
     {
@@ -44,21 +43,18 @@
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightLocationsView"/>.
         /// </summary>
-        /// <param name="locations">The locations to show in the view.</param>
-        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
-        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
-        /// <param name="assessmentSection">The assessment section which the locations belong to.</param>
+        /// <param name="calculations">The calculations to show in the view.</param>
+        /// <param name="assessmentSection">The assessment section which the calculations belong to.</param>
         /// <param name="getNormFunc"><see cref="Func{TResult}"/> for getting the norm to use during calculations.</param>
         /// <param name="categoryBoundaryName">The name of the category boundary.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="locations"/>, <paramref name="getCalculationFunc"/>,
-        /// <paramref name="assessmentSection"/> or <paramref name="getNormFunc"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/>, <paramref name="assessmentSection"/>
+        /// or <paramref name="getNormFunc"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
-        public WaveHeightLocationsView(ObservableList<HydraulicBoundaryLocation> locations,
-                                       Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc,
+        public WaveHeightLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
                                        IAssessmentSection assessmentSection,
                                        Func<double> getNormFunc,
                                        string categoryBoundaryName)
-            : base(locations, getCalculationFunc, assessmentSection)
+            : base(calculations, assessmentSection)
         {
             if (getNormFunc == null)
             {
@@ -78,19 +74,17 @@
 
             if (currentRow != null)
             {
-                HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject;
-
-                return new WaveHeightCalculationContext(GetCalculationFunc(hydraulicBoundaryLocation));
+                return new WaveHeightCalculationContext(((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject);
             }
 
             return null;
         }
 
-        protected override void HandleCalculateSelectedLocations(IEnumerable<HydraulicBoundaryLocation> locations)
+        protected override void PerformSelectedCalculations(IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
         {
             CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
                                                        AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
-                                                       locations.Select(l => GetCalculationFunc(l)),
+                                                       calculations,
                                                        getNormFunc(),
                                                        messageProvider);
         }