Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableCombinedSectionAssembly.cs
===================================================================
diff -u -rd8340b402c51ae80af23df797bbbe73a3da9a48e -rf8d1729383c35f7c6e435afbfc314beed2b3175e
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableCombinedSectionAssembly.cs	(.../ExportableCombinedSectionAssembly.cs)	(revision d8340b402c51ae80af23df797bbbe73a3da9a48e)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableCombinedSectionAssembly.cs	(.../ExportableCombinedSectionAssembly.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Helpers;
 using Riskeer.AssemblyTool.IO.Model.Enums;
 
@@ -45,12 +44,12 @@
         /// <exception cref="ArgumentException">Thrown when <paramref name="id"/> is invalid.</exception>
         public ExportableCombinedSectionAssembly(string id,
                                                  ExportableCombinedFailureMechanismSection section,
-                                                 FailureMechanismSectionAssemblyGroup assemblyGroup,
+                                                 ExportableFailureMechanismSectionAssemblyGroup assemblyGroup,
                                                  ExportableAssemblyMethod assemblyGroupAssemblyMethod,
                                                  IEnumerable<ExportableFailureMechanismCombinedSectionAssemblyResult> failureMechanismResults)
         {
             IdValidationHelper.ThrowIfInvalid(id);
-            
+
             if (section == null)
             {
                 throw new ArgumentNullException(nameof(section));
@@ -67,7 +66,7 @@
             AssemblyGroupAssemblyMethod = assemblyGroupAssemblyMethod;
             FailureMechanismResults = failureMechanismResults;
         }
-        
+
         /// <summary>
         /// Gets the id of the combined section assembly.
         /// </summary>
@@ -81,7 +80,7 @@
         /// <summary>
         /// Gets the assembly group.
         /// </summary>
-        public FailureMechanismSectionAssemblyGroup AssemblyGroup { get; }
+        public ExportableFailureMechanismSectionAssemblyGroup AssemblyGroup { get; }
 
         /// <summary>
         /// Gets the method that was used to assemble the assembly group for this combined section.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
===================================================================
diff -u -rf70260f208dfbbac4b822a2a4b00a8edc5351ccd -rf8d1729383c35f7c6e435afbfc314beed2b3175e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision f70260f208dfbbac4b822a2a4b00a8edc5351ccd)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
@@ -239,7 +239,7 @@
                 }, new[]
                 {
                     new ExportableCombinedSectionAssembly("resultaat_gecombineerd_1", combinedSection,
-                                                          FailureMechanismSectionAssemblyGroup.I, ExportableAssemblyMethod.BOI3C1,
+                                                          ExportableFailureMechanismSectionAssemblyGroup.I, ExportableAssemblyMethod.BOI3C1,
                                                           new[]
                                                           {
                                                               new ExportableFailureMechanismCombinedSectionAssemblyResult(
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableCombinedSectionAssemblyTest.cs
===================================================================
diff -u -rd8340b402c51ae80af23df797bbbe73a3da9a48e -rf8d1729383c35f7c6e435afbfc314beed2b3175e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableCombinedSectionAssemblyTest.cs	(.../ExportableCombinedSectionAssemblyTest.cs)	(revision d8340b402c51ae80af23df797bbbe73a3da9a48e)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableCombinedSectionAssemblyTest.cs	(.../ExportableCombinedSectionAssemblyTest.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Model;
 using Riskeer.AssemblyTool.IO.Model.Enums;
 using Riskeer.AssemblyTool.IO.TestUtil;
@@ -44,7 +43,7 @@
 
             // Call
             void Call() => new ExportableCombinedSectionAssembly(
-                invalidId, section, random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+                invalidId, section, random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>(),
                 random.NextEnumValue<ExportableAssemblyMethod>(), Enumerable.Empty<ExportableFailureMechanismCombinedSectionAssemblyResult>());
 
             // Assert
@@ -60,7 +59,7 @@
 
             // Call
             void Call() => new ExportableCombinedSectionAssembly(
-                "id", null, random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+                "id", null, random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>(),
                 random.NextEnumValue<ExportableAssemblyMethod>(), Enumerable.Empty<ExportableFailureMechanismCombinedSectionAssemblyResult>());
 
             // Assert
@@ -77,7 +76,7 @@
 
             // Call
             void Call() => new ExportableCombinedSectionAssembly(
-                "id", section, random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+                "id", section, random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>(),
                 random.NextEnumValue<ExportableAssemblyMethod>(), null);
 
             // Assert
@@ -91,7 +90,7 @@
             // Setup
             var random = new Random(21);
             const string id = "id";
-            var assemblyGroup = random.NextEnumValue<FailureMechanismSectionAssemblyGroup>();
+            var assemblyGroup = random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>();
             var assemblyMethod = random.NextEnumValue<ExportableAssemblyMethod>();
 
             ExportableCombinedFailureMechanismSection section = ExportableFailureMechanismSectionTestFactory.CreateExportableCombinedFailureMechanismSection();
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
===================================================================
diff -u -rb355635a42391cc4f1699f6d3a0e3439ef7a7e52 -rf8d1729383c35f7c6e435afbfc314beed2b3175e
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision b355635a42391cc4f1699f6d3a0e3439ef7a7e52)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
@@ -88,7 +88,8 @@
                 ExportableCombinedFailureMechanismSection exportableCombinedSection = registry.Get(assemblyResult);
 
                 var exportableSectionResult = new ExportableCombinedSectionAssembly(
-                    idGenerator.GetNewId(Resources.ExportableCombinedSectionAssembly_IdPrefix), exportableCombinedSection, assemblyResult.TotalResult,
+                    idGenerator.GetNewId(Resources.ExportableCombinedSectionAssembly_IdPrefix), exportableCombinedSection,
+                    ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(assemblyResult.TotalResult),
                     ExportableAssemblyMethodConverter.ConvertTo(assemblyResult.CombinedSectionResultAssemblyMethod),
                     CreateFailureMechanismCombinedSectionAssemblyResults(registry, exportableCombinedSection, assemblyResult, assessmentSection));
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -r6a22c3ff4de0702b053397d1560f18d69155d6a2 -rf8d1729383c35f7c6e435afbfc314beed2b3175e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 6a22c3ff4de0702b053397d1560f18d69155d6a2)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
@@ -128,7 +128,7 @@
 
                 Assert.AreEqual(1, exportableAssessmentSection.CombinedSectionAssemblies.Count());
                 ExportableCombinedSectionAssembly exportableCombinedSectionAssembly = exportableAssessmentSection.CombinedSectionAssemblies.ElementAt(0);
-                Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Zero, exportableCombinedSectionAssembly.AssemblyGroup);
+                Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroup.Zero, exportableCombinedSectionAssembly.AssemblyGroup);
                 Assert.AreEqual(ExportableAssemblyMethod.BOI3C1, exportableCombinedSectionAssembly.AssemblyGroupAssemblyMethod);
 
                 ExportableCombinedFailureMechanismSection exportableCombinedFailureMechanismSection = exportableCombinedSectionAssembly.Section;
@@ -191,7 +191,7 @@
 
                 Assert.AreEqual(1, exportableAssessmentSection.CombinedSectionAssemblies.Count());
                 ExportableCombinedSectionAssembly exportableCombinedSectionAssembly = exportableAssessmentSection.CombinedSectionAssemblies.ElementAt(0);
-                Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Zero, exportableCombinedSectionAssembly.AssemblyGroup);
+                Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroup.Zero, exportableCombinedSectionAssembly.AssemblyGroup);
                 Assert.AreEqual(ExportableAssemblyMethod.BOI3C1, exportableCombinedSectionAssembly.AssemblyGroupAssemblyMethod);
 
                 CollectionAssert.IsEmpty(exportableCombinedSectionAssembly.FailureMechanismResults);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
===================================================================
diff -u -r08a22799875699c55ccdf224a272bdc93d2b0ed1 -rf8d1729383c35f7c6e435afbfc314beed2b3175e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision 08a22799875699c55ccdf224a272bdc93d2b0ed1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
@@ -250,7 +250,7 @@
             Assert.AreEqual($"Gf.{index}", actualSectionResult.Id);
 
             Assert.AreSame(actualSection, actualSectionResult.Section);
-            Assert.AreEqual(expectedSection.TotalResult, actualSectionResult.AssemblyGroup);
+            Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(expectedSection.TotalResult), actualSectionResult.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(expectedSection.CombinedSectionResultAssemblyMethod), actualSectionResult.AssemblyGroupAssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismCombinedSectionAssemblyResult> failureMechanismCombinedSectionResults = actualSectionResult.FailureMechanismResults;