Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSection2aAssessmentResultExtensions.cs
===================================================================
diff -u -re1a93747d105f27392f4bc0655694810c7d29f4d -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSection2aAssessmentResultExtensions.cs	(.../HeightStructuresFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision e1a93747d105f27392f4bc0655694810c7d29f4d)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSection2aAssessmentResultExtensions.cs	(.../HeightStructuresFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -41,7 +41,7 @@
         /// <returns>The calculated assessment layer 2A; or <see cref="double.NaN"/> when there is no
         /// calculation assigned to the section result or the calculation is not performed.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static double GetAssessmentLayerTwoA(this StructuresFailureMechanismSectionResult<HeightStructuresInput> sectionResult,
+        public static double GetAssessmentLayerTwoA(this HeightStructuresFailureMechanismSectionResult sectionResult,
                                                     HeightStructuresFailureMechanism failureMechanism,
                                                     IAssessmentSection assessmentSection)
         {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r87ad62ce6aca2a109eb0357098687c3a7d95c0b5 -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 87ad62ce6aca2a109eb0357098687c3a7d95c0b5)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -37,10 +37,10 @@
 namespace Ringtoets.HeightStructures.Forms.Views
 {
     /// <summary>
-    /// The view for the <see cref="StructuresFailureMechanismSectionResult{T}"/>.
+    /// The view for the <see cref="HeightStructuresFailureMechanismSectionResult"/>.
     /// </summary>
     public class HeightStructuresFailureMechanismResultView
-        : FailureMechanismResultView<StructuresFailureMechanismSectionResult<HeightStructuresInput>, HeightStructuresFailureMechanism>
+        : FailureMechanismResultView<HeightStructuresFailureMechanismSectionResult, HeightStructuresFailureMechanism>
     {
         private const int assessmentLayerTwoAIndex = 2;
         private readonly IAssessmentSection assessmentSection;
@@ -54,7 +54,7 @@
         /// <param name="assessmentSection">The assessment section the failure mechanism result belongs to.</param>
         /// <inheritdoc />
         public HeightStructuresFailureMechanismResultView(
-            IObservableEnumerable<StructuresFailureMechanismSectionResult<HeightStructuresInput>> failureMechanismSectionResults,
+            IObservableEnumerable<HeightStructuresFailureMechanismSectionResult> failureMechanismSectionResults,
             HeightStructuresFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
             : base(failureMechanismSectionResults, failureMechanism)
@@ -105,7 +105,7 @@
             base.Dispose(disposing);
         }
 
-        protected override object CreateFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<HeightStructuresInput> sectionResult)
+        protected override object CreateFailureMechanismSectionResultRow(HeightStructuresFailureMechanismSectionResult sectionResult)
         {
             return new HeightStructuresFailureMechanismSectionResultRow(sectionResult,
                                                                         FailureMechanism,
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r758ce737a65c6a90b92ef8446aa911ced6d7b21a -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs	(.../HeightStructuresFailureMechanismSectionResultRow.cs)	(revision 758ce737a65c6a90b92ef8446aa911ced6d7b21a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs	(.../HeightStructuresFailureMechanismSectionResultRow.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -31,20 +31,20 @@
 namespace Ringtoets.HeightStructures.Forms.Views
 {
     /// <summary>
-    /// This class represents a row of <see cref="StructuresFailureMechanismSectionResult{T}"/> for height structures.
+    /// This class represents a row of <see cref="HeightStructuresFailureMechanismSectionResult"/> for height structures.
     /// </summary>
-    internal class HeightStructuresFailureMechanismSectionResultRow : FailureMechanismSectionResultRow<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+    internal class HeightStructuresFailureMechanismSectionResultRow : FailureMechanismSectionResultRow<HeightStructuresFailureMechanismSectionResult>
     {
         private readonly HeightStructuresFailureMechanism failureMechanism;
         private readonly IAssessmentSection assessmentSection;
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresFailureMechanismSectionResultRow"/>.
         /// </summary>
-        /// <param name="sectionResult">The <see cref="StructuresFailureMechanismSectionResult{T}"/> this row contains.</param>
+        /// <param name="sectionResult">The <see cref="HeightStructuresFailureMechanismSectionResult"/> this row contains.</param>
         /// <param name="failureMechanism">The failure mechanism the result belongs to.</param>
         /// <param name="assessmentSection">The assessment section the result belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public HeightStructuresFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<HeightStructuresInput> sectionResult,
+        public HeightStructuresFailureMechanismSectionResultRow(HeightStructuresFailureMechanismSectionResult sectionResult,
                                                                 HeightStructuresFailureMechanism failureMechanism,
                                                                 IAssessmentSection assessmentSection)
             : base(sectionResult)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r23a31dd663977ebcc7fcf4c330fc3d980c953624 -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 23a31dd663977ebcc7fcf4c330fc3d980c953624)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -174,8 +174,8 @@
             };
 
             yield return new ViewInfo<
-                ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<HeightStructuresInput>>,
-                IEnumerable<StructuresFailureMechanismSectionResult<HeightStructuresInput>>,
+                ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>,
+                IEnumerable<HeightStructuresFailureMechanismSectionResult>,
                 HeightStructuresFailureMechanismResultView>
             {
                 GetViewName = (view, results) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs
===================================================================
diff -u -r784f8c63205c30af7cfbd62aaeacc87c19f0891e -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs	(.../HeightStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs)	(revision 784f8c63205c30af7cfbd62aaeacc87c19f0891e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs	(.../HeightStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -62,7 +62,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var failureMechanismSectionResult = new HeightStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => failureMechanismSectionResult.GetAssessmentLayerTwoA(null, assessmentSection);
@@ -78,7 +78,7 @@
         {
             // Setup
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var failureMechanismSectionResult = new HeightStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => failureMechanismSectionResult.GetAssessmentLayerTwoA(new HeightStructuresFailureMechanism(), null);
@@ -97,7 +97,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var failureMechanismSectionResult = new HeightStructuresFailureMechanismSectionResult(section);
 
             // Call
             double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new HeightStructuresFailureMechanism(),
@@ -117,7 +117,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            var failureMechanismSectionResult = new HeightStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = new TestHeightStructuresCalculation()
             };
@@ -142,7 +142,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            var failureMechanismSectionResult = new HeightStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = new TestHeightStructuresCalculation
                 {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r23a31dd663977ebcc7fcf4c330fc3d980c953624 -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 23a31dd663977ebcc7fcf4c330fc3d980c953624)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -74,10 +74,10 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             // Call
-            using (var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<StructuresFailureMechanismSectionResult<HeightStructuresInput>,
+                Assert.IsInstanceOf<FailureMechanismResultView<HeightStructuresFailureMechanismSectionResult,
                     HeightStructuresFailureMechanism>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
@@ -93,7 +93,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             // Call
-            TestDelegate call = () => new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, null);
+            TestDelegate call = () => new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -104,7 +104,7 @@
         public void GivenFormWithHeightStructuresFailureMechanismResultView_ThenExpectedColumnsAreVisible()
         {
             // Given
-            using (ShowFailureMechanismResultsView(new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>()))
+            using (ShowFailureMechanismResultsView(new ObservableList<HeightStructuresFailureMechanismSectionResult>()))
             {
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -259,7 +259,7 @@
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
+                Assert.AreEqual(newValue, failureMechanism.SectionResults2.First().AssessmentLayerThree);
             }
         }
 
@@ -269,12 +269,12 @@
         public void GivenSectionResultWithoutCalculation_ThenLayerTwoAErrorTooltip(AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneState
             };
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+                new ObservableList<HeightStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -299,14 +299,14 @@
         public void GivenSectionResultAndCalculationNotCalculated_ThenLayerTwoAErrorTooltip(AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 Calculation = new StructuresCalculation<HeightStructuresInput>(),
                 AssessmentLayerOne = assessmentLayerOneState
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+                new ObservableList<HeightStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -336,14 +336,14 @@
                 Output = new TestStructuresOutput(double.NaN)
             };
             FailureMechanismSection section = CreateSimpleFailureMechanismSection();
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = calculation,
                 AssessmentLayerOne = assessmentLayerOneState
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+                new ObservableList<HeightStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -368,7 +368,7 @@
         public void GivenSectionResultAndSuccessfulCalculation_ThenLayerTwoANoError(AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 Calculation = new StructuresCalculation<HeightStructuresInput>
                 {
@@ -378,7 +378,7 @@
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+                new ObservableList<HeightStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -400,11 +400,11 @@
         [Test]
         [TestCaseSource(nameof(AssessmentLayerOneStateIsSufficientVariousSections))]
         public void GivenSectionResultAndAssessmentLayerOneStateSufficient_ThenLayerTwoANoError(
-            StructuresFailureMechanismSectionResult<HeightStructuresInput> sectionResult, string expectedValue)
+            HeightStructuresFailureMechanismSectionResult sectionResult, string expectedValue)
         {
             // Given
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+                new ObservableList<HeightStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -430,7 +430,7 @@
             AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 Calculation = new StructuresCalculation<HeightStructuresInput>
                 {
@@ -439,7 +439,7 @@
                 AssessmentLayerOne = assessmentLayerOneState
             };
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+                new ObservableList<HeightStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -471,24 +471,24 @@
         {
             FailureMechanismSection section = CreateSimpleFailureMechanismSection();
 
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            yield return new TestCaseData(new HeightStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient
             }, "-").SetName("SectionWithoutCalculation");
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            yield return new TestCaseData(new HeightStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<HeightStructuresInput>()
             }, "-").SetName("SectionWithCalculationNoOutput");
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            yield return new TestCaseData(new HeightStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<HeightStructuresInput>
                 {
                     Output = new TestStructuresOutput(double.NaN)
                 }
             }, "-").SetName("SectionWithInvalidCalculationOutput");
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            yield return new TestCaseData(new HeightStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<HeightStructuresInput>
@@ -523,13 +523,13 @@
                 new Point2D(10.0, 0.0)
             }));
 
-            HeightStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
+            HeightStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults2);
 
             return failureMechanismResultView;
         }
 
         private HeightStructuresFailureMechanismResultView ShowFailureMechanismResultsView(
-            IObservableEnumerable<StructuresFailureMechanismSectionResult<HeightStructuresInput>> sectionResults)
+            IObservableEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults)
         {
             var failureMechanismResultView = new HeightStructuresFailureMechanismResultView(sectionResults,
                                                                                             new HeightStructuresFailureMechanism(),
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r758ce737a65c6a90b92ef8446aa911ced6d7b21a -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision 758ce737a65c6a90b92ef8446aa911ced6d7b21a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -48,15 +48,15 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var result = new HeightStructuresFailureMechanismSectionResult(section);
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             // Call
             var row = new HeightStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismSectionResultRow<StructuresFailureMechanismSectionResult<HeightStructuresInput>>>(row);
+            Assert.IsInstanceOf<FailureMechanismSectionResultRow<HeightStructuresFailureMechanismSectionResult>>(row);
             Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne);
             Assert.AreEqual(result.GetAssessmentLayerTwoA(failureMechanism, assessmentSection), row.AssessmentLayerTwoA);
             Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree);
@@ -77,7 +77,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var result = new HeightStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => new HeightStructuresFailureMechanismSectionResultRow(result, null, assessmentSection);
@@ -93,7 +93,7 @@
         {
             // Setup
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var result = new HeightStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => new HeightStructuresFailureMechanismSectionResultRow(result, new HeightStructuresFailureMechanism(), null);
@@ -117,7 +117,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var result = new HeightStructuresFailureMechanismSectionResult(section);
             result.Attach(observer);
 
             var row = new HeightStructuresFailureMechanismSectionResultRow(result,
@@ -143,7 +143,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(section);
 
             // Precondition
             Assert.IsNull(sectionResult.Calculation);
@@ -177,7 +177,7 @@
             }
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = calculation
             };
@@ -208,7 +208,7 @@
             };
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = calculation
             };
@@ -234,7 +234,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section);
+            var result = new HeightStructuresFailureMechanismSectionResult(section);
 
             // Precondition
             Assert.IsNull(result.Calculation);
@@ -262,7 +262,7 @@
             var expectedCalculation = new StructuresCalculation<HeightStructuresInput>();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section)
