Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r41d1274632ecac576d2295240be59c3855c1c36e -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs	(.../StandAloneFailureMechanismAssemblyFactory.cs)	(revision 41d1274632ecac576d2295240be59c3855c1c36e)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs	(.../StandAloneFailureMechanismAssemblyFactory.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -76,7 +76,7 @@
         /// <exception cref="AssemblyException">Thrown when the failure mechanism cannot be assembled.</exception>
         public static double AssembleFailureMechanism<TFailureMechanism>(TFailureMechanism failureMechanism,
                                                                          IAssessmentSection assessmentSection)
-            where TFailureMechanism : IHasGeneralInput, IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
+            where TFailureMechanism : IHasGeneralInput, IHasSectionResults<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
         {
             if (failureMechanism == null)
             {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs
===================================================================
diff -u -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77 -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs	(.../AssessmentSectionResultObserver.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs	(.../AssessmentSectionResultObserver.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -188,7 +188,7 @@
         }
 
         private Observer CreateCalculatableFailureMechanismObserver<TFailureMechanism, TSectionResult, TCalculation>(TFailureMechanism failureMechanism)
-            where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
+            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>, ICalculatableFailureMechanism
             where TSectionResult : FailureMechanismSectionResult
             where TCalculation : ICalculation<ICalculationInput>
         {
@@ -200,7 +200,7 @@
         }
 
         private Observer CreateFailureMechanismObserver<TFailureMechanism, TSectionResult>(TFailureMechanism failureMechanism)
-            where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>
             where TSectionResult : FailureMechanismSectionResult
         {
             return new Observer(NotifyObservers)
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -r42bab853d615b667284416929f32f2fe228dd1c0 -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 42bab853d615b667284416929f32f2fe228dd1c0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -318,7 +318,7 @@
         }
 
         private FailureMechanismAssemblyResultRow CreateStandAloneFailureMechanismAssemblyResultRow<TFailureMechanism>(TFailureMechanism failureMechanism)
-            where TFailureMechanism : IHasGeneralInput, IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
+            where TFailureMechanism : IHasGeneralInput, IHasSectionResults<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
         {
             return new FailureMechanismAssemblyResultRow(failureMechanism, () => StandAloneFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, AssessmentSection));
         }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/StandAloneFailureMechanismView.cs
===================================================================
diff -u -r826ed5d86e04dbf6e830afa9bcf14b2b2619b10f -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/StandAloneFailureMechanismView.cs	(.../StandAloneFailureMechanismView.cs)	(revision 826ed5d86e04dbf6e830afa9bcf14b2b2619b10f)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/StandAloneFailureMechanismView.cs	(.../StandAloneFailureMechanismView.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -37,7 +37,7 @@
     /// This class is a view showing map data for a stand alone failure mechanism.
     /// </summary>
     public partial class StandAloneFailureMechanismView<TFailureMechanism, TSectionResult> : UserControl, IMapView
-        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+        where TFailureMechanism : IHasSectionResults<TSectionResult>
         where TSectionResult : FailureMechanismSectionResult
     {
         private readonly Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc;
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r649c00f8c201652de091dcd9f7ac0e15bdbe0ae5 -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 649c00f8c201652de091dcd9f7ac0e15bdbe0ae5)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -1077,7 +1077,7 @@
         private ViewInfo<TContext, IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>, NonAdoptableFailureMechanismResultView<TFailureMechanism>> CreateFailureMechanismResultViewInfo<TContext, TFailureMechanism>(
             Func<TFailureMechanism, double> getNFunc)
             where TContext : FailureMechanismSectionResultContext<NonAdoptableFailureMechanismSectionResult>
-            where TFailureMechanism : class, IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>
+            where TFailureMechanism : class, IHasSectionResults<NonAdoptableFailureMechanismSectionResult>
         {
             return new RiskeerViewInfo<
                 TContext,
@@ -1096,7 +1096,7 @@
         private ViewInfo<TContext, IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>, NonAdoptableWithProfileProbabilityFailureMechanismResultView<TFailureMechanism>> CreateFailureMechanismResultViewInfo<TContext, TFailureMechanism>(
             Func<TFailureMechanism, double> getNFunc, Func<TFailureMechanism, bool> getUseLengthEffectFunc)
             where TContext : FailureMechanismSectionResultContext<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
-            where TFailureMechanism : class, IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>, IHasGeneralInput
+            where TFailureMechanism : class, IHasSectionResults<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>, IHasGeneralInput
         {
             return new RiskeerViewInfo<
                 TContext,
@@ -1406,7 +1406,7 @@
         private ViewInfo<TFailureMechanismContext, TFailureMechanism, StandAloneFailureMechanismView<TFailureMechanism, TSectionResult>> CreateFailureMechanismWithDetailedAssessmentViewInfo<
             TFailureMechanismContext, TFailureMechanism, TSectionResult>(Func<TFailureMechanismContext, TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
             where TSectionResult : FailureMechanismSectionResult
-            where TFailureMechanism : FailureMechanismBase, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+            where TFailureMechanism : FailureMechanismBase, IHasSectionResults<TSectionResult>
             where TFailureMechanismContext : IFailurePathContext<TFailureMechanism>
         {
             return new RiskeerViewInfo<TFailureMechanismContext, TFailureMechanism,
@@ -1425,7 +1425,7 @@
         #region FailureMechanismResults ViewInfo
 
         private static bool CloseFailureMechanismResultViewForData<TFailureMechanism, TSectionResult, TView, TSectionResultRow>(TView view, object dataToCloseFor)
-            where TFailureMechanism : class, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+            where TFailureMechanism : class, IHasSectionResults<TSectionResult>
             where TSectionResult : FailureMechanismSectionResult
             where TSectionResultRow : FailureMechanismSectionResultRow<TSectionResult>
             where TView : FailureMechanismResultView<TSectionResult, TSectionResultRow, TFailureMechanism>
Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs
===================================================================
diff -u -r53efeb708a381dbd9de0fee0b9474b2502fe13b0 -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs	(.../RiskeerDataSynchronizationService.cs)	(revision 53efeb708a381dbd9de0fee0b9474b2502fe13b0)
+++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs	(.../RiskeerDataSynchronizationService.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -829,7 +829,7 @@
             removedObjects.AddRange(failureMechanism.Sections);
             changedObjects.Add(failureMechanism);
 
-            if (failureMechanism is IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult> failureMechanismWithSectionResults)
+            if (failureMechanism is IHasSectionResults<FailureMechanismSectionResult> failureMechanismWithSectionResults)
             {
                 removedObjects.AddRange(failureMechanismWithSectionResults.SectionResults);
                 changedObjects.Add(failureMechanismWithSectionResults.SectionResults);
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs
===================================================================
diff -u -r1631c3a4dbe0722d58d5e2cf906ff65bf2510250 -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs	(.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs)	(revision 1631c3a4dbe0722d58d5e2cf906ff65bf2510250)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs	(.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -121,7 +121,7 @@
                     });
 
                 // Assert
-                IObservableEnumerable<FailureMechanismSectionResult> failureMechanismSectionResults = ((IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>) failureMechanismInAssembly).SectionResults;
+                IObservableEnumerable<FailureMechanismSectionResult> failureMechanismSectionResults = ((IHasSectionResults<FailureMechanismSectionResult>) failureMechanismInAssembly).SectionResults;
                 AssertSections(failureMechanismSectionResults, inputs.Single());
             }
         }
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactoryTest.cs	(.../StandAloneFailureMechanismAssemblyFactoryTest.cs)	(revision 6257662de18fbfde1fa3285f82648f2798cdc511)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactoryTest.cs	(.../StandAloneFailureMechanismAssemblyFactoryTest.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -47,7 +47,7 @@
     public class StandAloneFailureMechanismAssemblyFactoryTest
     {
         private class TestFailureMechanism : FailureMechanismBase,
-                                             IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>,
+                                             IHasSectionResults<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>,
                                              IHasGeneralInput
         {
             private readonly ObservableList<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> sectionResults;
@@ -59,7 +59,6 @@
             }
 
             public override IEnumerable<ICalculation> Calculations { get; }
-            public IObservableEnumerable<FailureMechanismSectionResultOld> SectionResultsOld { get; }
 
             public IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> SectionResults => sectionResults;
 
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/StandAloneFailureMechanismViewTest.cs
===================================================================
diff -u -r826ed5d86e04dbf6e830afa9bcf14b2b2619b10f -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/StandAloneFailureMechanismViewTest.cs	(.../StandAloneFailureMechanismViewTest.cs)	(revision 826ed5d86e04dbf6e830afa9bcf14b2b2619b10f)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/StandAloneFailureMechanismViewTest.cs	(.../StandAloneFailureMechanismViewTest.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -66,7 +66,7 @@
             var assessmentSection = new AssessmentSectionStub();
 
             // Call
-            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view = CreateView(failureMechanism, assessmentSection))
+            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult> view = CreateView(failureMechanism, assessmentSection))
             {
                 // Assert
                 Assert.IsInstanceOf<UserControl>(view);
@@ -92,7 +92,7 @@
             mocks.ReplayAll();
 
             // Call
-            void Call() => new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+            void Call() => new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult>(
                 null, assessmentSection, sr => null);
 
             // Assert
@@ -106,11 +106,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
-            void Call() => new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+            void Call() => new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult>(
                 failureMechanism, null, sr => null);
 
             // Assert
@@ -124,12 +124,12 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             // Call
-            void Call() => new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+            void Call() => new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult>(
                 failureMechanism, assessmentSection, null);
 
             // Assert
@@ -145,7 +145,7 @@
             IAssessmentSection assessmentSection = new AssessmentSectionStub();
 
             // Call
-            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
                    CreateView(new TestFailureMechanism(), assessmentSection))
             {
                 // Assert
@@ -195,7 +195,7 @@
                 random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
             // Call
-            using (var view = new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+            using (var view = new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult>(
                        failureMechanism, assessmentSection, sr => failureMechanismSectionAssemblyResult))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
@@ -235,7 +235,7 @@
                 ReferenceLine = referenceLine
             };
 
-            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
                    CreateView(new TestFailureMechanism(), assessmentSection))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
@@ -276,7 +276,7 @@
                 ReferenceLine = referenceLine
             };
 
-            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
                    CreateView(new TestFailureMechanism(), assessmentSection))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
@@ -311,7 +311,7 @@
             // Setup
             var failureMechanism = new TestFailureMechanism();
 
-            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
                    CreateView(failureMechanism, new AssessmentSectionStub()))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
@@ -359,7 +359,7 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new TestFailureMechanism();
 
-            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+            using (StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
                    CreateView(failureMechanism, assessmentSection))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
@@ -412,11 +412,11 @@
             }
         }
 
-        private static StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> CreateView(
-            IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult> failureMechanism,
+        private static StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult> CreateView(
+            IHasSectionResults<FailureMechanismSectionResult> failureMechanism,
             IAssessmentSection assessmentSection)
         {
-            return new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+            return new StandAloneFailureMechanismView<IHasSectionResults<FailureMechanismSectionResult>, FailureMechanismSectionResult>(
                 failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult());
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -r53efeb708a381dbd9de0fee0b9474b2502fe13b0 -r09486786d73dcf29f225c4aad4a3ac89ca44d21a
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 53efeb708a381dbd9de0fee0b9474b2502fe13b0)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
@@ -1958,7 +1958,7 @@
         }
 
         private static IEnumerable<object> GetExpectedRemovedObjectsWhenClearingReferenceLine<T>(T failureMechanism)
-            where T : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>
+            where T : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResult>
         {
             foreach (FailureMechanismSection section in failureMechanism.Sections)
             {