Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r5a224a7c242690d5830bed1284095f54e469d6a5 -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5a224a7c242690d5830bed1284095f54e469d6a5)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -4083,33 +4083,24 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Doelkans [1/jaar].
+        ///   Looks up a localized string similar to Overschrijdingskans waarvoor de hydraulische belastingen worden berekend..
         /// </summary>
-        public static string TargetProbability_DisplayName {
+        public static string TargetProbability_Description {
             get {
-                return ResourceManager.GetString("TargetProbability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("TargetProbability_Description", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Overschrijdingskans waarvoor de waterstanden worden berekend..
+        ///   Looks up a localized string similar to Doelkans [1/jaar].
         /// </summary>
-        public static string TargetProbability_WaterLevels_Description {
+        public static string TargetProbability_DisplayName {
             get {
-                return ResourceManager.GetString("TargetProbability_WaterLevels_Description", resourceCulture);
+                return ResourceManager.GetString("TargetProbability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Overschrijdingskans waarvoor de golfhoogten worden berekend..
-        /// </summary>
-        public static string TargetProbability_WaveHeights_Description {
-            get {
-                return ResourceManager.GetString("TargetProbability_WaveHeights_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to {0} ({1}).
         /// </summary>
         public static string TopLevelSubMechanismIllustrationPointProperties_ToString_WindDirectionName_0_ClosingSituation_1 {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r5a224a7c242690d5830bed1284095f54e469d6a5 -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 5a224a7c242690d5830bed1284095f54e469d6a5)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -1589,10 +1589,7 @@
   <data name="TargetProbability_DisplayName" xml:space="preserve">
     <value>Doelkans [1/jaar]</value>
   </data>
-  <data name="TargetProbability_WaterLevels_Description" xml:space="preserve">
-    <value>Overschrijdingskans waarvoor de waterstanden worden berekend.</value>
+  <data name="TargetProbability_Description" xml:space="preserve">
+    <value>Overschrijdingskans waarvoor de hydraulische belastingen worden berekend.</value>
   </data>
-  <data name="TargetProbability_WaveHeights_Description" xml:space="preserve">
-    <value>Overschrijdingskans waarvoor de golfhoogten worden berekend.</value>
-  </data>
 </root>
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForNormTargetProbabilityProperties.cs
===================================================================
diff -u -r60e4735ae26be141471f3a99458d5b4dacd6e4f8 -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForNormTargetProbabilityProperties.cs	(.../WaterLevelCalculationsForNormTargetProbabilityProperties.cs)	(revision 60e4735ae26be141471f3a99458d5b4dacd6e4f8)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForNormTargetProbabilityProperties.cs	(.../WaterLevelCalculationsForNormTargetProbabilityProperties.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -65,7 +65,7 @@
         [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.TargetProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_WaterLevels_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_Description))]
         public double TargetProbability { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs
===================================================================
diff -u -r6f4ea37ceb6f1f384a59efe5b275b11f3c323ead -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision 6f4ea37ceb6f1f384a59efe5b275b11f3c323ead)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -74,7 +74,7 @@
         [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.TargetProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_WaterLevels_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_Description))]
         public double TargetProbability
         {
             get
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsForUserDefinedTargetProbabilityProperties.cs
===================================================================
diff -u -r6f4ea37ceb6f1f384a59efe5b275b11f3c323ead -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision 6f4ea37ceb6f1f384a59efe5b275b11f3c323ead)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -74,7 +74,7 @@
         [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.TargetProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_WaveHeights_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_Description))]
         public double TargetProbability
         {
             get
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaterLevelCalculationsForNormTargetProbabilityPropertiesTest.cs
===================================================================
diff -u -r60e4735ae26be141471f3a99458d5b4dacd6e4f8 -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaterLevelCalculationsForNormTargetProbabilityPropertiesTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityPropertiesTest.cs)	(revision 60e4735ae26be141471f3a99458d5b4dacd6e4f8)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaterLevelCalculationsForNormTargetProbabilityPropertiesTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityPropertiesTest.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -82,7 +82,7 @@
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetProbabilityProperty,
                                                                             "Algemeen",
                                                                             "Doelkans [1/jaar]",
-                                                                            "Overschrijdingskans waarvoor de waterstanden worden berekend.",
+                                                                            "Overschrijdingskans waarvoor de hydraulische belastingen worden berekend.",
                                                                             true);
 
             PropertyDescriptor locationsProperty = dynamicProperties[calculationsPropertyIndex];
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs
===================================================================
diff -u -r63c1cc78bc732875b0677afca1d47e2f853db4dc -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs)	(revision 63c1cc78bc732875b0677afca1d47e2f853db4dc)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -116,7 +116,7 @@
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetProbabilityProperty,
                                                                             "Algemeen",
                                                                             "Doelkans [1/jaar]",
-                                                                            "Overschrijdingskans waarvoor de waterstanden worden berekend.");
+                                                                            "Overschrijdingskans waarvoor de hydraulische belastingen worden berekend.");
 
             PropertyDescriptor locationsProperty = dynamicProperties[calculationsPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationsProperty,
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs
===================================================================
diff -u -r63c1cc78bc732875b0677afca1d47e2f853db4dc -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs)	(revision 63c1cc78bc732875b0677afca1d47e2f853db4dc)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityPropertiesTest.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -116,7 +116,7 @@
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(targetProbabilityProperty,
                                                                             "Algemeen",
                                                                             "Doelkans [1/jaar]",
-                                                                            "Overschrijdingskans waarvoor de golfhoogten worden berekend.");
+                                                                            "Overschrijdingskans waarvoor de hydraulische belastingen worden berekend.");
 
             PropertyDescriptor locationsProperty = dynamicProperties[calculationsPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationsProperty,
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsForUserDefinedTargetProbabilityProperties.cs
===================================================================
diff -u -r81b3fa7b45e8512447809a56a0e31a37ed67e652 -rdf47a6dbc3520e78fac96dcd09b871ec0b417277
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision 81b3fa7b45e8512447809a56a0e31a37ed67e652)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision df47a6dbc3520e78fac96dcd09b871ec0b417277)
@@ -24,9 +24,13 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.PropertyBag;
+using Riskeer.Common.Forms.ChangeHandlers;
+using Riskeer.Common.Forms.Properties;
 using Riskeer.Common.Forms.PropertyClasses;
