Index: Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs
===================================================================
diff -u -r42e20ff940bd2953e4abdb72b0c941bcc299c948 -r1b062cc4b3f0dd11defb95dd7ad5689a595274db
--- Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs	(.../RiskeerUpdateInfoFactory.cs)	(revision 42e20ff940bd2953e4abdb72b0c941bcc299c948)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs	(.../RiskeerUpdateInfoFactory.cs)	(revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db)
@@ -53,8 +53,8 @@
         public static UpdateInfo<TSectionContext> CreateFailureMechanismSectionsUpdateInfo<TSectionContext, TFailureMechanism, TSectionResult>(
             IFailureMechanismSectionResultUpdateStrategy<TSectionResult> sectionResultUpdateStrategy)
             where TSectionContext : FailureMechanismSectionsContext
-            where TFailureMechanism : IHasSectionResults<TSectionResult>
-            where TSectionResult : FailureMechanismSectionResultOld
+            where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+            where TSectionResult : FailureMechanismSectionResult
         {
             if (sectionResultUpdateStrategy == null)
             {
Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs
===================================================================
diff -u -r2035786ca034f059219f62857f44079715664b42 -r1b062cc4b3f0dd11defb95dd7ad5689a595274db
--- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs	(.../FailureMechanismSectionUpdateStrategy.cs)	(revision 2035786ca034f059219f62857f44079715664b42)
+++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs	(.../FailureMechanismSectionUpdateStrategy.cs)	(revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db)
@@ -34,9 +34,9 @@
     /// </summary>
     /// <typeparam name="T">The type of <see cref="FailureMechanismSectionResultOld"/> that will be updated.</typeparam>
     public class FailureMechanismSectionUpdateStrategy<T> : IFailureMechanismSectionUpdateStrategy
-        where T : FailureMechanismSectionResultOld
+        where T : FailureMechanismSectionResult
     {
-        private readonly IHasSectionResults<T> failureMechanism;
+        private readonly IHasSectionResults<FailureMechanismSectionResultOld, 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<T> failureMechanism,
+        public FailureMechanismSectionUpdateStrategy(IHasSectionResults<FailureMechanismSectionResultOld, T> failureMechanism,
                                                      IFailureMechanismSectionResultUpdateStrategy<T> sectionResultUpdateStrategy)
         {
             if (failureMechanism == null)
@@ -76,7 +76,7 @@
                 throw new ArgumentNullException(nameof(sourcePath));
             }
 
-            T[] oldSectionResults = failureMechanism.SectionResultsOld.ToArray();
+            T[] oldSectionResults = failureMechanism.SectionResults.ToArray();
 
             try
             {
@@ -87,21 +87,21 @@
                 throw new UpdateDataException(e.Message, e);
             }
 
-            foreach (T sectionResult in failureMechanism.SectionResultsOld)
+            foreach (T sectionResult in failureMechanism.SectionResults)
             {
                 T equalSection = oldSectionResults.FirstOrDefault(item => item.Section.StartPoint.Equals(sectionResult.Section.StartPoint)
                                                                           && item.Section.EndPoint.Equals(sectionResult.Section.EndPoint));
 
                 if (equalSection != null)
                 {
-                    sectionResultUpdateStrategy.UpdateSectionResultOld(equalSection, sectionResult);
+                    sectionResultUpdateStrategy.UpdateSectionResult(equalSection, sectionResult);
                 }
             }
 
             return new IObservable[]
             {
                 failureMechanism,
-                failureMechanism.SectionResultsOld
+                failureMechanism.SectionResults
             };
         }
 
@@ -111,14 +111,14 @@
             yield break;
         }
     }
-    
+
     /// <summary>
     /// An <see cref="IFailureMechanismSectionUpdateStrategy"/> that can be used to update failure mechanism sections with
     /// imported failure mechanism sections.
     /// </summary>
     /// <typeparam name="TOld">The type of <see cref="FailureMechanismSectionResultOld"/> that will be updated.</typeparam>
     /// <typeparam name="TNew">The type of <see cref="FailureMechanismSectionResult"/> that will be updated.</typeparam>
