Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r749041cd705445f067934c94b6be14c4ef5fc793 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision 749041cd705445f067934c94b6be14c4ef5fc793)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -326,7 +326,7 @@
                                                                           bool useManual)
         {
             FailureMechanismSectionAssembly sectionAssembly;
-            if (failureMechanismSectionResult.UseManualAssemblyProbability && useManual)
+            if (failureMechanismSectionResult.UseManualAssembly && useManual)
             {
                 sectionAssembly = AssembleManualAssessment(failureMechanismSectionResult,
                                                            CreateAssemblyCategoriesInput(failureMechanism, assessmentSection));
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismHelper.cs
===================================================================
diff -u -rfe04c069b2310e068ae0752393fef6a2fb783842 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismHelper.cs	(.../HeightStructuresFailureMechanismHelper.cs)	(revision fe04c069b2310e068ae0752393fef6a2fb783842)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismHelper.cs	(.../HeightStructuresFailureMechanismHelper.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -43,7 +43,7 @@
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            return failureMechanism.SectionResults.Any(sr => sr.UseManualAssemblyProbability);
+            return failureMechanism.SectionResults.Any(sr => sr.UseManualAssembly);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs	(.../HeightStructuresFailureMechanismSectionResult.cs)	(revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs	(.../HeightStructuresFailureMechanismSectionResult.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -93,7 +93,7 @@
         /// <summary>
         /// Gets or sets the indicator whether the combined assembly should be overwritten by <see cref="ManualAssemblyProbability"/>.
         /// </summary>
-        public bool UseManualAssemblyProbability { get; set; }
+        public bool UseManualAssembly { get; set; }
 
         /// <summary>
         /// Gets or sets the manually entered assembly probability.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs
===================================================================
diff -u -rbc524ff12185a64dc843839fd1711ba8df3561a4 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision bc524ff12185a64dc843839fd1711ba8df3561a4)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -170,9 +170,9 @@
                 DataGridViewControl,
                 nameof(HeightStructuresFailureMechanismSectionResultRow.CombinedAssemblyProbability));
 
-            FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn(
+            FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyColumn(
                 DataGridViewControl,
-                nameof(HeightStructuresFailureMechanismSectionResultRow.UseManualAssemblyProbability));
+                nameof(HeightStructuresFailureMechanismSectionResultRow.UseManualAssembly));
 
             FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyProbabilityColumn(
                 DataGridViewControl,
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs
===================================================================
diff -u -ra2405640a09a0b6df9457c317ab921a8dd7877fa -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs	(.../HeightStructuresFailureMechanismSectionResultRow.cs)	(revision a2405640a09a0b6df9457c317ab921a8dd7877fa)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs	(.../HeightStructuresFailureMechanismSectionResultRow.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -252,15 +252,15 @@
         /// </summary>
         /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// is a valid value, but unsupported.</exception>
-        public bool UseManualAssemblyProbability
+        public bool UseManualAssembly
         {
             get
             {
-                return SectionResult.UseManualAssemblyProbability;
+                return SectionResult.UseManualAssembly;
             }
             set
             {
-                SectionResult.UseManualAssemblyProbability = value;
+                SectionResult.UseManualAssembly = value;
                 UpdateInternalData();
             }
         }
@@ -297,7 +297,7 @@
         {
             if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult)
                 || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult)
-                || UseManualAssemblyProbability)
+                || UseManualAssembly)
             {
                 ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty;
             }
@@ -418,12 +418,12 @@
         {
             bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult);
 
-            FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssemblyProbability);
+            FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly);
             FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex],
-                                                                  simpleAssessmentSufficient || UseManualAssemblyProbability);
+                                                                  simpleAssessmentSufficient || UseManualAssembly);
             if (simpleAssessmentSufficient
                 || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult)
-                || UseManualAssemblyProbability)
+                || UseManualAssembly)
             {
                 FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]);
             }
@@ -433,13 +433,13 @@
             }
 
             FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex],
-                                                                  simpleAssessmentSufficient || UseManualAssemblyProbability);
+                                                                  simpleAssessmentSufficient || UseManualAssembly);
             FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex],
                                                                   simpleAssessmentSufficient
                                                                   || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult)
