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]