Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -r66517b122d50b79f9177a60398424102f23f2d11
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
@@ -139,7 +139,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            ShowDesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, testForm);
+            ShowDesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, testForm);
 
             // Assert
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -168,14 +168,14 @@
         }
 
         [Test]
-        public void DesignWaterLevelLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
+        public void DesignWaterLevelCalculationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
         {
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
             // Call
-            ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredDesignWaterLevelCalculationsView(assessmentSection, testForm);
 
             // Assert
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -220,15 +220,15 @@
         }
 
         [Test]
-        public void DesignWaterLevelLocationsView_HydraulicBoundaryLocationsUpdated_DataGridViewCorrectlyUpdated()
+        public void DesignWaterLevelCalculationsView_HydraulicBoundaryLocationsUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowDesignWaterLevelLocationsView(calculations, assessmentSection, 0.01, testForm);
+            ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, testForm);
 
             // Precondition
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -267,15 +267,15 @@
         }
 
         [Test]
-        public void DesignWaterLevelLocationsView_HydraulicBoundaryLocationUpdated_IllustrationPointsControlCorrectlyUpdated()
+        public void DesignWaterLevelCalculationsView_HydraulicBoundaryLocationUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowDesignWaterLevelLocationsView(calculations, assessmentSection, 0.01, testForm);
+            ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, testForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
 
@@ -323,7 +323,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelLocationsView(calculations, assessmentSection, 0.01, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, testForm);
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             object dataGridViewSource = calculationsDataGridView.DataSource;
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -351,7 +351,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
-            ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredDesignWaterLevelCalculationsView(assessmentSection, testForm);
 
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
             DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows;
@@ -371,15 +371,15 @@
         [TestCase(true, false, "De bijdrage van dit toetsspoor is nul.", TestName = "CalculateButton_RowSelectionContributionSet_SyncedAccordingly(true, false, message)")]
         [TestCase(false, true, "Er zijn geen berekeningen geselecteerd.", TestName = "CalculateButton_RowSelectionContributionSet_SyncedAccordingly(false, true, message)")]
         [TestCase(true, true, "", TestName = "CalculateButton_RowSelectionContributionSet_SyncedAccordingly(true, true, message)")]
-        public void GivenDesignWaterLevelLocationsView_WhenSpecificCombinationOfRowSelectionAndFailureMechanismContributionSet_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
-                                                                                                                                                                          bool contributionNotZero,
-                                                                                                                                                                          string expectedErrorMessage)
+        public void GivenDesignWaterLevelCalculationsView_WhenSpecificCombinationOfRowSelectionAndFailureMechanismContributionSet_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
+                                                                                                                                                                             bool contributionNotZero,
+                                                                                                                                                                             string expectedErrorMessage)
         {
             // Given
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowFullyConfiguredDesignWaterLevelCalculationsView(assessmentSection, testForm);
             if (!contributionNotZero)
             {
                 view.FailureMechanism.Contribution = 0;
@@ -438,7 +438,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelLocationsView(calculations, assessmentSection, norm, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, norm, testForm);
             GrassCoverErosionOutwardsFailureMechanism failureMechanism = view.FailureMechanism;
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -506,7 +506,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelLocationsView(calculations, assessmentSection, norm, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, norm, testForm);
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
             rows[0].Cells[calculateColumnIndex].Value = true;
@@ -573,7 +573,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelLocationsView(calculations, assessmentSection, norm, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, norm, testForm);
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
             rows[0].Cells[calculateColumnIndex].Value = true;
@@ -629,10 +629,10 @@
                                 });
         }
 
-        private static GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowDesignWaterLevelLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
-                                                                                                                   IAssessmentSection assessmentSection,
-                                                                                                                   double norm,
-                                                                                                                   Form form)
+        private static GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowDesignWaterLevelCalculationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
+                                                                                                                      IAssessmentSection assessmentSection,
+                                                                                                                      double norm,
+                                                                                                                      Form form)
         {
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
@@ -650,10 +650,10 @@
             return view;
         }
 
