Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs
===================================================================
diff -u -rd8340b402c51ae80af23df797bbbe73a3da9a48e -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs	(.../AssemblyGmlWriter.cs)	(revision d8340b402c51ae80af23df797bbbe73a3da9a48e)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs	(.../AssemblyGmlWriter.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
@@ -280,12 +280,12 @@
             writer.WriteStartElement(AssemblyXmlIdentifiers.CombinedFailureMechanismSectionResult, AssemblyXmlIdentifiers.UboiNamespace);
 
             writer.WriteElementString(AssemblyXmlIdentifiers.FailureMechanismSectionAssemblyGroup, AssemblyXmlIdentifiers.UboiNamespace,
-                                      EnumDisplayNameHelper.GetDisplayName(failureMechanismResult.SectionAssemblyResult.AssemblyGroup));
+                                      EnumDisplayNameHelper.GetDisplayName(failureMechanismResult.AssemblyGroup));
             writer.WriteElementString(AssemblyXmlIdentifiers.AssemblyMethod, AssemblyXmlIdentifiers.UboiNamespace,
-                                      EnumDisplayNameHelper.GetDisplayName(failureMechanismResult.SectionAssemblyResult.AssemblyMethod));
+                                      EnumDisplayNameHelper.GetDisplayName(failureMechanismResult.AssemblyMethod));
             writer.WriteElementString(AssemblyXmlIdentifiers.Status, AssemblyXmlIdentifiers.UboiNamespace, Resources.FullAssembly);
 
-            WriteLink(AssemblyXmlIdentifiers.DerivedFrom, AssemblyXmlIdentifiers.UboiNamespace, "resultaat_GABI_1");
+            WriteLink(AssemblyXmlIdentifiers.DerivedFrom, AssemblyXmlIdentifiers.UboiNamespace, failureMechanismResult.FailureMechanismSectionResult.Id);
             WriteLink(AssemblyXmlIdentifiers.Indicates, AssemblyXmlIdentifiers.UboiNamespace, combinedSectionAssemblyResultId);
 
             writer.WriteEndElement();
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismCombinedSectionAssemblyResult.cs
===================================================================
diff -u -rc5b8fb02fff7b66b609b690ffc0e95c240e30771 -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismCombinedSectionAssemblyResult.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResult.cs)	(revision c5b8fb02fff7b66b609b690ffc0e95c240e30771)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismCombinedSectionAssemblyResult.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResult.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Model.Enums;
 
 namespace Riskeer.AssemblyTool.IO.Model
@@ -32,45 +33,37 @@
         /// <summary>
         /// Creates a new instance of <see cref="ExportableFailureMechanismCombinedSectionAssemblyResult"/>
         /// </summary>
-        /// <param name="sectionAssemblyResult">The assembly result of the combined section.</param>
-        /// <param name="failureMechanismType">The type of the failure mechanism.</param>
-        /// <param name="code">The code of the failure mechanism.</param>
-        /// <param name="name">The name of the failure mechanism.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionAssemblyResult"/> is <c>null</c>.</exception>
-        public ExportableFailureMechanismCombinedSectionAssemblyResult(ExportableFailureMechanismSubSectionAssemblyResult sectionAssemblyResult,
-                                                                       ExportableFailureMechanismType failureMechanismType,
-                                                                       string code,
-                                                                       string name)
+        /// <param name="assemblyMethod">The method that was used to assemble this result.</param>
+        /// <param name="assemblyGroup">The assembly group of this section.</param>
+        /// <param name="failureMechanismSectionResult">The associated failure mechanism section result.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/> is <c>null</c>.</exception>
+        public ExportableFailureMechanismCombinedSectionAssemblyResult(FailureMechanismSectionAssemblyGroup assemblyGroup,
+                                                                       ExportableAssemblyMethod assemblyMethod,
+                                                                       ExportableFailureMechanismSectionAssemblyResult failureMechanismSectionResult)
         {
-            if (sectionAssemblyResult == null)
+            if (failureMechanismSectionResult == null)
             {
-                throw new ArgumentNullException(nameof(sectionAssemblyResult));
+                throw new ArgumentNullException(nameof(failureMechanismSectionResult));
             }
 
-            SectionAssemblyResult = sectionAssemblyResult;
-            FailureMechanismType = failureMechanismType;
-            Code = code;
-            Name = name;
+            AssemblyGroup = assemblyGroup;
+            AssemblyMethod = assemblyMethod;
+            FailureMechanismSectionResult = failureMechanismSectionResult;
         }
 
         /// <summary>
