Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
===================================================================
diff -u -r1c2bda6af93900e00924d260e4d18072cdc7f042 -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision 1c2bda6af93900e00924d260e4d18072cdc7f042)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -70,12 +70,12 @@
         {
             return new[]
             {
-                ExportablePipingFailureMechanismFactory.CreateExportablePipingFailureMechanism(assessmentSection.Piping, assessmentSection),
-                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableMacroStabilityInwardsFailureMechanism(assessmentSection.MacroStabilityInwards, assessmentSection),
-                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableGrassCoverErosionInwardsFailureMechanism(assessmentSection.GrassCoverErosionInwards, assessmentSection),
-                ExportableHeightStructuresFailureMechanismFactory.CreateExportableHeightStructuresFailureMechanism(assessmentSection.HeightStructures, assessmentSection),
-                ExportableClosingStructuresFailureMechanismFactory.CreateExportableClosingStructuresFailureMechanism(assessmentSection.ClosingStructures, assessmentSection),
-                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableStabilityPointStructuresFailureMechanism(assessmentSection.StabilityPointStructures, assessmentSection)
+                ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.Piping, assessmentSection),
+                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.MacroStabilityInwards, assessmentSection),
+                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.GrassCoverErosionInwards, assessmentSection),
+                ExportableHeightStructuresFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.HeightStructures, assessmentSection),
+                ExportableClosingStructuresFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.ClosingStructures, assessmentSection),
+                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.StabilityPointStructures, assessmentSection)
             };
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs
===================================================================
diff -u -r216c31765e8b886d171cb95860883e22a5d1b33e -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs	(.../ExportableClosingStructuresFailureMechanismFactory.cs)	(revision 216c31765e8b886d171cb95860883e22a5d1b33e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs	(.../ExportableClosingStructuresFailureMechanismFactory.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -29,7 +29,7 @@
         /// <returns>A <see cref="ExportableFailureMechanism{TFailureMechanismAssemblyResult}"/> with assembly results.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
-        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableClosingStructuresFailureMechanism(
+        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableFailureMechanism(
             ClosingStructuresFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
         {
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs
===================================================================
diff -u -r216c31765e8b886d171cb95860883e22a5d1b33e -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs)	(revision 216c31765e8b886d171cb95860883e22a5d1b33e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -29,7 +29,7 @@
         /// <returns>A <see cref="ExportableFailureMechanism{TFailureMechanismAssemblyResult}"/> with assembly results.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
-        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableGrassCoverErosionInwardsFailureMechanism(
+        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableFailureMechanism(
             GrassCoverErosionInwardsFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
         {
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs
===================================================================
diff -u -r216c31765e8b886d171cb95860883e22a5d1b33e -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs	(.../ExportableHeightStructuresFailureMechanismFactory.cs)	(revision 216c31765e8b886d171cb95860883e22a5d1b33e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs	(.../ExportableHeightStructuresFailureMechanismFactory.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -29,7 +29,7 @@
         /// <returns>A <see cref="ExportableFailureMechanism{TFailureMechanismAssemblyResult}"/> with assembly results.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
-        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableHeightStructuresFailureMechanism(
+        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableFailureMechanism(
             HeightStructuresFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
         {
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs
===================================================================
diff -u -r216c31765e8b886d171cb95860883e22a5d1b33e -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactory.cs)	(revision 216c31765e8b886d171cb95860883e22a5d1b33e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactory.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -29,7 +29,7 @@
         /// <returns>A <see cref="ExportableFailureMechanism{TFailureMechanismAssemblyResult}"/> with assembly results.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
-        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableMacroStabilityInwardsFailureMechanism(
+        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableFailureMechanism(
             MacroStabilityInwardsFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
         {
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs
===================================================================
diff -u -r216c31765e8b886d171cb95860883e22a5d1b33e -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs	(.../ExportablePipingFailureMechanismFactory.cs)	(revision 216c31765e8b886d171cb95860883e22a5d1b33e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs	(.../ExportablePipingFailureMechanismFactory.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -29,7 +29,7 @@
         /// <returns>A <see cref="ExportableFailureMechanism{TFailureMechanismAssemblyResult}"/> with assembly results.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
-        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportablePipingFailureMechanism(
+        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableFailureMechanism(
             PipingFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
         {
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs
===================================================================
diff -u -r216c31765e8b886d171cb95860883e22a5d1b33e -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactory.cs)	(revision 216c31765e8b886d171cb95860883e22a5d1b33e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactory.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -29,7 +29,7 @@
         /// <returns>A <see cref="ExportableFailureMechanism{TFailureMechanismAssemblyResult}"/> with assembly results.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created.</exception>
-        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableStabilityPointStructuresFailureMechanism(
+        public static ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> CreateExportableFailureMechanism(
             StabilityPointStructuresFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection)
         {
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs
===================================================================
diff -u -r6056937ae2b62d8d74261b245888702f00b69747 -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs	(.../ExportableClosingStructuresFailureMechanismFactoryTest.cs)	(revision 6056937ae2b62d8d74261b245888702f00b69747)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs	(.../ExportableClosingStructuresFailureMechanismFactoryTest.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -20,7 +20,7 @@
     public class ExportableClosingStructuresFailureMechanismFactoryTest
     {
         [Test]
-        public void CreateExportableClosingStructuresFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -29,8 +29,8 @@
 
             // Call
             TestDelegate call = () =>
-                ExportableClosingStructuresFailureMechanismFactory.CreateExportableClosingStructuresFailureMechanism(null,
-                                                                                                                     assessmentSection);
+                ExportableClosingStructuresFailureMechanismFactory.CreateExportableFailureMechanism(null,
+                                                                                                    assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -40,20 +40,20 @@
         }
 
         [Test]
-        public void CreateExportableClosingStructuresFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () =>
-                ExportableClosingStructuresFailureMechanismFactory.CreateExportableClosingStructuresFailureMechanism(new ClosingStructuresFailureMechanism(),
-                                                                                                                     null);
+                ExportableClosingStructuresFailureMechanismFactory.CreateExportableFailureMechanism(new ClosingStructuresFailureMechanism(),
+                                                                                                    null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         [Test]
-        public void CreateExportableClosingStructuresFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -67,7 +67,7 @@
 
             // Call
             ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                ExportableClosingStructuresFailureMechanismFactory.CreateExportableClosingStructuresFailureMechanism(failureMechanism, assessmentSection);
+                ExportableClosingStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreEqual(ExportableFailureMechanismType.BSKW, exportableFailureMechanism.Code);
@@ -83,7 +83,7 @@
         }
 
         [Test]
-        public void CreateExportableClosingStructuresFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -100,7 +100,7 @@
 
                 // Call
                 ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                    ExportableClosingStructuresFailureMechanismFactory.CreateExportableClosingStructuresFailureMechanism(failureMechanism, assessmentSection);
+                    ExportableClosingStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
                 // Assert
                 Assert.AreEqual(ExportableFailureMechanismType.BSKW, exportableFailureMechanism.Code);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -r7effbe398a2cf5fdb977851cb8d63bed6ebec611 -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs)	(revision 7effbe398a2cf5fdb977851cb8d63bed6ebec611)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -20,7 +20,7 @@
     public class ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest
     {
         [Test]
-        public void CreateExportableGrassCoverErosionInwardsFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -29,8 +29,8 @@
 
             // Call
             TestDelegate call = () =>
-                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableGrassCoverErosionInwardsFailureMechanism(null,
-                                                                                                                                   assessmentSection);
+                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableFailureMechanism(null,
+                                                                                                           assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -40,20 +40,20 @@
         }
 
         [Test]
-        public void CreateExportableGrassCoverErosionInwardsFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () =>
-                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableGrassCoverErosionInwardsFailureMechanism(new GrassCoverErosionInwardsFailureMechanism(),
-                                                                                                                                   null);
+                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableFailureMechanism(new GrassCoverErosionInwardsFailureMechanism(),
+                                                                                                           null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         [Test]
-        public void CreateExportableGrassCoverErosionInwardsFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -67,7 +67,7 @@
 
             // Call
             ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableGrassCoverErosionInwardsFailureMechanism(failureMechanism, assessmentSection);
+                ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreEqual(ExportableFailureMechanismType.GEKB, exportableFailureMechanism.Code);
@@ -83,7 +83,7 @@
         }
 
         [Test]
-        public void CreateExportableGrassCoverErosionInwardsFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -100,7 +100,7 @@
 
                 // Call
                 ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                    ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableGrassCoverErosionInwardsFailureMechanism(failureMechanism, assessmentSection);
+                    ExportableGrassCoverErosionInwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
                 // Assert
                 Assert.AreEqual(ExportableFailureMechanismType.GEKB, exportableFailureMechanism.Code);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs
===================================================================
diff -u -rafd3fc3d57bb7568d0232d9be934602b79c37aa2 -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs	(.../ExportableHeightStructuresFailureMechanismFactoryTest.cs)	(revision afd3fc3d57bb7568d0232d9be934602b79c37aa2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs	(.../ExportableHeightStructuresFailureMechanismFactoryTest.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -20,7 +20,7 @@
     public class ExportableHeightStructuresFailureMechanismFactoryTest
     {
         [Test]
-        public void CreateExportableHeightStructuresFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -29,8 +29,8 @@
 
             // Call
             TestDelegate call = () =>
-                ExportableHeightStructuresFailureMechanismFactory.CreateExportableHeightStructuresFailureMechanism(null,
-                                                                                                                   assessmentSection);
+                ExportableHeightStructuresFailureMechanismFactory.CreateExportableFailureMechanism(null,
+                                                                                                   assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -40,20 +40,20 @@
         }
 
         [Test]
-        public void CreateExportableHeightStructuresFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () =>
-                ExportableHeightStructuresFailureMechanismFactory.CreateExportableHeightStructuresFailureMechanism(new HeightStructuresFailureMechanism(),
-                                                                                                                   null);
+                ExportableHeightStructuresFailureMechanismFactory.CreateExportableFailureMechanism(new HeightStructuresFailureMechanism(),
+                                                                                                   null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         [Test]
-        public void CreateExportableHeightStructuresFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -67,7 +67,7 @@
 
             // Call
             ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                ExportableHeightStructuresFailureMechanismFactory.CreateExportableHeightStructuresFailureMechanism(failureMechanism, assessmentSection);
+                ExportableHeightStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreEqual(ExportableFailureMechanismType.HTKW, exportableFailureMechanism.Code);
@@ -83,7 +83,7 @@
         }
 
         [Test]
-        public void CreateExportableHeightStructuresFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -100,7 +100,7 @@
 
                 // Call
                 ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                    ExportableHeightStructuresFailureMechanismFactory.CreateExportableHeightStructuresFailureMechanism(failureMechanism, assessmentSection);
+                    ExportableHeightStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
                 // Assert
                 Assert.AreEqual(ExportableFailureMechanismType.HTKW, exportableFailureMechanism.Code);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -r216c31765e8b886d171cb95860883e22a5d1b33e -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs)	(revision 216c31765e8b886d171cb95860883e22a5d1b33e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -20,7 +20,7 @@
     public class ExportableMacroStabilityInwardsFailureMechanismFactoryTest
     {
         [Test]
-        public void CreateExportableMacroStabilityInwardsFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -29,8 +29,8 @@
 
             // Call
             TestDelegate call = () =>
-                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableMacroStabilityInwardsFailureMechanism(null,
-                                                                                                                             assessmentSection);
+                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableFailureMechanism(null,
+                                                                                                        assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -40,20 +40,20 @@
         }
 
         [Test]
-        public void CreateExportableMacroStabilityInwardsFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () =>
-                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableMacroStabilityInwardsFailureMechanism(new MacroStabilityInwardsFailureMechanism(),
-                                                                                                                             null);
+                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableFailureMechanism(new MacroStabilityInwardsFailureMechanism(),
+                                                                                                        null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         [Test]
-        public void CreateExportableMacroStabilityInwardsFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -67,7 +67,7 @@
 
             // Call
             ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableMacroStabilityInwardsFailureMechanism(failureMechanism, assessmentSection);
+                ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreEqual(ExportableFailureMechanismType.STBI, exportableFailureMechanism.Code);
@@ -83,7 +83,7 @@
         }
 
         [Test]
-        public void CreateExportableMacroStabilityInwardsFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -100,7 +100,7 @@
 
                 // Call
                 ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                    ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableMacroStabilityInwardsFailureMechanism(failureMechanism, assessmentSection);
+                    ExportableMacroStabilityInwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
                 // Assert
                 Assert.AreEqual(ExportableFailureMechanismType.STBI, exportableFailureMechanism.Code);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs
===================================================================
diff -u -r0fd76a0bde626efdb5058ada2df39285ca4333cf -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs	(.../ExportablePipingFailureMechanismFactoryTest.cs)	(revision 0fd76a0bde626efdb5058ada2df39285ca4333cf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs	(.../ExportablePipingFailureMechanismFactoryTest.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -20,15 +20,15 @@
     public class ExportablePipingFailureMechanismFactoryTest
     {
         [Test]
-        public void CreateExportablePipingFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => ExportablePipingFailureMechanismFactory.CreateExportablePipingFailureMechanism(null,
+            TestDelegate call = () => ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(null,
                                                                                                                      assessmentSection);
 
             // Assert
@@ -39,10 +39,10 @@
         }
 
         [Test]
-        public void CreateExportablePipingFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => ExportablePipingFailureMechanismFactory.CreateExportablePipingFailureMechanism(new PipingFailureMechanism(),
+            TestDelegate call = () => ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(new PipingFailureMechanism(),
                                                                                                                      null);
 
             // Assert
@@ -51,7 +51,7 @@
         }
 
         [Test]
-        public void CreateExportablePipingFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -65,7 +65,7 @@
 
             // Call
             ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                ExportablePipingFailureMechanismFactory.CreateExportablePipingFailureMechanism(failureMechanism, assessmentSection);
+                ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreEqual(ExportableFailureMechanismType.STPH, exportableFailureMechanism.Code);
@@ -81,7 +81,7 @@
         }
 
         [Test]
-        public void CreateExportablePipingFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -98,7 +98,7 @@
 
                 // Call
                 ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                    ExportablePipingFailureMechanismFactory.CreateExportablePipingFailureMechanism(failureMechanism, assessmentSection);
+                    ExportablePipingFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
                 // Assert
                 Assert.AreEqual(ExportableFailureMechanismType.STPH, exportableFailureMechanism.Code);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs
===================================================================
diff -u -r67ccd648ef0db4b9e75c60d2e060128fa8f54691 -re9ab2425db9e47647afa883e4a3b7032322ae709
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs)	(revision 67ccd648ef0db4b9e75c60d2e060128fa8f54691)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs)	(revision e9ab2425db9e47647afa883e4a3b7032322ae709)
@@ -20,7 +20,7 @@
     public class ExportableStabilityPointStructuresFailureMechanismFactoryTest
     {
         [Test]
-        public void CreateExportableStabilityPointStructuresFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -29,8 +29,8 @@
 
             // Call
             TestDelegate call = () =>
-                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableStabilityPointStructuresFailureMechanism(null,
-                                                                                                                                   assessmentSection);
+                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableFailureMechanism(null,
+                                                                                                           assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -40,20 +40,20 @@
         }
 
         [Test]
-        public void CreateExportableStabilityPointStructuresFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void CreateExportableFailureMechanism_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () =>
-                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableStabilityPointStructuresFailureMechanism(new StabilityPointStructuresFailureMechanism(),
-                                                                                                                                   null);
+                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableFailureMechanism(new StabilityPointStructuresFailureMechanism(),
+                                                                                                           null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         [Test]
-        public void CreateExportableStabilityPointStructuresFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismNotRelevant_ReturnsDefaultExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -67,7 +67,7 @@
 
             // Call
             ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableStabilityPointStructuresFailureMechanism(failureMechanism, assessmentSection);
+                ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreEqual(ExportableFailureMechanismType.STKWp, exportableFailureMechanism.Code);
@@ -83,7 +83,7 @@
         }
 
         [Test]
-        public void CreateExportableStabilityPointStructuresFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
+        public void CreateExportableFailureMechanism_WithFailureMechanismRelevant_ReturnsExportableFailureMechanism()
         {
             // Setup
             var random = new Random(21);
@@ -100,7 +100,7 @@
 
                 // Call
                 ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> exportableFailureMechanism =
-                    ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableStabilityPointStructuresFailureMechanism(failureMechanism, assessmentSection);
+                    ExportableStabilityPointStructuresFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
                 // Assert
                 Assert.AreEqual(ExportableFailureMechanismType.STKWp, exportableFailureMechanism.Code);