Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -r1f4fbcc980a70c87598d3c9be642e3e8934173ca -r929f7e82ce2fb85040c087744e427e700ccb5125
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 1f4fbcc980a70c87598d3c9be642e3e8934173ca)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 929f7e82ce2fb85040c087744e427e700ccb5125)
@@ -122,14 +122,14 @@
                 MapFeature feature = CreateSinglePointMapFeature(location.Location);
                 feature.MetaData[Resources.MetaData_ID] = location.Id;
                 feature.MetaData[Resources.MetaData_Name] = location.Name;
-                feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation1] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation1);
-                feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation2] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation2);
-                feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation3] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation3);
-                feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation4] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation4);
-                feature.MetaData[Resources.MetaData_WaveHeightCalculation1] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation1);
-                feature.MetaData[Resources.MetaData_WaveHeightCalculation2] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation2);
-                feature.MetaData[Resources.MetaData_WaveHeightCalculation3] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation3);
-                feature.MetaData[Resources.MetaData_WaveHeightCalculation4] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation4);
+                feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation1);
+                feature.MetaData[Resources.MetaData_WaterLevelCalculationForSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation2);
+                feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimit] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation3);
+                feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimit] = GetHydraulicBoundaryLocationOutput(location.DesignWaterLevelCalculation4);
+                feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation1);
+                feature.MetaData[Resources.MetaData_WaveHeightCalculationForSignalingNorm] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation2);
+                feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimit] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation3);
+                feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimit] = GetHydraulicBoundaryLocationOutput(location.WaveHeightCalculation4);
 
                 features[i] = feature;
             }
@@ -380,14 +380,14 @@
             MapFeature feature = CreateSinglePointMapFeature(location.Location);
             feature.MetaData[Resources.MetaData_ID] = location.Id;
             feature.MetaData[Resources.MetaData_Name] = location.Name;
-            feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation1] = location.WaterLevelCalculationForFactorizedSignalingNorm;
-            feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation2] = location.WaterLevelCalculationForSignalingNorm;
-            feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation3] = location.WaterLevelCalculationForLowerLimitNorm;
-            feature.MetaData[Resources.MetaData_DesignWaterLevelCalculation4] = location.WaterLevelCalculationForFactorizedLowerLimitNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculation1] = location.WaveHeightCalculationForFactorizedSignalingNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculation2] = location.WaveHeightCalculationForSignalingNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculation3] = location.WaveHeightCalculationForLowerLimitNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculation4] = location.WaveHeightCalculationForFactorizedLowerLimitNorm;
+            feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedSignalingNorm] = location.WaterLevelCalculationForFactorizedSignalingNorm;
+            feature.MetaData[Resources.MetaData_WaterLevelCalculationForSignalingNorm] = location.WaterLevelCalculationForSignalingNorm;
+            feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimit] = location.WaterLevelCalculationForLowerLimitNorm;
+            feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimit] = location.WaterLevelCalculationForFactorizedLowerLimitNorm;
+            feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedSignalingNorm] = location.WaveHeightCalculationForFactorizedSignalingNorm;
+            feature.MetaData[Resources.MetaData_WaveHeightCalculationForSignalingNorm] = location.WaveHeightCalculationForSignalingNorm;
+            feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimit] = location.WaveHeightCalculationForLowerLimitNorm;
+            feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimit] = location.WaveHeightCalculationForFactorizedLowerLimitNorm;
             return feature;
         }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r24b17ef1a15554434d0735d9d2e6fe800ab887a1 -r929f7e82ce2fb85040c087744e427e700ccb5125
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 24b17ef1a15554434d0735d9d2e6fe800ab887a1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 929f7e82ce2fb85040c087744e427e700ccb5125)
@@ -2332,101 +2332,101 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h(A+-&gt;A).
+        ///   Looks up a localized string similar to ID.
         /// </summary>