-        /// Gets the assembly result of this combined section.
+        /// Gets the assembly group of this section.
         /// </summary>
-        public ExportableFailureMechanismSubSectionAssemblyResult SectionAssemblyResult { get; }
-
+        public FailureMechanismSectionAssemblyGroup AssemblyGroup { get; }
+        
         /// <summary>
-        /// Gets the failure mechanism type.
+        /// Gets the assembly method that was used to assemble the assembly result.
         /// </summary>
-        public ExportableFailureMechanismType FailureMechanismType { get; }
-
+        public ExportableAssemblyMethod AssemblyMethod { get; }
+        
         /// <summary>
-        /// Gets the code of the failure mechanism.
+        /// Gets the associated failure mechanism section result.
         /// </summary>
-        public string Code { get; }
-
-        /// <summary>
-        /// Gets the name of the failure mechanism.
-        /// </summary>
-        public string Name { get; }
+        public ExportableFailureMechanismSectionAssemblyResult FailureMechanismSectionResult { get; }
     }
 }
\ No newline at end of file
Fisheye: Tag 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismSubSectionAssemblyResult.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
===================================================================
diff -u -rd8340b402c51ae80af23df797bbbe73a3da9a48e -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision d8340b402c51ae80af23df797bbbe73a3da9a48e)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
@@ -149,6 +149,10 @@
                 new Point2D(10.23, 10.24)
             }, 0.12, 10.23, ExportableAssemblyMethod.BOI3A1);
 
+            var failureMechanismSectionAssemblyResult = new ExportableFailureMechanismSectionAssemblyResult(
+                "resultaat_GABI_1", failureMechanismSection, 0.00073, FailureMechanismSectionAssemblyGroup.III,
+                ExportableAssemblyMethod.BOI0B1, ExportableAssemblyMethod.BOI0A2);
+
             var assessmentSection = new ExportableAssessmentSection(
                 "section1", "Traject A",
                 new[]
@@ -175,9 +179,7 @@
                     new ExportableGenericFailureMechanism("toetsspoorGABI", new ExportableFailureMechanismAssemblyResult(0.08419, ExportableAssemblyMethod.BOI1A1),
                                                           new[]
                                                           {
-                                                              new ExportableFailureMechanismSectionAssemblyResult(
-                                                                  "resultaat_GABI_1", failureMechanismSection, 0.00073, FailureMechanismSectionAssemblyGroup.III,
-                                                                  ExportableAssemblyMethod.BOI0B1, ExportableAssemblyMethod.BOI0A2)
+                                                              failureMechanismSectionAssemblyResult
                                                           }, "GABI"),
                     new ExportableSpecificFailureMechanism("specifiekFaalmechanisme", new ExportableFailureMechanismAssemblyResult(0.002834, ExportableAssemblyMethod.BOI1A1),
                                                            Enumerable.Empty<ExportableFailureMechanismSectionAssemblyResult>(), "Specifiek faalmechanisme")
@@ -188,9 +190,8 @@
                                                           new[]
                                                           {
                                                               new ExportableFailureMechanismCombinedSectionAssemblyResult(
-                                                                  new ExportableFailureMechanismSubSectionAssemblyResult(
-                                                                      FailureMechanismSectionAssemblyGroup.I, ExportableAssemblyMethod.BOI3B1),
-                                                                  ExportableFailureMechanismType.Generic, string.Empty, string.Empty)
+                                                                  FailureMechanismSectionAssemblyGroup.I, ExportableAssemblyMethod.BOI3B1,
+                                                                  failureMechanismSectionAssemblyResult)
                                                           })
                 });
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs
===================================================================
diff -u -rc5b8fb02fff7b66b609b690ffc0e95c240e30771 -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs)	(revision c5b8fb02fff7b66b609b690ffc0e95c240e30771)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
@@ -25,47 +25,47 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Model;
 using Riskeer.AssemblyTool.IO.Model.Enums;
