Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs
===================================================================
diff -u -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 -r23a3fa58a490d0c02415fb1914611d08917497b6
--- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
+++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision 23a3fa58a490d0c02415fb1914611d08917497b6)
@@ -75,7 +75,7 @@
         /// <param name="view">The view to be checked.</param>
         /// <param name="removedObject">The object that is removed.</param>
         /// <returns>Whether the view should be closed.</returns>
-        public static bool ShouldCloseForFailureMechanismView(CloseForFailureMechanismView view, object removedObject)
+        public static bool ShouldCloseForFailureMechanismView(CloseForFailurePathView view, object removedObject)
         {
             var assessmentSection = removedObject as IAssessmentSection;
             var failurePathContext = removedObject as IFailurePathContext<IFailureMechanism>;
@@ -89,10 +89,10 @@
             if (assessmentSection != null)
             {
                 failureMechanism = assessmentSection.GetFailureMechanisms()
-                                                    .FirstOrDefault(fm => fm == view.FailureMechanism);
+                                               .FirstOrDefault(fm => fm == view.FailurePath);
             }
 
-            return failureMechanism != null && ReferenceEquals(view.FailureMechanism, failureMechanism);
+            return failureMechanism != null && ReferenceEquals(view.FailurePath, failureMechanism);
         }
 
         private static IEnumerable<ICalculation> GetCalculationsFromFailureMechanisms(object o)
Index: Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs
===================================================================
diff -u -r68738cfb58ae2c7d0c876b2e429ca914859f480a -r23a3fa58a490d0c02415fb1914611d08917497b6
--- Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs	(.../RiskeerPluginHelperTest.cs)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs	(.../RiskeerPluginHelperTest.cs)	(revision 23a3fa58a490d0c02415fb1914611d08917497b6)
@@ -23,6 +23,7 @@
 using NUnit.Framework;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.Views;
 using Riskeer.Common.Plugin.TestUtil;
@@ -74,8 +75,8 @@
 
             private class TestFailureMechanismSectionsView : FailureMechanismSectionsView
             {
-                public TestFailureMechanismSectionsView(IFailureMechanism failureMechanism)
-                    : base(failureMechanism.Sections, failureMechanism) {}
+                public TestFailureMechanismSectionsView(IFailurePath failurePath)
+                    : base(failurePath.Sections, failurePath) {}
             }
 
             protected override IFailureMechanism GetFailureMechanism()