Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs
===================================================================
diff -u -r0006f4395d3b633196683821dda1a039b4c1dd9d -rd2744f91a62257d0e7854ed5107e7efca114465c
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs	(.../AssemblyXmlIdentifiers.cs)	(revision 0006f4395d3b633196683821dda1a039b4c1dd9d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs	(.../AssemblyXmlIdentifiers.cs)	(revision d2744f91a62257d0e7854ed5107e7efca114465c)
@@ -165,7 +165,7 @@
         /// <summary>
         /// Identifier for a failure mechanism section element.
         /// </summary>
-        public const string FailureMechanismSection = "ToetsVak";
+        public const string FailureMechanismSection = "Deelvak";
 
         /// <summary>
         /// Identifier for a failure mechanism section ID reference attribute.
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs
===================================================================
diff -u -r0006f4395d3b633196683821dda1a039b4c1dd9d -rd2744f91a62257d0e7854ed5107e7efca114465c
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs	(.../AssemblyXmlEnumIdentifiers.cs)	(revision 0006f4395d3b633196683821dda1a039b4c1dd9d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs	(.../AssemblyXmlEnumIdentifiers.cs)	(revision d2744f91a62257d0e7854ed5107e7efca114465c)
@@ -247,12 +247,12 @@
         /// <summary>
         /// Identifier for <see cref="SerializableFailureMechanismSectionType.FailureMechanism"/>.
         /// </summary>
-        public const string SerializableFailureMechanismSectionTypeFailureMechanism = "TOETSSSTE";
+        public const string SerializableFailureMechanismSectionTypeFailureMechanism = "FAALMVK";
 
         /// <summary>
         /// Identifier for <see cref="SerializableFailureMechanismSectionType.Combined"/>.
         /// </summary>
-        public const string SerializableFailureMechanismSectionTypeCombined = "GECBNETSSTE";
+        public const string SerializableFailureMechanismSectionTypeCombined = "DEELVK";
 
         #endregion
     }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs
===================================================================
diff -u -r0006f4395d3b633196683821dda1a039b4c1dd9d -rd2744f91a62257d0e7854ed5107e7efca114465c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs	(.../AssemblyXmlIdentifiersTest.cs)	(revision 0006f4395d3b633196683821dda1a039b4c1dd9d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs	(.../AssemblyXmlIdentifiersTest.cs)	(revision d2744f91a62257d0e7854ed5107e7efca114465c)
@@ -60,7 +60,7 @@
             Assert.AreEqual("analyseFaalmechanisme", AssemblyXmlIdentifiers.FailureMechanismAssemblyResult);
             Assert.AreEqual("FaalmechanismeID", AssemblyXmlIdentifiers.FailureMechanismId);
             Assert.AreEqual("FaalmechanismeIDRef", AssemblyXmlIdentifiers.FailureMechanismIdRef);
-            Assert.AreEqual("ToetsVak", AssemblyXmlIdentifiers.FailureMechanismSection);
+            Assert.AreEqual("Deelvak", AssemblyXmlIdentifiers.FailureMechanismSection);
             Assert.AreEqual("WaterkeringsectieIDRef", AssemblyXmlIdentifiers.FailureMechanismSectionIdRef);
             Assert.AreEqual("Faalanalyse", AssemblyXmlIdentifiers.FailureMechanismSectionAssembly);
             Assert.AreEqual("FaalanalyseID", AssemblyXmlIdentifiers.FailureMechanismSectionAssemblyId);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs
===================================================================
diff -u -r0006f4395d3b633196683821dda1a039b4c1dd9d -rd2744f91a62257d0e7854ed5107e7efca114465c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs	(.../AssemblyXmlEnumIdentifiersTest.cs)	(revision 0006f4395d3b633196683821dda1a039b4c1dd9d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs	(.../AssemblyXmlEnumIdentifiersTest.cs)	(revision d2744f91a62257d0e7854ed5107e7efca114465c)
@@ -74,8 +74,8 @@
             Assert.AreEqual("TOETSOPMT", AssemblyXmlEnumIdentifiers.SerializableAssessmentTypeTailorMadeAssessment);
             Assert.AreEqual("GECBNTR", AssemblyXmlEnumIdentifiers.SerializableAssessmentTypeCombinedAssessment);
 
-            Assert.AreEqual("TOETSSSTE", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeFailureMechanism);
-            Assert.AreEqual("GECBNETSSTE", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeCombined);
+            Assert.AreEqual("FAALMVK", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeFailureMechanism);
+            Assert.AreEqual("DEELVK", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeCombined);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableFailureMechanismSectionTypeTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rd2744f91a62257d0e7854ed5107e7efca114465c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableFailureMechanismSectionTypeTest.cs	(.../SerializableFailureMechanismSectionTypeTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableFailureMechanismSectionTypeTest.cs	(.../SerializableFailureMechanismSectionTypeTest.cs)	(revision d2744f91a62257d0e7854ed5107e7efca114465c)
@@ -29,36 +29,26 @@
     [TestFixture]
     public class SerializableFailureMechanismSectionTypeTest : EnumWithXmlEnumNameTestFixture<SerializableFailureMechanismSectionType>
     {
-        protected override IDictionary<SerializableFailureMechanismSectionType, int> ExpectedValueForEnumValues
-        {
-            get
+        protected override IDictionary<SerializableFailureMechanismSectionType, int> ExpectedValueForEnumValues =>
+            new Dictionary<SerializableFailureMechanismSectionType, int>
             {
-                return new Dictionary<SerializableFailureMechanismSectionType, int>
                 {
-                    {
-                        SerializableFailureMechanismSectionType.FailureMechanism, 1
-                    },
-                    {
-                        SerializableFailureMechanismSectionType.Combined, 2
-                    }
-                };
-            }
-        }
+                    SerializableFailureMechanismSectionType.FailureMechanism, 1
+                },
+                {
+                    SerializableFailureMechanismSectionType.Combined, 2
+                }
+            };
 
-        protected override IDictionary<SerializableFailureMechanismSectionType, string> ExpectedDisplayNameForEnumValues
-        {
-            get
+        protected override IDictionary<SerializableFailureMechanismSectionType, string> ExpectedDisplayNameForEnumValues =>
+            new Dictionary<SerializableFailureMechanismSectionType, string>
             {
-                return new Dictionary<SerializableFailureMechanismSectionType, string>
                 {
-                    {
-                        SerializableFailureMechanismSectionType.FailureMechanism, "TOETSSSTE"
-                    },
-                    {
-                        SerializableFailureMechanismSectionType.Combined, "GECBNETSSTE"
-                    }
-                };
-            }
-        }
+                    SerializableFailureMechanismSectionType.FailureMechanism, "FAALMVK"
+                },
+                {
+                    SerializableFailureMechanismSectionType.Combined, "DEELVK"
+                }
+            };
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs
===================================================================
diff -u -r36df51613268645bebe96e83389ecb5b79e1ee82 -rd2744f91a62257d0e7854ed5107e7efca114465c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs	(.../SerializableFailureMechanismSectionTest.cs)	(revision 36df51613268645bebe96e83389ecb5b79e1ee82)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs	(.../SerializableFailureMechanismSectionTest.cs)	(revision d2744f91a62257d0e7854ed5107e7efca114465c)
@@ -49,7 +49,7 @@
             Assert.IsNull(section.Geometry);
             Assert.AreEqual((SerializableFailureMechanismSectionType) 0, section.FailureMechanismSectionType);
 
-            SerializableAttributeTestHelper.AssertXmlTypeAttribute(typeof(SerializableFailureMechanismSection), "ToetsVak");
+            SerializableAttributeTestHelper.AssertXmlTypeAttribute(typeof(SerializableFailureMechanismSection), "Deelvak");
 
             SerializableAttributeTestHelper.AssertXmlAttributeAttribute<SerializableFailureMechanismSection>(
                 nameof(SerializableFailureMechanismSection.Id), "id", "http://www.opengis.net/gml/3.2");
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml
===================================================================
diff -u -r0006f4395d3b633196683821dda1a039b4c1dd9d -rd2744f91a62257d0e7854ed5107e7efca114465c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml	(.../configuredAssembly.gml)	(revision 0006f4395d3b633196683821dda1a039b4c1dd9d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml	(.../configuredAssembly.gml)	(revision d2744f91a62257d0e7854ed5107e7efca114465c)
@@ -67,7 +67,7 @@
     </asm:FaalanalyseGecombineerd>
     <asm:Vakindeling VakindelingID="vakindelingGABI" />
     <asm:Vakindeling VakindelingID="vakindeling_gecombineerd" />
-    <asm:ToetsVak gml:id="vak_GABI_1" VakindelingIDRef="vakindelingGABI">
+    <asm:Deelvak gml:id="vak_GABI_1" VakindelingIDRef="vakindelingGABI">
       <asm:afstandBegin uom="m">0.12</asm:afstandBegin>
       <asm:afstandEinde uom="m">10.23</asm:afstandEinde>
       <asm:geometrieLijn2D>
@@ -76,9 +76,9 @@
         </gml:LineString>
       </asm:geometrieLijn2D>
       <asm:lengte uom="m">14.142135623730951</asm:lengte>
-      <asm:typeWaterkeringsectie>TOETSSSTE</asm:typeWaterkeringsectie>
-    </asm:ToetsVak>
-    <asm:ToetsVak gml:id="vak_gecombineerd_1" VakindelingIDRef="vakindeling_gecombineerd">
+      <asm:typeWaterkeringsectie>FAALMVK</asm:typeWaterkeringsectie>
+    </asm:Deelvak>
+    <asm:Deelvak gml:id="vak_gecombineerd_1" VakindelingIDRef="vakindeling_gecombineerd">
       <asm:afstandBegin uom="m">0.12</asm:afstandBegin>
       <asm:afstandEinde uom="m">10.23</asm:afstandEinde>
       <asm:geometrieLijn2D>
@@ -87,8 +87,8 @@
         </gml:LineString>
       </asm:geometrieLijn2D>
       <asm:lengte uom="m">14.142135623730951</asm:lengte>
-      <asm:typeWaterkeringsectie>GECBNETSSTE</asm:typeWaterkeringsectie>
+      <asm:typeWaterkeringsectie>DEELVK</asm:typeWaterkeringsectie>
       <asm:assemblagemethode>WBI-3A-1</asm:assemblagemethode>
-    </asm:ToetsVak>
+    </asm:Deelvak>
   </asm:featureMember>
 </asm:Assemblage>
\ No newline at end of file