+using Riskeer.AssemblyTool.IO.TestUtil;
 
 namespace Riskeer.AssemblyTool.IO.Test.Model
 {
     [TestFixture]
     public class ExportableFailureMechanismCombinedSectionAssemblyResultTest
     {
         [Test]
-        public void Constructor_SectionAssemblyResultNull_ThrowsArgumentNullException()
+        public void Constructor_FailureMechanismSectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
             var random = new Random(21);
 
             // Call
             void Call() => new ExportableFailureMechanismCombinedSectionAssemblyResult(
-                null, random.NextEnumValue<ExportableFailureMechanismType>(), string.Empty, string.Empty);
+                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(), random.NextEnumValue<ExportableAssemblyMethod>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("sectionAssemblyResult", exception.ParamName);
+            Assert.AreEqual("failureMechanismSectionResult", exception.ParamName);
         }
 
         [Test]
-        public void Constructor_WithArguments_ExpectedValues()
+        public void Constructor_ExpectedValues()
         {
             // Setup
-            const string code = "code";
-            const string name = "name";
-            var random = new Random(21);
-            var combinedSectionAssembly = new ExportableFailureMechanismSubSectionAssemblyResult(
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(), random.NextEnumValue<ExportableAssemblyMethod>());
-            var failureMechanismType = random.NextEnumValue<ExportableFailureMechanismType>();
+            const int seed = 21;
+            ExportableFailureMechanismSection section = ExportableFailureMechanismSectionTestFactory.CreateExportableFailureMechanismSection();
+            ExportableFailureMechanismSectionAssemblyResult failureMechanismSectionAssemblyResult = ExportableFailureMechanismSectionAssemblyResultTestFactory.Create(section, seed);
 
+            var random = new Random(seed);
+            var assemblyGroup = random.NextEnumValue<FailureMechanismSectionAssemblyGroup>();
+            var assemblyMethod = random.NextEnumValue<ExportableAssemblyMethod>();
+
             // Call
-            var assemblyResult = new ExportableFailureMechanismCombinedSectionAssemblyResult(
-                combinedSectionAssembly, failureMechanismType, code, name);
+            var assemblyResult = new ExportableFailureMechanismCombinedSectionAssemblyResult(assemblyGroup, assemblyMethod, failureMechanismSectionAssemblyResult);
 
             // Assert
-            Assert.AreSame(combinedSectionAssembly, assemblyResult.SectionAssemblyResult);
-            Assert.AreEqual(failureMechanismType, assemblyResult.FailureMechanismType);
-            Assert.AreEqual(code, assemblyResult.Code);
-            Assert.AreEqual(name, assemblyResult.Name);
+            Assert.AreEqual(assemblyGroup, assemblyResult.AssemblyGroup);
+            Assert.AreEqual(assemblyMethod, assemblyResult.AssemblyMethod);
+            Assert.AreSame(failureMechanismSectionAssemblyResult, assemblyResult.FailureMechanismSectionResult);
         }
     }
 }
\ No newline at end of file
Fisheye: Tag 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSubSectionAssemblyResultTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSubSectionAssemblyResultTestFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
===================================================================
diff -u -rd8340b402c51ae80af23df797bbbe73a3da9a48e -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision d8340b402c51ae80af23df797bbbe73a3da9a48e)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Common.Base.Geometry;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Model;
 using Riskeer.AssemblyTool.IO.Model.Enums;
@@ -105,8 +106,7 @@
             List<ExportableFailureMechanismCombinedSectionAssemblyResult> exportableAssemblyResults =
                 failureMechanisms.Where(fm => fm.Item1.HasValue)
                                  .Select(fm => CreateExportableFailureMechanismCombinedSectionAssemblyResult(
-                                             fm.Item1.Value, assemblyResult.FailureMechanismResultsAssemblyMethod,
-                                             ExportableFailureMechanismType.Generic, fm.Item2, fm.Item3))
+                                             fm.Item1.Value, assemblyResult.FailureMechanismResultsAssemblyMethod))
                                  .ToList();
 
             for (var i = 0; i < assessmentSection.SpecificFailureMechanisms.Count; i++)
@@ -117,8 +117,7 @@
                 {
                     SpecificFailureMechanism specificFailureMechanism = assessmentSection.SpecificFailureMechanisms.ElementAt(i);
                     exportableAssemblyResults.Add(CreateExportableFailureMechanismCombinedSectionAssemblyResult(
-                                                      specificFailureMechanismAssemblyResult.Value, assemblyResult.FailureMechanismResultsAssemblyMethod,
-                                                      ExportableFailureMechanismType.Specific, specificFailureMechanism.Code, specificFailureMechanism.Name));
+                                                      specificFailureMechanismAssemblyResult.Value, assemblyResult.FailureMechanismResultsAssemblyMethod));
                 }
             }
 
