Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r0d4d9548637cbf814359cece7b551ca85b8378c3 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -1128,6 +1128,33 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Is convergentie bereikt in de waterstand berekening?.
+        /// </summary>
+        public static string DesignWaterLevelCalculation_Convergence_Description {
+            get {
+                return ResourceManager.GetString("DesignWaterLevelCalculation_Convergence_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Berekende waterstand..
+        /// </summary>
+        public static string DesignWaterLevelCalculation_Result_Description {
+            get {
+                return ResourceManager.GetString("DesignWaterLevelCalculation_Result_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Waterstand [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 Dijkhoogte [m+NAP].
         /// </summary>
         public static string DikeHeight_DisplayName {
@@ -3973,6 +4000,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 Locatie (RD) [m].
         /// </summary>
         public static string WorldReferencePoint_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r0d4d9548637cbf814359cece7b551ca85b8378c3 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -1431,4 +1431,22 @@
   <data name="AssemblyCategory_UpperBoundary_DisplayName" xml:space="preserve">
     <value>Bovengrens [1/jaar]</value>
   </data>
+  <data name="DesignWaterLevelCalculation_Result_DisplayName" xml:space="preserve">
+    <value>Waterstand [m+NAP]</value>
+  </data>
+  <data name="DesignWaterLevelCalculation_Result_Description" xml:space="preserve">
+    <value>Berekende waterstand.</value>
+  </data>
+  <data name="DesignWaterLevelCalculation_Convergence_Description" xml:space="preserve">
+    <value>Is convergentie bereikt in de waterstand berekening?</value>
+  </data>
+  <data name="WaveHeightCalculation_Convergence_Description" xml:space="preserve">
+    <value>Is convergentie bereikt in de golfhoogte berekening?</value>
+  </data>
+  <data name="WaveHeightCalculation_Result_DisplayName" xml:space="preserve">
+    <value>Hs [m]</value>
+  </data>
+  <data name="WaveHeightCalculation_Result_Description" xml:space="preserve">
+    <value>Berekende golfhoogte.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -94,12 +94,17 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="PropertyClasses\DesignVariableProperties.cs" />
+    <Compile Include="PropertyClasses\DesignWaterLevelCalculationProperties.cs" />
+    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsGroupProperties.cs" />
+    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProbabilityAssessmentProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsProbabilityAssessmentProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsProperties.cs" />
+    <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationBaseProperties.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationProperties.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationsProperties.cs" />
+    <Compile Include="PropertyClasses\HydraulicBoundaryLocationProperties.cs" />
     <Compile Include="PropertyClasses\IllustrationPointProperties.cs" />
     <Compile Include="PropertyClasses\SubMechanismIllustrationPointValuesProperties.cs" />
     <Compile Include="PropertyClasses\SubMechanismIllustrationPointProperties.cs" />
@@ -131,6 +136,8 @@
     <Compile Include="PropertyClasses\VariationCoefficientDistributionPropertiesReadOnly.cs" />
     <Compile Include="ExportInfos\RingtoetsExportInfoFactory.cs" />
     <Compile Include="PropertyClasses\TopLevelSubMechanismIllustrationPointProperties.cs" />
+    <Compile Include="PropertyClasses\WaveHeightCalculationProperties.cs" />
+    <Compile Include="PropertyClasses\WaveHeightCalculationsProperties.cs" />
     <Compile Include="ScenarioSelectionControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -96,12 +96,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\BreakWaterPropertiesTest.cs" />
     <Compile Include="PropertyClasses\DesignVariablePropertiesTest.cs" />
+    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsGroupPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationsPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\HydraulicBoundaryLocationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\SubMechanismIllustrationPointValuesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\SubMechanismIllustrationPointPropertiesTest.cs" />
     <Compile Include="PropertyClasses\IllustrationPointPropertiesTest.cs" />
@@ -125,6 +127,7 @@
     <Compile Include="PropertyClasses\UseBreakWaterPropertiesTest.cs" />
     <Compile Include="PropertyClasses\UseForeshorePropertiesTest.cs" />
     <Compile Include="PropertyClasses\TopLevelSubMechanismIllustrationPointPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\WaveHeightCalculationPropertiesTest.cs" />
     <Compile Include="ScenarioSelectionControlTest.cs" />
     <Compile Include="SelectionDialogBaseTest.cs" />
     <Compile Include="HydraulicBoundaryLocationSelectionDialogTest.cs" />
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r4376a372caaaeb42bf19c90fbf1cc012e56766ea -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -91,33 +91,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Is convergentie bereikt in de berekening van de waterstand bij doorsnede-eis?.
-        /// </summary>
-        public static string GrassCoverErosionOutwardsDesignWaterLevelCalculation_Convergence_Description {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionOutwardsDesignWaterLevelCalculation_Convergence_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Berekende waterstand bij doorsnede-eis..
-        /// </summary>
-        public static string GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_Description {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Waterstand bij doorsnede-eis [m+NAP].
-        /// </summary>
-        public static string GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_DisplayName {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties en berekeningen in dit toetsspoor verwijderd worden.
         ///
         ///Weet u zeker dat u wilt doorgaan?.
@@ -139,7 +112,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Berekende waterstand bij doorsnede-eis op de geselecteerde locatie..
+        ///   Looks up a localized string similar to Berekende waterstand op de geselecteerde locatie..
         /// </summary>
         public static string GrassCoverErosionOutwardsWaveConditionsInputContextProperties_DesignWaterLevel_Description {
             get {
@@ -149,7 +122,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bovengrens bepaald aan de hand van de waarde van de waterstand bij doorsnede-eis op de geselecteerde hydraulische locatie..
+        ///   Looks up a localized string similar to Bovengrens bepaald aan de hand van de waarde van de waterstand op de geselecteerde hydraulische locatie..
         /// </summary>
         public static string GrassCoverErosionOutwardsWaveConditionsInputContextProperties_UpperBoundaryDesignWaterLevel_Description {
             get {
@@ -159,7 +132,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bovengrens op basis van waterstand bij doorsnede-eis [m+NAP].
+        ///   Looks up a localized string similar to Bovengrens op basis van waterstand [m+NAP].
         /// </summary>
         public static string GrassCoverErosionOutwardsWaveConditionsInputContextProperties_UpperBoundaryDesignWaterLevel_DisplayName {
             get {
@@ -189,33 +162,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Is convergentie bereikt in de berekening van de golfhoogte bij doorsnede-eis?.
-        /// </summary>
-        public static string GrassCoverErosionOutwardsWaveHeightCalculation_Convergence_Description {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionOutwardsWaveHeightCalculation_Convergence_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Berekende golfhoogte bij doorsnede-eis..
-        /// </summary>
-        public static string GrassCoverErosionOutwardsWaveHeightCalculation_Result_Description {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionOutwardsWaveHeightCalculation_Result_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Golfhoogte bij doorsnede-eis [m].
-        /// </summary>
-        public static string GrassCoverErosionOutwardsWaveHeightCalculation_Result_DisplayName {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionOutwardsWaveHeightCalculation_Result_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to h(Vv-&gt;VIv).
         /// </summary>
         public static string MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r4376a372caaaeb42bf19c90fbf1cc012e56766ea -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -117,38 +117,20 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_Description" xml:space="preserve">
-    <value>Berekende waterstand bij doorsnede-eis.</value>
-  </data>
-  <data name="GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_DisplayName" xml:space="preserve">
-    <value>Waterstand bij doorsnede-eis [m+NAP]</value>
-  </data>
-  <data name="GrassCoverErosionOutwardsDesignWaterLevelCalculation_Convergence_Description" xml:space="preserve">
-    <value>Is convergentie bereikt in de berekening van de waterstand bij doorsnede-eis?</value>
-  </data>
-  <data name="GrassCoverErosionOutwardsWaveHeightCalculation_Convergence_Description" xml:space="preserve">
-    <value>Is convergentie bereikt in de berekening van de golfhoogte bij doorsnede-eis?</value>
-  </data>
-  <data name="GrassCoverErosionOutwardsWaveHeightCalculation_Result_Description" xml:space="preserve">
-    <value>Berekende golfhoogte bij doorsnede-eis.</value>
-  </data>
-  <data name="GrassCoverErosionOutwardsWaveHeightCalculation_Result_DisplayName" xml:space="preserve">
-    <value>Golfhoogte bij doorsnede-eis [m]</value>
-  </data>
   <data name="GrassCoverErosionOutwardsWaveConditionsOutputProperties_HydraulicBoundaryLocationResult_Description" xml:space="preserve">
     <value>Berekende resultaten voor de hydraulische randvoorwaarden voor gras.</value>
   </data>
   <data name="GrassCoverErosionOutwardsWaveConditionsOutputProperties_HydraulicBoundaryLocationResult_DisplayName" xml:space="preserve">
     <value>Hydraulische randvoorwaarden voor gras</value>
   </data>
   <data name="GrassCoverErosionOutwardsWaveConditionsInputContextProperties_UpperBoundaryDesignWaterLevel_Description" xml:space="preserve">
-    <value>Bovengrens bepaald aan de hand van de waarde van de waterstand bij doorsnede-eis op de geselecteerde hydraulische locatie.</value>
+    <value>Bovengrens bepaald aan de hand van de waarde van de waterstand op de geselecteerde hydraulische locatie.</value>
   </data>
   <data name="GrassCoverErosionOutwardsWaveConditionsInputContextProperties_UpperBoundaryDesignWaterLevel_DisplayName" xml:space="preserve">
-    <value>Bovengrens op basis van waterstand bij doorsnede-eis [m+NAP]</value>
+    <value>Bovengrens op basis van waterstand [m+NAP]</value>
   </data>
   <data name="GrassCoverErosionOutwardsWaveConditionsInputContextProperties_DesignWaterLevel_Description" xml:space="preserve">
-    <value>Berekende waterstand bij doorsnede-eis op de geselecteerde locatie.</value>
+    <value>Berekende waterstand op de geselecteerde locatie.</value>
   </data>
   <data name="GrassCoverErosionOutwardsWaveConditionsInputContext_RevetmentType" xml:space="preserve">
     <value>Gras</value>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs
===================================================================
diff -u -reea256188484122c8e96ab87e90a2c410caf60c9 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs)	(revision eea256188484122c8e96ab87e90a2c410caf60c9)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -26,6 +26,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
 using Ringtoets.Revetment.Forms.PropertyClasses;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses
 {
@@ -48,7 +49,7 @@
                                                                              IObservablePropertyChangeHandler propertyChangeHandler)
             : base(context, getAssessmentLevelFunc, propertyChangeHandler) {}
 
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_DisplayName))]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.DesignWaterLevelCalculation_Result_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsWaveConditionsInputContextProperties_DesignWaterLevel_Description))]
         public override RoundedDouble AssessmentLevel
         {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj
===================================================================
diff -u -r4e53af4a4179994c7a7d7fa25ab2b0bf256ca543 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.csproj)	(revision 4e53af4a4179994c7a7d7fa25ab2b0bf256ca543)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Ringtoets.GrassCoverErosionOutwards.Forms.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.csproj)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -38,10 +38,6 @@
     </Compile>
     <Compile Include="PropertyClasses\GrassCoverErosionOutwardsFailureMechanismProperties.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsWaveHeightCalculationProperties.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsWaveHeightCalculationsProperties.cs" />
     <Compile Include="Views\GrassCoverErosionOutwardsFailureMechanismView.cs">
       <SubType>UserControl</SubType>
     </Compile>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -99,7 +99,7 @@
         {
             base.InitializeDataGridView();
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
-                                                 Resources.GrassCoverErosionOutwardsDesignWaterLevelCalculation_Result_DisplayName);
+                                                 RingtoetsCommonFormsResources.DesignWaterLevelCalculation_Result_DisplayName);
         }
 
         protected override object CreateSelectedItemFromCurrentRow()
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -101,7 +101,7 @@
         {
             base.InitializeDataGridView();
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
-                                                 Resources.GrassCoverErosionOutwardsWaveHeightCalculation_Result_DisplayName);
+                                                 RingtoetsCommonFormsResources.WaveHeightCalculation_Result_DisplayName);
         }
 
         protected override object CreateSelectedItemFromCurrentRow()
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r5ef2f44bca31b92735dff724f97b717c7c55f912 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 5ef2f44bca31b92735dff724f97b717c7c55f912)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -43,6 +43,7 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.ImportInfos;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TreeNodeInfos;
 using Ringtoets.Common.Plugin;
 using Ringtoets.Common.Service;
@@ -79,13 +80,13 @@
                     context.WrappedData,
                     new GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler())
             };
-            yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext, GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties>
+            yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext, DesignWaterLevelCalculationsProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties(context.WrappedData)
+                CreateInstance = context => new DesignWaterLevelCalculationsProperties(context.WrappedData)
             };
-            yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightCalculationsContext, GrassCoverErosionOutwardsWaveHeightCalculationsProperties>
+            yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightCalculationsContext, WaveHeightCalculationsProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightCalculationsProperties(context.WrappedData)
+                CreateInstance = context => new WaveHeightCalculationsProperties(context.WrappedData)
             };
 
             yield return new PropertyInfo<GrassCoverErosionOutwardsWaveConditionsOutput, GrassCoverErosionOutwardsWaveConditionsOutputProperties>();
@@ -100,14 +101,14 @@
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
 
-            yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationContext, GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties>
+            yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationContext, DesignWaterLevelCalculationProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties(context.WrappedData)
+                CreateInstance = context => new DesignWaterLevelCalculationProperties(context.WrappedData)
             };
 
-            yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightCalculationContext, GrassCoverErosionOutwardsWaveHeightCalculationProperties>
+            yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightCalculationContext, WaveHeightCalculationProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightCalculationProperties(context.WrappedData)
+                CreateInstance = context => new WaveHeightCalculationProperties(context.WrappedData)
             };
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj
===================================================================
diff -u -rf1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision f1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -41,12 +41,8 @@
     <Compile Include="PresentationObjects\GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs" />
     <Compile Include="Views\GrassCoverErosionOutwardsFailureMechanismViewTest.cs" />
     <Compile Include="Views\GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs" />
     <Compile Include="Views\GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs" />
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs
===================================================================
diff -u -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -29,6 +29,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
@@ -141,12 +142,12 @@
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext),
-                    typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties));
+                    typeof(DesignWaterLevelCalculationsProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsWaveHeightCalculationsContext),
-                    typeof(GrassCoverErosionOutwardsWaveHeightCalculationsProperties));
+                    typeof(WaveHeightCalculationsProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
@@ -161,12 +162,12 @@
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationContext),
-                    typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties));
+                    typeof(DesignWaterLevelCalculationProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionOutwardsWaveHeightCalculationContext),
-                    typeof(GrassCoverErosionOutwardsWaveHeightCalculationProperties));
+                    typeof(WaveHeightCalculationProperties));
             }
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -raa9bd8cb8d845786765b7a59be9c9c29488ae598 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -25,8 +25,8 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.PropertyInfos
 {
@@ -44,7 +44,7 @@
 
                 // Assert
                 Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationContext), info.DataType);
