Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableAssessmentSection.cs
===================================================================
diff -u -ra4772f96edaa97e93ee69ecabe293fe66ae5716a -rfc38f668792f93cab0e9ed864540b622a7d6f406
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableAssessmentSection.cs	(.../ExportableAssessmentSection.cs)	(revision a4772f96edaa97e93ee69ecabe293fe66ae5716a)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableAssessmentSection.cs	(.../ExportableAssessmentSection.cs)	(revision fc38f668792f93cab0e9ed864540b622a7d6f406)
@@ -38,7 +38,7 @@
         /// <param name="id">The id of the assessment section.</param>
         /// <param name="name">The name of the assessment section.</param>
         /// <param name="geometry">The geometry of the assessment section.</param>
-        /// <param name="failureMechanismSectionCollections">The collection of failure mechanism sections.</param>
+        /// <param name="failureMechanismSectionCollections">The collection of failure mechanism section collections.</param>
         /// <param name="assessmentSectionAssembly">The assembly result of the assessment section.</param>
         /// <param name="failureMechanisms">The assembly results of failure mechanisms belonging
         /// to this assessment section.</param>
@@ -111,7 +111,7 @@
         public IEnumerable<Point2D> Geometry { get; }
 
         /// <summary>
-        /// Gets the collection of failure mechanism sections.
+        /// Gets the collection of failure mechanism section collections.
         /// </summary>
         public IEnumerable<ExportableFailureMechanismSectionCollection> FailureMechanismSectionCollections { get; }
 
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismCombinedSectionAssemblyResult.cs
===================================================================
diff -u -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7 -rfc38f668792f93cab0e9ed864540b622a7d6f406
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismCombinedSectionAssemblyResult.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResult.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismCombinedSectionAssemblyResult.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResult.cs)	(revision fc38f668792f93cab0e9ed864540b622a7d6f406)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Model.Enums;
 
 namespace Riskeer.AssemblyTool.IO.Model
@@ -37,7 +36,7 @@
         /// <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,
+        public ExportableFailureMechanismCombinedSectionAssemblyResult(ExportableFailureMechanismSectionAssemblyGroup assemblyGroup,
                                                                        ExportableAssemblyMethod assemblyMethod,
                                                                        ExportableFailureMechanismSectionAssemblyResult failureMechanismSectionResult)
         {
@@ -54,13 +53,13 @@
         /// <summary>
         /// Gets the assembly group of this section.
         /// </summary>
-        public FailureMechanismSectionAssemblyGroup AssemblyGroup { get; }
-        
+        public ExportableFailureMechanismSectionAssemblyGroup AssemblyGroup { get; }
+
         /// <summary>
         /// Gets the assembly method that was used to assemble the assembly result.
         /// </summary>
         public ExportableAssemblyMethod AssemblyMethod { get; }
-        
+
         /// <summary>
         /// Gets the associated failure mechanism section result.
         /// </summary>
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
===================================================================
diff -u -rf8d1729383c35f7c6e435afbfc314beed2b3175e -rfc38f668792f93cab0e9ed864540b622a7d6f406
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision fc38f668792f93cab0e9ed864540b622a7d6f406)
@@ -29,7 +29,6 @@
 using Core.Common.TestUtil;
 using Core.Common.Util;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Model;
 using Riskeer.AssemblyTool.IO.Model.Enums;
 
@@ -243,7 +242,7 @@
                                                           new[]
                                                           {
                                                               new ExportableFailureMechanismCombinedSectionAssemblyResult(
-                                                                  FailureMechanismSectionAssemblyGroup.I, ExportableAssemblyMethod.BOI3B1,
+                                                                  ExportableFailureMechanismSectionAssemblyGroup.I, ExportableAssemblyMethod.BOI3B1,
                                                                   failureMechanismSectionAssemblyResult)
                                                           })
                 });
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs
===================================================================
diff -u -r6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7 -rfc38f668792f93cab0e9ed864540b622a7d6f406
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs)	(revision 6987efa7ae64f10c5c00802ca6b3ba0c08cd5ab7)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs	(.../ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs)	(revision fc38f668792f93cab0e9ed864540b622a7d6f406)
@@ -22,7 +22,6 @@
 using System;
 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;
