Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/CalculationChangeHandler.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -r0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/CalculationChangeHandler.cs	(.../CalculationChangeHandler.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/CalculationChangeHandler.cs	(.../CalculationChangeHandler.cs)	(revision 0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3)
@@ -36,18 +36,18 @@
     {
         private readonly string query;
         private readonly IEnumerable<ICalculation> calculations;
-        private readonly IInquiryHelper inquiryHandler;
+        private readonly IInquiryHelper inquiryHelper;
 
         /// <summary>
         /// Creates a new instance of <see cref="CalculationChangeHandler"/>.
         /// </summary>
         /// <param name="calculations">The calculations for which to handle changes.</param>
         /// <param name="query">The query which should be displayed when inquiring for a confirmation.</param>
-        /// <param name="inquiryHandler">Object responsible for inquiring the required data.</param>
+        /// <param name="inquiryHelper">Object responsible for inquiring the required data.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public CalculationChangeHandler(IEnumerable<ICalculation> calculations,
                                         string query,
-                                        IInquiryHelper inquiryHandler)
+                                        IInquiryHelper inquiryHelper)
         {
             if (calculations == null)
             {
@@ -59,14 +59,14 @@
                 throw new ArgumentNullException(nameof(query));
             }
 
-            if (inquiryHandler == null)
+            if (inquiryHelper == null)
             {
-                throw new ArgumentNullException(nameof(inquiryHandler));
+                throw new ArgumentNullException(nameof(inquiryHelper));
             }
 
             this.calculations = calculations;
             this.query = query;
-            this.inquiryHandler = inquiryHandler;
+            this.inquiryHelper = inquiryHelper;
         }
 
         public bool RequireConfirmation()
@@ -76,7 +76,7 @@
 
         public bool InquireConfirmation()
         {
-            return inquiryHandler.InquireContinuation(query);
+            return inquiryHelper.InquireContinuation(query);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/FailureMechanismCalculationChangeHandler.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -r0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/FailureMechanismCalculationChangeHandler.cs	(.../FailureMechanismCalculationChangeHandler.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/FailureMechanismCalculationChangeHandler.cs	(.../FailureMechanismCalculationChangeHandler.cs)	(revision 0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3)
@@ -35,18 +35,18 @@
     {
         private readonly string query;
         private readonly IFailureMechanism failureMechanism;
-        private readonly IInquiryHelper inquiryHandler;
+        private readonly IInquiryHelper inquiryHelper;
 
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismCalculationChangeHandler"/>.
         /// </summary>
         /// <param name="failureMechanism">Failure mechanism for which to handle changes.</param>
         /// <param name="query">The query which should be displayed when inquiring for a confirmation.</param>
-        /// <param name="inquiryHandler">Object responsible for inquiring required data.</param>
+        /// <param name="inquiryHelper">Object responsible for inquiring required data.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public FailureMechanismCalculationChangeHandler(IFailureMechanism failureMechanism,
                                                         string query,
-                                                        IInquiryHelper inquiryHandler)
+                                                        IInquiryHelper inquiryHelper)
         {
             if (failureMechanism == null)
             {
@@ -58,14 +58,14 @@
                 throw new ArgumentNullException(nameof(query));
             }
 
-            if (inquiryHandler == null)
+            if (inquiryHelper == null)
             {
-                throw new ArgumentNullException(nameof(inquiryHandler));
+                throw new ArgumentNullException(nameof(inquiryHelper));
             }
 
             this.failureMechanism = failureMechanism;
             this.query = query;
-            this.inquiryHandler = inquiryHandler;
+            this.inquiryHelper = inquiryHelper;
         }
 
         public bool RequireConfirmation()
@@ -75,7 +75,7 @@
 
         public bool InquireConfirmation()
         {
-            return inquiryHandler.InquireContinuation(query);
+            return inquiryHelper.InquireContinuation(query);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/CalculationChangeHandlerTest.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -r0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/CalculationChangeHandlerTest.cs	(.../CalculationChangeHandlerTest.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/CalculationChangeHandlerTest.cs	(.../CalculationChangeHandlerTest.cs)	(revision 0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3)
@@ -39,11 +39,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.Stub<IInquiryHelper>();
+            var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             // Call
-            TestDelegate test = () => new CalculationChangeHandler(null, string.Empty, inquiryHandler);
+            TestDelegate test = () => new CalculationChangeHandler(null, string.Empty, inquiryHelper);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -52,7 +52,7 @@
         }
 
         [Test]
-        public void Constructor_WithoutInquiryHandler_ThrowsArgumentNullException()
+        public void Constructor_WithoutInquiryHelper_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate test = () => new CalculationChangeHandler(Enumerable.Empty<ICalculation>(),
@@ -61,21 +61,21 @@
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("inquiryHandler", paramName);
+            Assert.AreEqual("inquiryHelper", paramName);
         }
 
         [Test]
         public void Constructor_WithoutQuery_ThrowsArgumentNullException()
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.Stub<IInquiryHelper>();
+            var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             // Call
             TestDelegate test = () => new CalculationChangeHandler(Enumerable.Empty<ICalculation>(),
                                                                    null,
-                                                                   inquiryHandler);
+                                                                   inquiryHelper);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -87,13 +87,13 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             // Call
             var handler = new CalculationChangeHandler(Enumerable.Empty<ICalculation>(),
                                                        string.Empty,
-                                                       inquiryHandler);
+                                                       inquiryHelper);
 
             // Assert
             Assert.IsInstanceOf<IConfirmDataChangeHandler>(handler);
