Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.cs	(.../DesignWaterLevelCalculationsView.cs)	(revision 7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e)
@@ -33,7 +33,7 @@
     /// <summary>
     /// View for presenting and performing design water level calculations.
     /// </summary>
-    public partial class DesignWaterLevelCalculationsView : HydraulicBoundaryCalculationsView
+    public partial class DesignWaterLevelCalculationsView : LocationCalculationsView
     {
         private readonly Func<double> getTargetProbabilityFunc;
         private readonly Func<string> getCalculationIdentifierFunc;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.cs	(.../WaveHeightCalculationsView.cs)	(revision 7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e)
@@ -33,7 +33,7 @@
     /// <summary>
     /// View for presenting and performing wave height calculations.
     /// </summary>
-    public partial class WaveHeightCalculationsView : HydraulicBoundaryCalculationsView
+    public partial class WaveHeightCalculationsView : LocationCalculationsView
     {
         private readonly Func<double> getTargetProbabilityFunc;
         private readonly Func<string> getCalculationIdentifierFunc;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e)
@@ -119,7 +119,7 @@
                                                                    () => "1/100"))
             {
                 // Assert
-                Assert.IsInstanceOf<HydraulicBoundaryCalculationsView>(view);
+                Assert.IsInstanceOf<LocationCalculationsView>(view);
                 Assert.IsNull(view.Data);
             }
         }
@@ -536,17 +536,17 @@
                 base.Setup();
             }
 
-            protected override object GetCalculationSelection(LocationCalculationsView<HydraulicBoundaryLocationCalculation> view, object selectedRowObject)
+            protected override object GetCalculationSelection(LocationCalculationsView view, object selectedRowObject)
             {
                 return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject);
             }
 
-            protected override LocationCalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
+            protected override LocationCalculationsView ShowFullyConfiguredCalculationsView(Form form)
             {
                 return ShowFullyConfiguredDesignWaterLevelCalculationsView(calculations, form);
             }
 
-            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(LocationCalculationsView<HydraulicBoundaryLocationCalculation> view)
+            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(LocationCalculationsView view)
             {
                 return calculations;
             }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e)
@@ -119,7 +119,7 @@
                                                              () => "1/100"))
             {
                 // Assert
-                Assert.IsInstanceOf<HydraulicBoundaryCalculationsView>(view);
+                Assert.IsInstanceOf<LocationCalculationsView>(view);
                 Assert.IsNull(view.Data);
             }
         }
@@ -536,17 +536,17 @@
                 base.Setup();
             }
 
-            protected override object GetCalculationSelection(LocationCalculationsView<HydraulicBoundaryLocationCalculation> view, object selectedRowObject)
+            protected override object GetCalculationSelection(LocationCalculationsView view, object selectedRowObject)
             {
                 return new WaveHeightCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject);
             }
 
-            protected override LocationCalculationsView<HydraulicBoundaryLocationCalculation> ShowFullyConfiguredCalculationsView(Form form)
+            protected override LocationCalculationsView ShowFullyConfiguredCalculationsView(Form form)
             {
                 return ShowFullyConfiguredWaveHeightCalculationsView(calculations, form);
             }
 