-    public class FailureMechanismSectionUpdateStrategy<TOld, TNew> : FailureMechanismSectionUpdateStrategy<TOld>
+    public class FailureMechanismSectionUpdateStrategy<TOld, TNew> : FailureMechanismSectionUpdateStrategy<TNew>
         where TOld : FailureMechanismSectionResultOld
         where TNew : FailureMechanismSectionResult
     {
@@ -133,7 +133,7 @@
         /// the section results.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public FailureMechanismSectionUpdateStrategy(IHasSectionResults<TOld, TNew> failureMechanism,
-                                                     IFailureMechanismSectionResultUpdateStrategy<TOld, TNew> sectionResultUpdateStrategy) 
+                                                     IFailureMechanismSectionResultUpdateStrategy<TOld, TNew> sectionResultUpdateStrategy)
             : base(failureMechanism, sectionResultUpdateStrategy)
         {
             this.failureMechanism = failureMechanism;
@@ -142,21 +142,21 @@
 
         public override IEnumerable<IObservable> UpdateSectionsWithImportedData(IEnumerable<FailureMechanismSection> importedFailureMechanismSections, string sourcePath)
         {
-            TNew[] oldSectionResults = failureMechanism.SectionResults.ToArray();
+            TOld[] oldSectionResults = failureMechanism.SectionResultsOld.ToArray();
             List<IObservable> affectedObjects = base.UpdateSectionsWithImportedData(importedFailureMechanismSections, sourcePath).ToList();
-            
-            foreach (TNew sectionResult in failureMechanism.SectionResults)
+
+            foreach (TOld sectionResult in failureMechanism.SectionResultsOld)
             {
-                TNew equalSection = oldSectionResults.FirstOrDefault(item => item.Section.StartPoint.Equals(sectionResult.Section.StartPoint)
+                TOld equalSection = oldSectionResults.FirstOrDefault(item => item.Section.StartPoint.Equals(sectionResult.Section.StartPoint)
                                                                              && item.Section.EndPoint.Equals(sectionResult.Section.EndPoint));
 
                 if (equalSection != null)
                 {
-                    sectionResultUpdateStrategy.UpdateSectionResult(equalSection, sectionResult);
+                    sectionResultUpdateStrategy.UpdateSectionResultOld(equalSection, sectionResult);
                 }
             }
-            
-            affectedObjects.Add(failureMechanism.SectionResults);
+
+            affectedObjects.Add(failureMechanism.SectionResultsOld);
             return affectedObjects;
         }
     }
Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/IFailureMechanismSectionResultUpdateStrategy.cs
===================================================================
diff -u -r56c9ad888a22dc3b6695bf3928177aaf15754786 -r1b062cc4b3f0dd11defb95dd7ad5689a595274db
--- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/IFailureMechanismSectionResultUpdateStrategy.cs	(.../IFailureMechanismSectionResultUpdateStrategy.cs)	(revision 56c9ad888a22dc3b6695bf3928177aaf15754786)
+++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/IFailureMechanismSectionResultUpdateStrategy.cs	(.../IFailureMechanismSectionResultUpdateStrategy.cs)	(revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db)
@@ -25,12 +25,12 @@
 namespace Riskeer.Common.IO.FileImporters
 {
     /// <summary>
-    /// Interface describing the method of updating instances of <see cref="FailureMechanismSectionResultOld"/> derivatives
+    /// Interface describing the method of updating instances of <see cref="FailureMechanismSectionResult"/> derivatives
     /// with data from another instance.
     /// </summary>
     /// <typeparam name="T">The type of <see cref="FailureMechanismSectionResultOld"/> that will be updated.</typeparam>
     public interface IFailureMechanismSectionResultUpdateStrategy<in T>
-        where T : FailureMechanismSectionResultOld
+        where T : FailureMechanismSectionResult
     {
         /// <summary>
         /// Updates the <paramref name="target"/> object with the registered result
@@ -39,16 +39,16 @@
         /// <param name="origin">The object to get the data from that will be put on <paramref name="target"/>.</param>
         /// <param name="target">The object to update with data from <paramref name="origin"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        void UpdateSectionResultOld(T origin, T target);
+        void UpdateSectionResult(T origin, T target);
     }
 
     /// <summary>
-    /// Interface describing the method of updating instances of <see cref="FailureMechanismSectionResult"/> derivatives
+    /// Interface describing the method of updating instances of <see cref="FailureMechanismSectionResultOld"/> derivatives
     /// with data from another instance.
     /// </summary>
     /// <typeparam name="TOld">The type of <see cref="FailureMechanismSectionResultOld"/> that will be updated.</typeparam>
     /// <typeparam name="TNew">The type of <see cref="FailureMechanismSectionResult"/> that will be updated.</typeparam>
-    public interface IFailureMechanismSectionResultUpdateStrategy<in TOld, in TNew> : IFailureMechanismSectionResultUpdateStrategy<TOld>
+    public interface IFailureMechanismSectionResultUpdateStrategy<in TOld, in TNew> : IFailureMechanismSectionResultUpdateStrategy<TNew>
         where TOld : FailureMechanismSectionResultOld
         where TNew : FailureMechanismSectionResult
     {
@@ -59,6 +59,6 @@
         /// <param name="origin">The object to get the data from that will be put on <paramref name="target"/>.</param>
         /// <param name="target">The object to update with data from <paramref name="origin"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        void UpdateSectionResult(TNew origin, TNew target);
+        void UpdateSectionResultOld(TOld origin, TOld target);
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/UpdateInfos/RiskeerUpdateInfoFactoryTest.cs
===================================================================
diff -u -r42e20ff940bd2953e4abdb72b0c941bcc299c948 -r1b062cc4b3f0dd11defb95dd7ad5689a595274db
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/UpdateInfos/RiskeerUpdateInfoFactoryTest.cs	(.../RiskeerUpdateInfoFactoryTest.cs)	(revision 42e20ff940bd2953e4abdb72b0c941bcc299c948)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/UpdateInfos/RiskeerUpdateInfoFactoryTest.cs	(.../RiskeerUpdateInfoFactoryTest.cs)	(revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db)
@@ -44,7 +44,7 @@
         {
             // Call
             void Call() => RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld>(null);
+                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResult>(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -56,14 +56,14 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine());
             mocks.ReplayAll();
 
             // Call
             UpdateInfo<FailureMechanismSectionsContext> updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld>(sectionResultUpdateStrategy);
+                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResult>(sectionResultUpdateStrategy);
 
             // Assert
             Assert.AreEqual("Vakindeling", updateInfo.Name);
@@ -83,14 +83,14 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine());
             mocks.ReplayAll();
 
             // Call
             UpdateInfo<FailureMechanismSectionsContext> updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld>(sectionResultUpdateStrategy);
+                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResult>(sectionResultUpdateStrategy);
 
             // Assert
             var failureMechanismSectionsContext = new FailureMechanismSectionsContext(new TestFailureMechanism(), assessmentSection);
@@ -104,14 +104,14 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine());
             mocks.ReplayAll();
 
             // Call
             UpdateInfo<FailureMechanismSectionsContext> updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld>(sectionResultUpdateStrategy);
+                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResult>(sectionResultUpdateStrategy);
 
             // Assert
             var testFailureMechanism = new TestFailureMechanism();
@@ -126,14 +126,14 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine());
             mocks.ReplayAll();
 
             // Call
             UpdateInfo<FailureMechanismSectionsContext> updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld>(sectionResultUpdateStrategy);
+                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResult>(sectionResultUpdateStrategy);
 
             // Assert
             var testFailureMechanism = new TestFailureMechanism();
@@ -149,14 +149,14 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine());
             mocks.ReplayAll();
 
             // Call
             UpdateInfo<FailureMechanismSectionsContext> updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld>(sectionResultUpdateStrategy);
