Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs
===================================================================
diff -u -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57 -r6678e3c1cf7d4333cedf1afc4b338bf719d90b71
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs)	(revision 6678e3c1cf7d4333cedf1afc4b338bf719d90b71)
@@ -61,11 +61,11 @@
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsWaveConditionsInputContextProperties_UpperBoundaryDesignWaterLevel_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsWaveConditionsInputContextProperties_UpperBoundaryDesignWaterLevel_Description))]
-        public override RoundedDouble UpperBoundaryDesignWaterLevel
+        public override RoundedDouble UpperBoundaryAssessmentLevel
         {
             get
             {
-                return base.UpperBoundaryDesignWaterLevel;
+                return base.UpperBoundaryAssessmentLevel;
             }
         }
 
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rdd1d1365b44e52adf26da99a3102a1d2d426ca6b -r6678e3c1cf7d4333cedf1afc4b338bf719d90b71
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision dd1d1365b44e52adf26da99a3102a1d2d426ca6b)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6678e3c1cf7d4333cedf1afc4b338bf719d90b71)
@@ -316,20 +316,20 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bovengrens bepaald aan de hand van de waarde van het toetspeil op de geselecteerde hydraulische locatie..
+        ///   Looks up a localized string similar to Bovengrens bepaald aan de hand van de waterstand bij categoriegrens voor de geselecteerde hydraulische locatie..
         /// </summary>
-        public static string WaveConditionsInput_UpperBoundaryDesignWaterLevel_Description {
+        public static string WaveConditionsInput_UpperBoundaryAssessmentLevel_Description {
             get {
-                return ResourceManager.GetString("WaveConditionsInput_UpperBoundaryDesignWaterLevel_Description", resourceCulture);
+                return ResourceManager.GetString("WaveConditionsInput_UpperBoundaryAssessmentLevel_Description", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bovengrens op basis van toetspeil [m+NAP].
+        ///   Looks up a localized string similar to Bovengrens op basis van waterstand bij categoriegrens [m+NAP].
         /// </summary>
-        public static string WaveConditionsInput_UpperBoundaryDesignWaterLevel_DisplayName {
+        public static string WaveConditionsInput_UpperBoundaryAssessmentLevel_DisplayName {
             get {
-                return ResourceManager.GetString("WaveConditionsInput_UpperBoundaryDesignWaterLevel_DisplayName", resourceCulture);
+                return ResourceManager.GetString("WaveConditionsInput_UpperBoundaryAssessmentLevel_DisplayName", resourceCulture);
             }
         }
         
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx
===================================================================
diff -u -rdd1d1365b44e52adf26da99a3102a1d2d426ca6b -r6678e3c1cf7d4333cedf1afc4b338bf719d90b71
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision dd1d1365b44e52adf26da99a3102a1d2d426ca6b)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 6678e3c1cf7d4333cedf1afc4b338bf719d90b71)
@@ -165,11 +165,11 @@
   <data name="WaveConditionsInput_StepSize_DisplayName" xml:space="preserve">
     <value>Stapgrootte [m]</value>
   </data>
-  <data name="WaveConditionsInput_UpperBoundaryDesignWaterLevel_Description" xml:space="preserve">
-    <value>Bovengrens bepaald aan de hand van de waarde van het toetspeil op de geselecteerde hydraulische locatie.</value>
+  <data name="WaveConditionsInput_UpperBoundaryAssessmentLevel_Description" xml:space="preserve">
+    <value>Bovengrens bepaald aan de hand van de waterstand bij categoriegrens voor de geselecteerde hydraulische locatie.</value>
   </data>
-  <data name="WaveConditionsInput_UpperBoundaryDesignWaterLevel_DisplayName" xml:space="preserve">
-    <value>Bovengrens op basis van toetspeil [m+NAP]</value>
+  <data name="WaveConditionsInput_UpperBoundaryAssessmentLevel_DisplayName" xml:space="preserve">
+    <value>Bovengrens op basis van waterstand bij categoriegrens [m+NAP]</value>
   </data>
   <data name="WaveConditionsInput_UpperBoundaryRevetment_Description" xml:space="preserve">
     <value>Bovengrens van de bekleding.</value>
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs
===================================================================
diff -u -r8ce51e30daf6665658c57d67ba01a8a97f3489ad -r6678e3c1cf7d4333cedf1afc4b338bf719d90b71
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision 8ce51e30daf6665658c57d67ba01a8a97f3489ad)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision 6678e3c1cf7d4333cedf1afc4b338bf719d90b71)
@@ -60,7 +60,7 @@
         private const int hydraulicBoundaryLocationPropertyIndex = 0;
         private const int categoryTypePropertyIndex = 1;
         private const int assessmentLevelPropertyIndex = 2;
-        private const int upperBoundaryDesignWaterLevelPropertyIndex = 3;
+        private const int upperBoundaryAssessmentLevelPropertyIndex = 3;
         private const int upperBoundaryRevetmentPropertyIndex = 4;
         private const int lowerBoundaryRevetmentPropertyIndex = 5;
         private const int upperBoundaryWaterLevelsPropertyIndex = 6;
@@ -139,11 +139,11 @@
             }
         }
 
