Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs
===================================================================
diff -u -r40f13c78443ab9b208cdd1e877198aa89c237a44 -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResult.cs)	(revision 40f13c78443ab9b208cdd1e877198aa89c237a44)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResult.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -43,17 +43,17 @@
         /// Creates a new instance of <see cref="SerializableCombinedFailureMechanismSectionAssemblyResult"/>.
         /// </summary>
         /// <param name="assemblyMethod">The method used to assemble this result.</param>
-        /// <param name="genericFailureMechanismType">The generic failure mechanism type this result is assembled for.</param>
+        /// <param name="code">The generic failure mechanism code this result is assembled for.</param>
         /// <param name="assemblyGroup">The group of this assembly result.</param>
         public SerializableCombinedFailureMechanismSectionAssemblyResult(
             SerializableAssemblyMethod assemblyMethod,
-            SerializableFailureMechanismType genericFailureMechanismType,
+            string code,
             SerializableFailureMechanismSectionAssemblyGroup assemblyGroup) 
             : this()
         {
             AssemblyGroup = assemblyGroup;
             AssemblyMethod = assemblyMethod;
-            GenericFailureMechanism = genericFailureMechanismType;
+            GenericFailureMechanismCode = code;
         }
 
         /// <summary>
@@ -69,10 +69,10 @@
         public string FailureMechanismType { get; set; }
 
         /// <summary>
-        /// Gets or sets the generic failure mechanism type of this assembly result.
+        /// Gets or sets the generic failure mechanism code of this assembly result.
         /// </summary>
         [XmlElement(AssemblyXmlIdentifiers.GenericFailureMechanism)]
