Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs
===================================================================
diff -u -rff6c7198c6094bd341c2c7d7f90431328764f50f -r02aa5c4ae3ee7698a4cd0cd077037ff239350739
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision 02aa5c4ae3ee7698a4cd0cd077037ff239350739)
@@ -52,7 +52,7 @@
         private const int detailedAssemblyCategoryGroupIndex = 5;
         private const int tailorMadeAssemblyCategoryGroupIndex = 6;
         private const int combinedAssemblyCategoryGroupIndex = 7;
-        private const int useManualAssemblyCategoryGroupIndex = 8;
+        private const int useManualAssemblyIndex = 8;
         private const int manualAssemblyCategoryGroupIndex = 9;
         private const int columnCount = 10;
 
@@ -108,7 +108,7 @@
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[detailedAssemblyCategoryGroupIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[combinedAssemblyCategoryGroupIndex]);
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[useManualAssemblyCategoryGroupIndex]);
+                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[useManualAssemblyIndex]);
                 Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[manualAssemblyCategoryGroupIndex]);
 
                 Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText);
@@ -119,7 +119,7 @@
                 Assert.AreEqual("Toetsoordeel\r\ngedetailleerde toets per vak", dataGridView.Columns[detailedAssemblyCategoryGroupIndex].HeaderText);
                 Assert.AreEqual("Toetsoordeel\r\ntoets op maat", dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].HeaderText);
                 Assert.AreEqual("Toetsoordeel\r\ngecombineerd", dataGridView.Columns[combinedAssemblyCategoryGroupIndex].HeaderText);
-                Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyCategoryGroupIndex].HeaderText);
+                Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyIndex].HeaderText);
                 Assert.AreEqual("Toetsoordeel\r\nhandmatig", dataGridView.Columns[manualAssemblyCategoryGroupIndex].HeaderText);
 
                 Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly);
@@ -130,7 +130,7 @@
                 Assert.IsTrue(dataGridView.Columns[detailedAssemblyCategoryGroupIndex].ReadOnly);
                 Assert.IsTrue(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].ReadOnly);
                 Assert.IsTrue(dataGridView.Columns[combinedAssemblyCategoryGroupIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[useManualAssemblyCategoryGroupIndex].ReadOnly);
+                Assert.IsFalse(dataGridView.Columns[useManualAssemblyIndex].ReadOnly);
                 Assert.IsFalse(dataGridView.Columns[manualAssemblyCategoryGroupIndex].ReadOnly);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
@@ -169,7 +169,7 @@
                 Assert.AreEqual("IIv", cells[detailedAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual("IIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual("IIv", cells[combinedAssemblyCategoryGroupIndex].Value);
-                Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value);
+                Assert.AreEqual(false, cells[useManualAssemblyIndex].Value);
                 Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value);
             }
         }
@@ -180,7 +180,7 @@
             // Setup
             var failureMechanism = new MicrostabilityFailureMechanism();
             FailureMechanismTestHelper.AddSections(failureMechanism, 2);
-            failureMechanism.SectionResults.First().UseManualAssemblyCategoryGroup = true;
+            failureMechanism.SectionResults.First().UseManualAssembly = true;
 
             using (var form = new Form())
             using (var view = new MicrostabilityResultView(failureMechanism.SectionResults,
@@ -206,7 +206,7 @@
             // Given
             var failureMechanism = new MicrostabilityFailureMechanism();
             FailureMechanismTestHelper.AddSections(failureMechanism, 2);
-            failureMechanism.SectionResults.First().UseManualAssemblyCategoryGroup = true;
+            failureMechanism.SectionResults.First().UseManualAssembly = true;
 
             using (var form = new Form())
             using (var view = new MicrostabilityResultView(failureMechanism.SectionResults,
@@ -222,7 +222,7 @@
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
-                failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
+                failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssembly = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
@@ -242,7 +242,7 @@
 
             MicrostabilityFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
             sectionResult.ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.Iv;
-            sectionResult.UseManualAssemblyCategoryGroup = true;
+            sectionResult.UseManualAssembly = true;
 
             // When
             using (new AssemblyToolCalculatorFactoryConfig())