Index: Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs
===================================================================
diff -u -rac85d678e1c2819bd1b14b6bdbc12b8e2cdf1493 -r35b32be33e977a44b4e8268beeda8ee0afde66b1
--- Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs	(.../RiskeerUpdateInfoFactory.cs)	(revision ac85d678e1c2819bd1b14b6bdbc12b8e2cdf1493)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs	(.../RiskeerUpdateInfoFactory.cs)	(revision 35b32be33e977a44b4e8268beeda8ee0afde66b1)
@@ -53,7 +53,7 @@
         public static UpdateInfo<TSectionContext> CreateFailureMechanismSectionsUpdateInfo<TSectionContext, TFailureMechanism, TSectionResult>(
             IFailureMechanismSectionResultUpdateStrategy<TSectionResult> sectionResultUpdateStrategy)
             where TSectionContext : FailureMechanismSectionsContext
-            where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+            where TFailureMechanism : IHasSectionResults<TSectionResult>
             where TSectionResult : FailureMechanismSectionResult
         {
             if (sectionResultUpdateStrategy == null)
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs
===================================================================
diff -u -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993 -r35b32be33e977a44b4e8268beeda8ee0afde66b1
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs	(.../NonAdoptableFailureMechanismResultView.cs)	(revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs	(.../NonAdoptableFailureMechanismResultView.cs)	(revision 35b32be33e977a44b4e8268beeda8ee0afde66b1)
@@ -33,7 +33,7 @@
     /// </summary>
     /// <typeparam name="TFailureMechanism">The type of failure mechanism.</typeparam>
     public class NonAdoptableFailureMechanismResultView<TFailureMechanism> : FailureMechanismResultView<NonAdoptableFailureMechanismSectionResult, NonAdoptableFailureMechanismSectionResultRow, TFailureMechanism>
-        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>
+        where TFailureMechanism : IHasSectionResults<NonAdoptableFailureMechanismSectionResult>
     {
         private const int initialFailureMechanismResultTypeIndex = 2;
         private const int initialFailureMechanismResultSectionProbabilityIndex = 3;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs
===================================================================
diff -u -r4d01c6478afe814f57b87cfd5948a2722930afc4 -r35b32be33e977a44b4e8268beeda8ee0afde66b1
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs)	(revision 4d01c6478afe814f57b87cfd5948a2722930afc4)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs)	(revision 35b32be33e977a44b4e8268beeda8ee0afde66b1)
@@ -33,7 +33,7 @@
     /// </summary>
     /// <typeparam name="TFailureMechanism">The type of failure mechanism.</typeparam>
     public class NonAdoptableWithProfileProbabilityFailureMechanismResultView<TFailureMechanism> : FailureMechanismResultView<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRow, TFailureMechanism>
-        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
+        where TFailureMechanism : IHasSectionResults<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
     {
         private const int initialFailureMechanismResultTypeIndex = 2;
         private const int initialFailureMechanismResultProfileProbabilityIndex = 3;
Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs
===================================================================
diff -u -r75d9aa3f5d93ff0b6f4b725c5c3731277b0dcb29 -r35b32be33e977a44b4e8268beeda8ee0afde66b1
--- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs	(.../FailureMechanismSectionReplaceStrategy.cs)	(revision 75d9aa3f5d93ff0b6f4b725c5c3731277b0dcb29)
+++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs	(.../FailureMechanismSectionReplaceStrategy.cs)	(revision 35b32be33e977a44b4e8268beeda8ee0afde66b1)
@@ -77,7 +77,7 @@
                 throw new UpdateDataException(e.Message, e);
             }
 
-            if (failurePath is IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult> hasSectionResults)
+            if (failurePath is IHasSectionResults<FailureMechanismSectionResult> hasSectionResults)
             {
                 affectedObjects.Add(hasSectionResults.SectionResults);
             }
Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs
===================================================================
diff -u -r9467c0d784b05ccb42803f38d5952fc5819bffa2 -r35b32be33e977a44b4e8268beeda8ee0afde66b1
--- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs	(.../FailureMechanismSectionUpdateStrategy.cs)	(revision 9467c0d784b05ccb42803f38d5952fc5819bffa2)
+++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs	(.../FailureMechanismSectionUpdateStrategy.cs)	(revision 35b32be33e977a44b4e8268beeda8ee0afde66b1)
@@ -36,7 +36,7 @@
     public class FailureMechanismSectionUpdateStrategy<T> : IFailureMechanismSectionUpdateStrategy
         where T : FailureMechanismSectionResult
     {
-        private readonly IHasSectionResults<FailureMechanismSectionResultOld, T> failureMechanism;
+        private readonly IHasSectionResults<T> failureMechanism;
         private readonly IFailureMechanismSectionResultUpdateStrategy<T> sectionResultUpdateStrategy;
 
         /// <summary>
@@ -46,7 +46,7 @@
         /// <param name="sectionResultUpdateStrategy">The <see cref="IFailureMechanismSectionResultUpdateStrategy{T}"/> to use when updating
         /// the section results.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public FailureMechanismSectionUpdateStrategy(IHasSectionResults<FailureMechanismSectionResultOld, T> failureMechanism,
+        public FailureMechanismSectionUpdateStrategy(IHasSectionResults<T> failureMechanism,
                                                      IFailureMechanismSectionResultUpdateStrategy<T> sectionResultUpdateStrategy)
         {
             if (failureMechanism == null)