-        public SerializableFailureMechanismType GenericFailureMechanism { get; set; }
+        public string GenericFailureMechanismCode { get; set; }
 
         /// <summary>
         /// Gets or sets the group of this assembly result.
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs
===================================================================
diff -u -re96e57c22f4383cd69fa73661c0f0f37afe1baff -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs	(.../AssemblyXmlEnumIdentifiers.cs)	(revision e96e57c22f4383cd69fa73661c0f0f37afe1baff)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs	(.../AssemblyXmlEnumIdentifiers.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -139,85 +139,6 @@
 
         #endregion
 
-        #region SerializableFailureMechanismType
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.STBI"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeSTBI = "STBI";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.STPH"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeSTPH = "STPH";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.STMI"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeSTMI = "STMI";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.AGK"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeAGK = "AGK";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.AWO"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeAWO = "AWO";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.GEBU"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeGEBU = "GEBU";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.GABU"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeGABU = "GABU";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.GEKB"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeGEKB = "GEKB";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.GABI"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeGABI = "GABI";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.ZST"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeZST = "ZST";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.DA"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeDA = "DA";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.HTKW"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeHTKW = "HTKW";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.BSKW"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeBSKW = "BSKW";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.PKW"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypePKW = "PKW";
-
-        /// <summary>
-        /// Identifier for <see cref="SerializableFailureMechanismType.STKWp"/>.
-        /// </summary>
-        public const string SerializableFailureMechanismTypeSTKWp = "STKWp";
-
-        #endregion
-
         #region SerializableFailureMechanismSectionType
 
         /// <summary>
Fisheye: Tag 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableFailureMechanismType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs
===================================================================
diff -u -ra1090298a1bbfca8db1877eed50cab25a1d00cc8 -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs	(.../SerializableFailureMechanism.cs)	(revision a1090298a1bbfca8db1877eed50cab25a1d00cc8)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs	(.../SerializableFailureMechanism.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -22,7 +22,6 @@
 using System;
 using System.Xml.Serialization;
 using Riskeer.AssemblyTool.IO.Model.DataTypes;
-using Riskeer.AssemblyTool.IO.Model.Enums;
 using Riskeer.AssemblyTool.IO.Model.Helpers;
 using Riskeer.AssemblyTool.IO.Properties;
 
@@ -47,12 +46,12 @@
         /// </summary>
         /// <param name="id">The unique ID of the assembly result.</param>
         /// <param name="totalAssemblyResult">The total assembly result the failure mechanism belongs to.</param>
-        /// <param name="failureMechanismType">The type of the failure mechanism.</param>
+        /// <param name="code">The code of the failure mechanism.</param>
         /// <param name="failureMechanismAssemblyResult">The total failure mechanism assembly result.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter except <paramref name="id"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="id"/> is invalid.</exception>
         public SerializableFailureMechanism(string id, SerializableTotalAssemblyResult totalAssemblyResult,
-                                            SerializableFailureMechanismType failureMechanismType,
+                                            string code,
                                             SerializableFailureMechanismAssemblyResult failureMechanismAssemblyResult)
             : this()
         {
@@ -73,7 +72,7 @@
 
             Id = id;
             TotalAssemblyResultId = totalAssemblyResult.Id;
-            GenericFailureMechanism = failureMechanismType;
+            GenericFailureMechanismCode = code;
             FailureMechanismAssemblyResult = failureMechanismAssemblyResult;
         }
 
@@ -96,10 +95,10 @@
         public string FailureMechanismType { get; set; }
 
         /// <summary>
-        /// Gets or sets the generic failure mechanism type.
+        /// Gets or sets the generic failure mechanism code.
         /// </summary>
         [XmlElement(AssemblyXmlIdentifiers.GenericFailureMechanism)]
-        public SerializableFailureMechanismType GenericFailureMechanism { get; set; }
+        public string GenericFailureMechanismCode { get; set; }
 
         /// <summary>
         /// Gets or sets the total failure mechanism assembly result.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs
===================================================================
diff -u -ra1090298a1bbfca8db1877eed50cab25a1d00cc8 -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs)	(revision a1090298a1bbfca8db1877eed50cab25a1d00cc8)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -39,7 +39,7 @@
 
             // Assert
             Assert.AreEqual((SerializableAssemblyMethod) 0, assemblyResult.AssemblyMethod);
-            Assert.AreEqual((SerializableFailureMechanismType) 0, assemblyResult.GenericFailureMechanism);
+            Assert.IsNull( assemblyResult.GenericFailureMechanismCode);
             Assert.AreEqual((SerializableFailureMechanismSectionAssemblyGroup) 0, assemblyResult.AssemblyGroup);
             Assert.AreEqual("VOLLDG", assemblyResult.Status);
             Assert.AreEqual("GENRK", assemblyResult.FailureMechanismType);
@@ -49,7 +49,7 @@
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableCombinedFailureMechanismSectionAssemblyResult>(
                 nameof(SerializableCombinedFailureMechanismSectionAssemblyResult.AssemblyGroup), "duidingsklasse");
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableCombinedFailureMechanismSectionAssemblyResult>(
-                nameof(SerializableCombinedFailureMechanismSectionAssemblyResult.GenericFailureMechanism), "generiekFaalmechanisme");
+                nameof(SerializableCombinedFailureMechanismSectionAssemblyResult.GenericFailureMechanismCode), "generiekFaalmechanisme");
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableCombinedFailureMechanismSectionAssemblyResult>(
                 nameof(SerializableCombinedFailureMechanismSectionAssemblyResult.FailureMechanismType), "typeFaalmechanisme");
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableCombinedFailureMechanismSectionAssemblyResult>(
@@ -62,16 +62,16 @@
             // Setup
             var random = new Random(39);
             var assemblyMethod = random.NextEnumValue<SerializableAssemblyMethod>();
-            var genericFailureMechanism = random.NextEnumValue<SerializableFailureMechanismType>();
+            const string code = "code";
             var assemblyGroup = random.NextEnumValue<SerializableFailureMechanismSectionAssemblyGroup>();
 
             // Call
-            var assemblyResult = new SerializableCombinedFailureMechanismSectionAssemblyResult(assemblyMethod, genericFailureMechanism, assemblyGroup);
+            var assemblyResult = new SerializableCombinedFailureMechanismSectionAssemblyResult(assemblyMethod, code, assemblyGroup);
 
             // Assert
             Assert.AreEqual(assemblyMethod, assemblyResult.AssemblyMethod);
             Assert.AreEqual(assemblyGroup, assemblyResult.AssemblyGroup);
-            Assert.AreEqual(genericFailureMechanism, assemblyResult.GenericFailureMechanism);
+            Assert.AreEqual(code, assemblyResult.GenericFailureMechanismCode);
             Assert.AreEqual("VOLLDG", assemblyResult.Status);
             Assert.AreEqual("GENRK", assemblyResult.FailureMechanismType);
         }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs
===================================================================
diff -u -re96e57c22f4383cd69fa73661c0f0f37afe1baff -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs	(.../AssemblyXmlEnumIdentifiersTest.cs)	(revision e96e57c22f4383cd69fa73661c0f0f37afe1baff)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs	(.../AssemblyXmlEnumIdentifiersTest.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -53,22 +53,6 @@
             Assert.AreEqual("WBI-3C-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI3C1);
             Assert.AreEqual("Handmatig", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodManual);
 
-            Assert.AreEqual("STBI", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeSTBI);
-            Assert.AreEqual("STPH", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeSTPH);
-            Assert.AreEqual("STMI", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeSTMI);
-            Assert.AreEqual("AGK", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeAGK);
-            Assert.AreEqual("AWO", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeAWO);
-            Assert.AreEqual("GEBU", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeGEBU);
-            Assert.AreEqual("GABU", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeGABU);
-            Assert.AreEqual("GEKB", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeGEKB);
-            Assert.AreEqual("GABI", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeGABI);
-            Assert.AreEqual("ZST", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeZST);
-            Assert.AreEqual("DA", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeDA);
-            Assert.AreEqual("HTKW", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeHTKW);
-            Assert.AreEqual("BSKW", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeBSKW);
-            Assert.AreEqual("PKW", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypePKW);
-            Assert.AreEqual("STKWp", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeSTKWp);
-
             Assert.AreEqual("FAALMVK", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeFailureMechanism);
             Assert.AreEqual("DEELVK", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeCombined);
         }
Fisheye: Tag 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableFailureMechanismTypeTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u -r4944cd3d81cde6827703ce8a475f8c51935b4bc9 -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision 4944cd3d81cde6827703ce8a475f8c51935b4bc9)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -119,7 +119,7 @@
             var random = new Random(39);
             var failureMechanism = new SerializableFailureMechanism("failureMechanismID",
                                                                     new SerializableTotalAssemblyResult(),
-                                                                    random.NextEnumValue<SerializableFailureMechanismType>(),
+                                                                    "code",
                                                                     new SerializableFailureMechanismAssemblyResult());
             var section = new SerializableFailureMechanismSection("sectionID",
                                                                   new SerializableFailureMechanismSectionCollection(),
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs
===================================================================
diff -u -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs	(.../SerializableFailureMechanismTest.cs)	(revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs	(.../SerializableFailureMechanismTest.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -24,7 +24,6 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.IO.Model;
 using Riskeer.AssemblyTool.IO.Model.DataTypes;
-using Riskeer.AssemblyTool.IO.Model.Enums;
 using Riskeer.AssemblyTool.IO.TestUtil;
 
 namespace Riskeer.AssemblyTool.IO.Test.Model
@@ -43,7 +42,7 @@
             Assert.IsNull(failureMechanism.Id);
             Assert.IsNull(failureMechanism.TotalAssemblyResultId);
             Assert.IsNull(failureMechanism.FailureMechanismAssemblyResult);
-            Assert.AreEqual((SerializableFailureMechanismType) 0, failureMechanism.GenericFailureMechanism);
+            Assert.IsNull(failureMechanism.GenericFailureMechanismCode);
             Assert.AreEqual("GENRK", failureMechanism.FailureMechanismType);
 
             SerializableAttributeTestHelper.AssertXmlTypeAttribute(typeof(SerializableFailureMechanism), "Faalmechanisme");
@@ -54,7 +53,7 @@
                 nameof(SerializableFailureMechanism.TotalAssemblyResultId), "VeiligheidsoordeelIDRef");
 
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableFailureMechanism>(
-                nameof(SerializableFailureMechanism.GenericFailureMechanism), "generiekFaalmechanisme");
+                nameof(SerializableFailureMechanism.GenericFailureMechanismCode), "generiekFaalmechanisme");
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableFailureMechanism>(
                 nameof(SerializableFailureMechanism.FailureMechanismType), "typeFaalmechanisme");
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableFailureMechanism>(
@@ -65,13 +64,9 @@
         [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentException(string invalidId)
         {
-            // Setup
-            var random = new Random(39);
-
             // Call
             void Call() => new SerializableFailureMechanism(invalidId, new SerializableTotalAssemblyResult(),
-                                                            random.NextEnumValue<SerializableFailureMechanismType>(),
-                                                            new SerializableFailureMechanismAssemblyResult());
+                                                            "code", new SerializableFailureMechanismAssemblyResult());
 
             // Assert
             const string expectedMessage = "'id' must have a value and consist only of alphanumerical characters, '-', '_' or '.'.";
@@ -81,11 +76,8 @@
         [Test]
         public void Constructor_TotalAssemblyResultNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var random = new Random(39);
-
             // Call
-            void Call() => new SerializableFailureMechanism("id", null, random.NextEnumValue<SerializableFailureMechanismType>(),
+            void Call() => new SerializableFailureMechanism("id", null, "code",
                                                             new SerializableFailureMechanismAssemblyResult());
 
             // Assert
@@ -96,12 +88,9 @@
         [Test]
         public void Constructor_FailureMechanismAssemblyResultNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var random = new Random(39);
-
             // Call
             void Call() => new SerializableFailureMechanism("id", new SerializableTotalAssemblyResult(),
-                                                            random.NextEnumValue<SerializableFailureMechanismType>(), null);
+                                                            "code", null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -115,22 +104,19 @@
             const string id = "sectionId";
             const string totalResultId = "totalResultId";
 
-            var random = new Random(39);
-            var type = random.NextEnumValue<SerializableFailureMechanismType>();
+            const string code = "code";
             var assemblyResult = new SerializableFailureMechanismAssemblyResult();
 
             // Call
-            var failureMechanism = new SerializableFailureMechanism(id,
-                                                                    new SerializableTotalAssemblyResult(totalResultId,
-                                                                                                        new SerializableAssessmentProcess(),
-                                                                                                        new SerializableAssessmentSectionAssemblyResult()),
-                                                                    type,
-                                                                    assemblyResult);
+            var failureMechanism = new SerializableFailureMechanism(
+                id, new SerializableTotalAssemblyResult(
+                    totalResultId, new SerializableAssessmentProcess(), new SerializableAssessmentSectionAssemblyResult()),
+                code, assemblyResult);
 
             // Assert
             Assert.AreEqual(id, failureMechanism.Id);
             Assert.AreEqual(totalResultId, failureMechanism.TotalAssemblyResultId);
-            Assert.AreEqual(type, failureMechanism.GenericFailureMechanism);
+            Assert.AreEqual(code, failureMechanism.GenericFailureMechanismCode);
             Assert.AreSame(assemblyResult, failureMechanism.FailureMechanismAssemblyResult);
         }
     }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs
===================================================================
diff -u -r0102f161e02186c2fb3d2990d168d7271c1b1085 -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs	(.../SerializableAssemblyWriterTest.cs)	(revision 0102f161e02186c2fb3d2990d168d7271c1b1085)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs	(.../SerializableAssemblyWriterTest.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
@@ -284,8 +284,8 @@
             var failureMechanism = new SerializableFailureMechanism(
                 "toetsspoorGABI",
                 totalAssemblyResult,
-                SerializableFailureMechanismType.GABI,
-                new SerializableFailureMechanismAssemblyResult(0.08419, false));
+                "GABI",
+            new SerializableFailureMechanismAssemblyResult(0.08419, false));
 
             var sections1 = new SerializableFailureMechanismSectionCollection("vakindelingGABI");
             var section1 = new SerializableFailureMechanismSection(
@@ -325,10 +325,10 @@
                 new[]
                 {
                     new SerializableCombinedFailureMechanismSectionAssemblyResult(
-                        SerializableAssemblyMethod.WBI3B1, SerializableFailureMechanismType.HTKW,
+                        SerializableAssemblyMethod.WBI3B1, "HTKW",
                         SerializableFailureMechanismSectionAssemblyGroup.III),
                     new SerializableCombinedFailureMechanismSectionAssemblyResult(
-                        SerializableAssemblyMethod.WBI3B1, SerializableFailureMechanismType.STPH,
+                        SerializableAssemblyMethod.WBI3B1, "STPH",
                         SerializableFailureMechanismSectionAssemblyGroup.II)
                 },
                 new SerializableFailureMechanismSectionAssemblyResult(