@@ -132,12 +131,13 @@
         }
 
         private static ExportableFailureMechanismCombinedSectionAssemblyResult CreateExportableFailureMechanismCombinedSectionAssemblyResult(
-            FailureMechanismSectionAssemblyGroup sectionAssemblyGroup, AssemblyMethod assemblyMethod,
-            ExportableFailureMechanismType failureMechanismType, string failureMechanismCode, string failureMechanismName)
+            FailureMechanismSectionAssemblyGroup sectionAssemblyGroup, AssemblyMethod assemblyMethod)
         {
             return new ExportableFailureMechanismCombinedSectionAssemblyResult(
-                new ExportableFailureMechanismSubSectionAssemblyResult(sectionAssemblyGroup, ExportableAssemblyMethodFactory.Create(assemblyMethod)),
-                failureMechanismType, failureMechanismCode, failureMechanismName);
+                sectionAssemblyGroup, ExportableAssemblyMethodFactory.Create(assemblyMethod),
+                new ExportableFailureMechanismSectionAssemblyResult(
+                    "id", new ExportableFailureMechanismSection("id", Array.Empty<Point2D>(), double.NaN, double.NaN), double.NaN,
+                    FailureMechanismSectionAssemblyGroup.Zero, ExportableAssemblyMethod.Manual, ExportableAssemblyMethod.Manual));
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -rd8340b402c51ae80af23df797bbbe73a3da9a48e -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision d8340b402c51ae80af23df797bbbe73a3da9a48e)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
@@ -393,11 +393,8 @@
                                                                                           ExportableFailureMechanismType expectedFailureMechanismType,
                                                                                           ExportableFailureMechanismCombinedSectionAssemblyResult actualExportableFailureMechanismCombinedSectionAssemblyResult)
         {
-            Assert.AreEqual(failureMechanism.Code, actualExportableFailureMechanismCombinedSectionAssemblyResult.Code);
-            Assert.AreEqual(expectedFailureMechanismType, actualExportableFailureMechanismCombinedSectionAssemblyResult.FailureMechanismType);
-            Assert.AreEqual(failureMechanism.Name, actualExportableFailureMechanismCombinedSectionAssemblyResult.Name);
-            Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Dominant, actualExportableFailureMechanismCombinedSectionAssemblyResult.SectionAssemblyResult.AssemblyGroup);
-            Assert.AreEqual(ExportableAssemblyMethod.BOI3B1, actualExportableFailureMechanismCombinedSectionAssemblyResult.SectionAssemblyResult.AssemblyMethod);
+            Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Dominant, actualExportableFailureMechanismCombinedSectionAssemblyResult.AssemblyGroup);
+            Assert.AreEqual(ExportableAssemblyMethod.BOI3B1, actualExportableFailureMechanismCombinedSectionAssemblyResult.AssemblyMethod);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
===================================================================
diff -u -rd8340b402c51ae80af23df797bbbe73a3da9a48e -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision d8340b402c51ae80af23df797bbbe73a3da9a48e)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
@@ -196,7 +196,7 @@
             }
 
             Assert.AreEqual(17, failureMechanismCombinedSectionResults.Count());
-            Assert.IsTrue(failureMechanismCombinedSectionResults.All(result => result.SectionAssemblyResult.AssemblyMethod == ExportableAssemblyMethodFactory.Create(
+            Assert.IsTrue(failureMechanismCombinedSectionResults.All(result => result.AssemblyMethod == ExportableAssemblyMethodFactory.Create(
                                                                                    expectedSection.FailureMechanismResultsAssemblyMethod)));
 
             AssertSubSection(expectedSection.Piping, "STPH", ExportableFailureMechanismType.Generic,
@@ -239,9 +239,7 @@
                                              ExportableFailureMechanismType failureMechanismType,
                                              ExportableFailureMechanismCombinedSectionAssemblyResult actualResult)
         {
-            Assert.AreEqual(subSectionGroup, actualResult.SectionAssemblyResult.AssemblyGroup);
-            Assert.AreEqual(subSectionCode, actualResult.Code);
-            Assert.AreEqual(failureMechanismType, actualResult.FailureMechanismType);
+            Assert.AreEqual(subSectionGroup, actualResult.AssemblyGroup);
         }
     }
 }
\ No newline at end of file