Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -ra818b331454adfdbdf5e806ca3824e98f76e1d4a -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs	(.../HeightStructuresFailureMechanismCreateExtensions.cs)	(revision a818b331454adfdbdf5e806ca3824e98f76e1d4a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs	(.../HeightStructuresFailureMechanismCreateExtensions.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -48,7 +48,7 @@
             AddEntitiesForHeightStructures(mechanism.HeightStructures, entity, registry);
             AddEntitiesForFailureMechanismMeta(mechanism, entity);
             entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0);
-            AddEntitiesForSectionResults(mechanism.SectionResults2, registry);
+            AddEntitiesForSectionResults(mechanism.SectionResults, registry);
 
             return entity;
         }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r9d7965403fbd54e6c89d3536581bf385633dab8e -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 9d7965403fbd54e6c89d3536581bf385633dab8e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -290,7 +290,7 @@
             foreach (HeightStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.HeightStructuresSectionResultEntities))
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                HeightStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults2.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                HeightStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result, collector);
             }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r5d0796a95a893ecd6726ecd51485740d72e5ff88 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 5d0796a95a893ecd6726ecd51485740d72e5ff88)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -314,8 +314,8 @@
                     expectedAssessmentSection.GrassCoverErosionInwards.SectionResults,
                     actualAssessmentSection.GrassCoverErosionInwards.SectionResults);
                 AssertFailureMechanismSectionResults(
-                    expectedAssessmentSection.HeightStructures.SectionResults2,
-                    actualAssessmentSection.HeightStructures.SectionResults2);
+                    expectedAssessmentSection.HeightStructures.SectionResults,
+                    actualAssessmentSection.HeightStructures.SectionResults);
                 AssertFailureMechanismSectionResults(
                     expectedAssessmentSection.StrengthStabilityLengthwiseConstruction.SectionResults,
                     actualAssessmentSection.StrengthStabilityLengthwiseConstruction.SectionResults);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
===================================================================
diff -u -ra818b331454adfdbdf5e806ca3824e98f76e1d4a -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision a818b331454adfdbdf5e806ca3824e98f76e1d4a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -380,7 +380,7 @@
             var calculationWithoutOutput = (StructuresCalculation<HeightStructuresInput>) failureMechanism.CalculationsGroup.Children[2];
             Assert.IsFalse(calculationWithoutOutput.HasOutput);
 
-            HeightStructuresFailureMechanismSectionResult firstSectionResult = failureMechanism.SectionResults2.First();
+            HeightStructuresFailureMechanismSectionResult firstSectionResult = failureMechanism.SectionResults.First();
             Assert.AreSame(calculationWithOutput, firstSectionResult.Calculation);
         }
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -ra818b331454adfdbdf5e806ca3824e98f76e1d4a -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision a818b331454adfdbdf5e806ca3824e98f76e1d4a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -135,7 +135,7 @@
             AddForeshoreProfiles(heightStructuresFailureMechanism.ForeshoreProfiles);
             ConfigureHeightStructuresFailureMechanism(heightStructuresFailureMechanism, assessmentSection);
             AddSections(heightStructuresFailureMechanism);
-            SetSectionResults(heightStructuresFailureMechanism.SectionResults2,
+            SetSectionResults(heightStructuresFailureMechanism.SectionResults,
                               (StructuresCalculation<HeightStructuresInput>) heightStructuresFailureMechanism.Calculations.First());
 
             ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -rc17ffd96b09e1f2305d830380fd418f0cbfefb64 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision c17ffd96b09e1f2305d830380fd418f0cbfefb64)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -37,19 +37,17 @@
     /// </summary>
     public class HeightStructuresFailureMechanism : FailureMechanismBase,
                                                     ICalculatableFailureMechanism,
