Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs
===================================================================
diff -u -r56246f10e7876b30f36a5b9709ec2e3332b4010a -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -22,7 +22,6 @@
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Probability;
-using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.StabilityPointStructures.Data
 {
@@ -41,7 +40,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<StabilityPointStructuresInput> sectionResult,
+        public static double GetAssessmentLayerTwoA(this StabilityPointStructuresFailureMechanismSectionResult sectionResult,
                                                     StabilityPointStructuresFailureMechanism failureMechanism,
                                                     IAssessmentSection assessmentSection)
         {
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r87ad62ce6aca2a109eb0357098687c3a7d95c0b5 -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 87ad62ce6aca2a109eb0357098687c3a7d95c0b5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -37,11 +37,11 @@
 namespace Ringtoets.StabilityPointStructures.Forms.Views
 {
     /// <summary>
-    /// The view for a collection of <see cref="StructuresFailureMechanismSectionResult{T}"/>
+    /// The view for a collection of <see cref="StabilityPointStructuresFailureMechanismSectionResult"/>
     /// for stability point structures.
     /// </summary>
     public class StabilityPointStructuresFailureMechanismResultView
-        : FailureMechanismResultView<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>,
+        : FailureMechanismResultView<StabilityPointStructuresFailureMechanismSectionResult,
             StabilityPointStructuresFailureMechanism>
     {
         private const int assessmentLayerTwoAIndex = 2;
@@ -56,7 +56,7 @@
         /// <param name="assessmentSection">The assessment section the failure mechanism result belongs to.</param>
         /// <inheritdoc />
         public StabilityPointStructuresFailureMechanismResultView(
-            IObservableEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> failureMechanismSectionResults,
+            IObservableEnumerable<StabilityPointStructuresFailureMechanismSectionResult> failureMechanismSectionResults,
             StabilityPointStructuresFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
             : base(failureMechanismSectionResults, failureMechanism)
@@ -94,7 +94,7 @@
             UpdateDataGridViewDataSource();
         }
 
-        protected override object CreateFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult)
+        protected override object CreateFailureMechanismSectionResultRow(StabilityPointStructuresFailureMechanismSectionResult sectionResult)
         {
             return new StabilityPointStructuresFailureMechanismSectionResultRow(sectionResult,
                                                                                 FailureMechanism,
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r758ce737a65c6a90b92ef8446aa911ced6d7b21a -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRow.cs)	(revision 758ce737a65c6a90b92ef8446aa911ced6d7b21a)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRow.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -31,23 +31,23 @@
 namespace Ringtoets.StabilityPointStructures.Forms.Views
 {
     /// <summary>
-    /// This class represents a row of <see cref="StructuresFailureMechanismSectionResult{T}"/> for stability point structures
+    /// This class represents a row of <see cref="StabilityPointStructuresFailureMechanismSectionResult"/> for stability point structures
     /// </summary>
     public class StabilityPointStructuresFailureMechanismSectionResultRow
-        : FailureMechanismSectionResultRow<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+        : FailureMechanismSectionResultRow<StabilityPointStructuresFailureMechanismSectionResult>
     {
         private readonly StabilityPointStructuresFailureMechanism failureMechanism;
         private readonly IAssessmentSection assessmentSection;
 
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresFailureMechanismSectionResultRow"/>.
         /// </summary>
-        /// <param name="sectionResult">The <see cref="StructuresFailureMechanismSectionResult{T}"/> to wrap
+        /// <param name="sectionResult">The <see cref="StabilityPointStructuresFailureMechanismSectionResult"/> to wrap
         /// so that it can be displayed as a row.</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 StabilityPointStructuresFailureMechanismSectionResultRow(StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult,
+        public StabilityPointStructuresFailureMechanismSectionResultRow(StabilityPointStructuresFailureMechanismSectionResult sectionResult,
                                                                         StabilityPointStructuresFailureMechanism failureMechanism,
                                                                         IAssessmentSection assessmentSection)
             : base(sectionResult)
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rb4ff9985c6f91822918b2ea5c0484cd9d3cd7c30 -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision b4ff9985c6f91822918b2ea5c0484cd9d3cd7c30)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -100,8 +100,8 @@
             };
 
             yield return new ViewInfo<
-                ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>,
-                IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>,
+                ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>,
+                IEnumerable<StabilityPointStructuresFailureMechanismSectionResult>,
                 StabilityPointStructuresFailureMechanismResultView>
             {
                 GetViewName = (view, context) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs
===================================================================
diff -u -r784f8c63205c30af7cfbd62aaeacc87c19f0891e -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs)	(revision 784f8c63205c30af7cfbd62aaeacc87c19f0891e)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSection2aAssessmentResultExtensionsTest.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -24,7 +24,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
 
@@ -62,7 +61,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => failureMechanismSectionResult.GetAssessmentLayerTwoA(null, assessmentSection);
@@ -78,7 +77,7 @@
         {
             // Setup
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => failureMechanismSectionResult.GetAssessmentLayerTwoA(new StabilityPointStructuresFailureMechanism(), null);
@@ -97,7 +96,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             // Call
             double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new StabilityPointStructuresFailureMechanism(),
@@ -117,7 +116,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = new TestStabilityPointStructuresCalculation()
             };
@@ -142,7 +141,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var failureMechanismSectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = new TestStabilityPointStructuresCalculation
                 {
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rb4ff9985c6f91822918b2ea5c0484cd9d3cd7c30 -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision b4ff9985c6f91822918b2ea5c0484cd9d3cd7c30)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -75,10 +75,10 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             // Call
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>,
+                Assert.IsInstanceOf<FailureMechanismResultView<StabilityPointStructuresFailureMechanismSectionResult,
                     StabilityPointStructuresFailureMechanism>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
@@ -94,7 +94,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             // Call
-            TestDelegate call = () => new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults,
+            TestDelegate call = () => new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2,
                                                                                              failureMechanism,
                                                                                              null);
 
@@ -183,7 +183,7 @@
         public void GivenFormWithFailureMechanismResultView_ThenExpectedColumnsAreVisible()
         {
             // Given
-            using (ShowFailureMechanismResultsView(new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>()))
+            using (ShowFailureMechanismResultsView(new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>()))
             {
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -221,25 +221,25 @@
             });
 
             var random = new Random(21);
-            var result1 = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section1)
+            var result1 = new StabilityPointStructuresFailureMechanismSectionResult(section1)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 AssessmentLayerThree = random.NextRoundedDouble()
             };
-            var result2 = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section2)
+            var result2 = new StabilityPointStructuresFailureMechanismSectionResult(section2)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.NotAssessed,
                 AssessmentLayerThree = random.NextRoundedDouble()
             };
