Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionAssemblyResultFactory.cs
===================================================================
diff -u -r67b3d776bcd2a24360d3187557b5aaa6ba74f7c9 -r4f65751c794c7d4631e2c952be7e1a6a50334056
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionAssemblyResultFactory.cs	(.../ExportableFailureMechanismSectionAssemblyResultFactory.cs)	(revision 67b3d776bcd2a24360d3187557b5aaa6ba74f7c9)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionAssemblyResultFactory.cs	(.../ExportableFailureMechanismSectionAssemblyResultFactory.cs)	(revision 4f65751c794c7d4631e2c952be7e1a6a50334056)
@@ -39,7 +39,7 @@
         /// Creates a <see cref="ExportableFailureMechanismSectionAssemblyResult"/>.
         /// </summary>
         /// <param name="idGenerator">The generator to generate ids for the exportable components.</param>
-        /// <param name="registry">The <see cref="ExportableFailureMechanismSectionRegistry"/> to keep track of
+        /// <param name="registry">The <see cref="ExportableModelRegistry"/> to keep track of
         /// the created <see cref="ExportableFailureMechanismSection"/>.</param>
         /// <param name="sectionResult">The <see cref="TSectionResult"/> to assemble for.</param>
         /// <param name="failureMechanism">The <see cref="TFailureMechanism"/> the <paramref name="sectionResult"/>
@@ -53,7 +53,7 @@
         /// <exception cref="AssemblyFactoryException">Thrown when <paramref name="assemblyFunc"/> returns an invalid value
         /// that cannot be exported.</exception>
         public static ExportableFailureMechanismSectionAssemblyResult Create<TSectionResult, TFailureMechanism>(
-            IdentifierGenerator idGenerator, ExportableFailureMechanismSectionRegistry registry,
+            IdentifierGenerator idGenerator, ExportableModelRegistry registry,
             TSectionResult sectionResult, TFailureMechanism failureMechanism, IAssessmentSection assessmentSection,
             Func<TSectionResult, TFailureMechanism, IAssessmentSection, FailureMechanismSectionAssemblyResultWrapper> assemblyFunc)
             where TFailureMechanism : IFailureMechanism<TSectionResult>
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionFactory.cs
===================================================================
diff -u -rda0356f2b46faed6744d985f39372ab5ffa0ac2b -r4f65751c794c7d4631e2c952be7e1a6a50334056
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionFactory.cs	(.../ExportableFailureMechanismSectionFactory.cs)	(revision da0356f2b46faed6744d985f39372ab5ffa0ac2b)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionFactory.cs	(.../ExportableFailureMechanismSectionFactory.cs)	(revision 4f65751c794c7d4631e2c952be7e1a6a50334056)
@@ -120,7 +120,7 @@
                 idGenerator.GetNewId(Resources.ExportableFailureMechanismSection_IdPrefix),
                 FailureMechanismSectionHelper.GetFailureMechanismSectionGeometry(referenceLine, assemblyResult.SectionStart, assemblyResult.SectionEnd),
                 assemblyResult.SectionStart, assemblyResult.SectionEnd,
-                ExportableAssemblyMethodFactory.Create(assemblyResult.CommonSectionAssemblyMethod));
+                ExportableAssemblyMethodConverter.ConvertTo(assemblyResult.CommonSectionAssemblyMethod));
 
             registry.Register(assemblyResult, exportableSection);
             return exportableSection;
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionAssemblyResultFactoryTest.cs
===================================================================
diff -u -rebec6b457e0542ba44b77d1c2471d8966537955d -r4f65751c794c7d4631e2c952be7e1a6a50334056
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionAssemblyResultFactoryTest.cs	(.../ExportableFailureMechanismSectionAssemblyResultFactoryTest.cs)	(revision ebec6b457e0542ba44b77d1c2471d8966537955d)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionAssemblyResultFactoryTest.cs	(.../ExportableFailureMechanismSectionAssemblyResultFactoryTest.cs)	(revision 4f65751c794c7d4631e2c952be7e1a6a50334056)
@@ -48,7 +48,7 @@
 
             // Call
             void Call() => ExportableFailureMechanismSectionAssemblyResultFactory.Create(
-                null, new ExportableFailureMechanismSectionRegistry(), failureMechanism.SectionResults.First(),
+                null, new ExportableModelRegistry(), failureMechanism.SectionResults.First(),
                 failureMechanism, assessmentSection, (sr, fm, section) => null);
 
             // Assert
@@ -86,7 +86,7 @@
 
             // Call
             void Call() => ExportableFailureMechanismSectionAssemblyResultFactory.Create<TestFailureMechanismSectionResult, TestFailureMechanism>(
-                new IdentifierGenerator(), new ExportableFailureMechanismSectionRegistry(), null,
+                new IdentifierGenerator(), new ExportableModelRegistry(), null,
                 failureMechanism, assessmentSection, (sr, fm, section) => null);
 
             // Assert