-                                                    IHasSectionResults<StructuresFailureMechanismSectionResult<HeightStructuresInput>>
+                                                    IHasSectionResults<HeightStructuresFailureMechanismSectionResult>
     {
-        private readonly ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>> sectionResults;
-        private readonly ObservableList<HeightStructuresFailureMechanismSectionResult> sectionResults2;
+        private readonly ObservableList<HeightStructuresFailureMechanismSectionResult> sectionResults;
 
         /// <summary>
         /// Creates a new instance of the <see cref="HeightStructuresFailureMechanism"/> class.
         /// </summary>
         public HeightStructuresFailureMechanism()
             : base(Resources.HeightStructuresFailureMechanism_DisplayName, Resources.HeightStructuresFailureMechanism_Code)
         {
-            sectionResults = new ObservableList<StructuresFailureMechanismSectionResult<HeightStructuresInput>>();
-            sectionResults2 = new ObservableList<HeightStructuresFailureMechanismSectionResult>();
+            sectionResults = new ObservableList<HeightStructuresFailureMechanismSectionResult>();
             CalculationsGroup = new CalculationGroup
             {
                 Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName
@@ -82,39 +80,29 @@
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
-        /// <summary>
-        /// Gets the container of all calculations.
-        /// </summary>
-        public CalculationGroup CalculationsGroup { get; }
-
-        public IObservableEnumerable<StructuresFailureMechanismSectionResult<HeightStructuresInput>> SectionResults
+        public IObservableEnumerable<HeightStructuresFailureMechanismSectionResult> SectionResults
         {
             get
             {
                 return sectionResults;
             }
         }
 
-        public IObservableEnumerable<HeightStructuresFailureMechanismSectionResult> SectionResults2
-        {
-            get
-            {
-                return sectionResults2;
-            }
-        }
+        /// <summary>
+        /// Gets the container of all calculations.
+        /// </summary>
+        public CalculationGroup CalculationsGroup { get; }
 
         public override void AddSection(FailureMechanismSection section)
         {
             base.AddSection(section);
-            sectionResults.Add(new StructuresFailureMechanismSectionResult<HeightStructuresInput>(section));
-            sectionResults2.Add(new HeightStructuresFailureMechanismSectionResult(section));
+            sectionResults.Add(new HeightStructuresFailureMechanismSectionResult(section));
         }
 
         public override void ClearAllSections()
         {
             base.ClearAllSections();
             sectionResults.Clear();
-            sectionResults2.Clear();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs
===================================================================
diff -u -rda16c0ac134e9affa0893e190236f942b43bdaa2 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision da16c0ac134e9affa0893e190236f942b43bdaa2)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -132,7 +132,7 @@
                     StructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
 
                 List<HeightStructuresScenarioRow> scenarioRows =
-                    FailureMechanism.SectionResults2.Select(sectionResult => new HeightStructuresScenarioRow(sectionResult)).ToList();
+                    FailureMechanism.SectionResults.Select(sectionResult => new HeightStructuresScenarioRow(sectionResult)).ToList();
 
                 scenarioSelectionControl.UpdateDataGridViewDataSource(calculations, scenarioRows, calculationsPerSegment);
             }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r0604fd1bdba349b0eba9442a16d3d00664b772aa -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 0604fd1bdba349b0eba9442a16d3d00664b772aa)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -406,7 +406,7 @@
             {
                 new HeightStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(
-                    failureMechanism.SectionResults2, failureMechanism, assessmentSection),
+                    failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.OutputComments
             };
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Util/HeightStructuresHelper.cs
===================================================================
diff -u -rfd9e1dd4f143af493965eea4d564c087081fb7f7 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Util/HeightStructuresHelper.cs	(.../HeightStructuresHelper.cs)	(revision fd9e1dd4f143af493965eea4d564c087081fb7f7)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Util/HeightStructuresHelper.cs	(.../HeightStructuresHelper.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -33,7 +33,7 @@
     /// Class holds helper methods to match <see cref="HeightStructuresFailureMechanismSectionResult"/> objects 
     /// with <see cref="StructuresCalculation{T}"/> objects. 
     /// </summary>
-    public class HeightStructuresHelper
+    public static class HeightStructuresHelper
     {
         /// <summary>
         /// Updates the <see cref="HeightStructuresFailureMechanismSectionResult.Calculation"/> for each element
@@ -50,9 +50,9 @@
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            IObservableEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults = failureMechanism.SectionResults2;
+            IObservableEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults = failureMechanism.SectionResults;
             IEnumerable<StructuresCalculation<HeightStructuresInput>> calculations = failureMechanism.Calculations
-                                                                                                      .Cast<StructuresCalculation<HeightStructuresInput>>();
+                                                                                                     .Cast<StructuresCalculation<HeightStructuresInput>>();
             return AssignUnassignCalculations.Update(sectionResults.Select(AsCalculationAssignment),
                                                      AsCalculationsWithLocations(calculations))
                                              .Cast<HeightStructuresFailureMechanismSectionResult>()
@@ -80,8 +80,8 @@
         {
             return new SectionResultWithCalculationAssignment(
                 failureMechanismSectionResult,
-                result => ((HeightStructuresFailureMechanismSectionResult)result).Calculation,
-                (result, calculation) => ((HeightStructuresFailureMechanismSectionResult)result).Calculation = (StructuresCalculation<HeightStructuresInput>)calculation);
+                result => ((HeightStructuresFailureMechanismSectionResult) result).Calculation,
+                (result, calculation) => ((HeightStructuresFailureMechanismSectionResult) result).Calculation = (StructuresCalculation<HeightStructuresInput>) calculation);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -rc17ffd96b09e1f2305d830380fd418f0cbfefb64 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision c17ffd96b09e1f2305d830380fd418f0cbfefb64)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -42,15 +42,14 @@
             // Assert
             Assert.IsInstanceOf<FailureMechanismBase>(failureMechanism);
             Assert.IsInstanceOf<ICalculatableFailureMechanism>(failureMechanism);
-            Assert.IsInstanceOf<IHasSectionResults<StructuresFailureMechanismSectionResult<HeightStructuresInput>>>(failureMechanism);
+            Assert.IsInstanceOf<IHasSectionResults<HeightStructuresFailureMechanismSectionResult>>(failureMechanism);
             Assert.AreEqual("Kunstwerken - Hoogte kunstwerk", failureMechanism.Name);
             Assert.AreEqual("HTKW", failureMechanism.Code);
             Assert.IsInstanceOf<GeneralHeightStructuresInput>(failureMechanism.GeneralInput);
 
             Assert.AreEqual("Berekeningen", failureMechanism.CalculationsGroup.Name);
             CollectionAssert.IsEmpty(failureMechanism.Sections);
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
-            CollectionAssert.IsEmpty(failureMechanism.SectionResults2);
             CollectionAssert.IsEmpty(failureMechanism.Calculations);
             CollectionAssert.IsEmpty(failureMechanism.HeightStructures);
             CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children);
@@ -72,10 +71,7 @@
             // Assert
             Assert.AreEqual(1, failureMechanism.Sections.Count());
             Assert.AreEqual(1, failureMechanism.SectionResults.Count());
-            Assert.IsInstanceOf<StructuresFailureMechanismSectionResult<HeightStructuresInput>>(failureMechanism.SectionResults.ElementAt(0));
-
-            Assert.AreEqual(1, failureMechanism.SectionResults2.Count());
-            Assert.IsInstanceOf<HeightStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults2.ElementAt(0));
+            Assert.IsInstanceOf<HeightStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults.ElementAt(0));
         }
 
         [Test]