-            var result3 = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section3)
+            var result3 = new StabilityPointStructuresFailureMechanismSectionResult(section3)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.NoVerdict,
                 AssessmentLayerThree = random.NextRoundedDouble()
             };
 
             // Call
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     result1,
                     result2,
@@ -299,13 +299,13 @@
                 new Point2D(0, 0)
             });
             var random = new Random(21);
-            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = assessmentLayerOneState,
                 AssessmentLayerThree = random.NextRoundedDouble()
             };
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     result
                 }))
@@ -333,13 +333,13 @@
         public void GivenSectionResultWithoutCalculation_ThenLayerTwoAErrorTooltip(AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneState
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -365,14 +365,14 @@
             AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>(),
                 AssessmentLayerOne = assessmentLayerOneState
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -397,7 +397,7 @@
         public void GivenSectionResultAndFailedCalculation_ThenLayerTwoAErrorTooltip(AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>
                 {
@@ -407,7 +407,7 @@
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -430,7 +430,7 @@
         public void GivenSectionResultAndSuccessfulCalculation_ThenLayerTwoANoError()
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>
                 {
@@ -439,7 +439,7 @@
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -461,11 +461,11 @@
         [Test]
         [TestCaseSource(nameof(AssessmentLayerOneStateIsSufficientVariousSections))]
         public void GivenSectionResultAndAssessmentLayerOneStateSufficient_ThenLayerTwoANoError(
-            StructuresFailureMechanismSectionResult<StabilityPointStructuresInput> sectionResult, string expectedValue)
+            StabilityPointStructuresFailureMechanismSectionResult sectionResult, string expectedValue)
         {
             // Given
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -491,7 +491,7 @@
             AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(CreateSimpleFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSimpleFailureMechanismSection())
             {
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>
                 {
@@ -501,7 +501,7 @@
             };
 
             using (ShowFailureMechanismResultsView(
-                new ObservableList<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>
+                new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
                 {
                     sectionResult
                 }))
@@ -589,32 +589,32 @@
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
+                Assert.AreEqual(newValue, failureMechanism.SectionResults2.First().AssessmentLayerThree);
             }
         }
 
         private static IEnumerable AssessmentLayerOneStateIsSufficientVariousSections()
         {
             FailureMechanismSection section = CreateSimpleFailureMechanismSection();
 
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient
             }, "-").SetName("SectionWithoutCalculation");
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>()
             }, "-").SetName("SectionWithCalculationNoOutput");
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>
                 {
                     Output = new TestStructuresOutput(double.NaN)
                 }
             }, "-").SetName("SectionWithInvalidCalculationOutput");
-            yield return new TestCaseData(new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 Calculation = new StructuresCalculation<StabilityPointStructuresInput>
@@ -650,13 +650,13 @@
                 new Point2D(10.0, 0.0)
             }));
 