+            var result = new HeightStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = expectedCalculation
             };
@@ -290,7 +290,7 @@
             var random = new Random(21);
             double assessmentLayerThree = random.NextDouble();
 
-            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var row = new HeightStructuresFailureMechanismSectionResultRow(sectionResult, failureMechanism, assessmentSection);
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -130,8 +130,8 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<HeightStructuresInput>>),
-                    typeof(IEnumerable<StructuresFailureMechanismSectionResult<HeightStructuresInput>>),
+                    typeof(ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>),
+                    typeof(IEnumerable<HeightStructuresFailureMechanismSectionResult>),
                     typeof(HeightStructuresFailureMechanismResultView));
 
                 PluginTestHelper.AssertViewInfoDefined(
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r23a31dd663977ebcc7fcf4c330fc3d980c953624 -ra493758b8df1196d55fc8e4552e271eafddbbefe
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision 23a31dd663977ebcc7fcf4c330fc3d980c953624)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
@@ -63,8 +63,8 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<HeightStructuresInput>>), info.DataType);
-            Assert.AreEqual(typeof(IEnumerable<StructuresFailureMechanismSectionResult<HeightStructuresInput>>), info.ViewDataType);
+            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>), info.DataType);
+            Assert.AreEqual(typeof(IEnumerable<HeightStructuresFailureMechanismSectionResult>), info.ViewDataType);
         }
 
         [Test]
@@ -85,12 +85,12 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var sectionResults = new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+            var sectionResults = new ObservableList<HeightStructuresFailureMechanismSectionResult>
             {
-                new StructuresFailureMechanismSectionResult<HeightStructuresInput>(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
+                new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             };
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<HeightStructuresInput>>(
+            var context = new ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(
                 sectionResults,
                 new HeightStructuresFailureMechanism(),
                 assessmentSection);
@@ -123,7 +123,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
@@ -148,7 +148,7 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
@@ -173,7 +173,7 @@
             });
             mocks.ReplayAll();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
@@ -193,7 +193,7 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, failureMechanism);
@@ -213,7 +213,7 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, new HeightStructuresFailureMechanism());
@@ -234,7 +234,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, failureMechanismContext);
@@ -253,7 +253,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), assessmentSection);
 
@@ -275,8 +275,8 @@
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             mocks.ReplayAll();
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<HeightStructuresInput>>(
-                failureMechanism.SectionResults,
+            var context = new ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(
+                failureMechanism.SectionResults2,
                 failureMechanism,
                 assessmentSection);