-        [PropertyOrder(upperBoundaryDesignWaterLevelPropertyIndex)]
+        [PropertyOrder(upperBoundaryAssessmentLevelPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_HydraulicData))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.WaveConditionsInput_UpperBoundaryDesignWaterLevel_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.WaveConditionsInput_UpperBoundaryDesignWaterLevel_Description))]
-        public virtual RoundedDouble UpperBoundaryDesignWaterLevel
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.WaveConditionsInput_UpperBoundaryAssessmentLevel_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.WaveConditionsInput_UpperBoundaryAssessmentLevel_Description))]
+        public virtual RoundedDouble UpperBoundaryAssessmentLevel
         {
             get
             {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r4093eb9406dcdfc4da717e5f577478ee7d279bba -r6678e3c1cf7d4333cedf1afc4b338bf719d90b71
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 4093eb9406dcdfc4da717e5f577478ee7d279bba)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 6678e3c1cf7d4333cedf1afc4b338bf719d90b71)
@@ -53,7 +53,7 @@
         private const int hydraulicBoundaryLocationPropertyIndex = 0;
         private const int categoryTypePropertyIndex = 1;
         private const int assessmentLevelPropertyIndex = 2;
-        private const int upperBoundaryDesignWaterLevelPropertyIndex = 3;
+        private const int upperBoundaryAssessmentLevelPropertyIndex = 3;
         private const int upperBoundaryRevetmentPropertyIndex = 4;
         private const int lowerBoundaryRevetmentPropertyIndex = 5;
         private const int upperBoundaryWaterLevelsPropertyIndex = 6;
@@ -185,8 +185,8 @@
             Assert.IsInstanceOf<IHasHydraulicBoundaryLocationProperty>(properties);
             Assert.IsInstanceOf<IHasForeshoreProfileProperty>(properties);
 
-            Assert.AreEqual(assessmentLevel - 0.01, properties.UpperBoundaryDesignWaterLevel.Value, properties.UpperBoundaryDesignWaterLevel.GetAccuracy());
-            Assert.AreEqual(2, properties.UpperBoundaryDesignWaterLevel.NumberOfDecimalPlaces);
+            Assert.AreEqual(assessmentLevel - 0.01, properties.UpperBoundaryAssessmentLevel.Value, properties.UpperBoundaryAssessmentLevel.GetAccuracy());
+            Assert.AreEqual(2, properties.UpperBoundaryAssessmentLevel.NumberOfDecimalPlaces);
             Assert.AreEqual(upperBoundaryRevetment, properties.UpperBoundaryRevetment.Value, properties.UpperBoundaryRevetment.GetAccuracy());
             Assert.AreEqual(2, properties.UpperBoundaryRevetment.NumberOfDecimalPlaces);
             Assert.AreEqual(lowerBoundaryRevetment, properties.LowerBoundaryRevetment.Value, properties.LowerBoundaryRevetment.GetAccuracy());
@@ -268,11 +268,11 @@
                                                                             "Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm.",
                                                                             true);
 
-            PropertyDescriptor upperBoundaryDesignWaterLevelProperty = dynamicProperties[upperBoundaryDesignWaterLevelPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(upperBoundaryDesignWaterLevelProperty,
+            PropertyDescriptor upperBoundaryAssessmentLevelProperty = dynamicProperties[upperBoundaryAssessmentLevelPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(upperBoundaryAssessmentLevelProperty,
                                                                             hydraulicParametersCategory,
-                                                                            "Bovengrens op basis van toetspeil [m+NAP]",
-                                                                            "Bovengrens bepaald aan de hand van de waarde van het toetspeil op de geselecteerde hydraulische locatie.",
+                                                                            "Bovengrens op basis van waterstand bij categoriegrens [m+NAP]",
+                                                                            "Bovengrens bepaald aan de hand van de waterstand bij categoriegrens voor de geselecteerde hydraulische locatie.",
                                                                             true);
 
             PropertyDescriptor upperBoundaryRevetmentProperty = dynamicProperties[upperBoundaryRevetmentPropertyIndex];
@@ -464,9 +464,9 @@
         [Test]
         public void Orientation_Always_InputChangedAndObservablesNotified()
         {
-            RoundedDouble upperBoundaryDesignWaterLevel = new Random(21).NextRoundedDouble();
+            RoundedDouble orientation = new Random(21).NextRoundedDouble();
             SetPropertyAndVerifyNotificationsAndOutputForCalculation(
-                properties => properties.Orientation = upperBoundaryDesignWaterLevel);
+                properties => properties.Orientation = orientation);
         }
 
         [Test]