-        private static GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelLocationsView(IAssessmentSection assessmentSection,
-                                                                                                                                  Form form)
+        private static GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelCalculationsView(IAssessmentSection assessmentSection,
+                                                                                                                                     Form form)
         {
-            return ShowDesignWaterLevelLocationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, form);
+            return ShowDesignWaterLevelCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, form);
         }
 
         private static ObservableList<HydraulicBoundaryLocationCalculation> GetTestHydraulicBoundaryLocationCalculations()
@@ -722,7 +722,7 @@
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
             {
-                return ShowDesignWaterLevelLocationsView(calculations, new ObservableTestAssessmentSectionStub(), 0.01, form);
+                return ShowDesignWaterLevelCalculationsView(calculations, new ObservableTestAssessmentSectionStub(), 0.01, form);
             }
 
             protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(CalculationsView<HydraulicBoundaryLocationCalculation> view)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs
===================================================================
diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -r66517b122d50b79f9177a60398424102f23f2d11
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
@@ -139,7 +139,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            ShowWaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, testForm);
+            ShowWaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(), assessmentSection, 0.01, testForm);
 
             // Assert
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -168,14 +168,14 @@
         }
 
         [Test]
-        public void WaveHeightLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
+        public void WaveHeightCalculationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
         {
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
             // Call
-            ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredWaveHeightCalculationsView(assessmentSection, testForm);
 
             // Assert
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -220,15 +220,15 @@
         }
 
         [Test]
-        public void WaveHeightLocationsView_HydraulicBoundaryLocationsUpdated_DataGridViewCorrectlyUpdated()
+        public void WaveHeightCalculationsView_HydraulicBoundaryLocationsUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowWaveHeightLocationsView(calculations, assessmentSection, 0.01, testForm);
+            ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, testForm);
 
             // Precondition
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -267,15 +267,15 @@
         }
 
         [Test]
-        public void WaveHeightLocationsView_HydraulicBoundaryLocationUpdated_IllustrationPointsControlCorrectlyUpdated()
+        public void WaveHeightCalculationsView_HydraulicBoundaryLocationUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowWaveHeightLocationsView(calculations, assessmentSection, 0.01, testForm);
+            ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, testForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
 
@@ -323,7 +323,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightLocationsView(calculations, assessmentSection, 0.01, testForm);
+            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, testForm);
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             object dataGridViewSource = calculationsDataGridView.DataSource;
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -351,7 +351,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
-            ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredWaveHeightCalculationsView(assessmentSection, testForm);
 
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
             DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows;
@@ -371,15 +371,15 @@
         [TestCase(true, false, "De bijdrage van dit toetsspoor is nul.", TestName = "CalculateButton_RowSelectionContributionSet_SyncedAccordingly(true, false, message)")]
         [TestCase(false, true, "Er zijn geen berekeningen geselecteerd.", TestName = "CalculateButton_RowSelectionContributionSet_SyncedAccordingly(false, true, message)")]
         [TestCase(true, true, "", TestName = "CalculateButton_RowSelectionContributionSet_SyncedAccordingly(true, true, message)")]
-        public void GivenWaveHeightLocationsView_WhenSpecificCombinationOfRowSelectionAndFailureMechanismContributionSet_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
-                                                                                                                                                                    bool contributionNotZero,
-                                                                                                                                                                    string expectedErrorMessage)
+        public void GivenWaveHeightCalculationsView_WhenSpecificCombinationOfRowSelectionAndFailureMechanismContributionSet_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
+                                                                                                                                                                       bool contributionNotZero,
+                                                                                                                                                                       string expectedErrorMessage)
         {
             // Given
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
             mockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowFullyConfiguredWaveHeightCalculationsView(assessmentSection, testForm);
             if (!contributionNotZero)
             {
                 view.FailureMechanism.Contribution = 0;
@@ -438,7 +438,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightLocationsView(calculations, assessmentSection, norm, testForm);
+            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, norm, testForm);
             GrassCoverErosionOutwardsFailureMechanism failureMechanism = view.FailureMechanism;
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -506,7 +506,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightLocationsView(calculations, assessmentSection, norm, testForm);
+            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, norm, testForm);
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
             rows[0].Cells[calculateColumnIndex].Value = true;
@@ -573,7 +573,7 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightLocationsView(calculations, assessmentSection, norm, testForm);
+            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, norm, testForm);
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
             rows[0].Cells[calculateColumnIndex].Value = true;