+                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResult>(sectionResultUpdateStrategy);
 
             // Assert
             var failureMechanismSectionsContext = new FailureMechanismSectionsContext(new TestFailureMechanism(), assessmentSection);
@@ -169,14 +169,14 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine());
             mocks.ReplayAll();
 
             // Call
             UpdateInfo<FailureMechanismSectionsContext> updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld>(sectionResultUpdateStrategy);
+                FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResult>(sectionResultUpdateStrategy);
 
             // Assert
             var failureMechanismSectionsContext = new FailureMechanismSectionsContext(new TestFailureMechanism(), assessmentSection);
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs
===================================================================
diff -u -r2035786ca034f059219f62857f44079715664b42 -r1b062cc4b3f0dd11defb95dd7ad5689a595274db
--- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs	(.../FailureMechanismSectionUpdateStrategyTest.cs)	(revision 2035786ca034f059219f62857f44079715664b42)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs	(.../FailureMechanismSectionUpdateStrategyTest.cs)	(revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db)
@@ -44,11 +44,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResultOld>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
-            void Call() => new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResultOld>(null, sectionResultUpdateStrategy);
+            void Call() => new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResult>(null, sectionResultUpdateStrategy);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -61,11 +61,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
-            void Call() => new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResultOld>(failureMechanism, null);
+            void Call() => new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResult>(failureMechanism, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -77,12 +77,12 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld>>();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResultOld>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
-            var importer = new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResultOld>(failureMechanism, sectionResultUpdateStrategy);
+            var importer = new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResult>(failureMechanism, sectionResultUpdateStrategy);
 
             // Assert
             Assert.IsInstanceOf<IFailureMechanismSectionUpdateStrategy>(importer);
@@ -94,12 +94,12 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld>>();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResultOld>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
-            void Call() => new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResultOld>(failureMechanism, sectionResultUpdateStrategy).UpdateSectionsWithImportedData(null, "");
+            void Call() => new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResult>(failureMechanism, sectionResultUpdateStrategy).UpdateSectionsWithImportedData(null, "");
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -112,11 +112,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld>>();
-            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResultOld>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
-            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResultOld>(failureMechanism, sectionResultUpdateStrategy);
+            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<TestFailureMechanismSectionResult>(failureMechanism, sectionResultUpdateStrategy);
 
             // Call
             void Call() => failureMechanismSectionUpdateStrategy.UpdateSectionsWithImportedData(Enumerable.Empty<FailureMechanismSection>(), null);
@@ -150,11 +150,11 @@
                 failureMechanismSection2
             }, sourcePath);
 
