Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
===================================================================
diff -u -rfd914c7f9a3793fde3aaf8a8bc101f9c44de3c33 -r3efc79a1c526fe3fc890a419fcac978190456251
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision fd914c7f9a3793fde3aaf8a8bc101f9c44de3c33)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision 3efc79a1c526fe3fc890a419fcac978190456251)
@@ -108,26 +108,18 @@
                 exportableFailureMechanisms, assessmentSection.Piping, assessmentSection, PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 PipingFailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
 
-            AddFailureMechanismWhenInAssembly<MacroStabilityInwardsFailureMechanism, AdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                exportableFailureMechanisms, assessmentSection.MacroStabilityInwards, assessmentSection, MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
-
             AddFailureMechanismWhenInAssembly<GrassCoverErosionInwardsFailureMechanism, AdoptableWithProfileProbabilityFailureMechanismSectionResult>(
                 exportableFailureMechanisms, assessmentSection.GrassCoverErosionInwards, assessmentSection, GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
 
-            AddFailureMechanismWhenInAssembly<HeightStructuresFailureMechanism, AdoptableFailureMechanismSectionResult>(
-                exportableFailureMechanisms, assessmentSection.HeightStructures, assessmentSection, HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                StructuresFailureMechanismAssemblyFactory.AssembleSection<HeightStructuresInput>, ExportableFailureMechanismType.Generic);
+            AddFailureMechanismWhenInAssembly<MacroStabilityInwardsFailureMechanism, AdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                exportableFailureMechanisms, assessmentSection.MacroStabilityInwards, assessmentSection, MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
 
-            AddFailureMechanismWhenInAssembly<ClosingStructuresFailureMechanism, AdoptableFailureMechanismSectionResult>(
-                exportableFailureMechanisms, assessmentSection.ClosingStructures, assessmentSection, ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                StructuresFailureMechanismAssemblyFactory.AssembleSection<ClosingStructuresInput>, ExportableFailureMechanismType.Generic);
+            AddFailureMechanismWhenInAssembly<MicrostabilityFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                exportableFailureMechanisms, assessmentSection.Microstability, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
 
-            AddFailureMechanismWhenInAssembly<StabilityPointStructuresFailureMechanism, AdoptableFailureMechanismSectionResult>(
-                exportableFailureMechanisms, assessmentSection.StabilityPointStructures, assessmentSection, StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                StructuresFailureMechanismAssemblyFactory.AssembleSection<StabilityPointStructuresInput>, ExportableFailureMechanismType.Generic);
-
             AddFailureMechanismWhenInAssembly<StabilityStoneCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
                 exportableFailureMechanisms, assessmentSection.StabilityStoneCover, assessmentSection, StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
@@ -136,18 +128,14 @@
                 exportableFailureMechanisms, assessmentSection.WaveImpactAsphaltCover, assessmentSection, WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
 
+            AddFailureMechanismWhenInAssembly<WaterPressureAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                exportableFailureMechanisms, assessmentSection.WaterPressureAsphaltCover, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
+
             AddFailureMechanismWhenInAssembly<GrassCoverErosionOutwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
                 exportableFailureMechanisms, assessmentSection.GrassCoverErosionOutwards, assessmentSection, GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
 
-            AddFailureMechanismWhenInAssembly<DuneErosionFailureMechanism, NonAdoptableFailureMechanismSectionResult>(
-                exportableFailureMechanisms, assessmentSection.DuneErosion, assessmentSection, DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                (sr, fm, ass) => FailureMechanismSectionAssemblyResultFactory.AssembleSection(sr, ass), ExportableFailureMechanismType.Generic);
-
-            AddFailureMechanismWhenInAssembly<MicrostabilityFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                exportableFailureMechanisms, assessmentSection.Microstability, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
-
             AddFailureMechanismWhenInAssembly<GrassCoverSlipOffOutwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
                 exportableFailureMechanisms, assessmentSection.GrassCoverSlipOffOutwards, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
@@ -156,14 +144,26 @@
                 exportableFailureMechanisms, assessmentSection.GrassCoverSlipOffInwards, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
 
+            AddFailureMechanismWhenInAssembly<HeightStructuresFailureMechanism, AdoptableFailureMechanismSectionResult>(
+                exportableFailureMechanisms, assessmentSection.HeightStructures, assessmentSection, HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                StructuresFailureMechanismAssemblyFactory.AssembleSection<HeightStructuresInput>, ExportableFailureMechanismType.Generic);
+
+            AddFailureMechanismWhenInAssembly<ClosingStructuresFailureMechanism, AdoptableFailureMechanismSectionResult>(
+                exportableFailureMechanisms, assessmentSection.ClosingStructures, assessmentSection, ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                StructuresFailureMechanismAssemblyFactory.AssembleSection<ClosingStructuresInput>, ExportableFailureMechanismType.Generic);
+
             AddFailureMechanismWhenInAssembly<PipingStructureFailureMechanism, NonAdoptableFailureMechanismSectionResult>(
                 exportableFailureMechanisms, assessmentSection.PipingStructure, assessmentSection, PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism,
                 (sr, fm, ass) => FailureMechanismSectionAssemblyResultFactory.AssembleSection(sr, ass), ExportableFailureMechanismType.Generic);
 
-            AddFailureMechanismWhenInAssembly<WaterPressureAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                exportableFailureMechanisms, assessmentSection.WaterPressureAsphaltCover, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic);
+            AddFailureMechanismWhenInAssembly<StabilityPointStructuresFailureMechanism, AdoptableFailureMechanismSectionResult>(
+                exportableFailureMechanisms, assessmentSection.StabilityPointStructures, assessmentSection, StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                StructuresFailureMechanismAssemblyFactory.AssembleSection<StabilityPointStructuresInput>, ExportableFailureMechanismType.Generic);
 