@@ -105,7 +105,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             var calculations = new[]
@@ -115,7 +115,7 @@
 
             var handler = new CalculationChangeHandler(calculations,
                                                        string.Empty,
-                                                       inquiryHandler);
+                                                       inquiryHelper);
 
             // Call
             bool requireConfirmation = handler.RequireConfirmation();
@@ -130,7 +130,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             ICalculation[] calculations =
@@ -141,7 +141,7 @@
 
             var handler = new CalculationChangeHandler(calculations,
                                                        string.Empty,
-                                                       inquiryHandler);
+                                                       inquiryHelper);
 
             // Call
             bool requireConfirmation = handler.RequireConfirmation();
@@ -162,13 +162,13 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
-            inquiryHandler.Expect(ih => ih.InquireContinuation(message)).Return(expectedResult);
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
+            inquiryHelper.Expect(ih => ih.InquireContinuation(message)).Return(expectedResult);
             mockRepository.ReplayAll();
 
             var handler = new CalculationChangeHandler(Enumerable.Empty<ICalculation>(),
                                                        message,
-                                                       inquiryHandler);
+                                                       inquiryHelper);
 
             // Call
             bool result = handler.InquireConfirmation();
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/FailureMechanismCalculationChangeHandlerTest.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -r0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/FailureMechanismCalculationChangeHandlerTest.cs	(.../FailureMechanismCalculationChangeHandlerTest.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/FailureMechanismCalculationChangeHandlerTest.cs	(.../FailureMechanismCalculationChangeHandlerTest.cs)	(revision 0a2848bb4ffa317aae9cffb9e5374e9a22dd08c3)
@@ -40,11 +40,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.Stub<IInquiryHelper>();
+            var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             // Call
-            TestDelegate test = () => new FailureMechanismCalculationChangeHandler(null, string.Empty, inquiryHandler);
+            TestDelegate test = () => new FailureMechanismCalculationChangeHandler(null, string.Empty, inquiryHelper);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -57,12 +57,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.Stub<IInquiryHelper>();
+            var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             var failureMechanism = mockRepository.Stub<IFailureMechanism>();
             mockRepository.ReplayAll();
 
             // Call
-            TestDelegate test = () => new FailureMechanismCalculationChangeHandler(failureMechanism, null, inquiryHandler);
+            TestDelegate test = () => new FailureMechanismCalculationChangeHandler(failureMechanism, null, inquiryHelper);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -71,7 +71,7 @@
         }
 
         [Test]
-        public void Constructor_WithoutInquiryHandler_ThrowsArgumentNullException()
+        public void Constructor_WithoutInquiryHelper_ThrowsArgumentNullException()
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -83,7 +83,7 @@
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("inquiryHandler", paramName);
+            Assert.AreEqual("inquiryHelper", paramName);
             mockRepository.VerifyAll();
         }
 
@@ -92,12 +92,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.Stub<IInquiryHelper>();
+            var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             var failureMechanism = mockRepository.Stub<IFailureMechanism>();
             mockRepository.ReplayAll();
 
             // Call
-            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHandler);
+            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHelper);
 
             // Assert
             Assert.IsInstanceOf<IConfirmDataChangeHandler>(handler);
@@ -109,12 +109,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
 
-            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHandler);
+            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHelper);
 
             // Call
             bool requireConfirmation = handler.RequireConfirmation();
@@ -129,7 +129,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
 
             var calculation = mockRepository.StrictMock<ICalculation>();
             calculation.Expect(calc => calc.HasOutput).Return(false);
@@ -140,7 +140,7 @@
                 calculation
             });
 
-            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHandler);
+            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHelper);
 
             // Call
             bool requireConfirmation = handler.RequireConfirmation();
@@ -155,7 +155,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
 
             var calculation = mockRepository.StrictMock<ICalculation>();
             calculation.Expect(calc => calc.HasOutput).Return(true);
@@ -166,7 +166,7 @@
                 calculation
             });
 
-            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHandler);
+            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, string.Empty, inquiryHelper);
 
             // Call
             bool requireConfirmation = handler.RequireConfirmation();
@@ -187,12 +187,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var inquiryHandler = mockRepository.StrictMock<IInquiryHelper>();
-            inquiryHandler.Expect(ih => ih.InquireContinuation(message)).Return(expectedResult);
+            var inquiryHelper = mockRepository.StrictMock<IInquiryHelper>();
+            inquiryHelper.Expect(ih => ih.InquireContinuation(message)).Return(expectedResult);
             var failureMechanism = mockRepository.Stub<IFailureMechanism>();
             mockRepository.ReplayAll();
 
-            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, message, inquiryHandler);
+            var handler = new FailureMechanismCalculationChangeHandler(failureMechanism, message, inquiryHelper);
 
             // Call
             bool result = handler.InquireConfirmation();