Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -r5054dd8dca09c2c282b4c7aaccd4214c18413cd1 -r5c2e138b9ed67bd118a35dd6f2604d268923f19c
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision 5054dd8dca09c2c282b4c7aaccd4214c18413cd1)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision 5c2e138b9ed67bd118a35dd6f2604d268923f19c)
@@ -45,7 +45,7 @@
             TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE1((SimpleAssessmentResultType) 99);
 
             // Assert
-            const string expectedMessage = "The value of argument 'input' (99) is invalid for Enum type 'SimpleAssessmentResultType'.";
+            string expectedMessage = $"The value of argument 'input' (99) is invalid for Enum type '{nameof(SimpleAssessmentResultType)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
@@ -71,7 +71,7 @@
             TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE2((SimpleAssessmentValidityOnlyResultType) 99);
 
             // Assert
-            const string expectedMessage = "The value of argument 'input' (99) is invalid for Enum type 'SimpleAssessmentValidityOnlyResultType'.";
+            string expectedMessage = $"The value of argument 'input' (99) is invalid for Enum type '{nameof(SimpleAssessmentValidityOnlyResultType)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
@@ -302,7 +302,7 @@
                 new FailureMechanismSectionAssembly(0, (FailureMechanismSectionAssemblyCategoryGroup) 99));
 
             // Assert
-            const string expectedMessage = "The value of argument 'category' (99) is invalid for Enum type 'FailureMechanismSectionAssemblyCategoryGroup'.";
+            string expectedMessage = $"The value of argument 'category' (99) is invalid for Enum type '{nameof(FailureMechanismSectionAssemblyCategoryGroup)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
@@ -337,7 +337,7 @@
                 (FailureMechanismSectionAssemblyCategoryGroup) 99);
 
             // Assert
-            const string expectedMessage = "The value of argument 'category' (99) is invalid for Enum type 'FailureMechanismSectionAssemblyCategoryGroup'.";
+            string expectedMessage = $"The value of argument 'category' (99) is invalid for Enum type '{nameof(FailureMechanismSectionAssemblyCategoryGroup)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs
===================================================================
diff -u -r5054dd8dca09c2c282b4c7aaccd4214c18413cd1 -r5c2e138b9ed67bd118a35dd6f2604d268923f19c
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs	(.../FailureMechanismSectionResultViewColumnBuilder.cs)	(revision 5054dd8dca09c2c282b4c7aaccd4214c18413cd1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs	(.../FailureMechanismSectionResultViewColumnBuilder.cs)	(revision 5c2e138b9ed67bd118a35dd6f2604d268923f19c)
@@ -68,38 +68,6 @@
                        .ToArray();
         }
 
-        /// <summary>
-        /// Adds a column to the <paramref name="dataGridViewControl"/> showing the selectable
-        /// failure mechanism section assembly category group.
-        /// </summary>
-        /// <param name="dataGridViewControl">The <see cref="DataGridViewControl"/> to add the column to.</param>
-        /// <param name="dataPropertyName">The data property name of the column.</param>
-        /// <param name="headerText">The header text of the column.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="dataGridViewControl"/>
-        /// or <paramref name="dataPropertyName"/> is <c>null</c>.</exception>
-        private static void AddSelectableAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName, string headerText)
-        {
-            if (dataGridViewControl == null)
-            {
-                throw new ArgumentNullException(nameof(dataGridViewControl));
-            }
-
-            if (dataPropertyName == null)
-            {
-                throw new ArgumentNullException(nameof(dataPropertyName));
-            }
-
-            IEnumerable<EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>> dataSource =
-                CreateEnumDisplayWrappers<SelectableFailureMechanismSectionAssemblyCategoryGroup>();
-
-            dataGridViewControl.AddComboBoxColumn(
-                dataPropertyName,
-                headerText,
-                dataSource,
-                nameof(EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>.Value),
-                nameof(EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>.DisplayName));
-        }
-
         #region Assessment
 
         /// <summary>
@@ -626,8 +594,25 @@
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public static void AddManualAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName)
         {
-            AddSelectableAssemblyCategoryGroupColumn(dataGridViewControl, dataPropertyName,
-                                                     Resources.FailureMechanismResultView_ManualAssembly_DisplayName);
+            if (dataGridViewControl == null)
+            {
+                throw new ArgumentNullException(nameof(dataGridViewControl));
+            }
+
+            if (dataPropertyName == null)
+            {
+                throw new ArgumentNullException(nameof(dataPropertyName));
+            }
+
+            IEnumerable<EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>> dataSource =
+                CreateEnumDisplayWrappers<SelectableFailureMechanismSectionAssemblyCategoryGroup>();
+
+            dataGridViewControl.AddComboBoxColumn(
+                dataPropertyName,
+                Resources.FailureMechanismResultView_ManualAssembly_DisplayName,
+                dataSource,
+                nameof(EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>.Value),
+                nameof(EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>.DisplayName));
         }
 
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentCategoryGroupResultType.cs
===================================================================
diff -u -r1ac0b0a93ecc4e7981a2ef46a622d13bb8ab5996 -r5c2e138b9ed67bd118a35dd6f2604d268923f19c
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentCategoryGroupResultType.cs	(.../TailorMadeAssessmentCategoryGroupResultType.cs)	(revision 1ac0b0a93ecc4e7981a2ef46a622d13bb8ab5996)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentCategoryGroupResultType.cs	(.../TailorMadeAssessmentCategoryGroupResultType.cs)	(revision 5c2e138b9ed67bd118a35dd6f2604d268923f19c)
@@ -26,7 +26,7 @@
 {
     /// <summary>
     /// This enum defines the possible result types for a tailor made assessment 
-    /// on a failure mechanism section where a category group can be selected.
+    /// on a failure mechanism section in case only a category group is relevant.
     /// </summary>
     public enum TailorMadeAssessmentCategoryGroupResultType
     {