Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs
===================================================================
diff -u -rb23612b7fdc45eb275697f50a94756386d3c2c39 -r5758dcbd3c038700c314cb3a9921659f88f32f74
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs	(.../ClosingStructuresFailureMechanismResultView.cs)	(revision b23612b7fdc45eb275697f50a94756386d3c2c39)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs	(.../ClosingStructuresFailureMechanismResultView.cs)	(revision 5758dcbd3c038700c314cb3a9921659f88f32f74)
@@ -26,6 +26,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Views;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -52,24 +53,17 @@
             // The concat is needed to observe the input of calculations in child groups.
             calculationInputObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
                 UpdateDataGridViewDataSource,
-                cg => cg.Children.Concat<object>(
-                    cg.Children
-                      .OfType<ICalculation>()
-                      .Select(c => c.GetObservableInput())
-                          )
-                );
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<StructuresCalculation<ClosingStructuresInput>>()
+                                                   .Select(c => c.GetObservableInput())));
             calculationOutputObserver = new RecursiveObserver<CalculationGroup, ICalculationOutput>(
                 UpdateDataGridViewDataSource,
-                cg => cg.Children.Concat<object>(
-                    cg.Children
-                      .OfType<ICalculation>()
-                      .Select(c => c.GetObservableOutput())
-                          )
-                );
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<StructuresCalculation<ClosingStructuresInput>>()
+                                                   .Select(c => c.GetObservableOutput())));
             calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
                 UpdateDataGridViewDataSource,
-                c => c.Children
-                );
+                c => c.Children);
 
             AddDataGridColumns();
         }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rb23612b7fdc45eb275697f50a94756386d3c2c39 -r5758dcbd3c038700c314cb3a9921659f88f32f74
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision b23612b7fdc45eb275697f50a94756386d3c2c39)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 5758dcbd3c038700c314cb3a9921659f88f32f74)
@@ -74,7 +74,7 @@
         public void Data_DataAlreadySetNewDataSet_DataSetAndDataGridViewUpdated()
         {
             // Setup
-            using (var view = ShowFullyConfiguredFailureMechanismResultsView())
+            using (ClosingStructuresFailureMechanismResultView view = CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
 
@@ -110,7 +110,7 @@
         {
             // Setup
             var testData = new object();
-            using (var view = ShowFullyConfiguredFailureMechanismResultsView())
+            using (ClosingStructuresFailureMechanismResultView view = CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
 
@@ -125,18 +125,18 @@
         }
 
         [Test]
-        public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
+        public void GivenFailureMechanismResultsView_WhenAllDataSet_ThenDataGridViewCorrectlyInitialized()
         {
-            // Setup & Call
-            using (ShowFullyConfiguredFailureMechanismResultsView())
+            // Given
+            using (CreateConfiguredFailureMechanismResultsView())
             {
+                // Then
                 var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
 
-                // Assert
-                var rows = dataGridView.Rows;
+                DataGridViewRowCollection rows = dataGridView.Rows;
                 Assert.AreEqual(2, rows.Count);
 
-                var cells = rows[0].Cells;
+                DataGridViewCellCollection cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
                 Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue);
@@ -217,10 +217,10 @@
 
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-                var rows = dataGridView.Rows;
+                DataGridViewRowCollection rows = dataGridView.Rows;
                 Assert.AreEqual(2, rows.Count);
 
-                var cells = rows[0].Cells;
+                DataGridViewCellCollection cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
                 Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value);
@@ -270,10 +270,10 @@
 
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-                var rows = dataGridView.Rows;
+                DataGridViewRowCollection rows = dataGridView.Rows;
                 Assert.AreEqual(1, rows.Count);
 
-                var cells = rows[0].Cells;
+                DataGridViewCellCollection cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
 
                 AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]);
@@ -307,7 +307,7 @@
 
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-                var rows = dataGridView.Rows;
+                DataGridViewRowCollection rows = dataGridView.Rows;
                 Assert.AreEqual(0, rows.Count);
             }
         }
@@ -326,7 +326,7 @@
             Assert.AreEqual(Color.FromKnownColor(KnownColor.White), dataGridViewCell.Style.BackColor);
         }
 
