Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
===================================================================
diff -u -rd41d466b016e29fb8e52680f61a8cb744be378ce -r1800188e6e297e9ff843ac4e7299b776e89d7fe9
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision d41d466b016e29fb8e52680f61a8cb744be378ce)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision 1800188e6e297e9ff843ac4e7299b776e89d7fe9)
@@ -80,7 +80,7 @@
             }
 
             var registry = new ExportableModelRegistry();
-            return new ExportableAssessmentSection($"{Resources.ExportableAssessmentSection_IdPrefix}.{assessmentSection.Id}",
+            return new ExportableAssessmentSection(IdentifierGenerator.GenerateId(assessmentSection),
                                                    assessmentSection.Name,
                                                    assessmentSection.ReferenceLine.Points,
                                                    CreateExportableFailureMechanismSectionCollections(idGenerator, registry, assessmentSection),
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/IdentifierGenerator.cs
===================================================================
diff -u -rf56c6e3627abb4f2399032992d4793089f86d419 -r1800188e6e297e9ff843ac4e7299b776e89d7fe9
--- Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/IdentifierGenerator.cs	(.../IdentifierGenerator.cs)	(revision f56c6e3627abb4f2399032992d4793089f86d419)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/IdentifierGenerator.cs	(.../IdentifierGenerator.cs)	(revision 1800188e6e297e9ff843ac4e7299b776e89d7fe9)
@@ -21,7 +21,7 @@
 
 using System;
 using System.Collections.Generic;
-using Riskeer.AssemblyTool.IO.Model;
+using Riskeer.Integration.Data;
 using Riskeer.Integration.IO.Properties;
 
 namespace Riskeer.Integration.IO.Helpers
@@ -70,18 +70,18 @@
         /// <summary>
         /// Gets an id based on <paramref name="assessmentSection"/>.
         /// </summary>
-        /// <param name="assessmentSection">The <see cref="ExportableAssessmentSection"/>
+        /// <param name="assessmentSection">The <see cref="AssessmentSection"/>
         /// to generate an id for.</param>
         /// <returns>An id.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="assessmentSection"/> is <c>null</c>.</exception>
-        public static string GeneratedId(ExportableAssessmentSection assessmentSection)
+        public static string GenerateId(AssessmentSection assessmentSection)
         {
             if (assessmentSection == null)
             {
                 throw new ArgumentNullException(nameof(assessmentSection));
             }
 
-            return $"{Resources.SerializableAssessmentSection_IdPrefix}.{assessmentSection.Id}";
+            return $"{Resources.ExportableAssessmentSection_IdPrefix}.{assessmentSection.Id}";
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/IdentifierGeneratorTest.cs
===================================================================
diff -u -r7c5c4da68eaa7539d635b50361dbf224c5268107 -r1800188e6e297e9ff843ac4e7299b776e89d7fe9
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/IdentifierGeneratorTest.cs	(.../IdentifierGeneratorTest.cs)	(revision 7c5c4da68eaa7539d635b50361dbf224c5268107)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/IdentifierGeneratorTest.cs	(.../IdentifierGeneratorTest.cs)	(revision 1800188e6e297e9ff843ac4e7299b776e89d7fe9)
@@ -22,8 +22,8 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.IO.Model;
-using Riskeer.AssemblyTool.IO.TestUtil;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Integration.Data;
 using Riskeer.Integration.IO.Helpers;
 
 namespace Riskeer.Integration.IO.Test.Helpers
@@ -124,7 +124,7 @@
         public void GenerateId_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => IdentifierGenerator.GeneratedId(null);
+            void Call() => IdentifierGenerator.GenerateId(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -136,18 +136,23 @@
         {
             // Setup
             const string assessmentSectionId = "AssessmentSectionId";
-            ExportableAssessmentSection assessmentSection = CreateAssessmentSection(assessmentSectionId);
+            AssessmentSection assessmentSection = CreateAssessmentSection(assessmentSectionId);
 
             // Call
-            string generatedId = IdentifierGenerator.GeneratedId(assessmentSection);
+            string generatedId = IdentifierGenerator.GenerateId(assessmentSection);
 
             // Assert
             Assert.AreEqual($"Wks.{assessmentSection.Id}", generatedId);
         }
 
-        private static ExportableAssessmentSection CreateAssessmentSection(string id)
+        private static AssessmentSection CreateAssessmentSection(string id)
         {
-            return ExportableAssessmentSectionTestFactory.Create(id);
+            var random = new Random(21);
+            var assessmentSection = new AssessmentSection(random.NextEnumValue<AssessmentSectionComposition>())
+            {
+                Id = id
+            };
+            return assessmentSection;
         }
     }
 }
\ No newline at end of file