-                Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties), info.PropertyObjectType);
+                Assert.AreEqual(typeof(DesignWaterLevelCalculationProperties), info.PropertyObjectType);
             }
         }
 
@@ -64,7 +64,7 @@
                 IObjectProperties objectProperties = info.CreateInstance(context);
 
                 // Assert
-                Assert.IsInstanceOf<GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties>(objectProperties);
+                Assert.IsInstanceOf<DesignWaterLevelCalculationProperties>(objectProperties);
                 Assert.AreSame(hydraulicBoundaryLocationCalculation, objectProperties.Data);
             }
         }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextPropertyInfoTest.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextPropertyInfoTest.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -27,9 +27,9 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.PropertyInfos
 {
@@ -47,7 +47,7 @@
 
                 // Assert
                 Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext), info.DataType);
-                Assert.AreEqual(typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties), info.PropertyObjectType);
+                Assert.AreEqual(typeof(DesignWaterLevelCalculationsProperties), info.PropertyObjectType);
             }
         }
 
@@ -75,7 +75,7 @@
                 IObjectProperties objectProperties = info.CreateInstance(context);
 
                 // Assert
-                Assert.IsInstanceOf<GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties>(objectProperties);
+                Assert.IsInstanceOf<DesignWaterLevelCalculationsProperties>(objectProperties);
                 Assert.AreSame(calculations, objectProperties.Data);
             }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -raa9bd8cb8d845786765b7a59be9c9c29488ae598 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -25,8 +25,8 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.PropertyInfos
 {
@@ -44,7 +44,7 @@
 
                 // Assert
                 Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveHeightCalculationContext), info.DataType);