+            AddFailureMechanismWhenInAssembly<DuneErosionFailureMechanism, NonAdoptableFailureMechanismSectionResult>(
+                exportableFailureMechanisms, assessmentSection.DuneErosion, assessmentSection, DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                (sr, fm, ass) => FailureMechanismSectionAssemblyResultFactory.AssembleSection(sr, ass), ExportableFailureMechanismType.Generic);
+
             foreach (SpecificFailureMechanism specificFailureMechanism in assessmentSection.SpecificFailureMechanisms)
             {
                 AddFailureMechanismWhenInAssembly<SpecificFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
===================================================================
diff -u -r18e9564720d5d2d6765d39ceba8943ee8d1b9054 -r3efc79a1c526fe3fc890a419fcac978190456251
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision 18e9564720d5d2d6765d39ceba8943ee8d1b9054)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision 3efc79a1c526fe3fc890a419fcac978190456251)
@@ -86,20 +86,20 @@
             Tuple<FailureMechanismSectionAssemblyGroup?, string, string>[] failureMechanisms =
             {
                 CreateTuple(assemblyResult.Piping, assessmentSection.Piping),
-                CreateTuple(assemblyResult.MacroStabilityInwards, assessmentSection.MacroStabilityInwards),
                 CreateTuple(assemblyResult.GrassCoverErosionInwards, assessmentSection.GrassCoverErosionInwards),
-                CreateTuple(assemblyResult.HeightStructures, assessmentSection.HeightStructures),
-                CreateTuple(assemblyResult.ClosingStructures, assessmentSection.ClosingStructures),
-                CreateTuple(assemblyResult.StabilityPointStructures, assessmentSection.StabilityPointStructures),
+                CreateTuple(assemblyResult.MacroStabilityInwards, assessmentSection.MacroStabilityInwards),
+                CreateTuple(assemblyResult.Microstability, assessmentSection.Microstability),
                 CreateTuple(assemblyResult.StabilityStoneCover, assessmentSection.StabilityStoneCover),
                 CreateTuple(assemblyResult.WaveImpactAsphaltCover, assessmentSection.WaveImpactAsphaltCover),
+                CreateTuple(assemblyResult.WaterPressureAsphaltCover, assessmentSection.WaterPressureAsphaltCover),
                 CreateTuple(assemblyResult.GrassCoverErosionOutwards, assessmentSection.GrassCoverErosionOutwards),
-                CreateTuple(assemblyResult.DuneErosion, assessmentSection.DuneErosion),
-                CreateTuple(assemblyResult.Microstability, assessmentSection.Microstability),
                 CreateTuple(assemblyResult.GrassCoverSlipOffOutwards, assessmentSection.GrassCoverSlipOffOutwards),
                 CreateTuple(assemblyResult.GrassCoverSlipOffInwards, assessmentSection.GrassCoverSlipOffInwards),
+                CreateTuple(assemblyResult.HeightStructures, assessmentSection.HeightStructures),
+                CreateTuple(assemblyResult.ClosingStructures, assessmentSection.ClosingStructures),
                 CreateTuple(assemblyResult.PipingStructure, assessmentSection.PipingStructure),
-                CreateTuple(assemblyResult.WaterPressureAsphaltCover, assessmentSection.WaterPressureAsphaltCover)
+                CreateTuple(assemblyResult.StabilityPointStructures, assessmentSection.StabilityPointStructures),
+                CreateTuple(assemblyResult.DuneErosion, assessmentSection.DuneErosion)
             };
 
             List<ExportableFailureMechanismCombinedSectionAssemblyResult> exportableAssemblyResults =
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -r0c9054a7f1dfd78f554eacd9a356d59c3878079c -r3efc79a1c526fe3fc890a419fcac978190456251
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 3efc79a1c526fe3fc890a419fcac978190456251)
@@ -202,59 +202,59 @@
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(0));
 
