Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/CloseForFailurePathView.cs
===================================================================
diff -u -r07b3862293afdc4c605cfc444938462a668fad2d -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/CloseForFailurePathView.cs	(.../CloseForFailurePathView.cs)	(revision 07b3862293afdc4c605cfc444938462a668fad2d)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/CloseForFailurePathView.cs	(.../CloseForFailurePathView.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -23,12 +23,11 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Views;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.FailureMechanism;
 
 namespace Riskeer.Common.Forms.Views
 {
     /// <summary>
-    /// Base view which closes for an <see cref="IFailureMechanism"/> instance.
+    /// Base view which closes for an <see cref="IFailurePath"/> instance.
     /// </summary>
     public abstract class CloseForFailurePathView : UserControl, IView
     {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionsProbabilityAssessmentView.cs
===================================================================
diff -u -r2e1ab6663d2d1e55b101f212f276ad1bb25eadc1 -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionsProbabilityAssessmentView.cs	(.../FailureMechanismSectionsProbabilityAssessmentView.cs)	(revision 2e1ab6663d2d1e55b101f212f276ad1bb25eadc1)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionsProbabilityAssessmentView.cs	(.../FailureMechanismSectionsProbabilityAssessmentView.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -43,14 +43,14 @@
         /// Creates a new instance of <see cref="FailureMechanismSectionsProbabilityAssessmentView"/>.
         /// </summary>
         /// <param name="sections">The sections to be displayed in the view.</param>
-        /// <param name="failurePath">The failure mechanism the view belongs to.</param>
+        /// <param name="failureMechanism">The failure mechanism the view belongs to.</param>
         /// <param name="probabilityAssessmentInput">The probability assessment input belonging to the
         /// failure mechanism.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public FailureMechanismSectionsProbabilityAssessmentView(IEnumerable<FailureMechanismSection> sections,
-                                                                 IFailureMechanism failurePath,
+                                                                 IFailureMechanism failureMechanism,
                                                                  ProbabilityAssessmentInput probabilityAssessmentInput)
-            : base(sections, failurePath)
+            : base(sections, failureMechanism)
         {
             if (probabilityAssessmentInput == null)
             {
@@ -65,7 +65,7 @@
 
             failureMechanismObserver = new Observer(HandleProbabilityAssessmentInputChange)
             {
-                Observable = failurePath
+                Observable = failureMechanism
             };
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailurePath.cs
===================================================================
diff -u -r07b3862293afdc4c605cfc444938462a668fad2d -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailurePath.cs	(.../TestFailurePath.cs)	(revision 07b3862293afdc4c605cfc444938462a668fad2d)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailurePath.cs	(.../TestFailurePath.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -24,7 +24,6 @@
 using Core.Common.Base;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.Properties;
 
 namespace Riskeer.Common.Data.TestUtil
 {
@@ -40,7 +39,7 @@
         /// </summary>
         public TestFailurePath()
         {
-            Name = Resources.SpecificFailureMechanism_Name_DefaultName;
+            Name = "Faalpad";
 
             sectionCollection = new FailureMechanismSectionCollection();
             IsRelevant = true;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs
===================================================================
diff -u -r07b3862293afdc4c605cfc444938462a668fad2d -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision 07b3862293afdc4c605cfc444938462a668fad2d)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -1709,7 +1709,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1752,7 +1752,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1799,7 +1799,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1845,7 +1845,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1898,7 +1898,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1941,7 +1941,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1988,7 +1988,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -2037,7 +2037,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -2077,9 +2077,9 @@
 
         #region Nested types
 
-        private class TestFailurePathContext : FailureMechanismContext<IFailureMechanism>
+        private class TestFailureMechanismContext : FailureMechanismContext<IFailureMechanism>
         {
-            public TestFailurePathContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
+            public TestFailureMechanismContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
                 base(wrappedFailureMechanism, parent) {}
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs
===================================================================
diff -u -r07b3862293afdc4c605cfc444938462a668fad2d -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision 07b3862293afdc4c605cfc444938462a668fad2d)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -1447,7 +1447,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null);
@@ -1470,7 +1470,7 @@
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
 
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null);
@@ -1497,7 +1497,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1521,7 +1521,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1550,7 +1550,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, fmContext => counter++, context => null);
 
             // Call
@@ -1578,7 +1578,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(
@@ -1603,7 +1603,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(failureMechanismContext, null, fm => null);
@@ -1630,7 +1630,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1657,7 +1657,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1689,7 +1689,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(
                 failureMechanismContext,
@@ -2092,9 +2092,9 @@
 
         #region Nested types
 
-        private class TestFailurePathContext : FailureMechanismContext<IFailureMechanism>
+        private class TestFailureMechanismContext : FailureMechanismContext<IFailureMechanism>
         {
-            public TestFailurePathContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
+            public TestFailureMechanismContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
                 base(wrappedFailureMechanism, parent) {}
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -r07b3862293afdc4c605cfc444938462a668fad2d -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs	(.../RiskeerTreeNodeInfoFactoryTest.cs)	(revision 07b3862293afdc4c605cfc444938462a668fad2d)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs	(.../RiskeerTreeNodeInfoFactoryTest.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -994,7 +994,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailurePathmIsRelevant_ReturnResultFromConstructorMethod()
+        public void ContextMenuStrip_FailurePathIsRelevant_ReturnResultFromConstructorMethod()
         {
             // Setup
             using (var treeView = new TreeViewControl())
Index: Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs
===================================================================
diff -u -ree944aa350b4347a26a2ca337352272a373a487d -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs	(.../RiskeerPluginHelperTest.cs)	(revision ee944aa350b4347a26a2ca337352272a373a487d)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs	(.../RiskeerPluginHelperTest.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -67,7 +67,7 @@
         {
             protected override bool ShouldCloseMethod(IView view, object o)
             {
-                return RiskeerPluginHelper.ShouldCloseForFailureMechanismView((CloseForFailurePathView)view, o);
+                return RiskeerPluginHelper.ShouldCloseForFailureMechanismView((CloseForFailurePathView) view, o);
             }
 
             protected override IView GetView(IFailureMechanism failureMechanism)
@@ -94,9 +94,8 @@
             public void ShouldCloseMethod_ViewCorrespondingToRemovedAssessmentSectionAndFailureMechanism_ReturnsTrue()
             {
                 // Setup
-                IFailureMechanism failureMechanism = new TestFailureMechanism();
-
                 var mocks = new MockRepository();
+                var failureMechanism = mocks.Stub<IFailureMechanism>();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[]
                 {
@@ -117,6 +116,74 @@
                 mocks.VerifyAll();
             }
 
+            [Test]
+            public void ShouldCloseMethod_ViewNotCorrespondingToRemovedAssessmentSectionAndFailureMechanism_ReturnsFalse()
+            {
+                // Setup
+                var mocks = new MockRepository();
+                var otherFailureMechanism = mocks.Stub<IFailureMechanism>();
+                var failureMechanism = mocks.Stub<IFailureMechanism>();
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[]
+                {
+                    failureMechanism
+                });
+                assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList<IFailurePath>());
+                mocks.ReplayAll();
+
+                using (IView view = GetView(otherFailureMechanism))
+                {
+                    // Call
+                    bool closeForData = ShouldCloseMethod(view, assessmentSection);
+
+                    // Assert
+                    Assert.IsFalse(closeForData);
+                }
+
+                mocks.VerifyAll();
+            }
+
+            [Test]
+            public void ShouldCloseMethod_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
+            {
+                // Setup
+                var mocks = new MockRepository();
+                var failureMechanism = mocks.Stub<IFailureMechanism>();
+                mocks.ReplayAll();
+
+                using (IView view = GetView(failureMechanism))
+                {
+                    // Call
+                    bool closeForData = ShouldCloseMethod(view, failureMechanism);
+
+                    // Assert
+                    Assert.IsTrue(closeForData);
+                }
+
+                mocks.VerifyAll();
+            }
+
+            [Test]
+            public void ShouldCloseMethod_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
+            {
+                // Setup
+                var mocks = new MockRepository();
+                var otherFailureMechanism = mocks.Stub<IFailureMechanism>();
+                var failureMechanism = mocks.Stub<IFailureMechanism>();
+                mocks.ReplayAll();
+
+                using (IView view = GetView(otherFailureMechanism))
+                {
+                    // Call
+                    bool closeForData = ShouldCloseMethod(view, failureMechanism);
+
+                    // Assert
+                    Assert.IsFalse(closeForData);
+                }
+
+                mocks.VerifyAll();
+            }
+
             protected override bool ShouldCloseMethod(IView view, object o)
             {
                 return RiskeerPluginHelper.ShouldCloseForFailurePathView((CloseForFailurePathView) view, o);
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs	(.../ShouldCloseViewWithCalculationDataTester.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs	(.../ShouldCloseViewWithCalculationDataTester.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -108,12 +108,12 @@
         public void ShouldCloseMethod_ViewCorrespondingWithRemovedFailureMechanism_ReturnsTrue()
         {
             // Setup
-            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
 
-            using (IView view = GetView(failurePathContext.WrappedData.Calculations.First()))
+            using (IView view = GetView(failureMechanismContext.WrappedData.Calculations.First()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failurePathContext.WrappedData);
+                bool closeForData = ShouldCloseMethod(view, failureMechanismContext.WrappedData);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -124,12 +124,12 @@
         public void ShouldCloseMethod_ViewNotCorrespondingWithRemovedFailureMechanism_ReturnsFalse()
         {
             // Setup
-            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
 
             using (IView view = GetView(GetCalculation()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failurePathContext.WrappedData);
+                bool closeForData = ShouldCloseMethod(view, failureMechanismContext.WrappedData);
 
                 // Assert
                 Assert.IsFalse(closeForData);
@@ -140,12 +140,12 @@
         public void ShouldCloseMethod_ViewCorrespondingWithRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
 
-            using (IView view = GetView(failurePathContext.WrappedData.Calculations.First()))
+            using (IView view = GetView(failureMechanismContext.WrappedData.Calculations.First()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failurePathContext);
+                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -156,12 +156,12 @@
         public void ShouldCloseMethod_ViewNotCorrespondingWithRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
 
             using (IView view = GetView(GetCalculation()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failurePathContext);
+                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs	(.../ShouldCloseViewWithFailureMechanismTester.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs	(.../ShouldCloseViewWithFailureMechanismTester.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -126,12 +126,12 @@
             mocks.ReplayAll();
 
             IFailureMechanism failureMechanism = GetFailureMechanism();
-            var failurePathContext = new TestFailureMechanismContext(new TestFailureMechanism(), assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(new TestFailureMechanism(), assessmentSection);
 
             using (IView view = GetView(failureMechanism))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failurePathContext);
+                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
@@ -149,12 +149,12 @@
             mocks.ReplayAll();
 
             IFailureMechanism failureMechanism = GetFailureMechanism();
-            var failurePathContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             using (IView view = GetView(failureMechanism))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failurePathContext);
+                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs
===================================================================
diff -u -ree944aa350b4347a26a2ca337352272a373a487d -r8827a41d5876d9d929fa5a6536c18b46a851fc9a
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs	(.../ShouldCloseViewWithFailurePathTester.cs)	(revision ee944aa350b4347a26a2ca337352272a373a487d)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs	(.../ShouldCloseViewWithFailurePathTester.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
@@ -43,9 +43,9 @@
             assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList<IFailurePath>());
             mocks.ReplayAll();
 
-            IFailurePath failureMechanism = GetFailurePath();
+            IFailurePath failurePath = GetFailurePath();
 
-            using (IView view = GetView(failureMechanism))
+            using (IView view = GetView(failurePath))
             {
                 // Call
                 bool closeForData = ShouldCloseMethod(view, assessmentSection);
@@ -85,7 +85,7 @@
         }
 
         [Test]
-        public void ShouldCloseMethod_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
+        public void ShouldCloseMethod_ViewNotCorrespondingToRemovedFailurePath_ReturnsFalse()
         {
             // Setup
             var mocks = new MockRepository();
@@ -185,9 +185,9 @@
         protected abstract IView GetView(IFailurePath failurePath);
 
         /// <summary>
-        /// Gets a failure mechanism for testing purposes.
+        /// Gets a failure path for testing purposes.
         /// </summary>
-        /// <returns>An <see cref="IFailureMechanism"/>.</returns>
+        /// <returns>An <see cref="IFailurePath"/>.</returns>
         protected abstract IFailurePath GetFailurePath();
 
         private class TestFailurePathContext : IFailurePathContext<IFailurePath>