Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs
===================================================================
diff -u -r18bd8c1f3a85a8c02b7d7543cd19b24f1f973033 -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision 18bd8c1f3a85a8c02b7d7543cd19b24f1f973033)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
@@ -35,8 +35,7 @@
 namespace Ringtoets.Common.Forms.GuiServices
 {
     /// <summary>
-    /// This class is responsible for calculating the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/>
-    /// and <see cref="HydraulicBoundaryLocation.WaveHeight"/>.
+    /// This class is responsible for calculating design water levels and wave heights.
     /// </summary>
     public class HydraulicBoundaryLocationCalculationGuiService : IHydraulicBoundaryLocationCalculationGuiService
     {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs
===================================================================
diff -u -r0225653c669d19e281784bea8146c25bfe568a29 -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs	(.../IHydraulicBoundaryLocationCalculationGuiService.cs)	(revision 0225653c669d19e281784bea8146c25bfe568a29)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs	(.../IHydraulicBoundaryLocationCalculationGuiService.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
@@ -27,13 +27,12 @@
 namespace Ringtoets.Common.Forms.GuiServices
 {
     /// <summary>
-    /// Interface for <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/> and 
-    /// <see cref="HydraulicBoundaryLocation.WaveHeight"/> calculations.
+    /// Interface for design water level and wave height calculations.
     /// </summary>
     public interface IHydraulicBoundaryLocationCalculationGuiService
     {
         /// <summary>
-        /// Performs the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/> calculation for all <paramref name="locations"/>.
+        /// Performs the design water level calculation for all <paramref name="locations"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The hydraulic boundary database file that should be used for performing the calculation.</param>
         /// <param name="preprocessorDirectory">The preprocessor directory.</param>
@@ -55,7 +54,7 @@
                                         ICalculationMessageProvider messageProvider);
 
         /// <summary>
-        /// Performs the <see cref="HydraulicBoundaryLocation.WaveHeight"/> calculation for all <paramref name="locations"/>.
+        /// Performs the wave height calculation for all <paramref name="locations"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The hydraulic boundary database file that should be used for performing the calculation.</param>
         /// <param name="preprocessorDirectory">The preprocessor directory.</param>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs
===================================================================
diff -u -r0f28eb71a18af127ad376776ebd2cd597a0aa5c5 -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs)	(revision 0f28eb71a18af127ad376776ebd2cd597a0aa5c5)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
@@ -26,7 +26,7 @@
 {
     /// <summary>
     /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocation"/> 
-    /// with <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/> for a given norm.
+    /// with a design water level calculation result for a given norm.
     /// </summary>
     public class GrassCoverErosionOutwardsDesignWaterLevelLocationContext : GrassCoverErosionOutwardsHydraulicBoundaryLocationContext
     {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightLocationContext.cs
===================================================================
diff -u -r0f28eb71a18af127ad376776ebd2cd597a0aa5c5 -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightLocationContext.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContext.cs)	(revision 0f28eb71a18af127ad376776ebd2cd597a0aa5c5)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightLocationContext.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContext.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
@@ -26,7 +26,7 @@
 {
     /// <summary>
     /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocation"/> 
-    /// with <see cref="HydraulicBoundaryLocation.WaveHeight"/> for a given norm.
+    /// with a wave height calculation result for a given norm.
     /// </summary>
     public class GrassCoverErosionOutwardsWaveHeightLocationContext : GrassCoverErosionOutwardsHydraulicBoundaryLocationContext
     {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
@@ -606,9 +606,10 @@
                             CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
                             Assert.AreEqual($"Waterstand bij doorsnede-eis berekenen voor locatie '{hydraulicBoundaryLocation.Name}' is gelukt.", msgs[7]);
                         });
-                        Assert.AreEqual(0, hydraulicBoundaryLocation.DesignWaterLevel,
-                                        hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
-                        Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.CalculationConvergence);
+
+                        HydraulicBoundaryLocationOutput output = hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output;
+                        Assert.AreEqual(0, output.Result, output.Result.GetAccuracy());
+                        Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, output.CalculationConvergence);
                     }
                 }
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
@@ -212,6 +212,8 @@
             var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase();
             ObservableList<HydraulicBoundaryLocation> locations = testHydraulicBoundaryDatabase.Locations;
             ShowFullyConfiguredDesignWaterLevelLocationsView(locations, testForm);
+
+            const double designWaterLevel = 10.23;
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
                 DesignWaterLevelCalculation1 =
@@ -220,7 +222,7 @@
                     {
                         ShouldIllustrationPointsBeCalculated = true
                     },
-                    Output = new TestHydraulicBoundaryLocationOutput(10.23)
+                    Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel)
                 }
             };
 
@@ -244,7 +246,7 @@
             Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
-            Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevel, cells[locationDesignWaterlevelColumnIndex].Value);
+            Assert.AreEqual(designWaterLevel, cells[locationDesignWaterlevelColumnIndex].Value);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 2163fbe03dfcaf0fe5c69ea700c64d6cf31e13be)
@@ -555,8 +555,10 @@
                             CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
                             Assert.AreEqual($"Toetspeil berekenen voor locatie '{location.Name}' is gelukt.", msgs[7]);
                         });
-                        Assert.AreEqual(0, location.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
-                        Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, location.DesignWaterLevelCalculation1.Output.CalculationConvergence);
+
+                        HydraulicBoundaryLocationOutput output = location.DesignWaterLevelCalculation1.Output;
+                        Assert.AreEqual(0, output.Result, output.Result.GetAccuracy());
+                        Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, output.CalculationConvergence);
                     }
                 }
             }