-            StabilityPointStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
+            StabilityPointStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults2);
 
             return failureMechanismResultView;
         }
 
         private StabilityPointStructuresFailureMechanismResultView ShowFailureMechanismResultsView(
-            IObservableEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>> sectionResults)
+            IObservableEnumerable<StabilityPointStructuresFailureMechanismSectionResult> sectionResults)
         {
             var failureMechanismResultView = new StabilityPointStructuresFailureMechanismResultView(sectionResults,
                                                                                                     new StabilityPointStructuresFailureMechanism(),
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r758ce737a65c6a90b92ef8446aa911ced6d7b21a -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs)	(revision 758ce737a65c6a90b92ef8446aa911ced6d7b21a)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -48,15 +48,15 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             // Call
             var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismSectionResultRow<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>>(row);
+            Assert.IsInstanceOf<FailureMechanismSectionResultRow<StabilityPointStructuresFailureMechanismSectionResult>>(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<StabilityPointStructuresInput>(section);
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => new StabilityPointStructuresFailureMechanismSectionResultRow(result, null, assessmentSection);
@@ -93,7 +93,7 @@
         {
             // Setup
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             // Call
             TestDelegate call = () => new StabilityPointStructuresFailureMechanismSectionResultRow(
@@ -118,7 +118,7 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
             result.Attach(observer);
 
             var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result,
@@ -144,7 +144,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             // Precondition
             Assert.IsNull(sectionResult.Calculation);
@@ -178,7 +178,7 @@
             }
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = calculation
             };
@@ -209,7 +209,7 @@
             };
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = calculation
             };
@@ -235,7 +235,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section);
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
 
             // Precondition
             Assert.IsNull(result.Calculation);
@@ -263,7 +263,7 @@
             var expectedCalculation = new StructuresCalculation<StabilityPointStructuresInput>();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(section)
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(section)
             {
                 Calculation = expectedCalculation
             };
@@ -291,7 +291,7 @@
             var random = new Random(21);
             double assessmentLayerThree = random.NextDouble();
 
-            var sectionResult = new StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var row = new StabilityPointStructuresFailureMechanismSectionResultRow(sectionResult, failureMechanism, assessmentSection);
 
             // Call
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs
===================================================================
diff -u -r56246f10e7876b30f36a5b9709ec2e3332b4010a -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision 56246f10e7876b30f36a5b9709ec2e3332b4010a)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -130,8 +130,8 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>),
-                    typeof(IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>),
+                    typeof(ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>),
+                    typeof(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult>),
                     typeof(StabilityPointStructuresFailureMechanismResultView));
 
                 PluginTestHelper.AssertViewInfoDefined(
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs
===================================================================
diff -u -rb4ff9985c6f91822918b2ea5c0484cd9d3cd7c30 -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs	(.../StabilityPointStructuresResultViewInfoTest.cs)	(revision b4ff9985c6f91822918b2ea5c0484cd9d3cd7c30)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresResultViewInfoTest.cs	(.../StabilityPointStructuresResultViewInfoTest.cs)	(revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3)
@@ -29,7 +29,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
@@ -62,8 +61,8 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>), info.DataType);
-            Assert.AreEqual(typeof(IEnumerable<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>), info.ViewDataType);
+            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>), info.DataType);
+            Assert.AreEqual(typeof(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult>), info.ViewDataType);
         }
 
         [Test]
@@ -75,14 +74,14 @@
             mocks.ReplayAll();
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(
-                failureMechanism.SectionResults, failureMechanism, assessmentSection);
+            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
+                failureMechanism.SectionResults2, failureMechanism, assessmentSection);
 
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
-            Assert.AreSame(failureMechanism.SectionResults, viewData);
+            Assert.AreSame(failureMechanism.SectionResults2, viewData);
             mocks.VerifyAll();
         }
 
@@ -95,12 +94,12 @@
             mocks.ReplayAll();
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var constructionResultView = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults,
+            var constructionResultView = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2,
                                                                                                 failureMechanism,
                                                                                                 assessmentSection);
 
             // Call
-            string viewName = info.GetViewName(constructionResultView, failureMechanism.SectionResults);
+            string viewName = info.GetViewName(constructionResultView, failureMechanism.SectionResults2);
 
             // Assert
             Assert.AreEqual("Resultaat", viewName);
@@ -128,7 +127,7 @@
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -155,7 +154,7 @@
             });
             mocks.ReplayAll();
 
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -182,7 +181,7 @@
             });
             mocks.ReplayAll();
 
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -204,7 +203,7 @@
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanism);
@@ -226,7 +225,7 @@
 
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, new StabilityPointStructuresFailureMechanism());
@@ -249,7 +248,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanismContext);
@@ -273,7 +272,7 @@
             var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(),
                                                                                               assessmentSection);
 
-            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
+            using (var view = new StabilityPointStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanismContext);
@@ -295,8 +294,8 @@
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             mocks.ReplayAll();
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<StructuresFailureMechanismSectionResult<StabilityPointStructuresInput>>(
-                failureMechanism.SectionResults,
+            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
+                failureMechanism.SectionResults2,
                 failureMechanism,
                 assessmentSection);