-        private ClosingStructuresFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView()
+        private ClosingStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView()
         {
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r83003ce3a26b35511212cc95936e8574bea66516 -r5758dcbd3c038700c314cb3a9921659f88f32f74
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision 83003ce3a26b35511212cc95936e8574bea66516)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision 5758dcbd3c038700c314cb3a9921659f88f32f74)
@@ -54,24 +54,17 @@
             // The concat is needed to observe the input of calculations in child groups.
             calculationInputObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
                 UpdateDataGridViewDataSource,
-                cg => cg.Children.Concat<object>(
-                    cg.Children
-                      .OfType<ICalculation>()
-                      .Select(c => c.GetObservableInput())
-                          )
-                );
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<GrassCoverErosionInwardsCalculation>()
+                                                   .Select(c => c.GetObservableInput())));
             calculationOutputObserver = new RecursiveObserver<CalculationGroup, ICalculationOutput>(
                 UpdateDataGridViewDataSource,
-                cg => cg.Children.Concat<object>(
-                    cg.Children
-                      .OfType<ICalculation>()
-                      .Select(c => c.GetObservableOutput())
-                          )
-                );
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<GrassCoverErosionInwardsCalculation>()
+                                                   .Select(c => c.GetObservableOutput())));
             calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
                 UpdateDataGridViewDataSource,
-                c => c.Children
-                );
+                c => c.Children);
 
             AddDataGridColumns();
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r219bf641fa81657e9d154c9cb50245af9b2ebe27 -r5758dcbd3c038700c314cb3a9921659f88f32f74
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 5758dcbd3c038700c314cb3a9921659f88f32f74)
@@ -25,6 +25,7 @@
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.HeightStructures.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -50,16 +51,14 @@
             // The concat is needed to observe the input of calculations in child groups.
             calculationInputObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
                 UpdateDataGridViewDataSource,
-                cg => cg.Children.Concat<object>(
-                    cg.Children
-                      .OfType<ICalculation>()
-                      .Select(c => c.GetObservableInput())));
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<StructuresCalculation<HeightStructuresInput>>()
+                                                   .Select(c => c.GetObservableInput())));
             calculationOutputObserver = new RecursiveObserver<CalculationGroup, ICalculationOutput>(
                 UpdateDataGridViewDataSource,
-                cg => cg.Children.Concat<object>(
-                    cg.Children
-                      .OfType<ICalculation>()
-                      .Select(c => c.GetObservableOutput())));
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<StructuresCalculation<HeightStructuresInput>>()
+                                                   .Select(c => c.GetObservableOutput())));
             calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
                 UpdateDataGridViewDataSource,
                 c => c.Children);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r5758dcbd3c038700c314cb3a9921659f88f32f74
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision 5758dcbd3c038700c314cb3a9921659f88f32f74)
@@ -54,9 +54,19 @@
             DataGridViewControl.AddCellFormattingHandler(DisableIrrelevantFieldsFormatting);
 
             // The concat is needed to observe the input of calculations in child groups.
-            calculationInputObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(UpdateDataGridViewDataSource, cg => cg.Children.Concat<object>(cg.Children.OfType<ICalculationScenario>().Select(c => c.GetObservableInput())));
-            calculationOutputObserver = new RecursiveObserver<CalculationGroup, ICalculationOutput>(UpdateDataGridViewDataSource, cg => cg.Children.Concat<object>(cg.Children.OfType<ICalculationScenario>().Select(c => c.GetObservableOutput())));
-            calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(UpdateDataGridViewDataSource, c => c.Children);
+            calculationInputObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
+                UpdateDataGridViewDataSource,
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<PipingCalculationScenario>()
+                                                   .Select(c => c.GetObservableInput())));
+            calculationOutputObserver = new RecursiveObserver<CalculationGroup, ICalculationOutput>(
+                UpdateDataGridViewDataSource,
+                cg => cg.Children.Concat<object>(cg.Children
+                                                   .OfType<PipingCalculationScenario>()
+                                                   .Select(c => c.GetObservableOutput())));
+            calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
+                UpdateDataGridViewDataSource,
+                c => c.Children);
 
             AddDataGridColumns();
         }