Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71 -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -1739,6 +1739,42 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Het kunstwerk dat gebruikt wordt in de berekening..
+        /// </summary>
+        public static string Structure_Description {
+            get {
+                return ResourceManager.GetString("Structure_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kunstwerk.
+        /// </summary>
+        public static string Structure_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Faalkans kunstwerk gegeven erosie bodem..
+        /// </summary>
+        public static string Structure_FailureProbabilityStructureWithErosion_Description {
+            get {
+                return ResourceManager.GetString("Structure_FailureProbabilityStructureWithErosion_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Faalkans gegeven erosie bodem [1/jaar].
+        /// </summary>
+        public static string Structure_FailureProbabilityStructureWithErosion_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_FailureProbabilityStructureWithErosion_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Stroomvoerende breedte bodembescherming..
         /// </summary>
         public static string Structure_FlowWidthAtBottomProtection_Description {
@@ -1757,6 +1793,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De schematisatie van het voorlandprofiel..
+        /// </summary>
+        public static string Structure_ForeshoreProfile_Description {
+            get {
+                return ResourceManager.GetString("Structure_ForeshoreProfile_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Voorlandprofiel.
+        /// </summary>
+        public static string Structure_ForeshoreProfile_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_ForeshoreProfile_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Binnenwaterstand..
         /// </summary>
         public static string Structure_InsideWaterLevel_Description {
@@ -1811,6 +1865,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Modelfactor voor het overloopdebiet over een volkomen overlaat..
+        /// </summary>
+        public static string Structure_ModelFactorSuperCriticalFlow_Description {
+            get {
+                return ResourceManager.GetString("Structure_ModelFactorSuperCriticalFlow_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor overloopdebiet volkomen overlaat [-].
+        /// </summary>
+        public static string Structure_ModelFactorSuperCriticalFlow_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_ModelFactorSuperCriticalFlow_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De naam van het kunstwerk..
         /// </summary>
         public static string Structure_Name_Description {
@@ -1847,6 +1919,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Stormduur..
+        /// </summary>
+        public static string Structure_StormDuration_Description {
+            get {
+                return ResourceManager.GetString("Structure_StormDuration_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Stormduur [uur].
+        /// </summary>
+        public static string Structure_StormDuration_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_StormDuration_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden..
         /// </summary>
         public static string Structure_StructureNormalOrientation_Description {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71 -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -775,4 +775,34 @@
   <data name="FailureProbabilityStructureWithErosion_Value_too_large" xml:space="preserve">
     <value>De waarde voor de faalkans is te groot of te klein.</value>
   </data>
+  <data name="Structure_Description" xml:space="preserve">
+    <value>Het kunstwerk dat gebruikt wordt in de berekening.</value>
+  </data>
+  <data name="Structure_DisplayName" xml:space="preserve">
+    <value>Kunstwerk</value>
+  </data>
+  <data name="Structure_FailureProbabilityStructureWithErosion_Description" xml:space="preserve">
+    <value>Faalkans kunstwerk gegeven erosie bodem.</value>
+  </data>
+  <data name="Structure_FailureProbabilityStructureWithErosion_DisplayName" xml:space="preserve">
+    <value>Faalkans gegeven erosie bodem [1/jaar]</value>
+  </data>
+  <data name="Structure_ForeshoreProfile_Description" xml:space="preserve">
+    <value>De schematisatie van het voorlandprofiel.</value>
+  </data>
+  <data name="Structure_ForeshoreProfile_DisplayName" xml:space="preserve">
+    <value>Voorlandprofiel</value>
+  </data>
+  <data name="Structure_ModelFactorSuperCriticalFlow_Description" xml:space="preserve">
+    <value>Modelfactor voor het overloopdebiet over een volkomen overlaat.</value>
+  </data>
+  <data name="Structure_ModelFactorSuperCriticalFlow_DisplayName" xml:space="preserve">
+    <value>Modelfactor overloopdebiet volkomen overlaat [-]</value>
+  </data>
+  <data name="Structure_StormDuration_Description" xml:space="preserve">
+    <value>Stormduur.</value>
+  </data>
+  <data name="Structure_StormDuration_DisplayName" xml:space="preserve">
+    <value>Stormduur [uur]</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs
===================================================================
diff -u -r722cd6ca2d37bf0f325c17a8208a33735ea98cb4 -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision 722cd6ca2d37bf0f325c17a8208a33735ea98cb4)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -60,7 +60,7 @@
         where TCalculation : ICalculation
         where TFailureMechanism : IFailureMechanism
     {
-        private Dictionary<string, int> propertyIndexLookup;
+        private readonly Dictionary<string, int> propertyIndexLookup;
 
         /// <summary>
         /// Creates a new instance of the <see cref="StructuresInputBaseProperties{TStructure, TStructureInput, TCalculation, TFailureMechanism}"/> class.
@@ -129,8 +129,8 @@
         [DynamicPropertyOrder]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_ModelSettings")]
-        [ResourcesDisplayName(typeof(Resources), "ModelFactorSuperCriticalFlow_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "ModelFactorSuperCriticalFlow_Description")]
+        [ResourcesDisplayName(typeof(Resources), "Structure_ModelFactorSuperCriticalFlow_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "Structure_ModelFactorSuperCriticalFlow_Description")]
         public NormalDistributionProperties ModelFactorSuperCriticalFlow
         {
             get
@@ -401,8 +401,8 @@
 
         [DynamicPropertyOrder]
         [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "FailureProbabilityStructureWithErosion_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "FailureProbabilityStructureWithErosion_Description")]
+        [ResourcesDisplayName(typeof(Resources), "Structure_FailureProbabilityStructureWithErosion_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "Structure_FailureProbabilityStructureWithErosion_Description")]
         public string FailureProbabilityStructureWithErosion
         {
             get
@@ -434,8 +434,8 @@
         [DynamicPropertyOrder]
         [Editor(typeof(ForeshoreProfileEditor), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "ForeshoreProfile_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "ForeshoreProfile_Description")]
+        [ResourcesDisplayName(typeof(Resources), "Structure_ForeshoreProfile_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "Structure_ForeshoreProfile_Description")]
         public ForeshoreProfile ForeshoreProfile
         {
             get
@@ -502,8 +502,8 @@
         [DynamicPropertyOrder]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
-        [ResourcesDisplayName(typeof(Resources), "StormDuration_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "StormDuration_Description")]
+        [ResourcesDisplayName(typeof(Resources), "Structure_StormDuration_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "Structure_StormDuration_Description")]
         public VariationCoefficientLogNormalDistributionProperties StormDuration
         {
             get
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71 -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -100,96 +100,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Faalkans kunstwerk gegeven erosie bodem..
-        /// </summary>
-        public static string FailureProbabilityStructureWithErosion_Description {
-            get {
-                return ResourceManager.GetString("FailureProbabilityStructureWithErosion_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Faalkans gegeven erosie bodem [1/jaar].
-        /// </summary>
-        public static string FailureProbabilityStructureWithErosion_DisplayName {
-            get {
-                return ResourceManager.GetString("FailureProbabilityStructureWithErosion_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De schematisatie van het voorlandprofiel..
-        /// </summary>
-        public static string ForeshoreProfile_Description {
-            get {
-                return ResourceManager.GetString("ForeshoreProfile_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Voorlandprofiel.
-        /// </summary>
-        public static string ForeshoreProfile_DisplayName {
-            get {
-                return ResourceManager.GetString("ForeshoreProfile_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Modelfactor voor het overloopdebiet over een volkomen overlaat..
-        /// </summary>
-        public static string ModelFactorSuperCriticalFlow_Description {
-            get {
-                return ResourceManager.GetString("ModelFactorSuperCriticalFlow_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Modelfactor overloopdebiet volkomen overlaat [-].
-        /// </summary>
-        public static string ModelFactorSuperCriticalFlow_DisplayName {
-            get {
-                return ResourceManager.GetString("ModelFactorSuperCriticalFlow_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Stormduur..
-        /// </summary>
-        public static string StormDuration_Description {
-            get {
-                return ResourceManager.GetString("StormDuration_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Stormduur [uur].
-        /// </summary>
-        public static string StormDuration_DisplayName {
-            get {
-                return ResourceManager.GetString("StormDuration_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het kunstwerk dat gebruikt wordt in de berekening..
-        /// </summary>
-        public static string Structure_Description {
-            get {
-                return ResourceManager.GetString("Structure_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Kunstwerk.
-        /// </summary>
-        public static string Structure_DisplayName {
-            get {
-                return ResourceManager.GetString("Structure_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Selecteer kunstwerken.
         /// </summary>
         public static string StructureSelectionDialog_Select_Structures {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71 -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -117,36 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="FailureProbabilityStructureWithErosion_Description" xml:space="preserve">
-    <value>Faalkans kunstwerk gegeven erosie bodem.</value>
-  </data>
-  <data name="FailureProbabilityStructureWithErosion_DisplayName" xml:space="preserve">
-    <value>Faalkans gegeven erosie bodem [1/jaar]</value>
-  </data>
-  <data name="ModelFactorSuperCriticalFlow_Description" xml:space="preserve">
-    <value>Modelfactor voor het overloopdebiet over een volkomen overlaat.</value>
-  </data>
-  <data name="ModelFactorSuperCriticalFlow_DisplayName" xml:space="preserve">
-    <value>Modelfactor overloopdebiet volkomen overlaat [-]</value>
-  </data>
-  <data name="StormDuration_Description" xml:space="preserve">
-    <value>Stormduur.</value>
-  </data>
-  <data name="StormDuration_DisplayName" xml:space="preserve">
-    <value>Stormduur [uur]</value>
-  </data>
-  <data name="Structure_Description" xml:space="preserve">
-    <value>Het kunstwerk dat gebruikt wordt in de berekening.</value>
-  </data>
-  <data name="Structure_DisplayName" xml:space="preserve">
-    <value>Kunstwerk</value>
-  </data>
-  <data name="ForeshoreProfile_Description" xml:space="preserve">
-    <value>De schematisatie van het voorlandprofiel.</value>
-  </data>
-  <data name="ForeshoreProfile_DisplayName" xml:space="preserve">
-    <value>Voorlandprofiel</value>
-  </data>
   <data name="StructureSelectionDialog_Select_Structures" xml:space="preserve">
     <value>Selecteer kunstwerken</value>
   </data>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs
===================================================================
diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs	(.../HeightStructureProperties.cs)	(revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs	(.../HeightStructureProperties.cs)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -184,8 +184,8 @@
 
         [PropertyOrder(failureProbabilityStructureWithErosionPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "FailureProbabilityStructureWithErosion_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "FailureProbabilityStructureWithErosion_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FailureProbabilityStructureWithErosion_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FailureProbabilityStructureWithErosion_Description")]
         public string FailureProbabilityStructureWithErosion
         {
             get
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -r5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71 -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 5a89ab5ef9ddfed831b2ef5ca2ce980a4735bc71)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -72,8 +72,8 @@
         [PropertyOrder(modelFactorSuperCriticalFlowPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")]
-        [ResourcesDisplayName(typeof(Resources), "ModelFactorSuperCriticalFlow_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "ModelFactorSuperCriticalFlow_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_ModelFactorSuperCriticalFlow_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_ModelFactorSuperCriticalFlow_Description")]
         public NormalDistributionProperties ModelFactorSuperCriticalFlow
         {
             get
@@ -107,8 +107,8 @@
         [PropertyOrder(heightStructurePropertyIndex)]
         [Editor(typeof(StructureEditor<HeightStructure>), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "Structure_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "Structure_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Description")]
         public HeightStructure Structure
         {
             get
@@ -253,8 +253,8 @@
 
         [PropertyOrder(failureProbabilityStructureWithErosionPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "FailureProbabilityStructureWithErosion_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "FailureProbabilityStructureWithErosion_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FailureProbabilityStructureWithErosion_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FailureProbabilityStructureWithErosion_Description")]
         public string FailureProbabilityStructureWithErosion
         {
             get
@@ -286,8 +286,8 @@
         [PropertyOrder(foreshoreProfilePropertyIndex)]
         [Editor(typeof(ForeshoreProfileEditor), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "ForeshoreProfile_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "ForeshoreProfile_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_ForeshoreProfile_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_ForeshoreProfile_Description")]
         public ForeshoreProfile ForeshoreProfile
         {
             get
@@ -354,8 +354,8 @@
         [PropertyOrder(stormDurationPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
-        [ResourcesDisplayName(typeof(Resources), "StormDuration_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "StormDuration_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_StormDuration_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_StormDuration_Description")]
         public VariationCoefficientLogNormalDistributionProperties StormDuration
         {
             get
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/StructureSelectionDialog.cs
===================================================================
diff -u -r7b3f00698f1c53c6464df710234f7b4b716e9bd3 -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/StructureSelectionDialog.cs	(.../StructureSelectionDialog.cs)	(revision 7b3f00698f1c53c6464df710234f7b4b716e9bd3)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/StructureSelectionDialog.cs	(.../StructureSelectionDialog.cs)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -27,6 +27,7 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms
 {
@@ -51,7 +52,7 @@
             }
 
             Text = Resources.StructureSelectionDialog_Select_Structures;
-            InitializeDataGridView(Resources.Structure_DisplayName);
+            InitializeDataGridView(RingtoetsCommonFormsResources.Structure_DisplayName);
 
             SetDataSource(structures.Select(structure => new SelectableRow<HeightStructure>(structure, structure.Name)).ToArray());
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r03ee61e8df1f1512fe8a4f29f4b53b08e553145f -rfd6db3bae09296e4da11ac9fb9e5dde9b31bc178
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 03ee61e8df1f1512fe8a4f29f4b53b08e553145f)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision fd6db3bae09296e4da11ac9fb9e5dde9b31bc178)
@@ -191,7 +191,7 @@
             else
             {
                 validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.StormDuration,
-                                                                                             GenerateParameterNameWithoutUnits(HeightStructuresForms.StormDuration_DisplayName)));
+                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_StormDuration_DisplayName)));
 
                 if (IsInvalidNumber(inputParameters.DeviationWaveDirection))
                 {
@@ -200,7 +200,7 @@
                 }
 
                 validationResult.AddRange(DistributionValidationService.ValidateDistribution(inputParameters.ModelFactorSuperCriticalFlow,
-                                                                                             GenerateParameterNameWithoutUnits(HeightStructuresForms.ModelFactorSuperCriticalFlow_DisplayName)));
+                                                                                             GenerateParameterNameWithoutUnits(RingtoetsCommonFormsResources.Structure_ModelFactorSuperCriticalFlow_DisplayName)));
 
                 if (IsInvalidNumber(inputParameters.StructureNormalOrientation))
                 {