Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -174,7 +174,7 @@
       <DependentUpon>FailureMechanismView.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\FailureMechanismSectionResultRow.cs" />
-    <Compile Include="Views\HydraulicBoundaryLocationRow.cs" />
+    <Compile Include="Views\HydraulicBoundaryLocationCalculationRow.cs" />
     <Compile Include="Views\HydraulicBoundaryCalculationsView.cs">
       <SubType>UserControl</SubType>
     </Compile>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs
===================================================================
diff -u -rc00b1c9a3f2e8eeb36d5f6493bfde8920d767729 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs	(.../HydraulicBoundaryCalculationsView.cs)	(revision c00b1c9a3f2e8eeb36d5f6493bfde8920d767729)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs	(.../HydraulicBoundaryCalculationsView.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -94,13 +94,13 @@
         {
             base.InitializeDataGridView();
 
-            dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationRow.IncludeIllustrationPoints),
+            dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.IncludeIllustrationPoints),
                                                   RingtoetsCommonFormsResources.HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName);
-            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Name),
+            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Name),
                                                  RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Location_Name_DisplayName);
-            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Id),
+            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Id),
                                                  RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Location_Id_DisplayName);
-            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Location),
+            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Location),
                                                  RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Location_Coordinates_DisplayName);
         }
 
@@ -133,7 +133,7 @@
                 return Enumerable.Empty<IllustrationPointControlItem>();
             }
 