@@ -629,10 +629,10 @@
                                 });
         }
 
-        private static GrassCoverErosionOutwardsWaveHeightCalculationsView ShowWaveHeightLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
-                                                                                                       IAssessmentSection assessmentSection,
-                                                                                                       double norm,
-                                                                                                       Form form)
+        private static GrassCoverErosionOutwardsWaveHeightCalculationsView ShowWaveHeightCalculationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
+                                                                                                          IAssessmentSection assessmentSection,
+                                                                                                          double norm,
+                                                                                                          Form form)
         {
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
@@ -650,10 +650,10 @@
             return view;
         }
 
-        private static GrassCoverErosionOutwardsWaveHeightCalculationsView ShowFullyConfiguredWaveHeightLocationsView(IAssessmentSection assessmentSection,
-                                                                                                                      Form form)
+        private static GrassCoverErosionOutwardsWaveHeightCalculationsView ShowFullyConfiguredWaveHeightCalculationsView(IAssessmentSection assessmentSection,
+                                                                                                                         Form form)
         {
-            return ShowWaveHeightLocationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, form);
+            return ShowWaveHeightCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, form);
         }
 
         private static ObservableList<HydraulicBoundaryLocationCalculation> GetTestHydraulicBoundaryLocationCalculations()
@@ -722,7 +722,7 @@
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
             {
-                return ShowWaveHeightLocationsView(calculations, new ObservableTestAssessmentSectionStub(), 0.01, form);
+                return ShowWaveHeightCalculationsView(calculations, new ObservableTestAssessmentSectionStub(), 0.01, form);
             }
 
             protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(CalculationsView<HydraulicBoundaryLocationCalculation> view)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs
===================================================================
diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -r66517b122d50b79f9177a60398424102f23f2d11
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs)	(revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
@@ -57,12 +57,12 @@
         [TestCase(true, false, "De bijdrage van dit toetsspoor is nul.", TestName = "CalculateButton_ContributionChanged_SyncedAccordingly(true, false, message)")]
         [TestCase(false, true, "Er zijn geen berekeningen geselecteerd.", TestName = "CalculateButton_ContributionChanged_SyncedAccordingly(false, true, message)")]
         [TestCase(true, true, "", TestName = "CalculateButton_ContributionChanged_SyncedAccordingly(true, true, message)")]
-        public void GivenDesignWaterLevelLocationsView_WhenFailureMechanismContributionChanged_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
-                                                                                                                                          bool contributionAfterChangeNotZero,
-                                                                                                                                          string expectedErrorMessage)
+        public void GivenDesignWaterLevelCalculationsView_WhenFailureMechanismContributionChanged_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
+                                                                                                                                             bool contributionAfterChangeNotZero,
+                                                                                                                                             string expectedErrorMessage)
         {
             // Given
-            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
+            GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowFullyConfiguredDesignWaterLevelCalculationsView();
 
             if (rowSelected)
             {
@@ -93,7 +93,7 @@
             Assert.AreEqual(expectedErrorMessage, errorProvider.GetError(button));
         }
 
-        private GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelLocationsView()
+        private GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelCalculationsView()
         {
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs
===================================================================
diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -r66517b122d50b79f9177a60398424102f23f2d11
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs)	(revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
@@ -57,12 +57,12 @@
         [TestCase(true, false, "De bijdrage van dit toetsspoor is nul.", TestName = "CalculateButton_ContributionChanged_SyncedAccordingly(true, false, message)")]
         [TestCase(false, true, "Er zijn geen berekeningen geselecteerd.", TestName = "CalculateButton_ContributionChanged_SyncedAccordingly(false, true, message)")]
         [TestCase(true, true, "", TestName = "CalculateButton_ContributionChanged_SyncedAccordingly(true, true, message)")]
-        public void GivenWaveHeightLocationsView_WhenFailureMechanismContributionChanged_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
-                                                                                                                                    bool contributionAfterChangeNotZero,
-                                                                                                                                    string expectedErrorMessage)
+        public void GivenWaveHeightCalculationsView_WhenFailureMechanismContributionChanged_ThenButtonAndErrorMessageSyncedAccordingly(bool rowSelected,
+                                                                                                                                       bool contributionAfterChangeNotZero,
+                                                                                                                                       string expectedErrorMessage)
         {
             // Given
-            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowFullyConfiguredWaveHeightLocationsView();
+            GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowFullyConfiguredWaveHeightCalculationsView();
 
             if (rowSelected)
             {
@@ -93,7 +93,7 @@
             Assert.AreEqual(expectedErrorMessage, errorProvider.GetError(button));
         }
 
-        private GrassCoverErosionOutwardsWaveHeightCalculationsView ShowFullyConfiguredWaveHeightLocationsView()
+        private GrassCoverErosionOutwardsWaveHeightCalculationsView ShowFullyConfiguredWaveHeightCalculationsView()
         {
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r8f71111fae4dc2d04afae34491748404c0466ce8 -r66517b122d50b79f9177a60398424102f23f2d11
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 8f71111fae4dc2d04afae34491748404c0466ce8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
@@ -400,7 +400,7 @@
                 GetViewName = (view, context) => $"{RingtoetsFormsResources.DesignWaterLevelLocationsContext_DisplayName} - {context.CategoryBoundaryName}",
                 GetViewData = context => context.WrappedData,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                CloseForData = CloseHydraulicBoundaryLocationsViewForData,
+                CloseForData = CloseHydraulicBoundaryCalculationsViewForData,
                 CreateInstance = context => new DesignWaterLevelCalculationsView(GetHydraulicBoundaryLocationCalculations(context.WrappedData, context.GetCalculationFunc),
                                                                                  context.AssessmentSection,
                                                                                  context.GetNormFunc,
@@ -413,7 +413,7 @@
                 GetViewName = (view, context) => $"{RingtoetsFormsResources.WaveHeightLocationsContext_DisplayName} - {context.CategoryBoundaryName}",
                 GetViewData = context => context.WrappedData,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                CloseForData = CloseHydraulicBoundaryLocationsViewForData,
+                CloseForData = CloseHydraulicBoundaryCalculationsViewForData,
                 CreateInstance = context => new WaveHeightCalculationsView(GetHydraulicBoundaryLocationCalculations(context.WrappedData, context.GetCalculationFunc),
                                                                            context.AssessmentSection,
                                                                            context.GetNormFunc,
@@ -1074,7 +1074,7 @@
 
         #region HydraulicBoundaryCalculationsView ViewInfo
 
-        private static bool CloseHydraulicBoundaryLocationsViewForData(HydraulicBoundaryCalculationsView view, object dataToCloseFor)
+        private static bool CloseHydraulicBoundaryCalculationsViewForData(HydraulicBoundaryCalculationsView view, object dataToCloseFor)
         {
             IAssessmentSection viewData = view.AssessmentSection;
             var assessmentSection = dataToCloseFor as IAssessmentSection;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -r66517b122d50b79f9177a60398424102f23f2d11
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
@@ -117,11 +117,11 @@
             mockRepository.ReplayAll();
 
             // Call
-            ShowDesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
-                                              assessmentSection,
-                                              0.01,
-                                              "Category",
-                                              testForm);
+            ShowDesignWaterLevelCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
+                                                 assessmentSection,
+                                                 0.01,
+                                                 "Category",
+                                                 testForm);
 
             // Assert
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -153,7 +153,7 @@
         public void Constructor_WithCalculations_DataGridViewCorrectlyInitialized()
         {
             // Call
-            ShowFullyConfiguredDesignWaterLevelLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
+            ShowFullyConfiguredDesignWaterLevelCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
 
             // Assert
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -198,12 +198,12 @@
         }
 
         [Test]
-        public void DesignWaterLevelLocationsView_CalculationsUpdated_DataGridViewCorrectlyUpdated()
+        public void DesignWaterLevelCalculationsView_CalculationsUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            ShowFullyConfiguredDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             const double designWaterLevel = 10.23;
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0))
@@ -239,12 +239,12 @@
         }
 
         [Test]
-        public void DesignWaterLevelLocationsView_CalculationUpdated_DataGridViewCorrectlyUpdated()
+        public void DesignWaterLevelCalculationsView_CalculationUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            ShowFullyConfiguredDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             // Precondition
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -264,12 +264,12 @@
         }
 
         [Test]