-                                                                  || UseManualAssemblyProbability);
+                                                                  || UseManualAssembly);
 
-            if (UseManualAssemblyProbability)
+            if (UseManualAssembly)
             {
                 FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex]);
                 FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex]);
@@ -460,7 +460,7 @@
                 FailureMechanismSectionResultRowHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true);
             }
 
-            FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[manualAssemblyProbabilityIndex], !UseManualAssemblyProbability);
+            FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[manualAssemblyProbabilityIndex], !UseManualAssembly);
         }
 
         /// <summary>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategy.cs
===================================================================
diff -u -r0c80386e4c06dd8832cfe86ce6bd2201f185cde1 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategy.cs	(.../HeightStructuresFailureMechanismSectionResultUpdateStrategy.cs)	(revision 0c80386e4c06dd8832cfe86ce6bd2201f185cde1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategy.cs	(.../HeightStructuresFailureMechanismSectionResultUpdateStrategy.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -49,7 +49,7 @@
             target.DetailedAssessmentResult = origin.DetailedAssessmentResult;
             target.TailorMadeAssessmentResult = origin.TailorMadeAssessmentResult;
             target.TailorMadeAssessmentProbability = origin.TailorMadeAssessmentProbability;
-            target.UseManualAssemblyProbability = origin.UseManualAssemblyProbability;
+            target.UseManualAssembly = origin.UseManualAssembly;
             target.ManualAssemblyProbability = origin.ManualAssemblyProbability;
         }
     }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -763,7 +763,7 @@
             // Setup
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
-                UseManualAssemblyProbability = true,
+                UseManualAssembly = true,
                 ManualAssemblyProbability = new Random(39).NextDouble()
             };
 
@@ -800,7 +800,7 @@
             var random = new Random(39);
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
-                UseManualAssemblyProbability = true,
+                UseManualAssembly = true,
                 ManualAssemblyProbability = random.NextDouble(),
                 TailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
                 TailorMadeAssessmentProbability = random.NextDouble()
@@ -868,7 +868,7 @@
             // Setup
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
-                UseManualAssemblyProbability = true,
+                UseManualAssembly = true,
                 ManualAssemblyProbability = new Random(39).NextDouble()
             };
 
@@ -905,7 +905,7 @@
             // Setup
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
-                UseManualAssemblyProbability = true,
+                UseManualAssembly = true,
                 ManualAssemblyProbability = new Random(39).NextDouble()
             };
 
@@ -942,7 +942,7 @@
             // Setup
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
-                UseManualAssemblyProbability = useManualAssembly
+                UseManualAssembly = useManualAssembly
             };
             var failureMechanism = new HeightStructuresFailureMechanism();
 
@@ -1086,7 +1086,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             });
             HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
-            sectionResult.UseManualAssemblyProbability = true;
+            sectionResult.UseManualAssembly = true;
             sectionResult.ManualAssemblyProbability = new Random(39).NextDouble();
 
             var mocks = new MockRepository();
@@ -1124,7 +1124,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             });
             HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
-            sectionResult.UseManualAssemblyProbability = true;
+            sectionResult.UseManualAssembly = true;
             sectionResult.ManualAssemblyProbability = new Random(39).NextDouble();
 
             var mocks = new MockRepository();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismHelperTest.cs
===================================================================
diff -u -rfe04c069b2310e068ae0752393fef6a2fb783842 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismHelperTest.cs	(.../HeightStructuresFailureMechanismHelperTest.cs)	(revision fe04c069b2310e068ae0752393fef6a2fb783842)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismHelperTest.cs	(.../HeightStructuresFailureMechanismHelperTest.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -57,7 +57,7 @@
                     new Point2D(0, 0)
                 })
             });
-            failureMechanism.SectionResults.First().UseManualAssemblyProbability = true;
+            failureMechanism.SectionResults.First().UseManualAssembly = true;
 
             // Call
             bool hasManualAssemblyResults = HeightStructuresFailureMechanismHelper.HasManualAssemblyResults(failureMechanism);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs	(.../HeightStructuresFailureMechanismSectionResultTest.cs)	(revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs	(.../HeightStructuresFailureMechanismSectionResultTest.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -48,7 +48,7 @@
             Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, sectionResult.TailorMadeAssessmentResult);
             Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability);
             Assert.AreSame(section, sectionResult.Section);
