Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
@@ -214,7 +214,7 @@
             ShowFullyConfiguredWaveHeightLocationsView(locations, testForm);
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
-                WaveHeightCalculation =
+                WaveHeightCalculation1 =
                 {
                     InputParameters =
                     {
@@ -265,7 +265,7 @@
             HydraulicBoundaryLocation location = locations.First();
 
             // Call
-            location.WaveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = true;
+            location.WaveHeightCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated = true;
             location.NotifyObservers();
 
             // Assert
@@ -299,7 +299,7 @@
 
             // Call
             HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[3];
-            hydraulicBoundaryLocation.WaveHeightCalculation.Output = output;
+            hydraulicBoundaryLocation.WaveHeightCalculation1.Output = output;
             hydraulicBoundaryLocation.NotifyObservers();
 
             // Assert
@@ -417,7 +417,7 @@
             Assert.AreEqual(1, calculatedLocationsValue.Length);
             HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First();
             Assert.AreEqual(expectedLocation, calculatedLocationsValue.First());
-            Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation));
+            Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation));
         }
 
         [Test]
@@ -483,7 +483,7 @@
             Assert.AreEqual(1, calculatedLocationsValue.Length);
             HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First();
             Assert.AreEqual(expectedLocation, calculatedLocationsValue.First());
-            Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation));
+            Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation));
         }
 
         [Test]
@@ -548,7 +548,7 @@
             Assert.AreEqual(1, calculatedLocationsValue.Length);
             HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First();
             Assert.AreEqual(expectedLocation, calculatedLocationsValue.First());
-            Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation));
+            Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation));
         }
 
         private DataGridView GetLocationsDataGridView()
@@ -587,7 +587,7 @@
                                                                            Form form)
         {
             var view = new WaveHeightLocationsView(locations,
-                                                   hbl => hbl.WaveHeightCalculation,
+                                                   hbl => hbl.WaveHeightCalculation1,
                                                    assessmentSection,
                                                    () => norm);
 
@@ -617,21 +617,21 @@
                 Locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0));
                 Locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
                 {
-                    WaveHeightCalculation =
+                    WaveHeightCalculation1 =
                     {
                         Output = new TestHydraulicBoundaryLocationOutput(1.23)
                     }
                 });
                 Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
                 {
-                    DesignWaterLevelCalculation =
+                    DesignWaterLevelCalculation1 =
                     {
                         Output = new TestHydraulicBoundaryLocationOutput(2.45)
                     }
                 });
                 Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
                 {
-                    WaveHeightCalculation =
+                    WaveHeightCalculation1 =
                     {
                         InputParameters =
                         {
@@ -655,7 +655,7 @@
 
                 Locations.Add(new HydraulicBoundaryLocation(5, "5", 5.0, 5.0)
                 {
-                    WaveHeightCalculation =
+                    WaveHeightCalculation1 =
                     {
                         InputParameters =
                         {