Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismSectionAssemblyResult.cs
===================================================================
diff -u -rfaef9046b62f643860c2885dc4270fce2542a1e3 -rf70260f208dfbbac4b822a2a4b00a8edc5351ccd
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismSectionAssemblyResult.cs	(.../ExportableFailureMechanismSectionAssemblyResult.cs)	(revision faef9046b62f643860c2885dc4270fce2542a1e3)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismSectionAssemblyResult.cs	(.../ExportableFailureMechanismSectionAssemblyResult.cs)	(revision f70260f208dfbbac4b822a2a4b00a8edc5351ccd)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Helpers;
 using Riskeer.AssemblyTool.IO.Model.Enums;
 
@@ -45,12 +44,12 @@
         public ExportableFailureMechanismSectionAssemblyResult(string id,
                                                                ExportableFailureMechanismSection failureMechanismSection,
                                                                double probability,
-                                                               FailureMechanismSectionAssemblyGroup assemblyGroup,
+                                                               ExportableFailureMechanismSectionAssemblyGroup assemblyGroup,
                                                                ExportableAssemblyMethod assemblyGroupAssemblyMethod,
                                                                ExportableAssemblyMethod probabilityAssemblyMethod)
         {
             IdValidationHelper.ThrowIfInvalid(id);
-            
+
             if (failureMechanismSection == null)
             {
                 throw new ArgumentNullException(nameof(failureMechanismSection));
@@ -77,7 +76,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 section.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
===================================================================
diff -u -r452d2a4774cf89c6dce7ee4d7cbd482c26d14569 -rf70260f208dfbbac4b822a2a4b00a8edc5351ccd
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision 452d2a4774cf89c6dce7ee4d7cbd482c26d14569)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision f70260f208dfbbac4b822a2a4b00a8edc5351ccd)
@@ -203,7 +203,7 @@
             }, 0.12, 10.23, ExportableAssemblyMethod.BOI3A1);
 
             var failureMechanismSectionAssemblyResult = new ExportableFailureMechanismSectionAssemblyResult(
-                "resultaat_GABI_1", failureMechanismSection, 0.00073, FailureMechanismSectionAssemblyGroup.III,
+                "resultaat_GABI_1", failureMechanismSection, 0.00073, ExportableFailureMechanismSectionAssemblyGroup.III,
                 ExportableAssemblyMethod.BOI0B1, ExportableAssemblyMethod.BOI0A2);
 
             var assessmentSection = new ExportableAssessmentSection(
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionAssemblyResultTest.cs
===================================================================
diff -u -rfaef9046b62f643860c2885dc4270fce2542a1e3 -rf70260f208dfbbac4b822a2a4b00a8edc5351ccd
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionAssemblyResultTest.cs	(.../ExportableFailureMechanismSectionAssemblyResultTest.cs)	(revision faef9046b62f643860c2885dc4270fce2542a1e3)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionAssemblyResultTest.cs	(.../ExportableFailureMechanismSectionAssemblyResultTest.cs)	(revision f70260f208dfbbac4b822a2a4b00a8edc5351ccd)
@@ -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;
@@ -42,7 +41,7 @@
 
             // Call
             void Call() => new ExportableFailureMechanismSectionAssemblyResult(invalidId, section, random.NextDouble(),
-                                                                               random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+                                                                               random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>(),
                                                                                random.NextEnumValue<ExportableAssemblyMethod>(),
                                                                                random.NextEnumValue<ExportableAssemblyMethod>());
 
@@ -59,7 +58,7 @@
 
             // Call
             void Call() => new ExportableFailureMechanismSectionAssemblyResult("id", null, random.NextDouble(),
-                                                                               random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+                                                                               random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>(),
                                                                                random.NextEnumValue<ExportableAssemblyMethod>(),
                                                                                random.NextEnumValue<ExportableAssemblyMethod>());
 
@@ -77,7 +76,7 @@
             var random = new Random(21);
             double probability = random.NextDouble();
             ExportableFailureMechanismSection section = ExportableFailureMechanismSectionTestFactory.CreateExportableFailureMechanismSection();
-            var assemblyGroup = random.NextEnumValue<FailureMechanismSectionAssemblyGroup>();
+            var assemblyGroup = random.NextEnumValue<ExportableFailureMechanismSectionAssemblyGroup>();
             var assemblyMethod = random.NextEnumValue<ExportableAssemblyMethod>();
             var probabilityAssemblyMethod = random.NextEnumValue<ExportableAssemblyMethod>();
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultAssertHelper.cs
===================================================================
diff -u -rd39840d43d8d7ec0687a6172a83543d1cb60e1ba -rf70260f208dfbbac4b822a2a4b00a8edc5351ccd
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultAssertHelper.cs	(.../ExportableFailureMechanismSectionAssemblyResultAssertHelper.cs)	(revision d39840d43d8d7ec0687a6172a83543d1cb60e1ba)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultAssertHelper.cs	(.../ExportableFailureMechanismSectionAssemblyResultAssertHelper.cs)	(revision f70260f208dfbbac4b822a2a4b00a8edc5351ccd)
@@ -83,7 +83,7 @@
             Assert.AreEqual($"Fa.{i}", actualExportableAssemblyResult.Id);
             Assert.AreSame(section, actualExportableAssemblyResult.FailureMechanismSection);
             FailureMechanismSectionAssemblyResult expectedAssemblyResult = expectedAssemblyResultWrapper.AssemblyResult;
-            Assert.AreEqual(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup, actualExportableAssemblyResult.AssemblyGroup);
+            Assert.AreEqual(ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup), actualExportableAssemblyResult.AssemblyGroup);
             Assert.AreEqual(expectedAssemblyResult.SectionProbability, actualExportableAssemblyResult.Probability);
             Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(expectedAssemblyResultWrapper.AssemblyGroupMethod),
                             actualExportableAssemblyResult.AssemblyGroupAssemblyMethod);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestFactory.cs