@@ -96,15 +92,13 @@
             // Precondition
             Assert.AreEqual(2, failureMechanism.Sections.Count());
             Assert.AreEqual(2, failureMechanism.SectionResults.Count());
-            Assert.AreEqual(2, failureMechanism.SectionResults2.Count());
 
             // Call
             failureMechanism.ClearAllSections();
 
             // Assert
             Assert.AreEqual(0, failureMechanism.Sections.Count());
             Assert.AreEqual(0, failureMechanism.SectionResults.Count());
-            Assert.AreEqual(0, failureMechanism.SectionResults2.Count());
         }
 
         [Test]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -rfd9e1dd4f143af493965eea4d564c087081fb7f7 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision fd9e1dd4f143af493965eea4d564c087081fb7f7)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -318,7 +318,7 @@
             properties.Structure = newStructure;
 
             // Assert
-            Assert.AreSame(calculation, failureMechanism.SectionResults2.ElementAt(0).Calculation);
+            Assert.AreSame(calculation, failureMechanism.SectionResults.ElementAt(0).Calculation);
             mockRepository.VerifyAll();
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -ra493758b8df1196d55fc8e4552e271eafddbbefe -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -74,7 +74,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             // Call
-            using (var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection))
+            using (var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<HeightStructuresFailureMechanismSectionResult,
@@ -93,7 +93,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             // Call
-            TestDelegate call = () => new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, null);
+            TestDelegate call = () => new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -259,7 +259,7 @@
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-                Assert.AreEqual(newValue, failureMechanism.SectionResults2.First().AssessmentLayerThree);
+                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
             }
         }
 