-            IObservableEnumerable<FailureMechanismSectionResultOld> failureMechanismSectionResults = failureMechanism.SectionResultsOld;
-            FailureMechanismSectionResultOld oldSectionResult = failureMechanismSectionResults.First();
+            IObservableEnumerable<FailureMechanismSectionResult> failureMechanismSectionResults = failureMechanism.SectionResults;
+            FailureMechanismSectionResult oldSectionResult = failureMechanismSectionResults.First();
 
             var sectionResultUpdateStrategy = new TestUpdateFailureMechanismSectionResultUpdateStrategyOld();
-            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResultOld>(failureMechanism, sectionResultUpdateStrategy);
+            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResult>(failureMechanism, sectionResultUpdateStrategy);
 
             FailureMechanismSection[] sections =
             {
@@ -179,12 +179,12 @@
             IEnumerable<FailureMechanismSection> failureMechanismSections = failureMechanism.Sections;
             Assert.AreEqual(2, failureMechanismSections.Count());
             CollectionAssert.AreEqual(sections, failureMechanismSections);
-            Assert.AreSame(oldSectionResult, sectionResultUpdateStrategy.OriginOld);
-            Assert.AreSame(failureMechanismSectionResults.First(), sectionResultUpdateStrategy.TargetOld);
+            Assert.AreSame(oldSectionResult, sectionResultUpdateStrategy.Origin);
+            Assert.AreSame(failureMechanismSectionResults.First(), sectionResultUpdateStrategy.Target);
             CollectionAssert.AreEqual(new IObservable[]
             {
                 failureMechanism,
-                failureMechanism.SectionResultsOld
+                failureMechanism.SectionResults
             }, affectedObjects);
         }
 
