Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -re87ab3607b8b78351fe71e56cbce5e2b6717a1cc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision e87ab3607b8b78351fe71e56cbce5e2b6717a1cc)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -221,10 +221,10 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -242,17 +242,17 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -320,9 +320,9 @@
             return control;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs	(.../DuneErosionFailureMechanismResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs	(.../DuneErosionFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -193,10 +193,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -219,17 +219,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -290,9 +290,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -re87ab3607b8b78351fe71e56cbce5e2b6717a1cc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision e87ab3607b8b78351fe71e56cbce5e2b6717a1cc)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -219,10 +219,10 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -240,17 +240,17 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -318,9 +318,9 @@
             return control;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -193,10 +193,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -219,17 +219,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Assert
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -290,9 +290,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -re87ab3607b8b78351fe71e56cbce5e2b6717a1cc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision e87ab3607b8b78351fe71e56cbce5e2b6717a1cc)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -221,10 +221,10 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -242,17 +242,17 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -320,9 +320,9 @@
             return control;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs	(.../GrassCoverSlipOffInwardsResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs	(.../GrassCoverSlipOffInwardsResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -190,10 +190,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -216,17 +216,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -287,9 +287,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -190,10 +190,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -216,17 +216,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -287,9 +287,9 @@
             return control;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs
===================================================================
diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs	(.../MacroStabilityOutwardsResultViewTest.cs)	(revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs	(.../MacroStabilityOutwardsResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -213,10 +213,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -246,17 +246,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
 
             mocks.VerifyAll();
@@ -321,9 +321,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -190,10 +190,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -216,17 +216,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -287,9 +287,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs
===================================================================
diff -u -r07e29100cdf200567cd182aac4d7e72cb29ac068 -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision 07e29100cdf200567cd182aac4d7e72cb29ac068)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -190,10 +190,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -216,17 +216,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -287,9 +287,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -180,10 +180,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -206,17 +206,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -277,9 +277,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -180,10 +180,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -206,17 +206,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -277,9 +277,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs	(.../WaterPressureAsphaltCoverResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs	(.../WaterPressureAsphaltCoverResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -180,10 +180,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -206,17 +206,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -277,9 +277,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -re87ab3607b8b78351fe71e56cbce5e2b6717a1cc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision e87ab3607b8b78351fe71e56cbce5e2b6717a1cc)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -220,10 +220,10 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -241,17 +241,17 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -319,9 +319,9 @@
             return control;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -re87ab3607b8b78351fe71e56cbce5e2b6717a1cc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision e87ab3607b8b78351fe71e56cbce5e2b6717a1cc)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -220,10 +220,10 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -241,17 +241,17 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -319,9 +319,9 @@
             return control;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -re87ab3607b8b78351fe71e56cbce5e2b6717a1cc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision e87ab3607b8b78351fe71e56cbce5e2b6717a1cc)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -221,10 +221,10 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -242,17 +242,17 @@
             using (ShowFailureMechanismResultsView(failureMechanism))
             {
                 FailureMechanismAssemblyControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -320,9 +320,9 @@
             return control;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs
===================================================================
diff -u -r28d5e7ee5b11b21b38aa0306170a729fc4ad95dc -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs	(.../StabilityStoneCoverResultViewTest.cs)	(revision 28d5e7ee5b11b21b38aa0306170a729fc4ad95dc)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs	(.../StabilityStoneCoverResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -193,10 +193,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -219,17 +219,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -290,9 +290,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs
===================================================================
diff -u -r07e29100cdf200567cd182aac4d7e72cb29ac068 -rff6c7198c6094bd341c2c7d7f90431328764f50f
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs)	(revision 07e29100cdf200567cd182aac4d7e72cb29ac068)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs)	(revision ff6c7198c6094bd341c2c7d7f90431328764f50f)
@@ -193,10 +193,10 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Call
-                string warningMessage = warningProvider.GetError(failureMechanismAssemblyControl);
+                string warningMessage = manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl);
 
                 // Assert
                 Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningMessage);
@@ -219,17 +219,17 @@
                 form.Show();
 
                 FailureMechanismAssemblyCategoryGroupControl failureMechanismAssemblyControl = GetFailureMechanismAssemblyControl();
-                ErrorProvider warningProvider = GetWarningProvider(failureMechanismAssemblyControl);
+                ErrorProvider manualAssemblyWarningProvider = GetManualAssemblyWarningProvider(failureMechanismAssemblyControl);
 
                 // Precondition
-                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
 
                 // When
                 failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false);
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.IsEmpty(warningProvider.GetError(failureMechanismAssemblyControl));
+                Assert.IsEmpty(manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl));
             }
         }
 
@@ -290,9 +290,9 @@
             return failureMechanismResultView;
         }
 
-        private static ErrorProvider GetWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
+        private static ErrorProvider GetManualAssemblyWarningProvider(FailureMechanismAssemblyCategoryGroupControl control)
         {
-            return TypeUtils.GetField<ErrorProvider>(control, "warningProvider");
+            return TypeUtils.GetField<ErrorProvider>(control, "manualAssemblyWarningProvider");
         }
     }
 }
\ No newline at end of file