Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r466a02f3ba52351117297fcc1ea2d4242ab92b39 -rceea3576d68a9ec132886da026446b28672414b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 466a02f3ba52351117297fcc1ea2d4242ab92b39)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ceea3576d68a9ec132886da026446b28672414b7)
@@ -388,6 +388,33 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Is convergentie bereikt in de toetspeil berekening?.
+        /// </summary>
+        public static string DesignWaterLevelCalculation_Convergence_Description {
+            get {
+                return ResourceManager.GetString("DesignWaterLevelCalculation_Convergence_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Berekend toetspeil..
+        /// </summary>
+        public static string DesignWaterLevelCalculation_Result_Description {
+            get {
+                return ResourceManager.GetString("DesignWaterLevelCalculation_Result_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Toetspeil [m+NAP].
+        /// </summary>
+        public static string DesignWaterLevelCalculation_Result_DisplayName {
+            get {
+                return ResourceManager.GetString("DesignWaterLevelCalculation_Result_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Toetspeilen.
         /// </summary>
         public static string DesignWaterLevelCalculationsContext_DisplayName {
@@ -471,24 +498,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Is convergentie bereikt in de toetspeil berekening?.
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_Description {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Is convergentie bereikt in de golfhoogte berekening?.
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Convergence_WaveHeight_Description {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Convergence_WaveHeight_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Hydraulische randvoorwaarden.
         /// </summary>
         public static string HydraulicBoundaryDatabase_DisplayName {
@@ -516,42 +525,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Berekend toetspeil..
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Location_DesignWaterLevel_Description {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Location_DesignWaterLevel_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Toetspeil [m+NAP].
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Berekende golfhoogte..
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Location_WaveHeight_Description {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Location_WaveHeight_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hs [m].
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Locatie waar de preprocessor bestanden opslaat..
         /// </summary>
         public static string HydraulicBoundaryDatabase_PreprocessorDirectory_Description {
@@ -778,6 +751,33 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Is convergentie bereikt in de golfhoogte berekening?.
+        /// </summary>
+        public static string WaveHeightCalculation_Convergence_Description {
+            get {
+                return ResourceManager.GetString("WaveHeightCalculation_Convergence_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Berekende golfhoogte..
+        /// </summary>
+        public static string WaveHeightCalculation_Result_Description {
+            get {
+                return ResourceManager.GetString("WaveHeightCalculation_Result_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Hs [m].
+        /// </summary>
+        public static string WaveHeightCalculation_Result_DisplayName {
+            get {
+                return ResourceManager.GetString("WaveHeightCalculation_Result_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Golfhoogtes.
         /// </summary>
         public static string WaveHeightCalculationsContext_DisplayName {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r466a02f3ba52351117297fcc1ea2d4242ab92b39 -rceea3576d68a9ec132886da026446b28672414b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 466a02f3ba52351117297fcc1ea2d4242ab92b39)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ceea3576d68a9ec132886da026446b28672414b7)
@@ -249,22 +249,22 @@
   <data name="WaveHeight_Calculate_All_ToolTip" xml:space="preserve">
     <value>Alle golfhoogtes berekenen.</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_Description" xml:space="preserve">
+  <data name="DesignWaterLevelCalculation_Convergence_Description" xml:space="preserve">
     <value>Is convergentie bereikt in de toetspeil berekening?</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Convergence_WaveHeight_Description" xml:space="preserve">
+  <data name="WaveHeightCalculation_Convergence_Description" xml:space="preserve">
     <value>Is convergentie bereikt in de golfhoogte berekening?</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Location_DesignWaterLevel_Description" xml:space="preserve">
+  <data name="DesignWaterLevelCalculation_Result_Description" xml:space="preserve">
     <value>Berekend toetspeil.</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName" xml:space="preserve">
+  <data name="DesignWaterLevelCalculation_Result_DisplayName" xml:space="preserve">
     <value>Toetspeil [m+NAP]</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Location_WaveHeight_Description" xml:space="preserve">
+  <data name="WaveHeightCalculation_Result_Description" xml:space="preserve">
     <value>Berekende golfhoogte.</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName" xml:space="preserve">
+  <data name="WaveHeightCalculation_Result_DisplayName" xml:space="preserve">
     <value>Hs [m]</value>
   </data>
   <data name="FailureMechanismContribution_Composition_Description" xml:space="preserve">
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelCalculationProperties.cs
===================================================================
diff -u -r63ca446f378484b5dc555b2db50b77f8ff94fa7b -rceea3576d68a9ec132886da026446b28672414b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelCalculationProperties.cs	(.../DesignWaterLevelCalculationProperties.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelCalculationProperties.cs	(.../DesignWaterLevelCalculationProperties.cs)	(revision ceea3576d68a9ec132886da026446b28672414b7)
@@ -48,8 +48,8 @@
 
         [PropertyOrder(4)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Location_DesignWaterLevel_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.DesignWaterLevelCalculation_Result_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.DesignWaterLevelCalculation_Result_Description))]
         [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
         public RoundedDouble DesignWaterLevel
         {
@@ -62,7 +62,7 @@
         [PropertyOrder(9)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_Convergence_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Convergence_DesignWaterLevel_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.DesignWaterLevelCalculation_Convergence_Description))]
         public string Convergence
         {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightCalculationProperties.cs
===================================================================
diff -u -r8b256e4113bff0cf82676406410bfa6347d27629 -rceea3576d68a9ec132886da026446b28672414b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightCalculationProperties.cs	(.../WaveHeightCalculationProperties.cs)	(revision 8b256e4113bff0cf82676406410bfa6347d27629)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightCalculationProperties.cs	(.../WaveHeightCalculationProperties.cs)	(revision ceea3576d68a9ec132886da026446b28672414b7)
@@ -48,8 +48,8 @@
 
         [PropertyOrder(4)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Location_WaveHeight_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.WaveHeightCalculation_Result_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.WaveHeightCalculation_Result_Description))]
         [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
         public RoundedDouble WaveHeight
         {
@@ -62,7 +62,7 @@
         [PropertyOrder(9)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Result))]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_Convergence_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Convergence_WaveHeight_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.WaveHeightCalculation_Convergence_Description))]
         public string Convergence
         {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs
===================================================================
diff -u -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082 -rceea3576d68a9ec132886da026446b28672414b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision ceea3576d68a9ec132886da026446b28672414b7)
@@ -93,7 +93,7 @@
         {
             base.InitializeDataGridView();
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
-                                                 Resources.HydraulicBoundaryDatabase_Location_DesignWaterLevel_DisplayName);
+                                                 Resources.DesignWaterLevelCalculation_Result_DisplayName);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs
===================================================================
diff -u -r8560f7a7b53b45ad9d2d4afc6172ffdd05342082 -rceea3576d68a9ec132886da026446b28672414b7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision 8560f7a7b53b45ad9d2d4afc6172ffdd05342082)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision ceea3576d68a9ec132886da026446b28672414b7)
@@ -93,7 +93,7 @@
         {
             base.InitializeDataGridView();
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
-                                                 Resources.HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName);
+                                                 Resources.WaveHeightCalculation_Result_DisplayName);
         }
     }
 }
\ No newline at end of file