===================================================================
diff -u -r191163e5ea9e3725076cd87d69225f6420bd2aad -rf70260f208dfbbac4b822a2a4b00a8edc5351ccd
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestFactory.cs	(.../ExportableFailureMechanismSectionAssemblyResultTestFactory.cs)	(revision 191163e5ea9e3725076cd87d69225f6420bd2aad)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestFactory.cs	(.../ExportableFailureMechanismSectionAssemblyResultTestFactory.cs)	(revision f70260f208dfbbac4b822a2a4b00a8edc5351ccd)
@@ -21,7 +21,6 @@
 
 using System;
 using Core.Common.TestUtil;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.IO.Model;
 using Riskeer.AssemblyTool.IO.Model.Enums;
 
@@ -49,15 +48,15 @@
                 random.NextDouble(),
                 random.NextEnumValue(new[]
                 {
-                    FailureMechanismSectionAssemblyGroup.NotDominant,
-                    FailureMechanismSectionAssemblyGroup.III,
-                    FailureMechanismSectionAssemblyGroup.II,
-                    FailureMechanismSectionAssemblyGroup.I,
-                    FailureMechanismSectionAssemblyGroup.Zero,
-                    FailureMechanismSectionAssemblyGroup.IMin,
-                    FailureMechanismSectionAssemblyGroup.IIMin,
-                    FailureMechanismSectionAssemblyGroup.IIIMin,
-                    FailureMechanismSectionAssemblyGroup.NotRelevant
+                    ExportableFailureMechanismSectionAssemblyGroup.NotDominant,
+                    ExportableFailureMechanismSectionAssemblyGroup.III,
+                    ExportableFailureMechanismSectionAssemblyGroup.II,
+                    ExportableFailureMechanismSectionAssemblyGroup.I,
+                    ExportableFailureMechanismSectionAssemblyGroup.Zero,
+                    ExportableFailureMechanismSectionAssemblyGroup.IMin,
+                    ExportableFailureMechanismSectionAssemblyGroup.IIMin,
+                    ExportableFailureMechanismSectionAssemblyGroup.IIIMin,
+                    ExportableFailureMechanismSectionAssemblyGroup.NotRelevant
                 }),
                 random.NextEnumValue<ExportableAssemblyMethod>(),
                 random.NextEnumValue<ExportableAssemblyMethod>());
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionAssemblyResultFactory.cs
===================================================================
diff -u -rb355635a42391cc4f1699f6d3a0e3439ef7a7e52 -rf70260f208dfbbac4b822a2a4b00a8edc5351ccd
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionAssemblyResultFactory.cs	(.../ExportableFailureMechanismSectionAssemblyResultFactory.cs)	(revision b355635a42391cc4f1699f6d3a0e3439ef7a7e52)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionAssemblyResultFactory.cs	(.../ExportableFailureMechanismSectionAssemblyResultFactory.cs)	(revision f70260f208dfbbac4b822a2a4b00a8edc5351ccd)
@@ -107,7 +107,8 @@
             var exportableFailureMechanismSectionAssemblyResult = new ExportableFailureMechanismSectionAssemblyResult(
                 idGenerator.GetNewId(Resources.ExportableFailureMechanismSectionAssemblyResult_IdPrefix),
                 registry.Get(sectionResult.Section),
-                assemblyResult.SectionProbability, assemblyResult.FailureMechanismSectionAssemblyGroup,
+                assemblyResult.SectionProbability,
+                ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(assemblyResult.FailureMechanismSectionAssemblyGroup),
                 ExportableAssemblyMethodConverter.ConvertTo(assemblyResultWrapper.AssemblyGroupMethod),
                 ExportableAssemblyMethodConverter.ConvertTo(assemblyResultWrapper.ProbabilityMethod));