@@ -523,7 +523,7 @@
                 new Point2D(10.0, 0.0)
             }));
 
-            HeightStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults2);
+            HeightStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
 
             return failureMechanismResultView;
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -rfd9e1dd4f143af493965eea4d564c087081fb7f7 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs	(.../HeightStructuresCalculationConfigurationImporterTest.cs)	(revision fd9e1dd4f143af493965eea4d564c087081fb7f7)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs	(.../HeightStructuresCalculationConfigurationImporterTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -599,14 +599,14 @@
                 failureMechanism);
 
             // Preconditions
-            Assert.AreEqual(1, failureMechanism.SectionResults2.Count());
-            Assert.IsNull(failureMechanism.SectionResults2.ElementAt(0).Calculation);
+            Assert.AreEqual(1, failureMechanism.SectionResults.Count());
+            Assert.IsNull(failureMechanism.SectionResults.ElementAt(0).Calculation);
 
             // Call
             importer.DoPostImport();
 
             // Assert
-            Assert.AreSame(calculation, failureMechanism.SectionResults2.ElementAt(0).Calculation);
+            Assert.AreSame(calculation, failureMechanism.SectionResults.ElementAt(0).Calculation);
         }
 
         [TestCase("validConfigurationUnknownForeshoreProfile.xml",
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs
===================================================================
diff -u -rc98e53ce0b3bfc032dc6577ae590830623c98e99 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs	(.../HeightStructureReplaceDataStrategyTest.cs)	(revision c98e53ce0b3bfc032dc6577ae590830623c98e99)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs	(.../HeightStructureReplaceDataStrategyTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -321,7 +321,7 @@
             {
                 location
             }));
-            HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults2.First();
+            HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.First();
             sectionResult.Calculation = calculation;
 
             failureMechanism.HeightStructures.AddRange(new[]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs
===================================================================
diff -u -rc98e53ce0b3bfc032dc6577ae590830623c98e99 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs	(.../HeightStructureUpdateDataStrategyTest.cs)	(revision c98e53ce0b3bfc032dc6577ae590830623c98e99)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs	(.../HeightStructureUpdateDataStrategyTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -607,7 +607,7 @@
             }));
 
             HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism);
-            HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults2.ToArray();
+            HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults.ToArray();
 
             var strategy = new HeightStructureUpdateDataStrategy(failureMechanism);
 
@@ -634,7 +634,7 @@
                 sectionResults[1]
             }, affectedObjects);
 
-            sectionResults = failureMechanism.SectionResults2.ToArray();
+            sectionResults = failureMechanism.SectionResults.ToArray();
             Assert.AreEqual(2, sectionResults.Length);
             Assert.IsNull(sectionResults[0].Calculation);
             Assert.AreSame(calculation, sectionResults[1].Calculation);
@@ -677,7 +677,7 @@
             }));
 
             HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism);
-            HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults2.ToArray();
+            HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults.ToArray();
 
             var strategy = new HeightStructureUpdateDataStrategy(failureMechanism);
 
@@ -697,7 +697,7 @@
                 sectionResults[0]
             }, affectedObjects);
 
-            sectionResults = failureMechanism.SectionResults2.ToArray();
+            sectionResults = failureMechanism.SectionResults.ToArray();
             Assert.AreEqual(1, sectionResults.Length);
             Assert.IsNull(sectionResults[0].Calculation);
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfd9e1dd4f143af493965eea4d564c087081fb7f7 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision fd9e1dd4f143af493965eea4d564c087081fb7f7)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -1309,7 +1309,7 @@
 
             failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
-            HeightStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults2.First();
+            HeightStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First();
             result.Calculation = elementToBeRemoved;
 
             // Call
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfd9e1dd4f143af493965eea4d564c087081fb7f7 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision fd9e1dd4f143af493965eea4d564c087081fb7f7)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -1770,7 +1770,7 @@
             var calculation = new StructuresCalculation<HeightStructuresInput>();
             group.Children.Add(calculation);
 
-            HeightStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults2.First();
+            HeightStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First();
             result.Calculation = calculation;
 
             // Call
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0604fd1bdba349b0eba9442a16d3d00664b772aa -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 0604fd1bdba349b0eba9442a16d3d00664b772aa)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -163,7 +163,7 @@
 
             var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