-                Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveHeightCalculationProperties), info.PropertyObjectType);
+                Assert.AreEqual(typeof(WaveHeightCalculationProperties), info.PropertyObjectType);
             }
         }
 
@@ -64,7 +64,7 @@
                 IObjectProperties objectProperties = info.CreateInstance(context);
 
                 // Assert
-                Assert.IsInstanceOf<GrassCoverErosionOutwardsWaveHeightCalculationProperties>(objectProperties);
+                Assert.IsInstanceOf<WaveHeightCalculationProperties>(objectProperties);
                 Assert.AreSame(hydraulicBoundaryLocationCalculation, objectProperties.Data);
             }
         }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextPropertyInfoTest.cs
===================================================================
diff -u -rb24c5545e830f4418c0412be6c51853467044865 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextPropertyInfoTest.cs)	(revision b24c5545e830f4418c0412be6c51853467044865)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -27,9 +27,9 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.PropertyInfos
 {
@@ -47,7 +47,7 @@
 
                 // Assert
                 Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveHeightCalculationsContext), info.DataType);
-                Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveHeightCalculationsProperties), info.PropertyObjectType);
+                Assert.AreEqual(typeof(WaveHeightCalculationsProperties), info.PropertyObjectType);
             }
         }
 
@@ -73,7 +73,7 @@
                 IObjectProperties objectProperties = info.CreateInstance(context);
 
                 // Assert