+using Riskeer.Common.Forms.TypeConverters;
 using Riskeer.DuneErosion.Data;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
@@ -37,6 +41,9 @@
     /// </summary>
     public class DuneLocationCalculationsForUserDefinedTargetProbabilityProperties : ObjectProperties<DuneLocationCalculationsForTargetProbability>, IDisposable
     {
+        private const int targetProbabilityPropertyIndex = 1;
+        private const int calculationsPropertyIndex = 2;
+
         private readonly IObservablePropertyChangeHandler targetProbabilityChangeHandler;
         private readonly RecursiveObserver<IObservableEnumerable<DuneLocationCalculation>, DuneLocationCalculation> calculationsObserver;
 
@@ -69,6 +76,7 @@
             };
         }
 
+        [PropertyOrder(calculationsPropertyIndex)]
         [TypeConverter(typeof(ExpandableArrayConverter))]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
         [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.HydraulicBoundaryDatabase_Locations_DisplayName))]
@@ -81,6 +89,23 @@
             }
         }
 
+        [PropertyOrder(targetProbabilityPropertyIndex)]
+        [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.TargetProbability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_Description))]
+        public double TargetProbability
+        {
+            get
+            {
+                return data.TargetProbability;
+            }
+            set
+            {
+                PropertyChangeHelper.ChangePropertyAndNotify(() => data.TargetProbability = value, targetProbabilityChangeHandler);
+            }
+        }
+
         public void Dispose()
         {
             calculationsObserver.Dispose();