-            Assert.IsFalse(sectionResult.UseManualAssemblyProbability);
+            Assert.IsFalse(sectionResult.UseManualAssembly);
             Assert.IsNaN(sectionResult.ManualAssemblyProbability);
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rff6c7198c6094bd341c2c7d7f90431328764f50f -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -56,7 +56,7 @@
         private const int tailorMadeAssemblyCategoryGroupIndex = 8;
         private const int combinedAssemblyCategoryGroupIndex = 9;
         private const int combinedAssemblyProbabilityIndex = 10;
-        private const int useManualAssemblyProbabilityIndex = 11;
+        private const int useManualAssemblyIndex = 11;
         private const int manualAssemblyProbabilityIndex = 12;
         private const int columnCount = 13;
 
@@ -136,7 +136,7 @@
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[combinedAssemblyCategoryGroupIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[combinedAssemblyProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[useManualAssemblyProbabilityIndex]);
+                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[useManualAssemblyIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[manualAssemblyProbabilityIndex]);
 
                 Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText);
@@ -150,7 +150,7 @@
                 Assert.AreEqual("Toetsoordeel\r\ntoets op maat", dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].HeaderText);
                 Assert.AreEqual("Toetsoordeel\r\ngecombineerd", dataGridView.Columns[combinedAssemblyCategoryGroupIndex].HeaderText);
                 Assert.AreEqual("Toetsoordeel\r\ngecombineerde\r\nfaalkansschatting", dataGridView.Columns[combinedAssemblyProbabilityIndex].HeaderText);
-                Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyProbabilityIndex].HeaderText);
+                Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyIndex].HeaderText);
                 Assert.AreEqual("Toetsoordeel\r\nhandmatig", dataGridView.Columns[manualAssemblyProbabilityIndex].HeaderText);
 
                 Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly);
@@ -164,7 +164,7 @@
                 Assert.IsTrue(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].ReadOnly);
                 Assert.IsTrue(dataGridView.Columns[combinedAssemblyCategoryGroupIndex].ReadOnly);
                 Assert.IsTrue(dataGridView.Columns[combinedAssemblyProbabilityIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[useManualAssemblyProbabilityIndex].ReadOnly);
+                Assert.IsFalse(dataGridView.Columns[useManualAssemblyIndex].ReadOnly);
                 Assert.IsFalse(dataGridView.Columns[manualAssemblyProbabilityIndex].ReadOnly);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
@@ -205,7 +205,7 @@
                 Assert.AreEqual("VIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual("VIv", cells[combinedAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual("1/1", cells[combinedAssemblyProbabilityIndex].FormattedValue);
-                Assert.AreEqual(false, cells[useManualAssemblyProbabilityIndex].Value);
+                Assert.AreEqual(false, cells[useManualAssemblyIndex].Value);
                 Assert.AreEqual("-", cells[manualAssemblyProbabilityIndex].FormattedValue);
             }
         }
@@ -216,7 +216,7 @@
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
             FailureMechanismTestHelper.AddSections(failureMechanism, 2);
-            failureMechanism.SectionResults.First().UseManualAssemblyProbability = true;
+            failureMechanism.SectionResults.First().UseManualAssembly = true;
 
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
@@ -237,7 +237,7 @@
             // Given
             var failureMechanism = new HeightStructuresFailureMechanism();
             FailureMechanismTestHelper.AddSections(failureMechanism, 2);
-            failureMechanism.SectionResults.First().UseManualAssemblyProbability = true;
+            failureMechanism.SectionResults.First().UseManualAssembly = true;
 
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
@@ -248,7 +248,7 @@
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
-                failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false);
+                failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssembly = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
@@ -268,7 +268,7 @@
 
             HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
             sectionResult.ManualAssemblyProbability = new Random(39).NextDouble();
-            sectionResult.UseManualAssemblyProbability = true;
+            sectionResult.UseManualAssembly = true;
 
             // When
             using (new AssemblyToolCalculatorFactoryConfig())
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -157,7 +157,7 @@
                 Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult);
                 Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult);
                 Assert.AreEqual(result.TailorMadeAssessmentProbability, row.TailorMadeAssessmentProbability);