-                Assert.IsInstanceOf<GrassCoverErosionOutwardsWaveHeightCalculationsProperties>(objectProperties);
+                Assert.IsInstanceOf<WaveHeightCalculationsProperties>(objectProperties);
                 Assert.AreSame(calculations, objectProperties.Data);
             }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r53b0860b01df1d3444a4d71350637e2c2e4cd6b5 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 53b0860b01df1d3444a4d71350637e2c2e4cd6b5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -479,33 +479,6 @@
         }
         
         /// <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 {
@@ -889,33 +862,6 @@
         }
         
         /// <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 -r53b0860b01df1d3444a4d71350637e2c2e4cd6b5 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 53b0860b01df1d3444a4d71350637e2c2e4cd6b5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -237,24 +237,6 @@
   <data name="WaveHeightCalculationsContext_DisplayName" xml:space="preserve">
     <value>Golfhoogtes</value>
   </data>
-  <data name="DesignWaterLevelCalculation_Convergence_Description" xml:space="preserve">
-    <value>Is convergentie bereikt in de toetspeil berekening?</value>
-  </data>
-  <data name="WaveHeightCalculation_Convergence_Description" xml:space="preserve">
-    <value>Is convergentie bereikt in de golfhoogte berekening?</value>
-  </data>
-  <data name="DesignWaterLevelCalculation_Result_Description" xml:space="preserve">
-    <value>Berekend toetspeil.</value>
-  </data>
-  <data name="DesignWaterLevelCalculation_Result_DisplayName" xml:space="preserve">
-    <value>Toetspeil [m+NAP]</value>
-  </data>
-  <data name="WaveHeightCalculation_Result_Description" xml:space="preserve">
-    <value>Berekende golfhoogte.</value>
-  </data>
-  <data name="WaveHeightCalculation_Result_DisplayName" xml:space="preserve">
-    <value>Hs [m]</value>
-  </data>
   <data name="AssessmentSectionComposition_Composition_Description" xml:space="preserve">
     <value>Selecteer het type traject, bepalend voor de faalkansbegroting.</value>
   </data>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r7fa52135f4ec71e9a1260a611e30633e73d4f3ea -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 7fa52135f4ec71e9a1260a611e30633e73d4f3ea)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -44,19 +44,14 @@
     <Compile Include="PropertyClasses\BackgroundDataProperties.cs" />
     <Compile Include="PropertyClasses\CalculationContextProperties.cs" />
     <Compile Include="PropertyClasses\CalculationGroupContextProperties.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsGroupProperties.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsProperties.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoryProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionAssemblyCategoryProperties.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationProperties.cs" />
     <Compile Include="PropertyClasses\NormProperties.cs" />
     <Compile Include="PropertyClasses\AssessmentSectionCompositionProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\PipingStructureFailureMechanismProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\MacroStabilityOutwardsFailureMechanismProperties.cs" />
     <Compile Include="PropertyClasses\ReferenceLineProperties.cs" />