@@ -207,7 +207,7 @@
             });
 
             var sectionResultUpdateStrategy = new TestUpdateFailureMechanismSectionResultUpdateStrategyOld();
-            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResultOld>(failureMechanism, sectionResultUpdateStrategy);
+            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResult>(failureMechanism, sectionResultUpdateStrategy);
 
             FailureMechanismSection[] sections =
             {
@@ -239,7 +239,7 @@
             }, oldSourcePath);
 
             var sectionResultUpdateStrategy = new TestUpdateFailureMechanismSectionResultUpdateStrategyOld();
-            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResultOld>(
+            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResult>(
                 failureMechanism, sectionResultUpdateStrategy);
 
             // Precondition
@@ -269,7 +269,7 @@
             var failureMechanism = new TestFailureMechanism();
 
             var sectionResultUpdateStrategy = new TestUpdateFailureMechanismSectionResultUpdateStrategyOld();
-            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResultOld>(
+            var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResult>(
                 failureMechanism, sectionResultUpdateStrategy);
 
             // Call
@@ -279,17 +279,17 @@
             CollectionAssert.IsEmpty(affectedObjects);
         }
 
-        private class TestUpdateFailureMechanismSectionResultUpdateStrategyOld : IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld>
+        private class TestUpdateFailureMechanismSectionResultUpdateStrategyOld : IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResult>
         {
             public bool UpdatedOld { get; private set; }
-            public FailureMechanismSectionResultOld OriginOld { get; private set; }
-            public FailureMechanismSectionResultOld TargetOld { get; private set; }
+            public FailureMechanismSectionResult Origin { get; private set; }
+            public FailureMechanismSectionResult Target { get; private set; }
 
-            public void UpdateSectionResultOld(FailureMechanismSectionResultOld origin, FailureMechanismSectionResultOld target)
+            public void UpdateSectionResult(FailureMechanismSectionResult origin, FailureMechanismSectionResult target)
             {
                 UpdatedOld = true;
-                OriginOld = origin;
-                TargetOld = target;
+                Origin = origin;
+                Target = target;
             }
         }
 
@@ -311,7 +311,7 @@
                 failureMechanism, sectionResultUpdateStrategy);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResultOld>>(importer);
+            Assert.IsInstanceOf<FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResult>>(importer);
             mocks.VerifyAll();
         }
 
@@ -338,8 +338,8 @@
                 failureMechanismSection2
             }, sourcePath);
 
