Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs
===================================================================
diff -u -ra68f144ae66e3c768759bf16cc26dfca2e2aed49 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs)	(revision a68f144ae66e3c768759bf16cc26dfca2e2aed49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -33,35 +33,31 @@
         : IClearIllustrationPointsOfCalculationCollectionChangeHandler
     {
         private readonly IInquiryHelper inquiryHelper;
-        private readonly string inquiry;
 
         /// <summary>
         /// Creates a new instance of <see cref="ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase"/>.
         /// </summary>
         /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
-        /// <param name="inquiry">The inquiry that should be displayed when inquiring whether the illustration points
-        /// should be cleared.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        protected ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase(IInquiryHelper inquiryHelper,
-                                                                                  string inquiry)
+        protected ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase(IInquiryHelper inquiryHelper)
         {
             if (inquiryHelper == null)
             {
                 throw new ArgumentNullException(nameof(inquiryHelper));
             }
 
-            if (inquiry == null)
-            {
-                throw new ArgumentNullException(nameof(inquiry));
-            }
-
             this.inquiryHelper = inquiryHelper;
-            this.inquiry = inquiry;
         }
 
+        /// <summary>
+        /// Gets the message that should be displayed when inquiring the confirmation.
+        /// </summary>
+        /// <returns>The message that should be displayed when inquiring the confirmation.</returns>
+        protected abstract string GetConfirmationMessage();
+
         public bool InquireConfirmation()
         {
-            return inquiryHelper.InquireContinuation(inquiry);
+            return inquiryHelper.InquireContinuation(GetConfirmationMessage());
         }
 
         public abstract IEnumerable<IObservable> ClearIllustrationPoints();
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs
===================================================================
diff -u -ra68f144ae66e3c768759bf16cc26dfca2e2aed49 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs)	(revision a68f144ae66e3c768759bf16cc26dfca2e2aed49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -30,9 +30,10 @@
     /// <summary>
     /// Class for handling clearing the illustration points results from a collection of hydraulic boundary location calculations.
     /// </summary>
-    public class ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler 
+    public class ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler
         : ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase
     {
+        private readonly string collectionDescription;
         private readonly Func<IEnumerable<IObservable>> clearIllustrationPointsFunc;
 
         /// <summary>
@@ -43,10 +44,9 @@
         /// <param name="clearIllustrationPointsFunc">The function to clear the illustration point results.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(IInquiryHelper inquiryHelper,
-                                                                                         string collectionDescription,
-                                                                                         Func<IEnumerable<IObservable>> clearIllustrationPointsFunc)
-            : base(inquiryHelper,
-                   string.Format(Resources.ClearHydraulicBoundaryLocationCalculationsIllustrationPointsChangeHandler_ClearIllustrationPoints_Remove_calculated_IllustrationPoints_for_collection_0_, collectionDescription))
+                                                                                                    string collectionDescription,
+                                                                                                    Func<IEnumerable<IObservable>> clearIllustrationPointsFunc)
+            : base(inquiryHelper)
         {
             if (collectionDescription == null)
             {
@@ -58,12 +58,18 @@
                 throw new ArgumentNullException(nameof(clearIllustrationPointsFunc));
             }
 
+            this.collectionDescription = collectionDescription;
             this.clearIllustrationPointsFunc = clearIllustrationPointsFunc;
         }
 
         public override IEnumerable<IObservable> ClearIllustrationPoints()
         {
             return clearIllustrationPointsFunc();
         }