-            AssertExportableFailureMechanism(assessmentSection.MacroStabilityInwards,
+            AssertExportableFailureMechanism(assessmentSection.GrassCoverErosionInwards,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(1));
 
-            AssertExportableFailureMechanism(assessmentSection.GrassCoverErosionInwards,
+            AssertExportableFailureMechanism(assessmentSection.MacroStabilityInwards,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(2));
 
-            AssertExportableFailureMechanism(assessmentSection.HeightStructures,
+            AssertExportableFailureMechanism(assessmentSection.Microstability,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(3));
 
-            AssertExportableFailureMechanism(assessmentSection.ClosingStructures,
+            AssertExportableFailureMechanism(assessmentSection.StabilityStoneCover,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(4));
 
-            AssertExportableFailureMechanism(assessmentSection.StabilityPointStructures,
+            AssertExportableFailureMechanism(assessmentSection.WaveImpactAsphaltCover,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(5));
 
-            AssertExportableFailureMechanism(assessmentSection.StabilityStoneCover,
+            AssertExportableFailureMechanism(assessmentSection.WaterPressureAsphaltCover,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(6));
 
-            AssertExportableFailureMechanism(assessmentSection.WaveImpactAsphaltCover,
+            AssertExportableFailureMechanism(assessmentSection.GrassCoverErosionOutwards,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(7));
 
-            AssertExportableFailureMechanism(assessmentSection.GrassCoverErosionOutwards,
+            AssertExportableFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(8));
 
-            AssertExportableFailureMechanism(assessmentSection.DuneErosion,
+            AssertExportableFailureMechanism(assessmentSection.GrassCoverSlipOffInwards,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(9));
 
-            AssertExportableFailureMechanism(assessmentSection.Microstability,
+            AssertExportableFailureMechanism(assessmentSection.HeightStructures,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(10));
 
-            AssertExportableFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards,
+            AssertExportableFailureMechanism(assessmentSection.ClosingStructures,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(11));
 
-            AssertExportableFailureMechanism(assessmentSection.GrassCoverSlipOffInwards,
+            AssertExportableFailureMechanism(assessmentSection.PipingStructure,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(12));
 
-            AssertExportableFailureMechanism(assessmentSection.PipingStructure,
+            AssertExportableFailureMechanism(assessmentSection.StabilityPointStructures,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(13));
 
-            AssertExportableFailureMechanism(assessmentSection.WaterPressureAsphaltCover,
+            AssertExportableFailureMechanism(assessmentSection.DuneErosion,
                                              ExportableFailureMechanismType.Generic,
                                              exportableFailureMechanisms.ElementAt(14));
 
@@ -290,59 +290,59 @@
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(0));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.MacroStabilityInwards,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverErosionInwards,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(1));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverErosionInwards,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.MacroStabilityInwards,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(2));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.HeightStructures,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.Microstability,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(3));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.ClosingStructures,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.StabilityStoneCover,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(4));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.StabilityPointStructures,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.WaveImpactAsphaltCover,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(5));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.StabilityStoneCover,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.WaterPressureAsphaltCover,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(6));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.WaveImpactAsphaltCover,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverErosionOutwards,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(7));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverErosionOutwards,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverSlipOffOutwards,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(8));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.DuneErosion,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverSlipOffInwards,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(9));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.Microstability,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.HeightStructures,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(10));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverSlipOffOutwards,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.ClosingStructures,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(11));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverSlipOffInwards,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.PipingStructure,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(12));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.PipingStructure,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.StabilityPointStructures,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(13));
 