-        public void DesignWaterLevelLocationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated()
+        public void DesignWaterLevelCalculationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            ShowFullyConfiguredDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -304,7 +304,7 @@
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            DesignWaterLevelCalculationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            DesignWaterLevelCalculationsView view = ShowFullyConfiguredDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
             DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows;
@@ -332,7 +332,7 @@
         public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
-            ShowFullyConfiguredDesignWaterLevelLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
+            ShowFullyConfiguredDesignWaterLevelCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
 
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
             DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows;
@@ -388,11 +388,11 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            DesignWaterLevelCalculationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations,
-                                                                                      assessmentSection,
-                                                                                      norm,
-                                                                                      categoryBoundaryName,
-                                                                                      testForm);
+            DesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations,
+                                                                                         assessmentSection,
+                                                                                         norm,
+                                                                                         categoryBoundaryName,
+                                                                                         testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -460,11 +460,11 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            DesignWaterLevelCalculationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations,
-                                                                                      assessmentSection,
-                                                                                      norm,
-                                                                                      categoryBoundaryName,
-                                                                                      testForm);
+            DesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations,
+                                                                                         assessmentSection,
+                                                                                         norm,
+                                                                                         categoryBoundaryName,
+                                                                                         testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -531,11 +531,11 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            DesignWaterLevelCalculationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations,
-                                                                                      assessmentSection,
-                                                                                      norm,
-                                                                                      categoryBoundaryName,
-                                                                                      testForm);
+            DesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations,
+                                                                                         assessmentSection,
+                                                                                         norm,
+                                                                                         categoryBoundaryName,
+                                                                                         testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -588,11 +588,11 @@
                                 });
         }
 
-        private static DesignWaterLevelCalculationsView ShowDesignWaterLevelLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
-                                                                                          IAssessmentSection assessmentSection,
-                                                                                          double norm,
-                                                                                          string categoryBoundaryName,
-                                                                                          Form form)
+        private static DesignWaterLevelCalculationsView ShowDesignWaterLevelCalculationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
+                                                                                             IAssessmentSection assessmentSection,
+                                                                                             double norm,
+                                                                                             string categoryBoundaryName,
+                                                                                             Form form)
         {
             var view = new DesignWaterLevelCalculationsView(calculations,
                                                             assessmentSection,
@@ -605,12 +605,12 @@
             return view;
         }
 
-        private static DesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
-                                                                                                         Form form)
+        private static DesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelCalculationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
+                                                                                                            Form form)
         {
             var assessmentSection = new ObservableTestAssessmentSectionStub();
 
-            return ShowDesignWaterLevelLocationsView(calculations, assessmentSection, 0.01, "Category", form);
+            return ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, "Category", form);
         }
 
         private static ObservableList<HydraulicBoundaryLocationCalculation> GetTestHydraulicBoundaryLocationCalculations()
@@ -679,7 +679,7 @@
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
             {
-                return ShowFullyConfiguredDesignWaterLevelLocationsView(calculations, form);
+                return ShowFullyConfiguredDesignWaterLevelCalculationsView(calculations, form);
             }
 
             protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(CalculationsView<HydraulicBoundaryLocationCalculation> view)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs
===================================================================
diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -r66517b122d50b79f9177a60398424102f23f2d11
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 66517b122d50b79f9177a60398424102f23f2d11)
@@ -117,11 +117,11 @@
             mockRepository.ReplayAll();
 
             // Call
-            ShowWaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
-                                        assessmentSection,
-                                        0.01,
-                                        "Category",
-                                        testForm);
+            ShowWaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
+                                           assessmentSection,
+                                           0.01,
+                                           "Category",
+                                           testForm);
 
             // Assert
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
@@ -153,7 +153,7 @@
         public void Constructor_WithCalculations_DataGridViewCorrectlyInitialized()
         {
             // Call
-            ShowFullyConfiguredWaveHeightLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
+            ShowFullyConfiguredWaveHeightCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
 
             // Assert
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -198,12 +198,12 @@
         }
 
         [Test]