-                Assert.AreEqual(result.UseManualAssemblyProbability, row.UseManualAssemblyProbability);
+                Assert.AreEqual(result.UseManualAssembly, row.UseManualAssembly);
                 Assert.AreEqual(result.ManualAssemblyProbability, row.ManualAssemblyProbability);
 
                 TestHelper.AssertTypeConverter<HeightStructuresFailureMechanismSectionResultRow,
@@ -189,7 +189,7 @@
         }
 
         [Test]
-        public void UseManualAssemblyProbability_SetNewValue_NotifyObserversAndPropertyChanged()
+        public void UseManualAssembly_SetNewValue_NotifyObserversAndPropertyChanged()
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -208,14 +208,14 @@
             {
                 var row = new HeightStructuresFailureMechanismSectionResultRow(
                     result, failureMechanism, assessmentSection, ConstructionProperties);
-                bool originalValue = result.UseManualAssemblyProbability;
+                bool originalValue = result.UseManualAssembly;
                 bool newValue = !originalValue;
 
                 // Call
-                row.UseManualAssemblyProbability = newValue;
+                row.UseManualAssembly = newValue;
 
                 // Assert
-                Assert.AreEqual(newValue, result.UseManualAssemblyProbability);
+                Assert.AreEqual(newValue, result.UseManualAssembly);
                 mocks.VerifyAll();
             }
         }
@@ -529,7 +529,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void Constructor_WithUseManualAssemblyCategoryGroupSet_ExpectedColumnStates(bool useManualAssemblyProbability)
+        public void Constructor_WithUseManualAssemblySet_ExpectedColumnStates(bool useManualAssembly)
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -543,7 +543,7 @@
             {
                 Calculation = CreateCalculationWithOutput(),
                 TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability,
-                UseManualAssemblyProbability = useManualAssemblyProbability
+                UseManualAssembly = useManualAssembly
             };
 
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -556,17 +556,17 @@
                 IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
 
                 DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex],
-                                                                                     !useManualAssemblyProbability);
+                                                                                     !useManualAssembly);
                 DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex],
-                                                                                     !useManualAssemblyProbability);
+                                                                                     !useManualAssembly);
                 DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex],
-                                                                                     !useManualAssemblyProbability, true);
+                                                                                     !useManualAssembly, true);
                 DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex],
-                                                                                     !useManualAssemblyProbability);
+                                                                                     !useManualAssembly);
                 DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex],
-                                                                                     !useManualAssemblyProbability);
+                                                                                     !useManualAssembly);
 
-                if (useManualAssemblyProbability)
+                if (useManualAssembly)
                 {
                     DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateIsDisabled(
                         columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]);
@@ -579,9 +579,9 @@
                 }
 
                 DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyProbabilityIndex],
-                                                                                     !useManualAssemblyProbability, true);
+                                                                                     !useManualAssembly, true);
                 DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyProbabilityIndex],
-                                                                                     useManualAssemblyProbability);
+                                                                                     useManualAssembly);
 
                 mocks.VerifyAll();
             }
@@ -779,7 +779,7 @@
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 Calculation = new TestHeightStructuresCalculation(),
-                UseManualAssemblyProbability = true
+                UseManualAssembly = true
             };
 
             using (new AssemblyToolCalculatorFactoryConfig())
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs
===================================================================
diff -u -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f -r1799dafc2a14d789d85e5ef3315bd6c23038fbc0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs	(.../HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs)	(revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs	(.../HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs)	(revision 1799dafc2a14d789d85e5ef3315bd6c23038fbc0)
@@ -49,7 +49,7 @@
                 DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed,
                 TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability,
                 TailorMadeAssessmentProbability = random.NextDouble(),
-                UseManualAssemblyProbability = true,
+                UseManualAssembly = true,
                 ManualAssemblyProbability = random.NextDouble()
             };
         }
@@ -62,7 +62,7 @@
             Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult);
             Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult);
             Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability);
-            Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability);
+            Assert.AreEqual(originResult.UseManualAssembly, targetResult.UseManualAssembly);
             Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability);
         }
     }