+
+        protected override string GetConfirmationMessage()
+        {
+            return string.Format(Resources.ClearHydraulicBoundaryLocationCalculationsIllustrationPointsChangeHandler_ClearIllustrationPoints_Remove_calculated_IllustrationPoints_for_collection_0_, collectionDescription);
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs
===================================================================
diff -u -ra68f144ae66e3c768759bf16cc26dfca2e2aed49 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs)	(revision a68f144ae66e3c768759bf16cc26dfca2e2aed49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -45,7 +45,7 @@
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler(IInquiryHelper inquiryHelper,
                                                                                     IEnumerable<IStructuresCalculation> calculations)
-            : base(inquiryHelper, Resources.ClearIllustrationPointsCalculationCollection_Inquiry)
+            : base(inquiryHelper)
         {
             if (calculations == null)
             {
@@ -59,5 +59,10 @@
         {
             return RiskeerCommonDataSynchronizationService.ClearStructuresCalculationIllustrationPoints(calculations);
         }
+
+        protected override string GetConfirmationMessage()
+        {
+            return Resources.ClearIllustrationPointsCalculationCollection_ConfirmationMessage;
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf3185a475b108baad793126da4b851c48f723e63 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision f3185a475b108baad793126da4b851c48f723e63)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -1055,9 +1055,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Weet u zeker dat u alle illustratiepunten wilt wissen?.
         /// </summary>
-        public static string ClearIllustrationPointsCalculationCollection_Inquiry {
+        public static string ClearIllustrationPointsCalculationCollection_ConfirmationMessage {
             get {
-                return ResourceManager.GetString("ClearIllustrationPointsCalculationCollection_Inquiry", resourceCulture);
+                return ResourceManager.GetString("ClearIllustrationPointsCalculationCollection_ConfirmationMessage", resourceCulture);
             }
         }
         
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rf3185a475b108baad793126da4b851c48f723e63 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision f3185a475b108baad793126da4b851c48f723e63)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -1533,7 +1533,7 @@
   <data name="CreateClearIllustrationPointsOfCalculationItem_No_IllustrationPoints_to_clear" xml:space="preserve">
     <value>Deze berekening heeft geen illustratiepunten om te wissen.</value>
   </data>
-  <data name="ClearIllustrationPointsCalculationCollection_Inquiry" xml:space="preserve">
+  <data name="ClearIllustrationPointsCalculationCollection_ConfirmationMessage" xml:space="preserve">
     <value>Weet u zeker dat u alle illustratiepunten wilt wissen?</value>
   </data>
   <data name="ClearIllustrationPointsOfCalculation_InquireConfirmation" xml:space="preserve">
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBaseTest.cs
===================================================================
diff -u -r6d18571198270d2bce752be57493a447fee10680 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBaseTest.cs	(.../ClearIllustrationPointsOfCalculationCollectionChangeHandlerBaseTest.cs)	(revision 6d18571198270d2bce752be57493a447fee10680)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBaseTest.cs	(.../ClearIllustrationPointsOfCalculationCollectionChangeHandlerBaseTest.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -36,32 +36,14 @@
         public void Constructor_InquiryHelperNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new TestClearIllustrationPointsOfCalculationCollectionChangeHandler(null, string.Empty);
+            TestDelegate call = () => new TestClearIllustrationPointsOfCalculationCollectionChangeHandler(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("inquiryHelper", exception.ParamName);
         }
 
         [Test]
-        public void Constructor_InquiryNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var inquiryHelper = mocks.Stub<IInquiryHelper>();
-            mocks.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new TestClearIllustrationPointsOfCalculationCollectionChangeHandler(inquiryHelper, null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("inquiry", exception.ParamName);
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void Constructor_WithArguments_ExpectedValues()
         {
             // Setup
@@ -70,7 +52,7 @@
             mocks.ReplayAll();
 
             // Call
-            var handler = new TestClearIllustrationPointsOfCalculationCollectionChangeHandler(inquiryHelper, string.Empty);
+            var handler = new TestClearIllustrationPointsOfCalculationCollectionChangeHandler(inquiryHelper);
 
             // Assert
             Assert.IsInstanceOf<IClearIllustrationPointsOfCalculationCollectionChangeHandler>(handler);
@@ -83,32 +65,45 @@
         public void InquireConfirmation_Always_UsesExpectedInquiryAndReturnsExpectedConfirmation(bool expectedConfirmation)
         {
             // Setup
-            const string inquiry = "Inquiry";
+            const string confirmationMessage = "Inquiry";
 
             var mocks = new MockRepository();
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();
-            inquiryHelper.Expect(h => h.InquireContinuation(inquiry)).Return(expectedConfirmation);
+            inquiryHelper.Expect(h => h.InquireContinuation(confirmationMessage)).Return(expectedConfirmation);
             mocks.ReplayAll();
 
-            var handler = new TestClearIllustrationPointsOfCalculationCollectionChangeHandler(inquiryHelper, inquiry);
+            var handler = new TestClearIllustrationPointsOfCalculationCollectionChangeHandler(inquiryHelper)
+            {
+                ConfirmationMessage = confirmationMessage
+            };
 
             // Call
             bool confirmation = handler.InquireConfirmation();
 
             // Assert
+            Assert.IsTrue(handler.GetConfirmationMessageCalled);
             Assert.AreEqual(expectedConfirmation, confirmation);
             mocks.VerifyAll();
         }
 
         private class TestClearIllustrationPointsOfCalculationCollectionChangeHandler
             : ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase
         {
-            public TestClearIllustrationPointsOfCalculationCollectionChangeHandler(IInquiryHelper helper, string inquiry) : base(helper, inquiry) {}
+            public TestClearIllustrationPointsOfCalculationCollectionChangeHandler(IInquiryHelper helper) : base(helper) {}
+            public string ConfirmationMessage { private get; set; }
 
+            public bool GetConfirmationMessageCalled { get; private set; }
+
             public override IEnumerable<IObservable> ClearIllustrationPoints()
             {
                 throw new NotImplementedException();
             }
+
+            protected override string GetConfirmationMessage()
+            {
+                GetConfirmationMessageCalled = true;
+                return ConfirmationMessage;
+            }
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandlerTest.cs
===================================================================
diff -u -r32e70d7a1e20d6b63a5d3d7fb2593ed77c25800a -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandlerTest.cs	(.../ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandlerTest.cs)	(revision 32e70d7a1e20d6b63a5d3d7fb2593ed77c25800a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandlerTest.cs	(.../ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandlerTest.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -42,9 +42,8 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(inquiryHelper,
-                                                                                                                               null,
-                                                                                                                               Enumerable.Empty<IObservable>);
+            TestDelegate call = () => new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
+                inquiryHelper, null, Enumerable.Empty<IObservable>);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -61,9 +60,8 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(inquiryHelper,
-                                                                                                                               string.Empty,
-                                                                                                                               null);
+            TestDelegate call = () => new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
+                inquiryHelper, string.Empty, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -80,9 +78,8 @@
             mocks.ReplayAll();
 
             // Cal
-            var handler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(inquiryHelper, 
-                                                                                                                   string.Empty,
-                                                                                                                   Enumerable.Empty<IObservable>);
+            var handler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
+                inquiryHelper, string.Empty, Enumerable.Empty<IObservable>);
 
             // Assert
             Assert.IsInstanceOf<ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase>(handler);
@@ -104,9 +101,8 @@
                          .Return(expectedConfirmation);
             mocks.ReplayAll();
 
-            var handler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(inquiryHelper,
-                                                                                                                   collectionDescription, 
-                                                                                                                   Enumerable.Empty<IObservable>);
+            var handler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
+                inquiryHelper, collectionDescription, Enumerable.Empty<IObservable>);
 
             // Call
             bool confirmation = handler.InquireConfirmation();
@@ -130,9 +126,8 @@
                 observable
             };
 
-            var handler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(inquiryHelper,
-                                                                                                                   string.Empty,
-                                                                                                                   () => observables);
+            var handler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
+                inquiryHelper, string.Empty, () => observables);
 
             // Call
             IEnumerable<IObservable> affectedObjects = handler.ClearIllustrationPoints();
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs
===================================================================
diff -u -r810d2a004a428a8da86879af41a54b5d985cbd61 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs)	(revision 810d2a004a428a8da86879af41a54b5d985cbd61)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -47,7 +47,7 @@
             var handler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
 
             // Assert
-            Assert.IsInstanceOf<ClearIllustrationPointsOfCalculationChangeHandlerBase<StructuresCalculation<TestStructuresInput>>>(handler);
+            Assert.IsInstanceOf<ClearIllustrationPointsOfCalculationChangeHandlerBase<IStructuresCalculation>>(handler);
             mocks.VerifyAll();
         }
 
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationCollectionChangeHandler.cs
===================================================================
diff -u -ra68f144ae66e3c768759bf16cc26dfca2e2aed49 -re8ef88fcdd082e97681b264d849c1faf9b86457b
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationCollectionChangeHandler.cs)	(revision a68f144ae66e3c768759bf16cc26dfca2e2aed49)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationCollectionChangeHandler.cs)	(revision e8ef88fcdd082e97681b264d849c1faf9b86457b)
@@ -46,7 +46,7 @@
         /// <exception cref="System.ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationCollectionChangeHandler(IInquiryHelper inquiryHelper,
                                                                                                    IEnumerable<GrassCoverErosionInwardsCalculation> calculations)
-            : base(inquiryHelper, RiskeerCommonFormsResources.ClearIllustrationPointsCalculationCollection_Inquiry)
+            : base(inquiryHelper)
         {
             if (calculations == null)
             {
@@ -60,5 +60,10 @@
         {
             return GrassCoverErosionInwardsDataSynchronizationService.ClearIllustrationPoints(calculations);
         }
+
+        protected override string GetConfirmationMessage()
+        {
+            return RiskeerCommonFormsResources.ClearIllustrationPointsCalculationCollection_ConfirmationMessage;
+        }
     }
 }
\ No newline at end of file