Fisheye: Tag 8a067d513f440f079818bcec9deb1c86f8360ed6 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedAssemblyFailureMechanismSection.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedAssemblyFailureMechanismSectionOld.cs
===================================================================
diff -u
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedAssemblyFailureMechanismSectionOld.cs	(revision 0)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedAssemblyFailureMechanismSectionOld.cs	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -0,0 +1,59 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Riskeer.AssemblyTool.Data
+{
+    /// <summary>
+    /// The failure mechanism section of a combined assembly.
+    /// </summary>
+    public class CombinedAssemblyFailureMechanismSectionOld
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="CombinedAssemblyFailureMechanismSectionOld"/>.
+        /// </summary>
+        /// <param name="sectionStart">The start of the section from the beginning of the reference line in meters.</param>
+        /// <param name="sectionEnd">The end of the section from the beginning of the reference line in meters.</param>
+        /// <param name="categoryGroup">The category group assembly.</param>
+        public CombinedAssemblyFailureMechanismSectionOld(double sectionStart, double sectionEnd, FailureMechanismSectionAssemblyCategoryGroup categoryGroup)
+        {
+            SectionStart = sectionStart;
+            SectionEnd = sectionEnd;
+            CategoryGroup = categoryGroup;
+        }
+
+        /// <summary>
+        /// Gets the start of the section from the beginning of the reference line.
+        /// [m]
+        /// </summary>
+        public double SectionStart { get; }
+
+        /// <summary>
+        /// Gets the end of the section from the beginning of the reference line.
+        /// [m]
+        /// </summary>
+        public double SectionEnd { get; }
+
+        /// <summary>
+        /// Gets the category group assembly.
+        /// </summary>
+        public FailureMechanismSectionAssemblyCategoryGroup CategoryGroup { get; }
+    }
+}
\ No newline at end of file
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedFailureMechanismSectionAssemblyOld.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedFailureMechanismSectionAssemblyOld.cs	(.../CombinedFailureMechanismSectionAssemblyOld.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedFailureMechanismSectionAssemblyOld.cs	(.../CombinedFailureMechanismSectionAssemblyOld.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -35,7 +35,7 @@
         /// <param name="section">The section of the assembly.</param>
         /// <param name="failureMechanismResults">The assembly results per failure mechanism.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public CombinedFailureMechanismSectionAssemblyOld(CombinedAssemblyFailureMechanismSection section,
+        public CombinedFailureMechanismSectionAssemblyOld(CombinedAssemblyFailureMechanismSectionOld section,
                                                        IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> failureMechanismResults)
         {
             if (section == null)
@@ -55,7 +55,7 @@
         /// <summary>
         /// Gets the section of the assembly.
         /// </summary>
-        public CombinedAssemblyFailureMechanismSection Section { get; }
+        public CombinedAssemblyFailureMechanismSectionOld Section { get; }
 
         /// <summary>
         /// Gets the assembly results per failure mechanism.
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -49,7 +49,7 @@
         }
 
         public IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(
-            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input, double assessmentSectionLength)
+            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input, double assessmentSectionLength)
         {
             return new List<CombinedFailureMechanismSectionAssemblyOld>();
         }
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculatorOld.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculatorOld.cs	(.../AssessmentSectionAssemblyCalculatorOld.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculatorOld.cs	(.../AssessmentSectionAssemblyCalculatorOld.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -127,7 +127,7 @@
         }
 
         public IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(
-            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input, double assessmentSectionLength)
+            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input, double assessmentSectionLength)
         {
             try
             {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -38,6 +38,6 @@
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
         IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(
-            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input, double assessmentSectionLength);
+            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input, double assessmentSectionLength);
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculatorOld.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculatorOld.cs	(.../IAssessmentSectionAssemblyCalculatorOld.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculatorOld.cs	(.../IAssessmentSectionAssemblyCalculatorOld.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -76,7 +76,7 @@
         /// <returns>A collection of <see cref="CombinedFailureMechanismSectionAssemblyOld"/>.</returns>
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
-        IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input,
+        IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input,
                                                                                                       double assessmentSectionLength);
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/CombinedFailureMechanismSectionAssemblyCreatorOld.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/CombinedFailureMechanismSectionAssemblyCreatorOld.cs	(.../CombinedFailureMechanismSectionAssemblyCreatorOld.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/CombinedFailureMechanismSectionAssemblyCreatorOld.cs	(.../CombinedFailureMechanismSectionAssemblyCreatorOld.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -66,9 +66,9 @@
             return sectionAssemblies;
         }
 
-        private static CombinedAssemblyFailureMechanismSection CreateSection(FmSectionWithDirectCategory section)
+        private static CombinedAssemblyFailureMechanismSectionOld CreateSection(FmSectionWithDirectCategory section)
         {
-            return new CombinedAssemblyFailureMechanismSection(
+            return new CombinedAssemblyFailureMechanismSectionOld(
                 section.SectionStart, section.SectionEnd,
                 FailureMechanismSectionAssemblyCreatorOld.CreateFailureMechanismSectionAssemblyCategoryGroup(section.Category));
         }
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionListCreator.cs
===================================================================
diff -u -r439e534653c76b69813a20e1c9208ece3092afd6 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionListCreator.cs	(.../FailureMechanismSectionListCreator.cs)	(revision 439e534653c76b69813a20e1c9208ece3092afd6)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionListCreator.cs	(.../FailureMechanismSectionListCreator.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -47,7 +47,7 @@
         /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// is a valid value, but unsupported.</exception>
         public static IEnumerable<FailureMechanismSectionList> Create(
-            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> failureMechanismSectionsCollection)
+            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> failureMechanismSectionsCollection)
         {
             if (failureMechanismSectionsCollection == null)
             {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedAssemblyFailureMechanismSectionOldTest.cs
===================================================================
diff -u
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedAssemblyFailureMechanismSectionOldTest.cs	(revision 0)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedAssemblyFailureMechanismSectionOldTest.cs	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+
+namespace Riskeer.AssemblyTool.Data.Test
+{
+    [TestFixture]
+    public class CombinedAssemblyFailureMechanismSectionOldTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var random = new Random(21);
+            double sectionStart = random.NextDouble();
+            double sectionEnd = random.NextDouble();
+            var categoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+
+            // Call
+            var assembly = new CombinedAssemblyFailureMechanismSectionOld(sectionStart, sectionEnd, categoryGroup);
+
+            // Assert
+            Assert.AreEqual(sectionStart, assembly.SectionStart);
+            Assert.AreEqual(sectionEnd, assembly.SectionEnd);
+            Assert.AreEqual(categoryGroup, assembly.CategoryGroup);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 8a067d513f440f079818bcec9deb1c86f8360ed6 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedAssemblyFailureMechanismSectionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedFailureMechanismSectionAssemblyOldTest.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedFailureMechanismSectionAssemblyOldTest.cs	(.../CombinedFailureMechanismSectionAssemblyOldTest.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedFailureMechanismSectionAssemblyOldTest.cs	(.../CombinedFailureMechanismSectionAssemblyOldTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -46,7 +46,7 @@
         {
             // Setup
             var random = new Random(21);
-            var section = new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(),
+            var section = new CombinedAssemblyFailureMechanismSectionOld(random.NextDouble(), random.NextDouble(),
                                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
 
             // Call
@@ -62,7 +62,7 @@
         {
             // Setup
             var random = new Random(21);
-            var section = new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(),
+            var section = new CombinedAssemblyFailureMechanismSectionOld(random.NextDouble(), random.NextDouble(),
                                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> failureMechanismResults = Enumerable.Empty<FailureMechanismSectionAssemblyCategoryGroup>();
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorOldTest.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorOldTest.cs	(.../AssessmentSectionAssemblyCalculatorOldTest.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorOldTest.cs	(.../AssessmentSectionAssemblyCalculatorOldTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -596,7 +596,7 @@
                 {
                     new[]
                     {
-                        new CombinedAssemblyFailureMechanismSection(0, 1, (FailureMechanismSectionAssemblyCategoryGroup) 99)
+                        new CombinedAssemblyFailureMechanismSectionOld(0, 1, (FailureMechanismSectionAssemblyCategoryGroup) 99)
                     }
                 }, random.Next());
 
@@ -616,7 +616,7 @@
             {
                 new[]
                 {
-                    new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                    new CombinedAssemblyFailureMechanismSectionOld(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
                 }
             };
             double assessmentSectionLength = random.NextDouble();
@@ -676,7 +676,7 @@
                 {
                     new[]
                     {
-                        new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                        new CombinedAssemblyFailureMechanismSectionOld(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
                     }
                 }, random.NextDouble()).ToArray();
 
@@ -713,7 +713,7 @@
                 {
                     new[]
                     {
-                        new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                        new CombinedAssemblyFailureMechanismSectionOld(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
                     }
                 }, random.NextDouble()).ToArray();
 
@@ -743,7 +743,7 @@
                 {
                     new[]
                     {
-                        new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                        new CombinedAssemblyFailureMechanismSectionOld(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
                     }
                 }, random.NextDouble()).ToArray();
 
@@ -773,7 +773,7 @@
                 {
                     new[]
                     {
-                        new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                        new CombinedAssemblyFailureMechanismSectionOld(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
                     }
                 }, random.NextDouble()).ToArray();
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionListCreatorTest.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionListCreatorTest.cs	(.../FailureMechanismSectionListCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionListCreatorTest.cs	(.../FailureMechanismSectionListCreatorTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -56,8 +56,8 @@
             {
                 new[]
                 {
-                    new CombinedAssemblyFailureMechanismSection(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()),
-                    new CombinedAssemblyFailureMechanismSection(1, 2, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                    new CombinedAssemblyFailureMechanismSectionOld(0, 1, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()),
+                    new CombinedAssemblyFailureMechanismSectionOld(1, 2, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
                 }
             };
 
@@ -76,7 +76,7 @@
             {
                 new[]
                 {
-                    new CombinedAssemblyFailureMechanismSection(0, 1, (FailureMechanismSectionAssemblyCategoryGroup) 99)
+                    new CombinedAssemblyFailureMechanismSectionOld(0, 1, (FailureMechanismSectionAssemblyCategoryGroup) 99)
                 }
             });
 
@@ -102,7 +102,7 @@
             {
                 new[]
                 {
-                    new CombinedAssemblyFailureMechanismSection(0, 1, originalGroup)
+                    new CombinedAssemblyFailureMechanismSectionOld(0, 1, originalGroup)
                 }
             });
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -39,7 +39,7 @@
         /// <summary>
         /// Gets the combined failure mechanism sections input.
         /// </summary>
-        public IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> CombinedFailureMechanismSectionsInput { get; private set; }
+        public IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> CombinedFailureMechanismSectionsInput { get; private set; }
 
         /// <summary>
         /// Gets the assessment section length input.
@@ -52,7 +52,7 @@
         public IEnumerable<CombinedFailureMechanismSectionAssemblyOld> CombinedFailureMechanismSectionAssemblyOutput { get; set; }
 
         public IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(
-            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input, double assessmentSectionLength)
+            IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input, double assessmentSectionLength)
         {
             if (ThrowExceptionOnCalculate)
             {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubOld.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubOld.cs	(.../AssessmentSectionAssemblyCalculatorStubOld.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubOld.cs	(.../AssessmentSectionAssemblyCalculatorStubOld.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -75,7 +75,7 @@
         /// <summary>
         /// Gets the combined failure mechanism sections input.
         /// </summary>
-        public IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> CombinedFailureMechanismSectionsInput { get; private set; }
+        public IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> CombinedFailureMechanismSectionsInput { get; private set; }
 
         /// <summary>
         /// Gets the assessment section length input.
@@ -165,7 +165,7 @@
             return AssembleAssessmentSectionCategoryGroupOutput.Value;
         }
 
-        public IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input,
+        public IEnumerable<CombinedFailureMechanismSectionAssemblyOld> AssembleCombinedFailureMechanismSections(IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input,
                                                                                                              double assessmentSectionLength)
         {
             if (ThrowExceptionOnCalculate)
@@ -179,7 +179,7 @@
             return CombinedFailureMechanismSectionAssemblyOutput ?? (CombinedFailureMechanismSectionAssemblyOutput = new[]
                                                                         {
                                                                             new CombinedFailureMechanismSectionAssemblyOld(
-                                                                                new CombinedAssemblyFailureMechanismSection(0, 1, FailureMechanismSectionAssemblyCategoryGroup.IIIv),
+                                                                                new CombinedAssemblyFailureMechanismSectionOld(0, 1, FailureMechanismSectionAssemblyCategoryGroup.IIIv),
                                                                                 input.Select(failureMechanism => FailureMechanismSectionAssemblyCategoryGroup.VIv).ToArray())
                                                                         });
         }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs	(.../CombinedFailureMechanismSectionsInputAssert.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs	(.../CombinedFailureMechanismSectionsInputAssert.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -37,25 +37,25 @@
         /// <summary>
         /// Asserts whether <paramref name="actual"/> is equal to <paramref name="original"/>.
         /// </summary>
-        /// <param name="original">The original collection of <see cref="CombinedAssemblyFailureMechanismSection"/>
+        /// <param name="original">The original collection of <see cref="CombinedAssemblyFailureMechanismSectionOld"/>
         /// collections.</param>
         /// <param name="actual">The actual collection of <see cref="FailureMechanismSectionList"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// is not equal to <paramref name="original"/>.</exception>
-        public static void AssertCombinedFailureMechanismInput(IEnumerable<CombinedAssemblyFailureMechanismSection[]> original, IEnumerable<FailureMechanismSectionList> actual)
+        public static void AssertCombinedFailureMechanismInput(IEnumerable<CombinedAssemblyFailureMechanismSectionOld[]> original, IEnumerable<FailureMechanismSectionList> actual)
         {
             Assert.AreEqual(original.Count(), actual.Count());
 
             for (var i = 0; i < original.Count(); i++)
             {
-                CombinedAssemblyFailureMechanismSection[] sections = original.ElementAt(i);
+                CombinedAssemblyFailureMechanismSectionOld[] sections = original.ElementAt(i);
                 FailureMechanismSectionList sectionList = actual.ElementAt(i);
                 Assert.IsEmpty(sectionList.FailureMechanismId);
                 AssertSections(sections, sectionList.Sections);
             }
         }
 
-        private static void AssertSections(IEnumerable<CombinedAssemblyFailureMechanismSection> originalSections, IEnumerable<FailureMechanismSection> failureMechanismSections)
+        private static void AssertSections(IEnumerable<CombinedAssemblyFailureMechanismSectionOld> originalSections, IEnumerable<FailureMechanismSection> failureMechanismSections)
         {
             Assert.AreEqual(originalSections.Count(), failureMechanismSections.Count());
             Assert.IsTrue(failureMechanismSections.All(r => r.GetType() == typeof(FmSectionWithDirectCategory)));
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs
===================================================================
diff -u -r134f43abf0f321d818ef0a02fa4b1f8d3fca068d -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs	(.../CombinedAssemblyFailureMechanismSectionFactory.cs)	(revision 134f43abf0f321d818ef0a02fa4b1f8d3fca068d)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs	(.../CombinedAssemblyFailureMechanismSectionFactory.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -41,19 +41,19 @@
 namespace Riskeer.Integration.Data.Assembly
 {
     /// <summary>
-    /// Factory that creates <see cref="CombinedAssemblyFailureMechanismSection"/> instances.
+    /// Factory that creates <see cref="CombinedAssemblyFailureMechanismSectionOld"/> instances.
     /// </summary>
     internal static class CombinedAssemblyFailureMechanismSectionFactory
     {
         /// <summary>
-        /// Creates a collection of <see cref="CombinedAssemblyFailureMechanismSection"/> collections.
+        /// Creates a collection of <see cref="CombinedAssemblyFailureMechanismSectionOld"/> collections.
         /// </summary>
         /// <param name="assessmentSection">The assessment section to use.</param>
         /// <param name="failureMechanisms">The failure mechanisms to build input for.</param>
         /// <param name="useManual">Indicator that determines whether the manual assembly should be considered when assembling the result.</param>
-        /// <returns>A collection of <see cref="CombinedAssemblyFailureMechanismSection"/> collections.</returns>
+        /// <returns>A collection of <see cref="CombinedAssemblyFailureMechanismSectionOld"/> collections.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> CreateInput(AssessmentSection assessmentSection,
+        public static IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> CreateInput(AssessmentSection assessmentSection,
                                                                                                     IEnumerable<IFailureMechanism> failureMechanisms,
                                                                                                     bool useManual)
         {
@@ -67,7 +67,7 @@
                 throw new ArgumentNullException(nameof(failureMechanisms));
             }
 
-            var inputs = new List<IEnumerable<CombinedAssemblyFailureMechanismSection>>();
+            var inputs = new List<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>>();
 
             PipingFailureMechanism pipingFailureMechanism = assessmentSection.Piping;
             if (failureMechanisms.Contains(pipingFailureMechanism))
@@ -177,7 +177,7 @@
             return inputs;
         }
 
-        private static IEnumerable<CombinedAssemblyFailureMechanismSection> CreateCombinedSections<TFailureMechanismSectionResult>(
+        private static IEnumerable<CombinedAssemblyFailureMechanismSectionOld> CreateCombinedSections<TFailureMechanismSectionResult>(
             IEnumerable<TFailureMechanismSectionResult> sectionResults,
             AssessmentSection assessmentSection,
             Func<TFailureMechanismSectionResult, AssessmentSection, bool, FailureMechanismSectionAssemblyCategoryGroup> getAssemblyFunc,
@@ -188,7 +188,7 @@
 
             return sectionResults.Select(sectionResult =>
                                  {
-                                     CombinedAssemblyFailureMechanismSection section = CreateSection(sectionResult,
+                                     CombinedAssemblyFailureMechanismSectionOld section = CreateSection(sectionResult,
                                                                                                      getAssemblyFunc(sectionResult,
                                                                                                                      assessmentSection,
                                                                                                                      useManual),
@@ -199,7 +199,7 @@
                                  .ToArray();
         }
 
-        private static IEnumerable<CombinedAssemblyFailureMechanismSection> CreateCombinedSections<TFailureMechanismSectionResult>(
+        private static IEnumerable<CombinedAssemblyFailureMechanismSectionOld> CreateCombinedSections<TFailureMechanismSectionResult>(
             IEnumerable<TFailureMechanismSectionResult> sectionResults,
             Func<TFailureMechanismSectionResult, bool, FailureMechanismSectionAssemblyCategoryGroup> getAssemblyFunc,
             bool useManual)
@@ -209,20 +209,20 @@
 
             return sectionResults.Select(sectionResult =>
                                  {
-                                     CombinedAssemblyFailureMechanismSection section = CreateSection(sectionResult, getAssemblyFunc(sectionResult, useManual), totalSectionsLength);
+                                     CombinedAssemblyFailureMechanismSectionOld section = CreateSection(sectionResult, getAssemblyFunc(sectionResult, useManual), totalSectionsLength);
                                      totalSectionsLength = section.SectionEnd;
                                      return section;
                                  })
                                  .ToArray();
         }
 
-        private static CombinedAssemblyFailureMechanismSection CreateSection<TFailureMechanismSectionResult>(
+        private static CombinedAssemblyFailureMechanismSectionOld CreateSection<TFailureMechanismSectionResult>(
             TFailureMechanismSectionResult sectionResult, FailureMechanismSectionAssemblyCategoryGroup assemblyCategoryGroup,
             double sectionStart)
             where TFailureMechanismSectionResult : FailureMechanismSectionResultOld
         {
             double sectionEnd = sectionResult.Section.Length + sectionStart;
-            return new CombinedAssemblyFailureMechanismSection(sectionStart, sectionEnd, assemblyCategoryGroup);
+            return new CombinedAssemblyFailureMechanismSectionOld(sectionStart, sectionEnd, assemblyCategoryGroup);
         }
 
         #region Assembly Funcs
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -694,15 +694,15 @@
                 AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection, random.NextBoolean());
 
                 // Assert
-                IEnumerable<CombinedAssemblyFailureMechanismSection>[] actualInput = calculator.CombinedFailureMechanismSectionsInput.ToArray();
-                IEnumerable<CombinedAssemblyFailureMechanismSection>[] expectedInput = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(
+                IEnumerable<CombinedAssemblyFailureMechanismSectionOld>[] actualInput = calculator.CombinedFailureMechanismSectionsInput.ToArray();
+                IEnumerable<CombinedAssemblyFailureMechanismSectionOld>[] expectedInput = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(
                     assessmentSection, assessmentSection.GetFailureMechanisms(), random.NextBoolean()).ToArray();
                 Assert.AreEqual(expectedInput.Length, actualInput.Length);
 
                 for (var i = 0; i < expectedInput.Length; i++)
                 {
-                    CombinedAssemblyFailureMechanismSection[] actualSections = actualInput[i].ToArray();
-                    CombinedAssemblyFailureMechanismSection[] expectedSections = expectedInput[i].ToArray();
+                    CombinedAssemblyFailureMechanismSectionOld[] actualSections = actualInput[i].ToArray();
+                    CombinedAssemblyFailureMechanismSectionOld[] expectedSections = expectedInput[i].ToArray();
                     Assert.AreEqual(expectedSections.Length, actualSections.Length);
 
                     for (var j = 0; j < expectedSections.Length; j++)
@@ -894,7 +894,7 @@
         private static CombinedFailureMechanismSectionAssemblyOld CreateCombinedFailureMechanismSectionAssembly(AssessmentSection assessmentSection, int seed)
         {
             var random = new Random(seed);
-            return new CombinedFailureMechanismSectionAssemblyOld(new CombinedAssemblyFailureMechanismSection(random.NextDouble(),
+            return new CombinedFailureMechanismSectionAssemblyOld(new CombinedAssemblyFailureMechanismSectionOld(random.NextDouble(),
                                                                                                            random.NextDouble(),
                                                                                                            random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()),
                                                                assessmentSection.GetFailureMechanisms()
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs
===================================================================
diff -u -rd614bcd846ea69dd53473fbfd3220d4c327eee59 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs	(.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs)	(revision d614bcd846ea69dd53473fbfd3220d4c327eee59)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs	(.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -86,7 +86,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 // Call
-                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> inputs = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(
+                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> inputs = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(
                     assessmentSection, assessmentSection.GetFailureMechanisms(), random.NextBoolean());
 
                 // Assert
@@ -120,7 +120,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 // Call
-                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> inputs = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(
+                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> inputs = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(
                     assessmentSection, new[]
                     {
                         failureMechanismInAssembly
@@ -155,7 +155,7 @@
 
         private static void AssertSectionsWithResult<T>(IEnumerable<T> originalSectionResults,
                                                         FailureMechanismSectionAssemblyCategoryGroup expectedAssemblyCategoryGroupInput,
-                                                        IEnumerable<CombinedAssemblyFailureMechanismSection> inputSections)
+                                                        IEnumerable<CombinedAssemblyFailureMechanismSectionOld> inputSections)
             where T : FailureMechanismSectionResultOld
         {
             AssertSections(originalSectionResults, inputSections);
@@ -166,7 +166,7 @@
             }
         }
 
-        private static void AssertSections<T>(IEnumerable<T> originalSectionResults, IEnumerable<CombinedAssemblyFailureMechanismSection> inputSections)
+        private static void AssertSections<T>(IEnumerable<T> originalSectionResults, IEnumerable<CombinedAssemblyFailureMechanismSectionOld> inputSections)
             where T : FailureMechanismSectionResultOld
         {
             Assert.AreEqual(originalSectionResults.Count(), inputSections.Count());
@@ -197,7 +197,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 // Call
-                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
+                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
                 {
                     failureMechanismInAssembly
                 }, true);
@@ -220,7 +220,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 // When
-                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
+                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
                 {
                     failureMechanismInAssembly
                 }, false);
@@ -247,7 +247,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 // Call
-                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
+                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
                 {
                     failureMechanismInAssembly
                 }, true);
@@ -266,7 +266,7 @@
             using (new AssemblyToolCalculatorFactoryConfigOld())
             {
                 // When
-                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
+                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> input = CombinedAssemblyFailureMechanismSectionFactory.CreateInput(assessmentSection, new[]
                 {
                     failureMechanismInAssembly
                 }, false);
@@ -279,7 +279,7 @@
         }
 
         private static void AssertInputForFailureMechanismsWithoutProbabilityWithManualAssembly(IFailureMechanism failureMechanism,
-                                                                                                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSection>> actualInput)
+                                                                                                IEnumerable<IEnumerable<CombinedAssemblyFailureMechanismSectionOld>> actualInput)
         {
             var duneErosion = failureMechanism as DuneErosionFailureMechanism;
             if (duneErosion != null)
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs	(.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs	(.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -90,8 +90,8 @@
                                                                                     })
                                                                                     .ToDictionary(x => x.FailureMechanism, x => x.Index);
 
-            var section1 = new CombinedAssemblyFailureMechanismSection(0, 5, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
-            var section2 = new CombinedAssemblyFailureMechanismSection(5, 11, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+            var section1 = new CombinedAssemblyFailureMechanismSectionOld(0, 5, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+            var section2 = new CombinedAssemblyFailureMechanismSectionOld(5, 11, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
             var output = new[]
             {
                 new CombinedFailureMechanismSectionAssemblyOld(section1, GetFailureMechanismsOutput(failureMechanisms.Keys, random)),
@@ -143,8 +143,8 @@
                                                                                     })
                                                                                     .ToDictionary(x => x.FailureMechanism, x => x.Index);
 
-            var section1 = new CombinedAssemblyFailureMechanismSection(0, 5, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
-            var section2 = new CombinedAssemblyFailureMechanismSection(5, 11, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+            var section1 = new CombinedAssemblyFailureMechanismSectionOld(0, 5, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+            var section2 = new CombinedAssemblyFailureMechanismSectionOld(5, 11, random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
             var output = new[]
             {
                 new CombinedFailureMechanismSectionAssemblyOld(section1, GetFailureMechanismsOutput(failureMechanisms.Keys, random)),
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs	(.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs	(.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -163,7 +163,7 @@
         private static CombinedFailureMechanismSectionAssemblyOld CreateCombinedFailureMechanismSectionAssembly(AssessmentSection assessmentSection, int seed)
         {
             var random = new Random(seed);
-            return new CombinedFailureMechanismSectionAssemblyOld(new CombinedAssemblyFailureMechanismSection(random.NextDouble(),
+            return new CombinedFailureMechanismSectionAssemblyOld(new CombinedAssemblyFailureMechanismSectionOld(random.NextDouble(),
                                                                                                            random.NextDouble(),
                                                                                                            random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()),
                                                                assessmentSection.GetFailureMechanisms()
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs
===================================================================
diff -u -rffec70662c33e5a611430ae73fa4d8cef5cdf147 -r8a067d513f440f079818bcec9deb1c86f8360ed6
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision ffec70662c33e5a611430ae73fa4d8cef5cdf147)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision 8a067d513f440f079818bcec9deb1c86f8360ed6)
@@ -451,7 +451,7 @@
                                                                                                              FailureMechanismSectionAssemblyCategoryGroup totalResult)
         {
             var random = new Random(37);
-            return new CombinedFailureMechanismSectionAssemblyOld(new CombinedAssemblyFailureMechanismSection(random.NextDouble(),
+            return new CombinedFailureMechanismSectionAssemblyOld(new CombinedAssemblyFailureMechanismSectionOld(random.NextDouble(),
                                                                                                            random.NextDouble(),
                                                                                                            totalResult),
                                                                assessmentSection.GetFailureMechanisms()