Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs
===================================================================
diff -u -rd08a296ffb28468d06fd83770e1cd2faeddeb5da -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs	(.../AssemblyXmlIdentifiers.cs)	(revision d08a296ffb28468d06fd83770e1cd2faeddeb5da)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/AssemblyXmlIdentifiers.cs	(.../AssemblyXmlIdentifiers.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -33,7 +33,7 @@
         public const string Assembly = "Assemblage";
 
         /// <summary>
-        /// Identifier for an assembly element.
+        /// Identifier for an assembly method element.
         /// </summary>
         public const string AssemblyMethod = "assemblagemethode";
 
@@ -48,11 +48,6 @@
         public const string AssemblyNamespaceIdentifier = "asm";
 
         /// <summary>
-        /// Identifier for an assessment type element.
-        /// </summary>
-        public const string AssessmentType = "toets";
-
-        /// <summary>
         /// Identifier for an assessment process element.
         /// </summary>
         public const string AssessmentProcess = "Beoordelingsproces";
@@ -63,7 +58,7 @@
         public const string AssessmentProcessId = "BeoordelingsprocesID";
 
         /// <summary>
-        /// Identifier for an assessment process ID attribute.
+        /// Identifier for an assessment process ID reference attribute.
         /// </summary>
         public const string AssessmentProcessIdRef = "BeoordelingsprocesIDRef";
 
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssembly.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssembly.cs	(.../SerializableAssembly.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssembly.cs	(.../SerializableAssembly.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -43,7 +43,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableAssembly"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the assembly.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <param name="lowerCorner">The lower corner of the assembly map boundary.</param>
         /// <param name="upperCorner">The upper corner of the assembly map boundary.</param>
         /// <param name="assessmentSection">The <see cref="SerializableAssessmentSection"/> that belongs to the assembly.</param>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssessmentProcess.cs
===================================================================
diff -u -r98966494faaf14289e8e5cbdfa9ad6852ab2ad09 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssessmentProcess.cs	(.../SerializableAssessmentProcess.cs)	(revision 98966494faaf14289e8e5cbdfa9ad6852ab2ad09)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssessmentProcess.cs	(.../SerializableAssessmentProcess.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -43,7 +43,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableAssessmentProcess"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the assessment process.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <param name="assessmentSection">The assessment section this process belongs to.</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>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssessmentSection.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssessmentSection.cs	(.../SerializableAssessmentSection.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableAssessmentSection.cs	(.../SerializableAssessmentSection.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -46,7 +46,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableAssessmentSection"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the assessment section.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <param name="name">The name of the assessment section.</param>
         /// <param name="geometry">The geometry of the reference line.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter except <paramref name="id"/> is <c>null</c>.</exception>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableCombinedFailureMechanismSectionAssembly.cs
===================================================================
diff -u -r0102f161e02186c2fb3d2990d168d7271c1b1085 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableCombinedFailureMechanismSectionAssembly.cs	(.../SerializableCombinedFailureMechanismSectionAssembly.cs)	(revision 0102f161e02186c2fb3d2990d168d7271c1b1085)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableCombinedFailureMechanismSectionAssembly.cs	(.../SerializableCombinedFailureMechanismSectionAssembly.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -40,7 +40,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableCombinedFailureMechanismSectionAssembly"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the assembly.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <param name="totalAssemblyResult">The total assembly result this assembly belongs to.</param>
         /// <param name="section">The section this assembly belongs to.</param>
         /// <param name="failureMechanismResults">The collection of assembly results for this assembly per failure mechanism.</param>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs
===================================================================
diff -u -rd08a296ffb28468d06fd83770e1cd2faeddeb5da -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs	(.../SerializableFailureMechanism.cs)	(revision d08a296ffb28468d06fd83770e1cd2faeddeb5da)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanism.cs	(.../SerializableFailureMechanism.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -41,7 +41,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableFailureMechanism"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the assembly result.</param>
+        /// <param name="id">The unique assembly ID.</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>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs	(.../SerializableFailureMechanismSection.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs	(.../SerializableFailureMechanismSection.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -43,7 +43,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableFailureMechanismSection"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the section.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <param name="failureMechanismSectionCollection">The failure mechanism sections object the section belong to.</param>
         /// <param name="startDistance">The distance over the reference line where this section starts in meters.</param>
         /// <param name="endDistance">The distance over the reference line where this section ends in meters.</param>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSectionAssembly.cs
===================================================================
diff -u -r98966494faaf14289e8e5cbdfa9ad6852ab2ad09 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSectionAssembly.cs	(.../SerializableFailureMechanismSectionAssembly.cs)	(revision 98966494faaf14289e8e5cbdfa9ad6852ab2ad09)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSectionAssembly.cs	(.../SerializableFailureMechanismSectionAssembly.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -40,7 +40,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableFailureMechanismSectionAssembly"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the assembly.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <param name="failureMechanism">The failure mechanism this assembly belongs to.</param>
         /// <param name="section">The section this assembly belongs to.</param>
         /// <param name="sectionResult">The assembly result for this section assembly.</param>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSectionCollection.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSectionCollection.cs	(.../SerializableFailureMechanismSectionCollection.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableFailureMechanismSectionCollection.cs	(.../SerializableFailureMechanismSectionCollection.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -39,7 +39,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableFailureMechanismSectionCollection"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the sections.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <exception cref="ArgumentException">Thrown when <paramref name="id"/> is invalid.</exception>
         public SerializableFailureMechanismSectionCollection(string id)
         {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs
===================================================================
diff -u -r17a9c7be85b873550e29ea918acb99fee9296c12 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs	(.../SerializableTotalAssemblyResult.cs)	(revision 17a9c7be85b873550e29ea918acb99fee9296c12)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/SerializableTotalAssemblyResult.cs	(.../SerializableTotalAssemblyResult.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -40,7 +40,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SerializableTotalAssemblyResult"/>.
         /// </summary>
-        /// <param name="id">The unique ID of the assembly result.</param>
+        /// <param name="id">The unique assembly ID.</param>
         /// <param name="assessmentProcess">The assessment process this result belongs to.</param>
         /// <param name="assessmentSectionAssemblyResult">The assembly result for the assessment section.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter except <paramref name="id"/> is <c>null</c>.</exception>
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rcee2db52a72ec34d52c88a4ba6e199153e9e1252 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -100,15 +100,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DIRECT.
-        /// </summary>
-        internal static string DirectFailureMechanism {
-            get {
-                return ResourceManager.GetString("DirectFailureMechanism", 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 -rcee2db52a72ec34d52c88a4ba6e199153e9e1252 -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx	(.../Resources.resx)	(revision cee2db52a72ec34d52c88a4ba6e199153e9e1252)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Properties/Resources.resx	(.../Resources.resx)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -120,9 +120,6 @@
   <data name="AssessmentSectionType" xml:space="preserve">
     <value>DKTRJCT</value>
   </data>
-  <data name="DirectFailureMechanism" xml:space="preserve">
-    <value>DIRECT</value>
-  </data>
   <data name="FullAssembly" xml:space="preserve">
     <value>VOLLDG</value>
   </data>
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs
===================================================================
diff -u -rd08a296ffb28468d06fd83770e1cd2faeddeb5da -rc902b44e0e5257db5527d8b3bdb836bfcc2ba7f8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs	(.../AssemblyXmlIdentifiersTest.cs)	(revision d08a296ffb28468d06fd83770e1cd2faeddeb5da)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs	(.../AssemblyXmlIdentifiersTest.cs)	(revision c902b44e0e5257db5527d8b3bdb836bfcc2ba7f8)
@@ -31,9 +31,9 @@
         public void AssemblyXmlIdentifiers_ExpectedValues()
         {
             Assert.AreEqual("Assemblage", AssemblyXmlIdentifiers.Assembly);
+            Assert.AreEqual("assemblagemethode", AssemblyXmlIdentifiers.AssemblyMethod);
             Assert.AreEqual("http://localhost/standaarden/assemblage", AssemblyXmlIdentifiers.AssemblyNamespace);
             Assert.AreEqual("asm", AssemblyXmlIdentifiers.AssemblyNamespaceIdentifier);
-            Assert.AreEqual("toets", AssemblyXmlIdentifiers.AssessmentType);
             Assert.AreEqual("Beoordelingsproces", AssemblyXmlIdentifiers.AssessmentProcess);
             Assert.AreEqual("BeoordelingsprocesID", AssemblyXmlIdentifiers.AssessmentProcessId);
             Assert.AreEqual("BeoordelingsprocesIDRef", AssemblyXmlIdentifiers.AssessmentProcessIdRef);