@@ -40,7 +39,8 @@
 
             // Call
             void Call() => new ExportableFailureMechanismCombinedSectionAssemblyResult(
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(), random.NextEnumValue<ExportableAssemblyMethod>(), null);
+                random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>(),
+                random.NextEnumValue<ExportableAssemblyMethod>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -56,7 +56,7 @@
             ExportableFailureMechanismSectionAssemblyResult failureMechanismSectionAssemblyResult = ExportableFailureMechanismSectionAssemblyResultTestFactory.Create(section, seed);
 
             var random = new Random(seed);
-            var assemblyGroup = random.NextEnumValue<FailureMechanismSectionAssemblyGroup>();
+            var assemblyGroup = random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>();
             var assemblyMethod = random.NextEnumValue<ExportableAssemblyMethod>();
 
             // Call
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
===================================================================
diff -u -r81843e82acc9b390e84b9478fd26e6af8a0fc4d5 -rfc38f668792f93cab0e9ed864540b622a7d6f406
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision 81843e82acc9b390e84b9478fd26e6af8a0fc4d5)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision fc38f668792f93cab0e9ed864540b622a7d6f406)
@@ -155,7 +155,8 @@
             FailureMechanismSectionAssemblyGroup sectionAssemblyGroup, AssemblyMethod assemblyMethod)
         {
             return new ExportableFailureMechanismCombinedSectionAssemblyResult(
-                sectionAssemblyGroup, ExportableAssemblyMethodConverter.ConvertTo(assemblyMethod),
+                ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(sectionAssemblyGroup),
+                ExportableAssemblyMethodConverter.ConvertTo(assemblyMethod),
                 ExportableCombinedFailureMechanismSectionHelper.GetExportableFailureMechanismSectionAssemblyResult(
                     registry, sectionResults, combinedFailureMechanismSection));
         }
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -rf8d1729383c35f7c6e435afbfc314beed2b3175e -rfc38f668792f93cab0e9ed864540b622a7d6f406
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision fc38f668792f93cab0e9ed864540b622a7d6f406)
@@ -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.KernelWrapper.TestUtil.Calculators;
@@ -420,7 +419,7 @@
             ExportableFailureMechanismSectionAssemblyResult associatedAssemblyResult = GetCorrespondingSectionAssemblyResultResult(
                 combinedFailureMechanismSectionAssembly, failureMechanismSectionAssemblyResults);
             Assert.AreSame(associatedAssemblyResult, actualExportableFailureMechanismCombinedSectionAssemblyResult.FailureMechanismSectionResult);
-            Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Dominant, actualExportableFailureMechanismCombinedSectionAssemblyResult.AssemblyGroup);
+            Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroup.Dominant, actualExportableFailureMechanismCombinedSectionAssemblyResult.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.BOI3B1, actualExportableFailureMechanismCombinedSectionAssemblyResult.AssemblyMethod);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
===================================================================
diff -u -rf8d1729383c35f7c6e435afbfc314beed2b3175e -rfc38f668792f93cab0e9ed864540b622a7d6f406
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision f8d1729383c35f7c6e435afbfc314beed2b3175e)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision fc38f668792f93cab0e9ed864540b622a7d6f406)
@@ -306,7 +306,7 @@
                                                 ExportableFailureMechanismCombinedSectionAssemblyResult actualResult)
             where T : FailureMechanismSectionResult
         {
-            Assert.AreEqual(subSectionGroup, actualResult.AssemblyGroup);
+            Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(subSectionGroup.Value), actualResult.AssemblyGroup);
 
             T sectionResult = failureMechanism.SectionResults.ElementAt(index);
             ExportableFailureMechanismSectionAssemblyResult expectedExportableSectionResult = registry.Get(sectionResult);