Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -r852180bf875d11a6c2ca28380c5b9132d39d8207 -r82cbcf9d050d372aab497aef5170f8ef29fa0acd
--- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision 852180bf875d11a6c2ca28380c5b9132d39d8207)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision 82cbcf9d050d372aab497aef5170f8ef29fa0acd)
@@ -53,8 +53,6 @@
         private const RiskeerWellKnownTileSource defaultWellKnownTileSource = RiskeerWellKnownTileSource.BingAerial;
 
         private readonly ObservableList<HydraulicBoundaryLocationCalculation> waterLevelCalculationsForFactorizedSignalingNorm = new ObservableList<HydraulicBoundaryLocationCalculation>();
-        private readonly HydraulicBoundaryLocationCalculationsForTargetProbability waterLevelCalculationsForSignalingNorm;
-        private readonly HydraulicBoundaryLocationCalculationsForTargetProbability waterLevelCalculationsForLowerLimitNorm;
         private readonly ObservableList<HydraulicBoundaryLocationCalculation> waterLevelCalculationsForFactorizedLowerLimitNorm = new ObservableList<HydraulicBoundaryLocationCalculation>();
         private readonly ObservableList<HydraulicBoundaryLocationCalculation> waveHeightCalculationsForFactorizedSignalingNorm = new ObservableList<HydraulicBoundaryLocationCalculation>();
         private readonly ObservableList<HydraulicBoundaryLocationCalculation> waveHeightCalculationsForSignalingNorm = new ObservableList<HydraulicBoundaryLocationCalculation>();
@@ -143,8 +141,8 @@
             FailureMechanismContribution = new FailureMechanismContribution(lowerLimitNorm, signalingNorm);
             ChangeComposition(composition);
             
-            waterLevelCalculationsForLowerLimitNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(lowerLimitNorm);
-            waterLevelCalculationsForSignalingNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(signalingNorm);
+            WaterLevelCalculationsForLowerLimitNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(lowerLimitNorm);
+            WaterLevelCalculationsForSignalingNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(signalingNorm);
         }
 
         /// <summary>
@@ -499,21 +497,9 @@
             }
         }
 
-        public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForSignalingNorm
-        {
-            get
-            {
-                return waterLevelCalculationsForSignalingNorm;
-            }
-        }
+        public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForSignalingNorm { get; }
 
-        public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForLowerLimitNorm
-        {
-            get
-            {
-                return waterLevelCalculationsForLowerLimitNorm;
-            }
-        }
+        public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForLowerLimitNorm { get; }
 
         public IObservableEnumerable<HydraulicBoundaryLocationCalculation> WaterLevelCalculationsForFactorizedLowerLimitNorm
         {
@@ -723,8 +709,8 @@
         private void ClearHydraulicBoundaryLocationCalculations()
         {
             waterLevelCalculationsForFactorizedSignalingNorm.Clear();
-            waterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Clear();
-            waterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Clear();
+            WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Clear();
+            WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Clear();
             waterLevelCalculationsForFactorizedLowerLimitNorm.Clear();
 
             foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities)
@@ -746,8 +732,8 @@
         private void AddHydraulicBoundaryLocationCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             waterLevelCalculationsForFactorizedSignalingNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation));
-            waterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation));
-            waterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation));
+            WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation));
+            WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation));
             waterLevelCalculationsForFactorizedLowerLimitNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation));
 
             foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities)
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs
===================================================================
diff -u -reb9a0f62c19ca6b4dcb6a45fd5e213febb0ccbea -r82cbcf9d050d372aab497aef5170f8ef29fa0acd
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision eb9a0f62c19ca6b4dcb6a45fd5e213febb0ccbea)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision 82cbcf9d050d372aab497aef5170f8ef29fa0acd)
@@ -190,8 +190,8 @@
             var locationsAndCalculationsObservables = new List<IObservable>
             {
                 hydraulicBoundaryDatabase.Locations,
-                assessmentSection.WaterLevelCalculationsForSignalingNorm,
-                assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
+                assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations,
+                assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations,
                 assessmentSection.DuneErosion.DuneLocations
             };
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -ra1246836188dc9e7c752531415362d6c14cc9978 -r82cbcf9d050d372aab497aef5170f8ef29fa0acd
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision a1246836188dc9e7c752531415362d6c14cc9978)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 82cbcf9d050d372aab497aef5170f8ef29fa0acd)
@@ -798,8 +798,8 @@
             var observables = new List<IObservable>
             {
                 hydraulicBoundaryDatabase.Locations,
-                assessmentSection.WaterLevelCalculationsForSignalingNorm,
-                assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
+                assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations,
+                assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations,
                 assessmentSection.DuneErosion.DuneLocations
             };