-    <Compile Include="PropertyClasses\WaveHeightCalculationProperties.cs" />
     <Compile Include="PropertyClasses\RingtoetsProjectProperties.cs" />
     <Compile Include="PropertyClasses\StandAlone\StandAloneFailureMechanismProperties.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -67,7 +62,6 @@
     </Compile>
     <Compile Include="PropertyClasses\AssessmentSectionProperties.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryDatabaseProperties.cs" />
-    <Compile Include="PropertyClasses\WaveHeightCalculationsProperties.cs" />
     <Compile Include="ReferenceLineMetaSelectionDialog.cs">
       <SubType>Form</SubType>
     </Compile>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs
===================================================================
diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision d3b14a0f327184e0239e5239c826805c565fe8be)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -28,7 +28,7 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Integration.Forms.PresentationObjects;
-using Ringtoets.Integration.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views
 {
@@ -93,7 +93,7 @@
         {
             base.InitializeDataGridView();
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
-                                                 Resources.DesignWaterLevelCalculation_Result_DisplayName);
+                                                 RingtoetsCommonFormsResources.DesignWaterLevelCalculation_Result_DisplayName);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs
===================================================================
diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision d3b14a0f327184e0239e5239c826805c565fe8be)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -28,7 +28,7 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Integration.Forms.PresentationObjects;
-using Ringtoets.Integration.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views
 {
@@ -93,7 +93,7 @@
         {
             base.InitializeDataGridView();
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Result),
-                                                 Resources.WaveHeightCalculation_Result_DisplayName);
+                                                 RingtoetsCommonFormsResources.WaveHeightCalculation_Result_DisplayName);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -re3ebc9635d55057cb242e9a5b4f650b9c87737a8 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision e3ebc9635d55057cb242e9a5b4f650b9c87737a8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -385,7 +385,7 @@
             };
             yield return new PropertyInfo<DesignWaterLevelCalculationsGroupContext, DesignWaterLevelCalculationsGroupProperties>
             {
-                CreateInstance = context => new DesignWaterLevelCalculationsGroupProperties(context.WrappedData, context.AssessmentSection)
+                CreateInstance = context => new DesignWaterLevelCalculationsGroupProperties(context.WrappedData)
             };
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r7fa52135f4ec71e9a1260a611e30633e73d4f3ea -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 7fa52135f4ec71e9a1260a611e30633e73d4f3ea)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -44,11 +44,9 @@
     <Compile Include="PresentationObjects\DesignWaterLevelCalculationContextTest.cs" />
     <Compile Include="PresentationObjects\StandAlone\PipingStructureFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\StandAlone\MacroStabilityOutwardsFailureMechanismContextTest.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsGroupPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoryPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionAssemblyCategoryPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\NormPropertiesTest.cs" />
     <Compile Include="PropertyClasses\StandAlone\PipingStructureFailureMechanismPropertiesTest.cs" />
     <Compile Include="PropertyClasses\StandAlone\MacroStabilityOutwardsFailureMechanismPropertiesTest.cs" />