-            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = ((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject;
+            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = ((HydraulicBoundaryLocationCalculationRow) currentRow.DataBoundItem).CalculatableObject;
 
             HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = hydraulicBoundaryLocationCalculation.Output;
             if (hydraulicBoundaryLocationCalculation.HasOutput
@@ -160,9 +160,9 @@
         /// </summary>
         /// <param name="calculation">The calculation for which to create a new row.</param>
         /// <returns>The newly created row.</returns>
-        private HydraulicBoundaryLocationRow CreateNewRow(HydraulicBoundaryLocationCalculation calculation)
+        private HydraulicBoundaryLocationCalculationRow CreateNewRow(HydraulicBoundaryLocationCalculation calculation)
         {
-            return new HydraulicBoundaryLocationRow(calculation);
+            return new HydraulicBoundaryLocationCalculationRow(calculation);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -0,0 +1,105 @@
+// 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 System.ComponentModel;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.TypeConverters;
+
+namespace Ringtoets.Common.Forms.Views
+{
+    /// <summary>
+    /// This class represents a row of <see cref="HydraulicBoundaryLocationCalculation"/>.
+    /// </summary>
+    public class HydraulicBoundaryLocationCalculationRow : CalculatableRow<HydraulicBoundaryLocationCalculation>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="HydraulicBoundaryLocationCalculationRow"/>.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocationCalculation">The <see cref="HydraulicBoundaryLocationCalculation"/> for this row.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculation"/> is <c>null</c>.</exception>
+        public HydraulicBoundaryLocationCalculationRow(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+            : base(hydraulicBoundaryLocationCalculation) {}
+
+        /// <summary>
+        /// Gets or sets the value indicating whether the illustration points need to be included.
+        /// </summary>
+        public bool IncludeIllustrationPoints
+        {
+            get
+            {
+                return CalculatableObject.InputParameters.ShouldIllustrationPointsBeCalculated;
+            }
+            set
+            {
+                CalculatableObject.InputParameters.ShouldIllustrationPointsBeCalculated = value;
+                CalculatableObject.NotifyObservers();
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="HydraulicBoundaryLocation.Name"/>.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return CalculatableObject.HydraulicBoundaryLocation.Name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="HydraulicBoundaryLocation.Id"/>.
+        /// </summary>
+        public long Id
+        {
+            get
+            {
+                return CalculatableObject.HydraulicBoundaryLocation.Id;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="HydraulicBoundaryLocation.Location"/>.
+        /// </summary>
+        public Point2D Location
+        {
+            get
+            {
+                return CalculatableObject.HydraulicBoundaryLocation.Location;
+            }
+        }
+
+        /// <summary>
+        /// Gets the result of the <see cref="HydraulicBoundaryLocationCalculation"/>.
+        /// </summary>
+        [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
+        public RoundedDouble Result
+        {
+            get
+            {
+                return CalculatableObject.Output?.Result ?? RoundedDouble.NaN;
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 8560f7a7b53b45ad9d2d4afc6172ffdd05342082 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationRow.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -137,7 +137,7 @@
     <Compile Include="Views\FailureMechanismResultViewTest.cs" />
     <Compile Include="Helpers\FailureMechanismSectionResultRowHelperTest.cs" />
     <Compile Include="Views\FailureMechanismSectionResultRowTest.cs" />
-    <Compile Include="Views\HydraulicBoundaryLocationRowTest.cs" />
+    <Compile Include="Views\HydraulicBoundaryLocationCalculationRowTest.cs" />
     <Compile Include="Views\HydraulicBoundaryCalculationsViewTest.cs" />
     <Compile Include="Factories\RingtoetsChartDataFactoryTest.cs" />
     <Compile Include="Views\RingtoetsMapControlTest.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -0,0 +1,112 @@
+// 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.Base;
+using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.Common.Forms.Views;
+
+namespace Ringtoets.Common.Forms.Test.Views
+{
+    [TestFixture]
+    public class HydraulicBoundaryLocationCalculationRowTest
+    {
+        [Test]
+        public void Constructor_WithHydraulicBoundaryLocationCalculation_ExpectedProperties()
+        {
+            // Setup
+            const int id = 1;
+            const string locationName = "LocationName";
+            const double coordinateX = 1.0;
+            const double coordinateY = 2.0;
+
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationName, coordinateX, coordinateY);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+
+            // Call
+            var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation);
+
+            // Assert
+            Assert.IsInstanceOf<CalculatableRow<HydraulicBoundaryLocationCalculation>>(row);
+
+            Assert.AreEqual(id, row.Id);
+            Assert.AreEqual(locationName, row.Name);
+            var expectedPoint2D = new Point2D(coordinateX, coordinateY);
+            Assert.AreEqual(expectedPoint2D, row.Location);
+
+            TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationRow, NoValueRoundedDoubleConverter>(nameof(HydraulicBoundaryLocationCalculationRow.Result));
+            Assert.IsNaN(row.Result);
+
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, row.CalculatableObject);
+            Assert.IsFalse(row.ShouldCalculate);
+        }
+
+        [Test]
+        public void IncludeIllustrationPoints_NewValue_SetsPropertiesAndNotifiesObservers(
+            [Values(true, false)] bool setIllustrationPoints)
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var observer = mockRepository.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver());
+            mockRepository.ReplayAll();
+
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
+
+            var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation);
+
+            row.CalculatableObject.Attach(observer);
+
+            // Call
+            row.IncludeIllustrationPoints = setIllustrationPoints;
+
+            // Assert
+            Assert.AreEqual(setIllustrationPoints, row.IncludeIllustrationPoints);
+            Assert.AreEqual(setIllustrationPoints, hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
+
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Result_WithCalculationOutput_ReturnsResult()
+        {
+            // Setup
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
+
+            var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation);
+
+            var random = new Random(432);
+            var output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+
+            // Call
+            hydraulicBoundaryLocationCalculation.Output = output;
+
+            // Assert
+            Assert.AreEqual(output.Result, row.Result);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 8560f7a7b53b45ad9d2d4afc6172ffdd05342082 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -rc51ba92268d9a8272778e758fd0f9a71a0d61849 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision c51ba92268d9a8272778e758fd0f9a71a0d61849)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -128,7 +128,7 @@
                 GetViewName = (view, context) => RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 GetViewData = context => context.WrappedData,
-                CloseForData = CloseDuneLocationViewForData,
+                CloseForData = CloseDuneLocationsViewForData,
                 CreateInstance = context => new DuneLocationsView(context.WrappedData,
                                                                   dl => dl.Calculation,
                                                                   context.FailureMechanism,
@@ -349,7 +349,7 @@
 
         #region DuneLocationsView ViewInfo
 
-        private static bool CloseDuneLocationViewForData(DuneLocationsView view, object dataToCloseFor)
+        private static bool CloseDuneLocationsViewForData(DuneLocationsView view, object dataToCloseFor)
         {
             var failureMechanismContext = dataToCloseFor as DuneErosionFailureMechanismContext;
             var assessmentSection = dataToCloseFor as IAssessmentSection;
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs
===================================================================
diff -u -rc045873bae1b4daaf2325e9903dcf656702c24c1 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs)	(revision c045873bae1b4daaf2325e9903dcf656702c24c1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -95,7 +95,7 @@
         protected override void InitializeDataGridView()
         {
             base.InitializeDataGridView();
-            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Result),
+            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
                                                  Resources.GrassCoverErosionOutwardsHydraulicBoundaryLocation_DesignWaterLevel_DisplayName);
         }
 
@@ -104,7 +104,7 @@
             DataGridViewRow currentRow = dataGridViewControl.CurrentRow;
 
             return currentRow != null
-                       ? new GrassCoverErosionOutwardsDesignWaterLevelCalculationContext(((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject)
+                       ? new GrassCoverErosionOutwardsDesignWaterLevelCalculationContext(((HydraulicBoundaryLocationCalculationRow) currentRow.DataBoundItem).CalculatableObject)
                        : null;
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs
===================================================================
diff -u -r036dbc232fd0151d7612ea584b3b46f419b74eae -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs)	(revision 036dbc232fd0151d7612ea584b3b46f419b74eae)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -97,7 +97,7 @@
         protected override void InitializeDataGridView()
         {
             base.InitializeDataGridView();
-            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Result),
+            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
                                                  Resources.GrassCoverErosionOutwardsHydraulicBoundaryLocation_WaveHeight_DisplayName);
         }
 
@@ -106,7 +106,7 @@
             DataGridViewRow currentRow = dataGridViewControl.CurrentRow;
 
             return currentRow != null
-                       ? new GrassCoverErosionOutwardsWaveHeightCalculationContext(((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject)
+                       ? new GrassCoverErosionOutwardsWaveHeightCalculationContext(((HydraulicBoundaryLocationCalculationRow) currentRow.DataBoundItem).CalculatableObject)
                        : null;
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -r66517b122d50b79f9177a60398424102f23f2d11 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -717,7 +717,7 @@
 
             protected override object GetCalculationSelection(CalculationsView<HydraulicBoundaryLocationCalculation> view, object selectedRowObject)
             {
-                return new GrassCoverErosionOutwardsDesignWaterLevelCalculationContext(((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject);
+                return new GrassCoverErosionOutwardsDesignWaterLevelCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject);
             }
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs
===================================================================
diff -u -r66517b122d50b79f9177a60398424102f23f2d11 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -717,7 +717,7 @@
 
             protected override object GetCalculationSelection(CalculationsView<HydraulicBoundaryLocationCalculation> view, object selectedRowObject)
             {
-                return new GrassCoverErosionOutwardsWaveHeightCalculationContext(((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject);
+                return new GrassCoverErosionOutwardsWaveHeightCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject);
             }
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs
===================================================================
diff -u -rc00b1c9a3f2e8eeb36d5f6493bfde8920d767729 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision c00b1c9a3f2e8eeb36d5f6493bfde8920d767729)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -74,7 +74,7 @@
 
             if (currentRow != null)
             {
-                return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject);
+                return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationCalculationRow) currentRow.DataBoundItem).CalculatableObject);
             }
 
             return null;
@@ -92,7 +92,7 @@
         protected override void InitializeDataGridView()
         {
             base.InitializeDataGridView();
-            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Result),
+            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
                                                  Resources.HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName);
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs
===================================================================
diff -u -r8f71111fae4dc2d04afae34491748404c0466ce8 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision 8f71111fae4dc2d04afae34491748404c0466ce8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -74,7 +74,7 @@
 
             if (currentRow != null)
             {
-                return new WaveHeightCalculationContext(((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject);
+                return new WaveHeightCalculationContext(((HydraulicBoundaryLocationCalculationRow) currentRow.DataBoundItem).CalculatableObject);
             }
 
             return null;
@@ -92,7 +92,7 @@
         protected override void InitializeDataGridView()
         {
             base.InitializeDataGridView();
-            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Result),
+            dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
                                                  Resources.HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName);
         }
     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -r66517b122d50b79f9177a60398424102f23f2d11 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -674,7 +674,7 @@
 
             protected override object GetCalculationSelection(CalculationsView<HydraulicBoundaryLocationCalculation> view, object selectedRowObject)
             {
-                return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject);
+                return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject);
             }
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs
===================================================================
diff -u -r66517b122d50b79f9177a60398424102f23f2d11 -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
@@ -674,7 +674,7 @@
 
             protected override object GetCalculationSelection(CalculationsView<HydraulicBoundaryLocationCalculation> view, object selectedRowObject)
             {
-                return new WaveHeightCalculationContext(((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject);
+                return new WaveHeightCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject);
             }
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)