Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs
===================================================================
diff -u -r38c104b33ad4b20a580b7512c4433925379c3e90 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs	(.../ExportableClosingStructuresFailureMechanismFactory.cs)	(revision 38c104b33ad4b20a580b7512c4433925379c3e90)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs	(.../ExportableClosingStructuresFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -25,6 +25,7 @@
 using Riskeer.ClosingStructures.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 
@@ -94,11 +95,11 @@
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability> CreateExportableFailureMechanismSectionResults(
             ClosingStructuresFailureMechanism failureMechanism)
         {
-            IDictionary<ClosingStructuresFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
-                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResultsOld);
+            IDictionary<AdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability>();
-            foreach (KeyValuePair<ClosingStructuresFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<AdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 var simpleAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
                 var detailedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableDuneErosionFailureMechanismFactory.cs
===================================================================
diff -u -r2cce2a85a414587a79f94abc0e9961b6340057e3 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableDuneErosionFailureMechanismFactory.cs	(.../ExportableDuneErosionFailureMechanismFactory.cs)	(revision 2cce2a85a414587a79f94abc0e9961b6340057e3)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableDuneErosionFailureMechanismFactory.cs	(.../ExportableDuneErosionFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.DuneErosion.Data;
@@ -76,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -85,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="DuneErosionFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableFailureMechanismSectionResult"/>
         /// to create a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<DuneErosionFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<DuneErosionFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<DuneErosionFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs
===================================================================
diff -u -rf6d8a38a39fa980545938710e144e835ecc22015 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs)	(revision f6d8a38a39fa980545938710e144e835ecc22015)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
@@ -94,11 +95,11 @@
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability> CreateExportableFailureMechanismSectionResults(
             GrassCoverErosionInwardsFailureMechanism failureMechanism)
         {
-            IDictionary<GrassCoverErosionInwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
-                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResultsOld);
+            IDictionary<AdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability>();
-            foreach (KeyValuePair<GrassCoverErosionInwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<AdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 var simpleAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
                 var detailedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs
===================================================================
diff -u -r98843de5182156088942567717084407b0c0c1ab -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs)	(revision 98843de5182156088942567717084407b0c0c1ab)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.GrassCoverErosionOutwards.Data;
@@ -76,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -85,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="GrassCoverErosionOutwardsFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
         /// to create a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<GrassCoverErosionOutwardsFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<GrassCoverErosionOutwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<GrassCoverErosionOutwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs
===================================================================
diff -u -r98843de5182156088942567717084407b0c0c1ab -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs)	(revision 98843de5182156088942567717084407b0c0c1ab)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,10 +24,10 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 
 namespace Riskeer.Integration.IO.Factories
 {
@@ -77,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -86,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
         /// to create a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<GrassCoverSlipOffInwardsFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<GrassCoverSlipOffInwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<GrassCoverSlipOffInwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs
===================================================================
diff -u -r98843de5182156088942567717084407b0c0c1ab -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs)	(revision 98843de5182156088942567717084407b0c0c1ab)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,10 +24,10 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 
 namespace Riskeer.Integration.IO.Factories
 {
@@ -77,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -86,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
         /// to create a <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs
===================================================================
diff -u -r38c104b33ad4b20a580b7512c4433925379c3e90 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs	(.../ExportableHeightStructuresFailureMechanismFactory.cs)	(revision 38c104b33ad4b20a580b7512c4433925379c3e90)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs	(.../ExportableHeightStructuresFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.HeightStructures.Data;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
@@ -94,11 +95,11 @@
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability> CreateExportableFailureMechanismSectionResults(
             HeightStructuresFailureMechanism failureMechanism)
         {
-            IDictionary<HeightStructuresFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
-                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResultsOld);
+            IDictionary<AdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability>();
-            foreach (KeyValuePair<HeightStructuresFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<AdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 var simpleAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
                 var detailedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs
===================================================================
diff -u -r98202e4db2f1c2994b5f2b4d48a28a74aec04728 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactory.cs)	(revision 98202e4db2f1c2994b5f2b4d48a28a74aec04728)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.MacroStabilityInwards.Data;
@@ -94,11 +95,11 @@
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability> CreateExportableFailureMechanismSectionResults(
             MacroStabilityInwardsFailureMechanism failureMechanism)
         {
-            IDictionary<MacroStabilityInwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
-                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResultsOld);
+            IDictionary<AdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability>();
-            foreach (KeyValuePair<MacroStabilityInwardsFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<AdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 var simpleAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
                 var detailedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs
===================================================================
diff -u -r98843de5182156088942567717084407b0c0c1ab -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs	(.../ExportableMicrostabilityFailureMechanismFactory.cs)	(revision 98843de5182156088942567717084407b0c0c1ab)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs	(.../ExportableMicrostabilityFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,8 +24,8 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 
@@ -77,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -86,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="MicrostabilityFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
         /// to create a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<MicrostabilityFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<MicrostabilityFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<MicrostabilityFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs
===================================================================
diff -u -r41f473231539e8121cbf2285ae7cd6783d743ce6 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs	(.../ExportablePipingFailureMechanismFactory.cs)	(revision 41f473231539e8121cbf2285ae7cd6783d743ce6)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs	(.../ExportablePipingFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.Piping.Data;
@@ -94,11 +95,11 @@
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability> CreateExportableFailureMechanismSectionResults(
             PipingFailureMechanism failureMechanism)
         {
-            IDictionary<PipingFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
-                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResultsOld);
+            IDictionary<AdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability>();
-            foreach (KeyValuePair<PipingFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<AdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 var simpleAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
                 var detailedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs
===================================================================
diff -u -r98843de5182156088942567717084407b0c0c1ab -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs	(.../ExportablePipingStructureFailureMechanismFactory.cs)	(revision 98843de5182156088942567717084407b0c0c1ab)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs	(.../ExportablePipingStructureFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,8 +24,8 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 
@@ -77,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -86,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on the sections in <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="PipingStructureFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableFailureMechanismSectionResult"/>
         /// to create a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<PipingStructureFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<PipingStructureFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<PipingStructureFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs
===================================================================
diff -u -r38c104b33ad4b20a580b7512c4433925379c3e90 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactory.cs)	(revision 38c104b33ad4b20a580b7512c4433925379c3e90)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.StabilityPointStructures.Data;
@@ -94,11 +95,11 @@
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability> CreateExportableFailureMechanismSectionResults(
             StabilityPointStructuresFailureMechanism failureMechanism)
         {
-            IDictionary<StabilityPointStructuresFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
-                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResultsOld);
+            IDictionary<AdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability>();
-            foreach (KeyValuePair<StabilityPointStructuresFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<AdoptableFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 var simpleAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
                 var detailedAssembly = new FailureMechanismSectionAssemblyOld(0, FailureMechanismSectionAssemblyCategoryGroup.None);
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs
===================================================================
diff -u -rd4f68e1d5c93d481cbc3adfd16c54e32f8751961 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactory.cs)	(revision d4f68e1d5c93d481cbc3adfd16c54e32f8751961)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.StabilityStoneCover.Data;
@@ -76,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -85,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="StabilityStoneCoverFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
         /// to create a <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<StabilityStoneCoverFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<StabilityStoneCoverFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<StabilityStoneCoverFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs
===================================================================
diff -u -r98843de5182156088942567717084407b0c0c1ab -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs	(.../ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs)	(revision 98843de5182156088942567717084407b0c0c1ab)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs	(.../ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,8 +24,8 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 
@@ -77,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -86,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="WaterPressureAsphaltCoverFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
         /// to create a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly> CreateFailureMechanismSectionResults(
-            IEnumerable<WaterPressureAsphaltCoverFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<WaterPressureAsphaltCoverFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly>();
-            foreach (KeyValuePair<WaterPressureAsphaltCoverFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs
===================================================================
diff -u -r98843de5182156088942567717084407b0c0c1ab -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs)	(revision 98843de5182156088942567717084407b0c0c1ab)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -24,6 +24,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.IO.Assembly;
 using Riskeer.Integration.IO.Helpers;
 using Riskeer.WaveImpactAsphaltCover.Data;
@@ -76,7 +77,7 @@
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
-                CreateFailureMechanismSectionResults(failureMechanism.SectionResultsOld),
+                CreateFailureMechanismSectionResults(failureMechanism.SectionResults),
                 failureMechanismCode,
                 failureMechanismGroup);
         }
@@ -85,18 +86,18 @@
         /// Creates a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>
         /// with assembly results based on <paramref name="failureMechanismSectionResults"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionResults">The collection of <see cref="WaveImpactAsphaltCoverFailureMechanismSectionResultOld"/>
+        /// <param name="failureMechanismSectionResults">The collection of <see cref="NonAdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
         /// to create a collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/> for.</param>
         /// <returns>A collection of <see cref="ExportableAggregatedFailureMechanismSectionAssemblyResult"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
         private static IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> CreateFailureMechanismSectionResults(
-            IEnumerable<WaveImpactAsphaltCoverFailureMechanismSectionResultOld> failureMechanismSectionResults)
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> failureMechanismSectionResults)
         {
-            IDictionary<WaveImpactAsphaltCoverFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
+            IDictionary<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
-            foreach (KeyValuePair<WaveImpactAsphaltCoverFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
+            foreach (KeyValuePair<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
                 const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
                 const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableFailureMechanismSectionHelper.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableFailureMechanismSectionHelper.cs	(.../ExportableFailureMechanismSectionHelper.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableFailureMechanismSectionHelper.cs	(.../ExportableFailureMechanismSectionHelper.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -43,7 +43,7 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResults"/> is <c>null</c>.</exception>
         public static IDictionary<TSectionResult, ExportableFailureMechanismSection> CreateFailureMechanismSectionResultLookup<TSectionResult>(
             IEnumerable<TSectionResult> failureMechanismSectionResults)
-            where TSectionResult : FailureMechanismSectionResultOld
+            where TSectionResult : FailureMechanismSectionResult
         {
             if (failureMechanismSectionResults == null)
             {
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableFailureMechanismSectionHelperTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableFailureMechanismSectionHelperTest.cs	(.../ExportableFailureMechanismSectionHelperTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableFailureMechanismSectionHelperTest.cs	(.../ExportableFailureMechanismSectionHelperTest.cs)	(revision 4a8dd8a852c4d2c3255b55892f5e85f2bbbb83cb)
@@ -36,11 +36,10 @@
         public void CreateFailureMechanismSectionResultLookup_FailureMechanismSectionResultsNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () =>
-                ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup<TestFailureMechanismSectionResultOld>(null);
+            void Call() => ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup<TestFailureMechanismSectionResult>(null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("failureMechanismSectionResults", exception.ParamName);
         }
 
@@ -50,43 +49,43 @@
             // Setup
             var failureMechanismSectionResults = new[]
             {
-                new TestFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
+                new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
                 {
                     new Point2D(0, 0),
                     new Point2D(0, 10)
                 })),
-                new TestFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
+                new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
                 {
                     new Point2D(0, 10),
                     new Point2D(0, 20)
                 })),
-                new TestFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
+                new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
                 {
                     new Point2D(0, 20),
                     new Point2D(0, 40)
                 }))
             };
 
             // Call
-            IDictionary<TestFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionResultsLookup =
+            IDictionary<TestFailureMechanismSectionResult, ExportableFailureMechanismSection> failureMechanismSectionResultsLookup =
                 ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults);
 
             // Assert
             CollectionAssert.AreEqual(failureMechanismSectionResults, failureMechanismSectionResultsLookup.Keys);
 
-            TestFailureMechanismSectionResultOld firstSectionResult = failureMechanismSectionResults[0];
+            TestFailureMechanismSectionResult firstSectionResult = failureMechanismSectionResults[0];
             ExportableFailureMechanismSection firstExportableSection = failureMechanismSectionResultsLookup[firstSectionResult];
             Assert.AreSame(firstSectionResult.Section.Points, firstExportableSection.Geometry);
             Assert.AreEqual(0, firstExportableSection.StartDistance);
             Assert.AreEqual(10, firstExportableSection.EndDistance);
 
-            TestFailureMechanismSectionResultOld secondSectionResult = failureMechanismSectionResults[1];
+            TestFailureMechanismSectionResult secondSectionResult = failureMechanismSectionResults[1];
             ExportableFailureMechanismSection secondExportableSection = failureMechanismSectionResultsLookup[secondSectionResult];
             Assert.AreSame(secondSectionResult.Section.Points, secondExportableSection.Geometry);
             Assert.AreEqual(10, secondExportableSection.StartDistance);
             Assert.AreEqual(20, secondExportableSection.EndDistance);
 
-            TestFailureMechanismSectionResultOld thirdSectionResult = failureMechanismSectionResults[2];
+            TestFailureMechanismSectionResult thirdSectionResult = failureMechanismSectionResults[2];
             ExportableFailureMechanismSection thirdExportableSection = failureMechanismSectionResultsLookup[thirdSectionResult];
             Assert.AreSame(thirdSectionResult.Section.Points, thirdExportableSection.Geometry);
             Assert.AreEqual(20, thirdExportableSection.StartDistance);