Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -refda058c94433264ac6a8087cd217e4cd8f61020 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision efda058c94433264ac6a8087cd217e4cd8f61020)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -163,7 +163,7 @@
             }
 
             return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
-                       ? failureMechanismSectionResult.ManualAssemblyCategoryGroup
+                       ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                        : AssembleCombinedAssessment(failureMechanismSectionResult);
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResult.cs
===================================================================
diff -u -r341edbfd5905c218dcbaacdc77b68ca67e5424cf -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResult.cs	(.../TechnicalInnovationFailureMechanismSectionResult.cs)	(revision 341edbfd5905c218dcbaacdc77b68ca67e5424cf)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResult.cs	(.../TechnicalInnovationFailureMechanismSectionResult.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Primitives;
 
@@ -40,7 +39,7 @@
         {
             SimpleAssessmentResult = SimpleAssessmentResultType.None;
             TailorMadeAssessmentResult = TailorMadeAssessmentResultType.None;
-            ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None;
+            ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.None;
         }
 
         /// <summary>
@@ -61,6 +60,6 @@
         /// <summary>
         /// Gets or sets the manually selected assembly category group.
         /// </summary>
-        public FailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; }
+        public ManualFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/TechnicalInnovationSectionResultRow.cs
===================================================================
diff -u -r4613f112c78c8a1ea1c69d07a0e08e5a69b3689e -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/TechnicalInnovationSectionResultRow.cs	(.../TechnicalInnovationSectionResultRow.cs)	(revision 4613f112c78c8a1ea1c69d07a0e08e5a69b3689e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/TechnicalInnovationSectionResultRow.cs	(.../TechnicalInnovationSectionResultRow.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -22,7 +22,6 @@
 using System;
 using Core.Common.Controls.DataGrid;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.Views;
@@ -171,15 +170,15 @@
         /// </summary>
         /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// is a valid value, but unsupported.</exception>
-        public SelectableFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup
+        public ManualFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup
         {
             get
             {
-                return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.ManualAssemblyCategoryGroup);
+                return SectionResult.ManualAssemblyCategoryGroup;
             }
             set
             {
-                SectionResult.ManualAssemblyCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value);
+                SectionResult.ManualAssemblyCategoryGroup = value;
                 UpdateInternalData();
             }
         }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs
===================================================================
diff -u -r352b81d92f568dbe5e072a2c00b4e518ee1605d3 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs	(.../TechnicalInnovationResultView.cs)	(revision 352b81d92f568dbe5e072a2c00b4e518ee1605d3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs	(.../TechnicalInnovationResultView.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -99,7 +99,7 @@
                 DataGridViewControl,
                 nameof(TechnicalInnovationSectionResultRow.UseManualAssemblyCategoryGroup));
 
-            FailureMechanismSectionResultViewColumnBuilder.AddSelectableAssemblyCategoryGroupColumn(
+            FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn(
                 DataGridViewControl,
                 nameof(TechnicalInnovationSectionResultRow.ManualAssemblyCategoryGroup));
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs)	(revision 9d464742b12df2c1a1779e74b8e289eed5045e91)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -391,15 +391,16 @@
             var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 UseManualAssemblyCategoryGroup = true,
-                ManualAssemblyCategoryGroup = new Random(39).NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()
+                ManualAssemblyCategoryGroup = new Random(39).NextEnumValue<ManualFailureMechanismSectionAssemblyCategoryGroup>()
             };
 
             // Call
             FailureMechanismSectionAssemblyCategoryGroup categoryGroup = TechnicalInnovationFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(
                 sectionResult);
 
             // Assert
-            Assert.AreEqual(categoryGroup, sectionResult.ManualAssemblyCategoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
+                            categoryGroup);
         }
 
         [Test]
@@ -493,7 +494,7 @@
             });
             TechnicalInnovationFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
             sectionResult.UseManualAssemblyCategoryGroup = true;
-            sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue<ManualFailureMechanismSectionAssemblyCategoryGroup>();
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
@@ -504,7 +505,8 @@
                 TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r341edbfd5905c218dcbaacdc77b68ca67e5424cf -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResultTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultTest.cs)	(revision 341edbfd5905c218dcbaacdc77b68ca67e5424cf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResultTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultTest.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
@@ -46,7 +45,7 @@
             Assert.AreEqual(SimpleAssessmentResultType.None, result.SimpleAssessmentResult);
             Assert.AreEqual(TailorMadeAssessmentResultType.None, result.TailorMadeAssessmentResult);
             Assert.IsFalse(result.UseManualAssemblyCategoryGroup);
-            Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/TechnicalInnovationSectionResultRowTest.cs
===================================================================
diff -u -r37d015e59a004f7deb5f1a9657016bd9c13c6539 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/TechnicalInnovationSectionResultRowTest.cs	(.../TechnicalInnovationSectionResultRowTest.cs)	(revision 37d015e59a004f7deb5f1a9657016bd9c13c6539)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/TechnicalInnovationSectionResultRowTest.cs	(.../TechnicalInnovationSectionResultRowTest.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -28,7 +28,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
@@ -94,8 +93,7 @@
                 Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult);
                 Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult);
                 Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup);
