Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs
===================================================================
diff -u -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9 -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResult.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResult.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResult.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -36,24 +36,26 @@
         public SerializableCombinedFailureMechanismSectionAssemblyResult()
         {
             Status = Resources.FullAssembly;
-            FailureMechanismType = Resources.FailureMechanismType_Generic_DisplayName;
         }
 
         /// <summary>
         /// Creates a new instance of <see cref="SerializableCombinedFailureMechanismSectionAssemblyResult"/>.
         /// </summary>
         /// <param name="assemblyMethod">The method used to assemble this result.</param>
+        /// <param name="failureMechanismType">The type of the failure mechanism.</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 failureMechanismType,
             string code,
             SerializableFailureMechanismSectionAssemblyGroup assemblyGroup) 
             : this()
         {
-            AssemblyGroup = assemblyGroup;
             AssemblyMethod = assemblyMethod;
+            FailureMechanismType = failureMechanismType;
             GenericFailureMechanismCode = code;
+            AssemblyGroup = assemblyGroup;
         }
 
         /// <summary>
@@ -66,7 +68,7 @@
         /// Gets or sets the failure mechanism type of this assembly result.
         /// </summary>
         [XmlElement(AssemblyXmlIdentifiers.FailureMechanismType)]
-        public string FailureMechanismType { get; set; }
+        public SerializableFailureMechanismType FailureMechanismType { get; set; }
 
         /// <summary>
         /// Gets or sets the generic failure mechanism code of this assembly result.
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs
===================================================================
diff -u -r641cbbb4010e957aae4f133ab9c91c3a4113784e -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs	(.../SerializableFailureMechanism.cs)	(revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs	(.../SerializableFailureMechanism.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -22,8 +22,8 @@
 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;
 
 namespace Riskeer.AssemblyTool.IO.Model
 {
@@ -36,21 +36,19 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableFailureMechanism"/>.
         /// </summary>
-        public SerializableFailureMechanism()
-        {
-            FailureMechanismType = Resources.FailureMechanismType_Generic_DisplayName;
-        }
+        public SerializableFailureMechanism() {}
 
         /// <summary>
         /// Creates a new instance of <see cref="SerializableFailureMechanism"/>.
         /// </summary>
         /// <param name="id">The unique ID of the assembly result.</param>
+        /// <param name="failureMechanismType">The type of the failure mechanism.</param>
         /// <param name="code">The code of the failure mechanism.</param>
         /// <param name="totalAssemblyResult">The total assembly result the failure mechanism belongs to.</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, string code,
+        public SerializableFailureMechanism(string id, SerializableFailureMechanismType failureMechanismType, string code,
                                             SerializableTotalAssemblyResult totalAssemblyResult,
                                             SerializableFailureMechanismAssemblyResult failureMechanismAssemblyResult)
             : this()
@@ -71,6 +69,7 @@
             }
 
             Id = id;
+            FailureMechanismType = failureMechanismType;
             TotalAssemblyResultId = totalAssemblyResult.Id;
             GenericFailureMechanismCode = code;
             FailureMechanismAssemblyResult = failureMechanismAssemblyResult;
@@ -92,7 +91,7 @@
         /// Gets or sets the failure mechanism type.
         /// </summary>
         [XmlElement(AssemblyXmlIdentifiers.FailureMechanismType)]
-        public string FailureMechanismType { get; set; }
+        public SerializableFailureMechanismType FailureMechanismType { get; set; }
 
         /// <summary>
         /// Gets or sets the generic failure mechanism code.
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -109,15 +109,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to GENRK.
-        /// </summary>
-        internal static string FailureMechanismType_Generic_DisplayName {
-            get {
-                return ResourceManager.GetString("FailureMechanismType_Generic_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to VOLLDG.
         /// </summary>
         internal static string FullAssembly {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx
===================================================================
diff -u -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx	(.../Resources.resx)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -132,7 +132,4 @@
   <data name="CoordinateSystemName" xml:space="preserve">
     <value>EPSG:28992</value>
   </data>
-  <data name="FailureMechanismType_Generic_DisplayName" xml:space="preserve">
-    <value>GENRK</value>
-  </data>
 </root>
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs
===================================================================
diff -u -r2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9 -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs)	(revision 2dc6ed57b83ae3eef313400ff41ac5cb369f9bc9)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -39,10 +39,10 @@
 
             // Assert
             Assert.AreEqual((SerializableAssemblyMethod) 0, assemblyResult.AssemblyMethod);
+            Assert.AreEqual((SerializableFailureMechanismType) 0, assemblyResult.FailureMechanismType);
             Assert.IsNull( assemblyResult.GenericFailureMechanismCode);
             Assert.AreEqual((SerializableFailureMechanismSectionAssemblyGroup) 0, assemblyResult.AssemblyGroup);
             Assert.AreEqual("VOLLDG", assemblyResult.Status);
-            Assert.AreEqual("GENRK", assemblyResult.FailureMechanismType);
 
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableCombinedFailureMechanismSectionAssemblyResult>(
                 nameof(SerializableCombinedFailureMechanismSectionAssemblyResult.AssemblyMethod), "assemblagemethode");
@@ -62,18 +62,20 @@
             // Setup
             var random = new Random(39);
             var assemblyMethod = random.NextEnumValue<SerializableAssemblyMethod>();
+            var failureMechanismType = random.NextEnumValue<SerializableFailureMechanismType>();
             const string code = "code";
             var assemblyGroup = random.NextEnumValue<SerializableFailureMechanismSectionAssemblyGroup>();
 
             // Call
-            var assemblyResult = new SerializableCombinedFailureMechanismSectionAssemblyResult(assemblyMethod, code, assemblyGroup);
+            var assemblyResult = new SerializableCombinedFailureMechanismSectionAssemblyResult(
+                assemblyMethod, failureMechanismType, code, assemblyGroup);
 
             // Assert
             Assert.AreEqual(assemblyMethod, assemblyResult.AssemblyMethod);
-            Assert.AreEqual(assemblyGroup, assemblyResult.AssemblyGroup);
+            Assert.AreEqual(failureMechanismType, assemblyResult.FailureMechanismType);
             Assert.AreEqual(code, assemblyResult.GenericFailureMechanismCode);
+            Assert.AreEqual(assemblyGroup, assemblyResult.AssemblyGroup);
             Assert.AreEqual("VOLLDG", assemblyResult.Status);
-            Assert.AreEqual("GENRK", assemblyResult.FailureMechanismType);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u -r641cbbb4010e957aae4f133ab9c91c3a4113784e -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -117,9 +117,9 @@
             const string id = "id";
 
             var random = new Random(39);
-            var failureMechanism = new SerializableFailureMechanism("failureMechanismID",
-                                                                    "code",
-                                                                    new SerializableTotalAssemblyResult(), new SerializableFailureMechanismAssemblyResult());
+            var failureMechanism = new SerializableFailureMechanism(
+                "failureMechanismID", random.NextEnumValue<SerializableFailureMechanismType>(),
+                "code", new SerializableTotalAssemblyResult(), new SerializableFailureMechanismAssemblyResult());
             var section = new SerializableFailureMechanismSection("sectionID",
                                                                   new SerializableFailureMechanismSectionCollection(),
                                                                   random.NextDouble(),
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs
===================================================================
diff -u -r641cbbb4010e957aae4f133ab9c91c3a4113784e -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs	(.../SerializableFailureMechanismTest.cs)	(revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs	(.../SerializableFailureMechanismTest.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -24,6 +24,7 @@
 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 +44,7 @@
             Assert.IsNull(failureMechanism.TotalAssemblyResultId);
             Assert.IsNull(failureMechanism.FailureMechanismAssemblyResult);
             Assert.IsNull(failureMechanism.GenericFailureMechanismCode);
-            Assert.AreEqual("GENRK", failureMechanism.FailureMechanismType);
+            Assert.AreEqual((SerializableFailureMechanismType) 0, failureMechanism.FailureMechanismType);
 
             SerializableAttributeTestHelper.AssertXmlTypeAttribute(typeof(SerializableFailureMechanism), "Faalmechanisme");
 
@@ -64,8 +65,14 @@
         [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentException(string invalidId)
         {
+            // Setup
+            var random = new Random(21);
+
             // Call
-            void Call() => new SerializableFailureMechanism(invalidId, "code", new SerializableTotalAssemblyResult(),
+            void Call() => new SerializableFailureMechanism(invalidId,
+                                                            random.NextEnumValue<SerializableFailureMechanismType>(),
+                                                            "code",
+                                                            new SerializableTotalAssemblyResult(),
                                                             new SerializableFailureMechanismAssemblyResult());
 
             // Assert
@@ -76,8 +83,12 @@
         [Test]
         public void Constructor_TotalAssemblyResultNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var random = new Random(21);
+
             // Call
-            void Call() => new SerializableFailureMechanism("id", "code", null, new SerializableFailureMechanismAssemblyResult());
+            void Call() => new SerializableFailureMechanism("id", random.NextEnumValue<SerializableFailureMechanismType>(),
+                                                            "code", null, new SerializableFailureMechanismAssemblyResult());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -87,8 +98,12 @@
         [Test]
         public void Constructor_FailureMechanismAssemblyResultNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var random = new Random(21);
+
             // Call
-            void Call() => new SerializableFailureMechanism("id", "code", new SerializableTotalAssemblyResult(), null);
+            void Call() => new SerializableFailureMechanism("id", random.NextEnumValue<SerializableFailureMechanismType>(),
+                                                            "code", new SerializableTotalAssemblyResult(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -99,22 +114,26 @@
         public void Constructor_WithValidData_ReturnsExpectedValues()
         {
             // Setup
-            const string id = "sectionId";
-            const string totalResultId = "totalResultId";
+            var random = new Random(21);
 
+            const string id = "sectionId";
+            var failureMechanismType = random.NextEnumValue<SerializableFailureMechanismType>();
             const string code = "code";
+            const string totalResultId = "totalResultId";
             var assemblyResult = new SerializableFailureMechanismAssemblyResult();
 
             // Call
             var failureMechanism = new SerializableFailureMechanism(
-                id, code, new SerializableTotalAssemblyResult(totalResultId, new SerializableAssessmentProcess(),
-                                                              new SerializableAssessmentSectionAssemblyResult()),
+                id, failureMechanismType, code, new SerializableTotalAssemblyResult(
+                    totalResultId, new SerializableAssessmentProcess(),
+                    new SerializableAssessmentSectionAssemblyResult()),
                 assemblyResult);
 
             // Assert
             Assert.AreEqual(id, failureMechanism.Id);
-            Assert.AreEqual(totalResultId, failureMechanism.TotalAssemblyResultId);
+            Assert.AreEqual(failureMechanismType, failureMechanism.FailureMechanismType);
             Assert.AreEqual(code, failureMechanism.GenericFailureMechanismCode);
+            Assert.AreEqual(totalResultId, failureMechanism.TotalAssemblyResultId);
             Assert.AreSame(assemblyResult, failureMechanism.FailureMechanismAssemblyResult);
         }
     }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs
===================================================================
diff -u -r641cbbb4010e957aae4f133ab9c91c3a4113784e -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs	(.../SerializableAssemblyWriterTest.cs)	(revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs	(.../SerializableAssemblyWriterTest.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -282,7 +282,7 @@
                     SerializableAssemblyMethod.WBI2B1, SerializableAssessmentSectionAssemblyGroup.B, 0.00068354));
 
             var failureMechanism = new SerializableFailureMechanism(
-                "toetsspoorGABI", "GABI", totalAssemblyResult,
+                "toetsspoorGABI", SerializableFailureMechanismType.Generic, "GABI", totalAssemblyResult,
                 new SerializableFailureMechanismAssemblyResult(0.08419, false));
 
             var sections1 = new SerializableFailureMechanismSectionCollection("vakindelingGABI");
@@ -323,10 +323,12 @@
                 new[]
                 {
                     new SerializableCombinedFailureMechanismSectionAssemblyResult(
-                        SerializableAssemblyMethod.WBI3B1, "HTKW",
+                        SerializableAssemblyMethod.WBI3B1,
+                        SerializableFailureMechanismType.Generic, "HTKW",
                         SerializableFailureMechanismSectionAssemblyGroup.III),
                     new SerializableCombinedFailureMechanismSectionAssemblyResult(
-                        SerializableAssemblyMethod.WBI3B1, "STPH",
+                        SerializableAssemblyMethod.WBI3B1,
+                        SerializableFailureMechanismType.Generic, "STPH",
                         SerializableFailureMechanismSectionAssemblyGroup.II)
                 },
                 new SerializableFailureMechanismSectionAssemblyResult(
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs
===================================================================
diff -u -r73991051d9869bec831a714115eb8c635566fd4d -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs)	(revision 73991051d9869bec831a714115eb8c635566fd4d)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -58,7 +58,9 @@
 
             return new SerializableCombinedFailureMechanismSectionAssemblyResult(
                 SerializableAssemblyMethodCreator.Create(sectionResultSectionAssemblyResult.AssemblyMethod),
-                sectionResult.Code, SerializableFailureMechanismSectionAssemblyGroupCreator.Create(sectionResultSectionAssemblyResult.AssemblyGroup));
+                SerializableFailureMechanismTypeCreator.Create(sectionResult.FailureMechanismType),
+                sectionResult.Code,
+                SerializableFailureMechanismSectionAssemblyGroupCreator.Create(sectionResultSectionAssemblyResult.AssemblyGroup));
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs
===================================================================
diff -u -r641cbbb4010e957aae4f133ab9c91c3a4113784e -rcee2db52a72ec34d52c88a4ba6e199153e9e1252
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs	(.../SerializableFailureMechanismCreator.cs)	(revision 641cbbb4010e957aae4f133ab9c91c3a4113784e)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismCreator.cs	(.../SerializableFailureMechanismCreator.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
@@ -65,6 +65,7 @@
             }
 
             return new SerializableFailureMechanism(idGenerator.GetNewId(Resources.SerializableFailureMechanismCreator_IdPrefix),
+                                                    SerializableFailureMechanismTypeCreator.Create(failureMechanism.Type),
                                                     failureMechanism.Code, serializableTotalAssembly,
                                                     SerializableFailureMechanismResultCreator.Create(failureMechanism.FailureMechanismAssembly));
         }