-        public static string MetaData_DesignWaterLevelCalculation1 {
+        public static string MetaData_ID {
             get {
-                return ResourceManager.GetString("MetaData_DesignWaterLevelCalculation1", resourceCulture);
+                return ResourceManager.GetString("MetaData_ID", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h(A-&gt;B).
+        ///   Looks up a localized string similar to Lengte*.
         /// </summary>
-        public static string MetaData_DesignWaterLevelCalculation2 {
+        public static string MetaData_Length_Rounded {
             get {
-                return ResourceManager.GetString("MetaData_DesignWaterLevelCalculation2", resourceCulture);
+                return ResourceManager.GetString("MetaData_Length_Rounded", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h(B-&gt;C).
+        ///   Looks up a localized string similar to Naam.
         /// </summary>
-        public static string MetaData_DesignWaterLevelCalculation3 {
+        public static string MetaData_Name {
             get {
-                return ResourceManager.GetString("MetaData_DesignWaterLevelCalculation3", resourceCulture);
+                return ResourceManager.GetString("MetaData_Name", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to h(C-&gt;D).
         /// </summary>
-        public static string MetaData_DesignWaterLevelCalculation4 {
+        public static string MetaData_WaterLevelCalculationForFactorizedLowerLimit {
             get {
-                return ResourceManager.GetString("MetaData_DesignWaterLevelCalculation4", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedLowerLimit", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ID.
+        ///   Looks up a localized string similar to h(A+-&gt;A).
         /// </summary>
-        public static string MetaData_ID {
+        public static string MetaData_WaterLevelCalculationForFactorizedSignalingNorm {
             get {
-                return ResourceManager.GetString("MetaData_ID", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedSignalingNorm", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lengte*.
+        ///   Looks up a localized string similar to h(B-&gt;C).
         /// </summary>
-        public static string MetaData_Length_Rounded {
+        public static string MetaData_WaterLevelCalculationForLowerLimit {
             get {
-                return ResourceManager.GetString("MetaData_Length_Rounded", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaterLevelCalculationForLowerLimit", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Naam.
+        ///   Looks up a localized string similar to h(A-&gt;B).
         /// </summary>
-        public static string MetaData_Name {
+        public static string MetaData_WaterLevelCalculationForSignalingNorm {
             get {
-                return ResourceManager.GetString("MetaData_Name", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaterLevelCalculationForSignalingNorm", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hs(A+-&gt;A).
+        ///   Looks up a localized string similar to Hs(C-&gt;D).
         /// </summary>
-        public static string MetaData_WaveHeightCalculation1 {
+        public static string MetaData_WaveHeightCalculationForFactorizedLowerLimit {
             get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculation1", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedLowerLimit", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hs(A-&gt;B).
+        ///   Looks up a localized string similar to Hs(A+-&gt;A).
         /// </summary>
-        public static string MetaData_WaveHeightCalculation2 {
+        public static string MetaData_WaveHeightCalculationForFactorizedSignalingNorm {
             get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculation2", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedSignalingNorm", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Hs(B-&gt;C).
         /// </summary>
-        public static string MetaData_WaveHeightCalculation3 {
+        public static string MetaData_WaveHeightCalculationForLowerLimit {
             get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculation3", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaveHeightCalculationForLowerLimit", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hs(C-&gt;D).
+        ///   Looks up a localized string similar to Hs(A-&gt;B).
         /// </summary>
-        public static string MetaData_WaveHeightCalculation4 {
+        public static string MetaData_WaveHeightCalculationForSignalingNorm {
             get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculation4", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaveHeightCalculationForSignalingNorm", resourceCulture);
             }
         }
         
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r24b17ef1a15554434d0735d9d2e6fe800ab887a1 -r929f7e82ce2fb85040c087744e427e700ccb5125
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 24b17ef1a15554434d0735d9d2e6fe800ab887a1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 929f7e82ce2fb85040c087744e427e700ccb5125)
@@ -1314,28 +1314,28 @@
   <data name="FailureMechanismSectionProbabilityAssessment_N_Rounded_DisplayName" xml:space="preserve">
     <value>N* [-]</value>
   </data>
-  <data name="MetaData_DesignWaterLevelCalculation1" xml:space="preserve">
+  <data name="MetaData_WaterLevelCalculationForFactorizedSignalingNorm" xml:space="preserve">
     <value>h(A+-&gt;A)</value>
   </data>
-  <data name="MetaData_DesignWaterLevelCalculation2" xml:space="preserve">
+  <data name="MetaData_WaterLevelCalculationForSignalingNorm" xml:space="preserve">
     <value>h(A-&gt;B)</value>
   </data>
-  <data name="MetaData_DesignWaterLevelCalculation3" xml:space="preserve">
+  <data name="MetaData_WaterLevelCalculationForLowerLimit" xml:space="preserve">
     <value>h(B-&gt;C)</value>
   </data>
-  <data name="MetaData_DesignWaterLevelCalculation4" xml:space="preserve">
+  <data name="MetaData_WaterLevelCalculationForFactorizedLowerLimit" xml:space="preserve">
     <value>h(C-&gt;D)</value>
   </data>
-  <data name="MetaData_WaveHeightCalculation1" xml:space="preserve">
+  <data name="MetaData_WaveHeightCalculationForFactorizedSignalingNorm" xml:space="preserve">
     <value>Hs(A+-&gt;A)</value>
   </data>
-  <data name="MetaData_WaveHeightCalculation2" xml:space="preserve">
+  <data name="MetaData_WaveHeightCalculationForSignalingNorm" xml:space="preserve">
     <value>Hs(A-&gt;B)</value>
   </data>
-  <data name="MetaData_WaveHeightCalculation3" xml:space="preserve">
+  <data name="MetaData_WaveHeightCalculationForLowerLimit" xml:space="preserve">
     <value>Hs(B-&gt;C)</value>
   </data>
-  <data name="MetaData_WaveHeightCalculation4" xml:space="preserve">
+  <data name="MetaData_WaveHeightCalculationForFactorizedLowerLimit" xml:space="preserve">
     <value>Hs(C-&gt;D)</value>
   </data>
   <data name="FailureMechanism_ProbabilityAssessmentInput_A_Description" xml:space="preserve">