-        public void WaveHeightLocationsView_CalculationsUpdated_DataGridViewCorrectlyUpdated()
+        public void WaveHeightCalculationsView_CalculationsUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            ShowFullyConfiguredWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             const double waveHeight = 10.23;
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0))
@@ -239,12 +239,12 @@
         }
 
         [Test]
-        public void WaveHeightLocationsView_CalculationUpdated_DataGridViewCorrectlyUpdated()
+        public void WaveHeightCalculationsView_CalculationUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            ShowFullyConfiguredWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             // Precondition
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -264,12 +264,12 @@
         }
 
         [Test]
-        public void WaveHeightLocationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated()
+        public void WaveHeightCalculationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            ShowFullyConfiguredWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
@@ -304,7 +304,7 @@
             // Setup
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            WaveHeightCalculationsView view = ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm);
+            WaveHeightCalculationsView view = ShowFullyConfiguredWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, testForm);
 
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
             DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows;
@@ -332,7 +332,7 @@
         public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
-            ShowFullyConfiguredWaveHeightLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
+            ShowFullyConfiguredWaveHeightCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm);
 
             DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl();
             DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows;
@@ -388,11 +388,11 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            WaveHeightCalculationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryLocationCalculations,
-                                                                          assessmentSection,
-                                                                          norm,
-                                                                          categoryBoundaryName,
-                                                                          testForm);
+            WaveHeightCalculationsView view = ShowWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations,
+                                                                             assessmentSection,
+                                                                             norm,
+                                                                             categoryBoundaryName,
+                                                                             testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -460,11 +460,11 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            WaveHeightCalculationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryLocationCalculations,
-                                                                          assessmentSection,
-                                                                          norm,
-                                                                          categoryBoundaryName,
-                                                                          testForm);
+            WaveHeightCalculationsView view = ShowWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations,
+                                                                             assessmentSection,
+                                                                             norm,
+                                                                             categoryBoundaryName,
+                                                                             testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -531,11 +531,11 @@
 
             ObservableList<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations();
 
-            WaveHeightCalculationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryLocationCalculations,
-                                                                          assessmentSection,
-                                                                          norm,
-                                                                          categoryBoundaryName,
-                                                                          testForm);
+            WaveHeightCalculationsView view = ShowWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations,
+                                                                             assessmentSection,
+                                                                             norm,
+                                                                             categoryBoundaryName,
+                                                                             testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection rows = calculationsDataGridView.Rows;
@@ -588,11 +588,11 @@
                                 });
         }
 
-        private static WaveHeightCalculationsView ShowWaveHeightLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
-                                                                              IAssessmentSection assessmentSection,
-                                                                              double norm,
-                                                                              string categoryBoundaryName,
-                                                                              Form form)
+        private static WaveHeightCalculationsView ShowWaveHeightCalculationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
+                                                                                 IAssessmentSection assessmentSection,
+                                                                                 double norm,
+                                                                                 string categoryBoundaryName,
+                                                                                 Form form)
         {
             var view = new WaveHeightCalculationsView(calculations,
                                                       assessmentSection,
@@ -605,12 +605,12 @@
             return view;
         }
 
-        private static WaveHeightCalculationsView ShowFullyConfiguredWaveHeightLocationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
-                                                                                             Form form)
+        private static WaveHeightCalculationsView ShowFullyConfiguredWaveHeightCalculationsView(ObservableList<HydraulicBoundaryLocationCalculation> calculations,
+                                                                                                Form form)
         {
             var assessmentSection = new ObservableTestAssessmentSectionStub();
 
-            return ShowWaveHeightLocationsView(calculations, assessmentSection, 0.01, "Category", form);
+            return ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, "Category", form);
         }
 
         private static ObservableList<HydraulicBoundaryLocationCalculation> GetTestHydraulicBoundaryLocationCalculations()
@@ -679,7 +679,7 @@
 
             protected override CalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
             {
-                return ShowFullyConfiguredWaveHeightLocationsView(calculations, form);
+                return ShowFullyConfiguredWaveHeightCalculationsView(calculations, form);
             }
 
             protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(CalculationsView<HydraulicBoundaryLocationCalculation> view)