Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r4093eb9406dcdfc4da717e5f577478ee7d279bba -r6d64ec25765e17f16059e15084096fef1dce2672
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision 4093eb9406dcdfc4da717e5f577478ee7d279bba)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision 6d64ec25765e17f16059e15084096fef1dce2672)
@@ -102,15 +102,15 @@
             PropertyDescriptor assessmentLevelProperty = dynamicProperties[2];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(assessmentLevelProperty,
                                                                             hydraulicParametersCategory,
-                                                                            "Waterstand bij doorsnede-eis [m+NAP]",
-                                                                            "Berekende waterstand bij doorsnede-eis op de geselecteerde locatie.",
+                                                                            "Waterstand [m+NAP]",
+                                                                            "Berekende waterstand op de geselecteerde locatie.",
                                                                             true);
 
             PropertyDescriptor upperBoundaryDesignWaterLevelProperty = dynamicProperties[3];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(upperBoundaryDesignWaterLevelProperty,
                                                                             hydraulicParametersCategory,
-                                                                            "Bovengrens op basis van waterstand bij doorsnede-eis [m+NAP]",
-                                                                            "Bovengrens bepaald aan de hand van de waarde van de waterstand bij doorsnede-eis op de geselecteerde hydraulische locatie.",
+                                                                            "Bovengrens op basis van waterstand [m+NAP]",
+                                                                            "Bovengrens bepaald aan de hand van de waarde van de waterstand op de geselecteerde hydraulische locatie.",
                                                                             true);
         }
     }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r6d64ec25765e17f16059e15084096fef1dce2672
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision 6d64ec25765e17f16059e15084096fef1dce2672)
@@ -162,7 +162,7 @@
             Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
             var designWaterLevelColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[designWaterLevelColumnIndex];
-            Assert.AreEqual("Waterstand bij doorsnede-eis [m+NAP]", designWaterLevelColumn.HeaderText);
+            Assert.AreEqual("Waterstand [m+NAP]", designWaterLevelColumn.HeaderText);
 
             var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r6d64ec25765e17f16059e15084096fef1dce2672
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision 6d64ec25765e17f16059e15084096fef1dce2672)
@@ -162,7 +162,7 @@
             Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
             var waveHeightColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[waveHeightColumnIndex];
-            Assert.AreEqual("Golfhoogte bij doorsnede-eis [m]", waveHeightColumn.HeaderText);
+            Assert.AreEqual("Hs [m]", waveHeightColumn.HeaderText);
 
             var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs
===================================================================
diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -r6d64ec25765e17f16059e15084096fef1dce2672
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs	(.../DesignWaterLevelCalculationPropertiesTest.cs)	(revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs	(.../DesignWaterLevelCalculationPropertiesTest.cs)	(revision 6d64ec25765e17f16059e15084096fef1dce2672)
@@ -106,8 +106,8 @@
             PropertyDescriptor designWaterLevelProperty = dynamicProperties[designWaterLevelPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(designWaterLevelProperty,
                                                                             resultCategory,
-                                                                            "Toetspeil [m+NAP]",
-                                                                            "Berekend toetspeil.",
+                                                                            "Waterstand [m+NAP]",
+                                                                            "Berekende waterstand.",
                                                                             true);
 
             PropertyDescriptor targetProbabilityProperty = dynamicProperties[targetProbabilityPropertyIndex];
@@ -142,7 +142,7 @@
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty,
                                                                             resultCategory,
                                                                             "Convergentie",
-                                                                            "Is convergentie bereikt in de toetspeil berekening?",
+                                                                            "Is convergentie bereikt in de waterstand berekening?",
                                                                             true);
 
             PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex];
@@ -196,8 +196,8 @@
             PropertyDescriptor designWaterLevelProperty = dynamicProperties[designWaterLevelPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(designWaterLevelProperty,
                                                                             resultCategory,
-                                                                            "Toetspeil [m+NAP]",
-                                                                            "Berekend toetspeil.",
+                                                                            "Waterstand [m+NAP]",
+                                                                            "Berekende waterstand.",
                                                                             true);
 
             PropertyDescriptor targetProbabilityProperty = dynamicProperties[targetProbabilityPropertyIndex];
@@ -232,7 +232,7 @@
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty,
                                                                             resultCategory,
                                                                             "Convergentie",
-                                                                            "Is convergentie bereikt in de toetspeil berekening?",
+                                                                            "Is convergentie bereikt in de waterstand berekening?",
                                                                             true);
 
             PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex];
@@ -295,7 +295,7 @@
             var properties = new DesignWaterLevelCalculationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.DesignWaterLevel);
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.Result);
 
             string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             Assert.AreEqual(convergenceValue, properties.Convergence);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r6d64ec25765e17f16059e15084096fef1dce2672
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 6d64ec25765e17f16059e15084096fef1dce2672)
@@ -142,7 +142,7 @@
             Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
             var designWaterLevelColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[designWaterLevelColumnIndex];
-            Assert.AreEqual("Toetspeil [m+NAP]", designWaterLevelColumn.HeaderText);
+            Assert.AreEqual("Waterstand [m+NAP]", designWaterLevelColumn.HeaderText);
 
             var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);