-            IObservableEnumerable<FailureMechanismSectionResult> failureMechanismSectionResults = failureMechanism.SectionResults;
-            FailureMechanismSectionResult oldSectionResult = failureMechanismSectionResults.First();
+            IObservableEnumerable<FailureMechanismSectionResultOld> failureMechanismSectionResults = failureMechanism.SectionResultsOld;
+            FailureMechanismSectionResultOld oldSectionResult = failureMechanismSectionResults.First();
 
             var sectionResultUpdateStrategy = new TestUpdateFailureMechanismSectionResultUpdateStrategy();
             var failureMechanismSectionUpdateStrategy = new FailureMechanismSectionUpdateStrategy<FailureMechanismSectionResultOld, FailureMechanismSectionResult>(
@@ -368,25 +368,25 @@
             IEnumerable<FailureMechanismSection> failureMechanismSections = failureMechanism.Sections;
             Assert.AreEqual(2, failureMechanismSections.Count());
             CollectionAssert.AreEqual(sections, failureMechanismSections);
-            Assert.AreSame(oldSectionResult, sectionResultUpdateStrategy.Origin);
-            Assert.AreSame(failureMechanismSectionResults.First(), sectionResultUpdateStrategy.Target);
+            Assert.AreSame(oldSectionResult, sectionResultUpdateStrategy.OriginOld);
+            Assert.AreSame(failureMechanismSectionResults.First(), sectionResultUpdateStrategy.TargetOld);
             CollectionAssert.AreEqual(new IObservable[]
             {
                 failureMechanism,
-                failureMechanism.SectionResultsOld,
-                failureMechanism.SectionResults
+                failureMechanism.SectionResults,
+                failureMechanism.SectionResultsOld
             }, affectedObjects);
         }
 
         private class TestUpdateFailureMechanismSectionResultUpdateStrategy : TestUpdateFailureMechanismSectionResultUpdateStrategyOld, IFailureMechanismSectionResultUpdateStrategy<FailureMechanismSectionResultOld, FailureMechanismSectionResult>
         {
-            public FailureMechanismSectionResult Origin { get; private set; }
-            public FailureMechanismSectionResult Target { get; private set; }
+            public FailureMechanismSectionResultOld OriginOld { get; private set; }
+            public FailureMechanismSectionResultOld TargetOld { get; private set; }
 
-            public void UpdateSectionResult(FailureMechanismSectionResult origin, FailureMechanismSectionResult target)
+            public void UpdateSectionResultOld(FailureMechanismSectionResultOld origin, FailureMechanismSectionResultOld target)
             {
-                Origin = origin;
-                Target = target;
+                OriginOld = origin;
+                TargetOld = target;
             }
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FileImporters/FailureMechanismSectionResultUpdateStrategyTestFixture.cs
===================================================================
diff -u -r56c9ad888a22dc3b6695bf3928177aaf15754786 -r1b062cc4b3f0dd11defb95dd7ad5689a595274db
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FileImporters/FailureMechanismSectionResultUpdateStrategyTestFixture.cs	(.../FailureMechanismSectionResultUpdateStrategyTestFixture.cs)	(revision 56c9ad888a22dc3b6695bf3928177aaf15754786)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FileImporters/FailureMechanismSectionResultUpdateStrategyTestFixture.cs	(.../FailureMechanismSectionResultUpdateStrategyTestFixture.cs)	(revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db)
@@ -33,7 +33,7 @@
     /// <typeparam name="TSectionResult">The type of the failure mechanism section result the update strategy uses.</typeparam>
     public abstract class FailureMechanismSectionResultUpdateStrategyTestFixture<TUpdateStrategy, TSectionResult>
         where TUpdateStrategy : IFailureMechanismSectionResultUpdateStrategy<TSectionResult>, new()
-        where TSectionResult : FailureMechanismSectionResultOld
+        where TSectionResult : FailureMechanismSectionResult
     {
         [Test]
         public virtual void Constructor_ExpectedValues()
@@ -52,7 +52,7 @@
             var strategy = new TUpdateStrategy();
 
             // Call
-            void Call() => strategy.UpdateSectionResultOld(null, CreateEmptySectionResultOld());
+            void Call() => strategy.UpdateSectionResult(null, CreateEmptySectionResult());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -66,7 +66,7 @@
             var strategy = new TUpdateStrategy();
 
             // Call
-            void Call() => strategy.UpdateSectionResultOld(CreateEmptySectionResultOld(), null);
+            void Call() => strategy.UpdateSectionResult(CreateEmptySectionResult(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -78,11 +78,11 @@
         {
             // Setup
             var strategy = new TUpdateStrategy();
-            TSectionResult originResult = CreateConfiguredSectionResultOld();
-            TSectionResult targetResult = CreateEmptySectionResultOld();
+            TSectionResult originResult = CreateConfiguredSectionResult();
+            TSectionResult targetResult = CreateEmptySectionResult();
 
             // Call
-            strategy.UpdateSectionResultOld(originResult, targetResult);
+            strategy.UpdateSectionResult(originResult, targetResult);
 
             // Assert
             AssertSectionResult(originResult, targetResult);
@@ -93,13 +93,13 @@
         /// Creates an empty instance of <typeparamref name="TSectionResult"/>.
         /// </summary>
         /// <returns>An empty <typeparamref name="TSectionResult"/>.</returns>
-        protected abstract TSectionResult CreateEmptySectionResultOld();
+        protected abstract TSectionResult CreateEmptySectionResult();
 
         /// <summary>
         /// Creates a configured instance of <typeparamref name="TSectionResult"/>.
         /// </summary>
         /// <returns>An empty <typeparamref name="TSectionResult"/>.</returns>
-        protected abstract TSectionResult CreateConfiguredSectionResultOld();
+        protected abstract TSectionResult CreateConfiguredSectionResult();
 
         /// <summary>
         /// Asserts whether <paramref name="originResult"/> and
@@ -117,7 +117,7 @@
     /// <typeparam name="TSectionResultOld">The type of the old failure mechanism section result the update strategy uses.</typeparam>
     /// <typeparam name="TSectionResult">The type of the failure mechanism section result the update strategy uses.</typeparam>
     public abstract class FailureMechanismSectionResultUpdateStrategyTestFixture<TUpdateStrategy, TSectionResultOld, TSectionResult>
-        : FailureMechanismSectionResultUpdateStrategyTestFixture<TUpdateStrategy, TSectionResultOld>
+        : FailureMechanismSectionResultUpdateStrategyTestFixture<TUpdateStrategy, TSectionResult>
         where TUpdateStrategy : IFailureMechanismSectionResultUpdateStrategy<TSectionResultOld, TSectionResult>, new()
         where TSectionResultOld : FailureMechanismSectionResultOld
         where TSectionResult : FailureMechanismSectionResult
@@ -129,7 +129,7 @@
             var strategy = new TUpdateStrategy();
 
             // Call
-            void Call() => strategy.UpdateSectionResult(null, CreateEmptySectionResult());
+            void Call() => strategy.UpdateSectionResultOld(null, CreateEmptySectionResultOld());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -143,7 +143,7 @@
             var strategy = new TUpdateStrategy();
 
             // Call
-            void Call() => strategy.UpdateSectionResult(CreateEmptySectionResult(), null);
+            void Call() => strategy.UpdateSectionResultOld(CreateEmptySectionResultOld(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -155,11 +155,11 @@
         {
             // Setup
             var strategy = new TUpdateStrategy();
-            TSectionResult originResult = CreateConfiguredSectionResult();
-            TSectionResult targetResult = CreateEmptySectionResult();
+            TSectionResultOld originResult = CreateConfiguredSectionResultOld();
+            TSectionResultOld targetResult = CreateEmptySectionResultOld();
 
             // Call
-            strategy.UpdateSectionResult(originResult, targetResult);
+            strategy.UpdateSectionResultOld(originResult, targetResult);
 
             // Assert
             AssertSectionResult(originResult, targetResult);
@@ -180,20 +180,20 @@
         /// Creates an empty instance of <typeparamref name="TSectionResult"/>.
         /// </summary>
         /// <returns>An empty <typeparamref name="TSectionResult"/>.</returns>
-        protected abstract TSectionResult CreateEmptySectionResult();
+        protected abstract TSectionResultOld CreateEmptySectionResultOld();
 
         /// <summary>
         /// Creates a configured instance of <typeparamref name="TSectionResult"/>.
         /// </summary>
         /// <returns>An empty <typeparamref name="TSectionResult"/>.</returns>
-        protected abstract TSectionResult CreateConfiguredSectionResult();
+        protected abstract TSectionResultOld CreateConfiguredSectionResultOld();
 
         /// <summary>
         /// Asserts whether <paramref name="originResult"/> and
         /// <paramref name="targetResult"/> are equal.
         /// </summary>
         /// <exception cref="AssertionException">Thrown when <paramref name="originResult"/>
         /// and <paramref name="targetResult"/> are not equal.</exception>
-        protected abstract void AssertSectionResult(TSectionResult originResult, TSectionResult targetResult);
+        protected abstract void AssertSectionResult(TSectionResultOld originResult, TSectionResultOld targetResult);
     }
 }
\ No newline at end of file