-                Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup),
-                                row.ManualAssemblyCategoryGroup);
+                Assert.AreEqual(result.ManualAssemblyCategoryGroup, row.ManualAssemblyCategoryGroup);
 
                 IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
                 Assert.AreEqual(6, columnStateDefinitions.Count);
@@ -207,7 +205,7 @@
             mocks.ReplayAll();
 
             var random = new Random(39);
-            var newValue = random.NextEnumValue<SelectableFailureMechanismSectionAssemblyCategoryGroup>();
+            var newValue = random.NextEnumValue<ManualFailureMechanismSectionAssemblyCategoryGroup>();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var result = new TechnicalInnovationFailureMechanismSectionResult(section);
@@ -221,8 +219,7 @@
                 row.ManualAssemblyCategoryGroup = newValue;
 
                 // Assert
-                FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue);
-                Assert.AreEqual(expectedCategoryGroup, result.ManualAssemblyCategoryGroup);
+                Assert.AreEqual(newValue, result.ManualAssemblyCategoryGroup);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs
===================================================================
diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision 9d464742b12df2c1a1779e74b8e289eed5045e91)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -23,7 +23,6 @@
 using Core.Common.Base;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Controls;
@@ -149,7 +148,7 @@
                 Assert.AreEqual("IIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual("IIv", cells[combinedAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value);
-                Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value);
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value);
             }
         }
 
Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r2a4390996dcafa47b869be130b46a395c90b5abb -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql	(.../DatabaseStructure18.1.sql)	(revision 2a4390996dcafa47b869be130b46a395c90b5abb)
+++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql	(.../DatabaseStructure18.1.sql)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 03-Aug-2018 15:05:35 				*/
+/*  Created On : 03-Aug-2018 15:17:58 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -862,7 +862,7 @@
 	'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther
 	'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed
 	'UseManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- true or false
-	'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = IIIv, 6 = IVv, 7 = Vv, 8 = VIv, 9 = VIIv
+	'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv 
 	CONSTRAINT 'FK_TechnicalInnovationSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs	(.../TechnicalInnovationSectionResultEntityReadExtensions.cs)	(revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs	(.../TechnicalInnovationSectionResultEntityReadExtensions.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
@@ -55,7 +54,7 @@
             sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
             sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
             sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
-            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.ManualAssemblyCategoryGroup;
+            sectionResult.ManualAssemblyCategoryGroup = (ManualFailureMechanismSectionAssemblyCategoryGroup) entity.ManualAssemblyCategoryGroup;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -22,7 +22,6 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
@@ -53,7 +52,7 @@
             var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
-            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<ManualFailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs	(.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs	(.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -22,7 +22,6 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
@@ -70,7 +69,7 @@
             var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
-            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<ManualFailureMechanismSectionAssemblyCategoryGroup>();
 
             var entity = new TechnicalInnovationSectionResultEntity
             {
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r2a4390996dcafa47b869be130b46a395c90b5abb -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 2a4390996dcafa47b869be130b46a395c90b5abb)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -219,7 +219,7 @@
                 sectionResult.SimpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
                 sectionResult.TailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
                 sectionResult.UseManualAssemblyCategoryGroup = random.NextBoolean();
-                sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+                sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue<ManualFailureMechanismSectionAssemblyCategoryGroup>();
             }
         }
 
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r2a4390996dcafa47b869be130b46a395c90b5abb -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
--- build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 2a4390996dcafa47b869be130b46a395c90b5abb)
+++ build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision c03d261f67b4fccb343a8be6224c0133cbd3edfb)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 03-Aug-2018 15:05:35 				*/
+/*  Created On : 03-Aug-2018 15:17:58 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -862,7 +862,7 @@
 	'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther
 	'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed
 	'UseManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- true or false
-	'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = IIIv, 6 = IVv, 7 = Vv, 8 = VIv, 9 = VIIv
+	'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv 
 	CONSTRAINT 'FK_TechnicalInnovationSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
Index: design/DatabaseDesign.eap
===================================================================
diff -u -r2a4390996dcafa47b869be130b46a395c90b5abb -rc03d261f67b4fccb343a8be6224c0133cbd3edfb
Binary files differ