-            Assert.AreSame(failureMechanism.SectionResults2, failureMechanismResultsContext.WrappedData);
+            Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
             var outputComment = (Comment) outputsFolder.Contents.ElementAt(2);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -ra493758b8df1196d55fc8e4552e271eafddbbefe -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision a493758b8df1196d55fc8e4552e271eafddbbefe)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -123,7 +123,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
@@ -148,7 +148,7 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
@@ -173,7 +173,7 @@
             });
             mocks.ReplayAll();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
@@ -193,7 +193,7 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, failureMechanism);
@@ -213,7 +213,7 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, 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.SectionResults2, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, failureMechanismContext);
@@ -253,7 +253,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults2, failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), assessmentSection);
 
@@ -276,7 +276,7 @@
             mocks.ReplayAll();
 
             var context = new ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(
-                failureMechanism.SectionResults2,
+                failureMechanism.SectionResults,
                 failureMechanism,
                 assessmentSection);
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs
===================================================================
diff -u -r0604fd1bdba349b0eba9442a16d3d00664b772aa -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision 0604fd1bdba349b0eba9442a16d3d00664b772aa)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -123,15 +123,15 @@
                 locationStructureToRemove,
                 new Point2D(1, 1)
             }));
-            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureToRemove = failureMechanism.SectionResults2.ElementAt(0);
+            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureToRemove = failureMechanism.SectionResults.ElementAt(0);
             sectionWithCalculationAtStructureToRemove.Calculation = calculationWithStructureToRemove;
 
             failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
                 new Point2D(1, 1),
                 locationStructureToKeep
             }));
-            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureToKeep = failureMechanism.SectionResults2.ElementAt(1);
+            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureToKeep = failureMechanism.SectionResults.ElementAt(1);
             sectionWithCalculationAtStructureToKeep.Calculation = calculationWithStructureToKeepAndOutput;
 
             // Call
@@ -231,15 +231,15 @@
                 locationStructureA,
                 new Point2D(1, 1)
             }));
-            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureA = failureMechanism.SectionResults2.ElementAt(0);
+            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureA = failureMechanism.SectionResults.ElementAt(0);
             sectionWithCalculationAtStructureA.Calculation = calculationWithStructureA;
 
             failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
                 new Point2D(1, 1),
                 locationStructureB
             }));
-            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureB = failureMechanism.SectionResults2.ElementAt(1);
+            HeightStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureB = failureMechanism.SectionResults.ElementAt(1);
             sectionWithCalculationAtStructureB.Calculation = calculationWithStructureBAndOutput;
 
             // Call
@@ -611,9 +611,9 @@
 
             failureMechanism.AddSection(section1);
             failureMechanism.AddSection(section2);
-            HeightStructuresFailureMechanismSectionResult result1 = failureMechanism.SectionResults2
+            HeightStructuresFailureMechanismSectionResult result1 = failureMechanism.SectionResults
                                                                                     .First(sr => ReferenceEquals(sr.Section, section1));
-            HeightStructuresFailureMechanismSectionResult result2 = failureMechanism.SectionResults2
+            HeightStructuresFailureMechanismSectionResult result2 = failureMechanism.SectionResults
                                                                                     .First(sr => ReferenceEquals(sr.Section, section2));
             result1.Calculation = calculation1;
             result2.Calculation = calculation2;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Util.Test/HeightStructuresHelperTest.cs
===================================================================
diff -u -rfd9e1dd4f143af493965eea4d564c087081fb7f7 -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Util.Test/HeightStructuresHelperTest.cs	(.../HeightStructuresHelperTest.cs)	(revision fd9e1dd4f143af493965eea4d564c087081fb7f7)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Util.Test/HeightStructuresHelperTest.cs	(.../HeightStructuresHelperTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
@@ -53,7 +53,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             failureMechanism.AddSection(CreateFailureMechanismSection(location));
 
-            HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults2.First();
+            HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.First();
             sectionResult.Calculation = CreateCalculation(location);
 
             // Call
@@ -81,7 +81,7 @@
             };
             failureMechanism.AddSection(CreateFailureMechanismSection(location));
 
-            HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults2.First();
+            HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.First();
             sectionResult.Calculation = CreateCalculation(location);
 
             // Call