@@ -62,7 +60,6 @@
     <Compile Include="PropertyClasses\DesignWaterLevelCalculationsPropertiesTest.cs" />
     <Compile Include="PropertyClasses\DesignWaterLevelCalculationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\AssessmentSectionCompositionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\WaveHeightCalculationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\RingtoetsProjectPropertiesTest.cs" />
     <Compile Include="PropertyClasses\StandAlone\StandAloneFailureMechanismPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryDatabasePropertiesTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -raa9bd8cb8d845786765b7a59be9c9c29488ae598 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -25,8 +25,8 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.PresentationObjects;
-using Ringtoets.Integration.Forms.PropertyClasses;
 
 namespace Ringtoets.Integration.Plugin.Test.PropertyInfos
 {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsContextPropertyInfoTest.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationsContextPropertyInfoTest.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationsContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
 namespace Ringtoets.Integration.Plugin.Test.PropertyInfos
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsGroupContextPropertyInfoTest.cs
===================================================================
diff -u -rdbf85f8af33717398f517d8e1602fe58e023e369 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsGroupContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationsGroupContextPropertyInfoTest.cs)	(revision dbf85f8af33717398f517d8e1602fe58e023e369)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsGroupContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationsGroupContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
 namespace Ringtoets.Integration.Plugin.Test.PropertyInfos
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -raa9bd8cb8d845786765b7a59be9c9c29488ae598 -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationContextPropertyInfoTest.cs	(.../WaveHeightCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationContextPropertyInfoTest.cs	(.../WaveHeightCalculationContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -25,6 +25,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsContextPropertyInfoTest.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsContextPropertyInfoTest.cs	(.../WaveHeightCalculationsContextPropertyInfoTest.cs)	(revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsContextPropertyInfoTest.cs	(.../WaveHeightCalculationsContextPropertyInfoTest.cs)	(revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
 namespace Ringtoets.Integration.Plugin.Test.PropertyInfos