-            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(LocationCalculationsView<HydraulicBoundaryLocationCalculation> view)
+            protected override ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(LocationCalculationsView view)
             {
                 return calculations;
             }
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/CalculationsViewSynchronizationTester.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/CalculationsViewSynchronizationTester.cs	(.../CalculationsViewSynchronizationTester.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/CalculationsViewSynchronizationTester.cs	(.../CalculationsViewSynchronizationTester.cs)	(revision 7ac2f75a6756638a96d288fe7dfd39a2c92a9c9e)
@@ -33,7 +33,7 @@
 namespace Riskeer.Common.Forms.TestUtil
 {
     /// <summary>
-    /// Class for testing data and selection synchronization in <see cref="LocationCalculationsView{T}"/> derivatives.
+    /// Class for testing data and selection synchronization in <see cref="LocationCalculationsView"/> derivatives.
     /// </summary>
     /// <typeparam name="T">The type of the calculations contained by the view.</typeparam>
     [TestFixture]
@@ -64,7 +64,7 @@
         /// <param name="view">The calculations view involved.</param>
         /// <param name="selectedRowObject">The selected calculation row object.</param>
         /// <returns>The view selection object.</returns>
-        protected abstract object GetCalculationSelection(LocationCalculationsView<T> view, object selectedRowObject);
+        protected abstract object GetCalculationSelection(LocationCalculationsView view, object selectedRowObject);
 
         /// <summary>
         /// Method for showing a fully configured calculations view.
@@ -80,16 +80,16 @@
         /// </list>
         /// </remarks>
         /// <returns>The fully configured calculations view.</returns>
-        protected abstract LocationCalculationsView<T> ShowFullyConfiguredCalculationsView(Form form);
+        protected abstract LocationCalculationsView ShowFullyConfiguredCalculationsView(Form form);
 
         /// <summary>
         /// Method for getting the calculations in <paramref name="view"/>.
         /// </summary>
         /// <param name="view">The view to get the calculations from.</param>
         /// <returns>An <see cref="ObservableList{T}"/> of calculations.</returns>
-        protected abstract ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(LocationCalculationsView<T> view);
+        protected abstract ObservableList<HydraulicBoundaryLocationCalculation> GetCalculationsInView(LocationCalculationsView view);
 
-        private void ReplaceCalculationsAndNotifyObservers(LocationCalculationsView<T> view)
+        private void ReplaceCalculationsAndNotifyObservers(LocationCalculationsView view)
         {
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView(view);
 
@@ -98,7 +98,7 @@
             calculations.NotifyObservers();
         }
 
-        private void ClearCalculationOutputAndNotifyObservers(LocationCalculationsView<T> view)
+        private void ClearCalculationOutputAndNotifyObservers(LocationCalculationsView view)
         {
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView(view);
 
@@ -109,7 +109,7 @@
             });
         }
 
-        private void SetCalculationOutputAndNotifyObservers(LocationCalculationsView<T> view)
+        private void SetCalculationOutputAndNotifyObservers(LocationCalculationsView view)
         {
             ObservableList<HydraulicBoundaryLocationCalculation> calculations = GetCalculationsInView(view);
 
@@ -192,7 +192,7 @@
         public void GivenFullyConfiguredViewWithFilledIllustrationPointsControl_WhenOutputCleared_ThenDataGridViewsUpdated()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             DataGridViewRowCollection dataGridViewRows = calculationsDataGridView.Rows;
@@ -230,7 +230,7 @@
         public void GivenFullyConfiguredView_WhenSelectingCalculation_ThenSelectionUpdated()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
 
@@ -247,7 +247,7 @@
         public void GivenFullyConfiguredViewWithCalculationSelection_WhenCalculationsReplaced_ThenSelectionUpdated()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             calculationsDataGridView.CurrentCell = calculationsDataGridView.Rows[3].Cells[0];
@@ -270,7 +270,7 @@
         public void GivenFullyConfiguredViewWithCalculationSelection_WhenOutputCleared_ThenSelectionPreserved()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             calculationsDataGridView.CurrentCell = calculationsDataGridView.Rows[3].Cells[0];
@@ -293,7 +293,7 @@
         public void GivenFullyConfiguredViewWithCalculationSelection_WhenOutputUpdated_ThenSelectionPreserved()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             calculationsDataGridView.CurrentCell = calculationsDataGridView.Rows[3].Cells[0];
@@ -316,7 +316,7 @@
         public void GivenFullyConfiguredView_WhenSelectingIllustrationPoint_ThenSelectionUpdated()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             calculationsDataGridView.CurrentCell = calculationsDataGridView.Rows[3].Cells[0];
@@ -333,7 +333,7 @@
         public void GivenFullyConfiguredViewWithIllustrationPointSelection_WhenCalculationsReplaced_ThenSelectionSetToCalculation()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             calculationsDataGridView.CurrentCell = calculationsDataGridView.Rows[3].Cells[0];
@@ -357,7 +357,7 @@
         public void GivenFullyConfiguredViewWithIllustrationPointSelection_WhenOutputCleared_ThenSelectionSetToCalculation()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             calculationsDataGridView.CurrentCell = calculationsDataGridView.Rows[3].Cells[0];
@@ -381,7 +381,7 @@
         public void GivenFullyConfiguredViewWithIllustrationPointSelection_WhenOutputUpdated_ThenSelectionPreserved()
         {
             // Given
-            LocationCalculationsView<T> view = ShowFullyConfiguredCalculationsView(testForm);
+            LocationCalculationsView view = ShowFullyConfiguredCalculationsView(testForm);
 
             DataGridView calculationsDataGridView = GetCalculationsDataGridView();
             calculationsDataGridView.CurrentCell = calculationsDataGridView.Rows[3].Cells[0];