-            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.WaterPressureAsphaltCover,
+            AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.DuneErosion,
                                                                           ExportableFailureMechanismType.Generic,
                                                                           exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(14));
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
===================================================================
diff -u -r794b265557c9d253ed6c889e81fa2d046c530663 -r3efc79a1c526fe3fc890a419fcac978190456251
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision 794b265557c9d253ed6c889e81fa2d046c530663)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision 3efc79a1c526fe3fc890a419fcac978190456251)
@@ -200,33 +200,33 @@
 
             AssertSubSection(expectedSection.Piping, "STPH", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(0));
-            AssertSubSection(expectedSection.MacroStabilityInwards, "STBI", ExportableFailureMechanismType.Generic,
-                             failureMechanismCombinedSectionResults.ElementAt(1));
             AssertSubSection(expectedSection.GrassCoverErosionInwards, "GEKB", ExportableFailureMechanismType.Generic,
+                             failureMechanismCombinedSectionResults.ElementAt(1));
+            AssertSubSection(expectedSection.MacroStabilityInwards, "STBI", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(2));
-            AssertSubSection(expectedSection.HeightStructures, "HTKW", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.Microstability, "STMI", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(3));
-            AssertSubSection(expectedSection.ClosingStructures, "BSKW", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.StabilityStoneCover, "ZST", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(4));
-            AssertSubSection(expectedSection.StabilityPointStructures, "STKWp", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.WaveImpactAsphaltCover, "AGK", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(5));
-            AssertSubSection(expectedSection.StabilityStoneCover, "ZST", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.WaterPressureAsphaltCover, "AWO", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(6));
-            AssertSubSection(expectedSection.WaveImpactAsphaltCover, "AGK", ExportableFailureMechanismType.Generic,
-                             failureMechanismCombinedSectionResults.ElementAt(7));
             AssertSubSection(expectedSection.GrassCoverErosionOutwards, "GEBU", ExportableFailureMechanismType.Generic,
+                             failureMechanismCombinedSectionResults.ElementAt(7));
+            AssertSubSection(expectedSection.GrassCoverSlipOffOutwards, "GABU", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(8));
-            AssertSubSection(expectedSection.DuneErosion, "DA", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.GrassCoverSlipOffInwards, "GABI", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(9));
-            AssertSubSection(expectedSection.Microstability, "STMI", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.HeightStructures, "HTKW", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(10));
-            AssertSubSection(expectedSection.GrassCoverSlipOffOutwards, "GABU", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.ClosingStructures, "BSKW", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(11));
-            AssertSubSection(expectedSection.GrassCoverSlipOffInwards, "GABI", ExportableFailureMechanismType.Generic,
-                             failureMechanismCombinedSectionResults.ElementAt(12));
             AssertSubSection(expectedSection.PipingStructure, "PKW", ExportableFailureMechanismType.Generic,
+                             failureMechanismCombinedSectionResults.ElementAt(12));
+            AssertSubSection(expectedSection.StabilityPointStructures, "STKWp", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(13));
-            AssertSubSection(expectedSection.WaterPressureAsphaltCover, "AWO", ExportableFailureMechanismType.Generic,
+            AssertSubSection(expectedSection.DuneErosion, "DA", ExportableFailureMechanismType.Generic,
                              failureMechanismCombinedSectionResults.ElementAt(14));
             AssertSubSection(expectedSection.SpecificFailureMechanisms[0], "Nieuw1", ExportableFailureMechanismType.Specific,
                              failureMechanismCombinedSectionResults.ElementAt(15));
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml
===================================================================
diff -u -r794b265557c9d253ed6c889e81fa2d046c530663 -r3efc79a1c526fe3fc890a419fcac978190456251
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml	(.../ExpectedGml.gml)	(revision 794b265557c9d253ed6c889e81fa2d046c530663)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml	(.../ExpectedGml.gml)	(revision 3efc79a1c526fe3fc890a419fcac978190456251)
@@ -38,7 +38,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.1" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>STBI</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>GEKB</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -47,7 +47,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.2" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>GEKB</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>STBI</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -56,7 +56,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.3" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>HTKW</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>STMI</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -65,7 +65,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.4" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>BSKW</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>ZST</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -74,7 +74,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.5" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>STKWp</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>AGK</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -83,7 +83,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.6" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>ZST</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>AWO</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -92,7 +92,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.7" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>AGK</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>GEBU</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -101,7 +101,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.8" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>GEBU</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>GABU</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -110,7 +110,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.9" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>STMI</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>GABI</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -119,7 +119,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.10" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>GABU</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>HTKW</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -128,7 +128,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.11" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>GABI</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>BSKW</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -146,7 +146,7 @@
     </asm:Faalmechanisme>
     <asm:Faalmechanisme FaalmechanismeID="Fm.13" VeiligheidsoordeelIDRef="Vo.0">
       <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-      <asm:generiekFaalmechanisme>AWO</asm:generiekFaalmechanisme>
+      <asm:generiekFaalmechanisme>STKWp</asm:generiekFaalmechanisme>
       <asm:analyseFaalmechanisme>
         <asm:assemblagemethode>WBI-1B-1</asm:assemblagemethode>
         <asm:faalkans>0</asm:faalkans>
@@ -443,77 +443,77 @@
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>STBI</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GEKB</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GEKB</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>STBI</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>HTKW</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>STMI</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>BSKW</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>ZST</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>STKWp</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>AGK</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>ZST</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>AWO</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>AGK</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GEBU</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GEBU</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GABU</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>STMI</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GABI</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GABU</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>HTKW</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GABI</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>BSKW</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
@@ -527,7 +527,7 @@
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>AWO</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>STKWp</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+II</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
@@ -562,77 +562,77 @@
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>STBI</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GEKB</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GEKB</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>STBI</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>HTKW</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>STMI</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>BSKW</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>ZST</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>STKWp</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>AGK</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>ZST</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>AWO</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>AGK</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GEBU</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GEBU</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GABU</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>STMI</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>GABI</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GABU</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>HTKW</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>GABI</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>BSKW</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>
@@ -646,7 +646,7 @@
       <asm:analyseDeelvak>
         <asm:assemblagemethode>WBI-3B-1</asm:assemblagemethode>
         <asm:typeFaalmechanisme>GENRK</asm:typeFaalmechanisme>
-        <asm:generiekFaalmechanisme>AWO</asm:generiekFaalmechanisme>
+        <asm:generiekFaalmechanisme>STKWp</asm:generiekFaalmechanisme>
         <asm:duidingsklasse>+III</asm:duidingsklasse>
         <asm:status>VOLLDG</asm:status>
       </asm:analyseDeelvak>