@@ -105,7 +105,7 @@
 
             // Call
             void Call() => ExportableFailureMechanismSectionAssemblyResultFactory.Create<TestFailureMechanismSectionResult, TestFailureMechanism>(
-                new IdentifierGenerator(), new ExportableFailureMechanismSectionRegistry(), failureMechanism.SectionResults.First(),
+                new IdentifierGenerator(), new ExportableModelRegistry(), failureMechanism.SectionResults.First(),
                 null, assessmentSection, (sr, fm, section) => null);
 
             // Assert
@@ -123,7 +123,7 @@
 
             // Call
             void Call() => ExportableFailureMechanismSectionAssemblyResultFactory.Create(
-                new IdentifierGenerator(), new ExportableFailureMechanismSectionRegistry(), failureMechanism.SectionResults.First(),
+                new IdentifierGenerator(), new ExportableModelRegistry(), failureMechanism.SectionResults.First(),
                 failureMechanism, null, (sr, fm, section) => null);
 
             // Assert
@@ -142,7 +142,7 @@
 
             // Call
             void Call() => ExportableFailureMechanismSectionAssemblyResultFactory.Create(
-                new IdentifierGenerator(), new ExportableFailureMechanismSectionRegistry(), failureMechanism.SectionResults.First(),
+                new IdentifierGenerator(), new ExportableModelRegistry(), failureMechanism.SectionResults.First(),
                 failureMechanism, assessmentSection, null);
 
             // Assert
@@ -164,7 +164,7 @@
 
             // Call
             void Call() => ExportableFailureMechanismSectionAssemblyResultFactory.Create(
-                new IdentifierGenerator(), new ExportableFailureMechanismSectionRegistry(), failureMechanism.SectionResults.First(),
+                new IdentifierGenerator(), new ExportableModelRegistry(), failureMechanism.SectionResults.First(),
                 failureMechanism, assessmentSection, (sr, fm, section) => new FailureMechanismSectionAssemblyResultWrapper(
                     new FailureMechanismSectionAssemblyResult(
                         random.NextDouble(), random.NextDouble(), random.NextDouble(), assemblyGroup),
@@ -188,7 +188,7 @@
 
             var idGenerator = new IdentifierGenerator();
 
-            var registry = new ExportableFailureMechanismSectionRegistry();
+            var registry = new ExportableModelRegistry();
             ExportableFailureMechanismSectionCollectionFactory.CreateExportableFailureMechanismSectionCollection(
                 new IdentifierGenerator(), registry, failureMechanism.Sections);
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionCollectionFactoryTest.cs
===================================================================
diff -u -r3f16d047b4c6d2a626357315f8ae38d678be17bb -r4f65751c794c7d4631e2c952be7e1a6a50334056
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionCollectionFactoryTest.cs	(.../ExportableFailureMechanismSectionCollectionFactoryTest.cs)	(revision 3f16d047b4c6d2a626357315f8ae38d678be17bb)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionCollectionFactoryTest.cs	(.../ExportableFailureMechanismSectionCollectionFactoryTest.cs)	(revision 4f65751c794c7d4631e2c952be7e1a6a50334056)
@@ -234,7 +234,7 @@
             Assert.AreEqual(assemblyResult.SectionStart, exportableCombinedFailureMechanismSection.StartDistance);
             Assert.AreEqual(assemblyResult.SectionEnd, exportableCombinedFailureMechanismSection.EndDistance);
             CollectionAssert.AreEqual(expectedGeometry, exportableCombinedFailureMechanismSection.Geometry);
-            Assert.AreEqual(ExportableAssemblyMethodFactory.Create(assemblyResult.CommonSectionAssemblyMethod), exportableCombinedFailureMechanismSection.AssemblyMethod);
+            Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(assemblyResult.CommonSectionAssemblyMethod), exportableCombinedFailureMechanismSection.AssemblyMethod);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionFactoryTest.cs
===================================================================
diff -u -rda0356f2b46faed6744d985f39372ab5ffa0ac2b -r4f65751c794c7d4631e2c952be7e1a6a50334056
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionFactoryTest.cs	(.../ExportableFailureMechanismSectionFactoryTest.cs)	(revision da0356f2b46faed6744d985f39372ab5ffa0ac2b)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionFactoryTest.cs	(.../ExportableFailureMechanismSectionFactoryTest.cs)	(revision 4f65751c794c7d4631e2c952be7e1a6a50334056)
@@ -210,7 +210,7 @@
             Assert.AreEqual(assemblyResult.SectionStart, exportableSection.StartDistance);
             Assert.AreEqual(assemblyResult.SectionEnd, exportableSection.EndDistance);
             CollectionAssert.AreEqual(expectedGeometry, exportableSection.Geometry);
-            Assert.AreEqual(ExportableAssemblyMethodFactory.Create(assemblyResult.CommonSectionAssemblyMethod), exportableSection.AssemblyMethod);
+            Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(assemblyResult.CommonSectionAssemblyMethod), exportableSection.AssemblyMethod);
         }
 
         [Test]