Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -310,9 +310,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<ClosingStructuresFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<ClosingStructuresFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
@@ -329,9 +329,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<ClosingStructuresFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<ClosingStructuresFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.CalculationsGroup);
Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismContext.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -29,7 +29,7 @@
     /// <summary>
     /// This class is an abstract base presentation object for a <see cref="IFailureMechanism"/> instance.
     /// </summary>
-    public abstract class FailureMechanismContext<T> : ObservableWrappedObjectContextBase<T>, IFailureMechanismContext<T> where T : IFailureMechanism
+    public abstract class FailureMechanismContext<T> : ObservableWrappedObjectContextBase<T>, IFailurePathContext<T> where T : IFailureMechanism
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FailureMechanismContext{T}"/> class.
Fisheye: Tag 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/IFailureMechanismContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/IFailurePathContext.cs
===================================================================
diff -u
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/IFailurePathContext.cs	(revision 0)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/IFailurePathContext.cs	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailurePath;
+
+namespace Riskeer.Common.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Interface for a failure mechanism context which wraps an implementation of the 
+    /// <see cref="IFailurePath"/> interface.
+    /// </summary>
+    /// <typeparam name="T">The type of the wrapped failure mechanism.</typeparam>
+    public interface IFailurePathContext<out T> where T : IFailurePath
+    {
+        /// <summary>
+        /// Gets the wrapped <see cref="IFailurePath"/> in this presentation object.
+        /// </summary>
+        T WrappedData { get; }
+
+        /// <summary>
+        /// Gets the parent of <see cref="WrappedData"/>.
+        /// </summary>
+        IAssessmentSection Parent { get; }
+    }
+}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/SpecificFailurePathContext.cs
===================================================================
diff -u -r40314bb83b4a91673fcc185253cc88a7d138bcdc -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/SpecificFailurePathContext.cs	(.../SpecificFailurePathContext.cs)	(revision 40314bb83b4a91673fcc185253cc88a7d138bcdc)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/SpecificFailurePathContext.cs	(.../SpecificFailurePathContext.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -29,7 +29,7 @@
     /// <summary>
     /// This class is a presentation object for a <see cref="SpecificFailurePath"/> instance.
     /// </summary>
-    public class SpecificFailurePathContext : ObservableWrappedObjectContextBase<SpecificFailurePath>, IFailureMechanismContext<SpecificFailurePath>
+    public class SpecificFailurePathContext : ObservableWrappedObjectContextBase<SpecificFailurePath>, IFailurePathContext<SpecificFailurePath>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FailureMechanismContext{T}"/> class.
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -230,7 +230,7 @@
             TFailureMechanismContext failureMechanismContext,
             Action<TFailureMechanismContext> calculateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction = null)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<IFailureMechanism>
         {
             contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, calculateAllAction, enableMenuItemFunction));
             return this;
@@ -251,7 +251,7 @@
             TFailureMechanismContext failureMechanism,
             Action<TFailureMechanismContext> validateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction = null)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<IFailureMechanism>
         {
             contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(failureMechanism, validateAllAction, enableMenuItemFunction));
             return this;
@@ -267,7 +267,7 @@
         public RiskeerContextMenuBuilder AddToggleRelevancyOfFailurePathItem<TFailurePathContext>(
             TFailurePathContext failurePathContext,
             Action<TFailurePathContext> onChangeAction)
-            where TFailurePathContext : IFailureMechanismContext<IFailurePath>
+            where TFailurePathContext : IFailurePathContext<IFailurePath>
         {
             contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailurePathItem(failurePathContext, onChangeAction));
             return this;
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs
===================================================================
diff -u -r091428672ce70930856bf22a225701c6d04759b2 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision 091428672ce70930856bf22a225701c6d04759b2)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -330,7 +330,7 @@
             TFailureMechanismContext failureMechanismContext,
             Action<TFailureMechanismContext> calculateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<IFailureMechanism>
         {
             var menuItem = new StrictContextMenuItem(
                 Resources.Calculate_All,
@@ -365,7 +365,7 @@
             TFailureMechanismContext failureMechanism,
             Action<TFailureMechanismContext> validateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<IFailureMechanism>
         {
             var menuItem = new StrictContextMenuItem(
                 Resources.Validate_All,
@@ -396,7 +396,7 @@
         public static StrictContextMenuItem CreateToggleRelevancyOfFailurePathItem<TFailurePathContext>(
             TFailurePathContext failurePathContext,
             Action<TFailurePathContext> onChangeAction)
-            where TFailurePathContext : IFailureMechanismContext<IFailurePath>
+            where TFailurePathContext : IFailurePathContext<IFailurePath>
         {
             bool isRelevant = failurePathContext.WrappedData.IsRelevant;
             Bitmap checkboxImage = isRelevant ? Resources.Checkbox_ticked : Resources.Checkbox_empty;
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs
===================================================================
diff -u -r56225f2f2a8e424a5c9def8b18b4276be1042ba9 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs	(.../RiskeerTreeNodeInfoFactory.cs)	(revision 56225f2f2a8e424a5c9def8b18b4276be1042ba9)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs	(.../RiskeerTreeNodeInfoFactory.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -122,7 +122,7 @@
             Func<TFailureMechanismContext, object[]> disabledChildNodeObjects,
             Func<TFailureMechanismContext, object, TreeViewControl, ContextMenuStrip> enabledContextMenuStrip,
             Func<TFailureMechanismContext, object, TreeViewControl, ContextMenuStrip> disabledContextMenuStrip)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<IFailureMechanism>
         {
             return new TreeNodeInfo<TFailureMechanismContext>
             {
@@ -150,7 +150,7 @@
         public static TreeNodeInfo<TFailureMechanismContext> CreateFailureMechanismStateContextTreeNodeInfo<TFailureMechanismContext>(
             Func<TFailureMechanismContext, object[]> childNodeObjects,
             Func<TFailureMechanismContext, object, TreeViewControl, ContextMenuStrip> contextMenuStrip)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<IFailureMechanism>
         {
             return new TreeNodeInfo<TFailureMechanismContext>
             {
Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs
===================================================================
diff -u -r68738cfb58ae2c7d0c876b2e429ca914859f480a -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
+++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -78,12 +78,12 @@
         public static bool ShouldCloseForFailureMechanismView(CloseForFailureMechanismView view, object removedObject)
         {
             var assessmentSection = removedObject as IAssessmentSection;
-            var failureMechanismContext = removedObject as IFailureMechanismContext<IFailureMechanism>;
+            var failurePathContext = removedObject as IFailurePathContext<IFailureMechanism>;
             var failureMechanism = removedObject as IFailureMechanism;
 
-            if (failureMechanismContext != null)
+            if (failurePathContext != null)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             if (assessmentSection != null)
@@ -99,7 +99,7 @@
         {
             var failureMechanism = o as IFailureMechanism;
 
-            var context = o as IFailureMechanismContext<IFailureMechanism>;
+            var context = o as IFailurePathContext<IFailureMechanism>;
             if (context != null)
             {
                 failureMechanism = context.WrappedData;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs	(.../FailureMechanismContextTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs	(.../FailureMechanismContextTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -46,7 +46,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<IFailureMechanism>>(context);
-            Assert.IsInstanceOf<IFailureMechanismContext<IFailureMechanism>>(context);
+            Assert.IsInstanceOf<IFailurePathContext<IFailureMechanism>>(context);
             Assert.AreSame(assessmentSection, context.Parent);
             Assert.AreSame(failureMechanism, context.WrappedData);
             mocks.VerifyAll();
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailurePathContextTest.cs
===================================================================
diff -u -r40314bb83b4a91673fcc185253cc88a7d138bcdc -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailurePathContextTest.cs	(.../FailurePathContextTest.cs)	(revision 40314bb83b4a91673fcc185253cc88a7d138bcdc)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailurePathContextTest.cs	(.../FailurePathContextTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -47,7 +47,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<SpecificFailurePath>>(context);
-            Assert.IsInstanceOf<IFailureMechanismContext<SpecificFailurePath>>(context);
+            Assert.IsInstanceOf<IFailurePathContext<SpecificFailurePath>>(context);
             Assert.AreSame(assessmentSection, context.Parent);
             Assert.AreSame(failurePath, context.WrappedData);
             mocks.VerifyAll();
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -330,7 +330,7 @@
             var viewCommands = mocks.StrictMock<IViewCommands>();
             var failurePath = mocks.StrictMock<IFailurePath>();
             failurePath.Expect(fm => fm.IsRelevant).Return(isRelevant);
-            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailurePath>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailurePath>>();
             failurePathContext.Expect(fmc => fmc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
@@ -1710,7 +1710,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1753,7 +1753,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1800,7 +1800,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1846,7 +1846,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1899,7 +1899,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1942,7 +1942,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -1989,7 +1989,7 @@
             {
                 new TestCalculation()
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -2038,7 +2038,7 @@
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             mocks.ReplayAll();
 
@@ -2078,9 +2078,9 @@
 
         #region Nested types
 
-        private class TestFailureMechanismContext : FailureMechanismContext<IFailureMechanism>
+        private class TestFailurePathContext : FailureMechanismContext<IFailureMechanism>
         {
-            public TestFailureMechanismContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
+            public TestFailurePathContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
                 base(wrappedFailureMechanism, parent) {}
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs
===================================================================
diff -u -r091428672ce70930856bf22a225701c6d04759b2 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision 091428672ce70930856bf22a225701c6d04759b2)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -452,7 +452,7 @@
             var mocks = new MockRepository();
             var failurePath = mocks.StrictMock<IFailurePath>();
             failurePath.Expect(fp => fp.IsRelevant).Return(isRelevant);
-            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailurePath>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailurePath>>();
             failurePathContext.Expect(fpc => fpc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
@@ -480,7 +480,7 @@
             failurePath.Expect(fp => fp.IsRelevant).SetPropertyWithArgument(!isRelevant);
             failurePath.Expect(fp => fp.NotifyObservers());
 
-            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailurePath>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailurePath>>();
             failurePathContext.Stub(fmc => fmc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
@@ -1448,7 +1448,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null);
@@ -1471,7 +1471,7 @@
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
 
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null);
@@ -1498,7 +1498,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1522,7 +1522,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1551,7 +1551,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, fmContext => counter++, context => null);
 
             // Call
@@ -1579,7 +1579,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(
@@ -1604,7 +1604,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             // Call
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(failureMechanismContext, null, fm => null);
@@ -1631,7 +1631,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1658,7 +1658,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             const string errorMessage = "Additional check failed.";
 
@@ -1690,7 +1690,7 @@
             {
                 calculation
             });
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new TestFailurePathContext(failureMechanism, assessmentSection);
 
             StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(
                 failureMechanismContext,
@@ -2093,9 +2093,9 @@
 
         #region Nested types
 
-        private class TestFailureMechanismContext : FailureMechanismContext<IFailureMechanism>
+        private class TestFailurePathContext : FailureMechanismContext<IFailureMechanism>
         {
-            public TestFailureMechanismContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
+            public TestFailurePathContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) :
                 base(wrappedFailureMechanism, parent) {}
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs	(.../ShouldCloseViewWithCalculationDataTester.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs	(.../ShouldCloseViewWithCalculationDataTester.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -108,12 +108,12 @@
         public void ShouldCloseMethod_ViewCorrespondingWithRemovedFailureMechanism_ReturnsTrue()
         {
             // Setup
-            IFailureMechanismContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
 
-            using (IView view = GetView(failureMechanismContext.WrappedData.Calculations.First()))
+            using (IView view = GetView(failurePathContext.WrappedData.Calculations.First()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext.WrappedData);
+                bool closeForData = ShouldCloseMethod(view, failurePathContext.WrappedData);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -124,12 +124,12 @@
         public void ShouldCloseMethod_ViewNotCorrespondingWithRemovedFailureMechanism_ReturnsFalse()
         {
             // Setup
-            IFailureMechanismContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
 
             using (IView view = GetView(GetCalculation()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext.WrappedData);
+                bool closeForData = ShouldCloseMethod(view, failurePathContext.WrappedData);
 
                 // Assert
                 Assert.IsFalse(closeForData);
@@ -140,12 +140,12 @@
         public void ShouldCloseMethod_ViewCorrespondingWithRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            IFailureMechanismContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
 
-            using (IView view = GetView(failureMechanismContext.WrappedData.Calculations.First()))
+            using (IView view = GetView(failurePathContext.WrappedData.Calculations.First()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
+                bool closeForData = ShouldCloseMethod(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -156,12 +156,12 @@
         public void ShouldCloseMethod_ViewNotCorrespondingWithRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            IFailureMechanismContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
+            IFailurePathContext<IFailureMechanism> failurePathContext = GetFailureMechanismContextWithCalculation();
 
             using (IView view = GetView(GetCalculation()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
+                bool closeForData = ShouldCloseMethod(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
@@ -274,7 +274,7 @@
         /// </summary>
         /// <returns>A failure mechanism context object.</returns>
         /// <remarks>A default implementation is added for creating a <see cref="TestFailureMechanismContext"/>.</remarks>
-        protected virtual IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+        protected virtual IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
         {
             return new TestFailureMechanismContext();
         }
@@ -317,7 +317,7 @@
             public TestFailureMechanism FailureMechanism { get; }
         }
 
-        private class TestFailureMechanismContext : Observable, IFailureMechanismContext<TestFailureMechanism>
+        private class TestFailureMechanismContext : Observable, IFailurePathContext<TestFailureMechanism>
         {
             public TestFailureMechanismContext()
             {
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs	(.../ShouldCloseViewWithFailureMechanismTester.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs	(.../ShouldCloseViewWithFailureMechanismTester.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -126,12 +126,12 @@
             mocks.ReplayAll();
 
             IFailureMechanism failureMechanism = GetFailureMechanism();
-            var failureMechanismContext = new TestFailureMechanismContext(new TestFailureMechanism(), assessmentSection);
+            var failurePathContext = new TestFailureMechanismContext(new TestFailureMechanism(), assessmentSection);
 
             using (IView view = GetView(failureMechanism))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
+                bool closeForData = ShouldCloseMethod(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
@@ -149,12 +149,12 @@
             mocks.ReplayAll();
 
             IFailureMechanism failureMechanism = GetFailureMechanism();
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
+            var failurePathContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             using (IView view = GetView(failureMechanism))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
+                bool closeForData = ShouldCloseMethod(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -342,9 +342,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<DuneErosionFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<DuneErosionFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -439,9 +439,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<GrassCoverErosionInwardsFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<GrassCoverErosionInwardsFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs
===================================================================
diff -u -rdfde1299339ca1573a354d708547072b1f30f24b -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs	(.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs)	(revision dfde1299339ca1573a354d708547072b1f30f24b)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsOutputViewInfoTestBase.cs	(.../GrassCoverErosionInwardsOutputViewInfoTestBase.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -153,7 +153,7 @@
                 new AssessmentSectionStub());
         }
 
-        protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
         {
             return new GrassCoverErosionInwardsCalculationsContext(
                 new GrassCoverErosionInwardsFailureMechanism
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -294,9 +294,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<GrassCoverErosionOutwardsFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<GrassCoverErosionOutwardsFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -r0ccde1570c16e7c6b7631753b5fb9490cabdc6d9 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision 0ccde1570c16e7c6b7631753b5fb9490cabdc6d9)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -199,7 +199,7 @@
                 new AssessmentSectionStub());
         }
 
-        protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
         {
             return new GrassCoverErosionOutwardsHydraulicLoadsContext(
                 new GrassCoverErosionOutwardsFailureMechanism
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -332,9 +332,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<HeightStructuresFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<HeightStructuresFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -240,7 +240,7 @@
                     context.WrappedData,
                     new FailureMechanismContributionNormChangeHandler(context.AssessmentSection))
             };
-            yield return new PropertyInfo<IFailureMechanismContext<IFailureMechanism>, StandAloneFailurePathProperties>
+            yield return new PropertyInfo<IFailurePathContext<IFailureMechanism>, StandAloneFailurePathProperties>
             {
                 CreateInstance = context => new StandAloneFailurePathProperties(context.WrappedData, context.Parent)
             };
@@ -987,6 +987,7 @@
                 StandAloneFailurePathEnabledContextMenuStrip,
                 StandAloneFailurePathDisabledContextMenuStrip);
 
+            
             yield return new TreeNodeInfo<FailureMechanismSectionsContext>
             {
                 Text = context => RiskeerCommonFormsResources.FailureMechanismSections_DisplayName,
@@ -1553,7 +1554,7 @@
             Func<TFailureMechanismContext, FailureMechanismWithDetailedAssessmentView<TFailureMechanism, TSectionResult>> createInstanceFunc)
             where TSectionResult : FailureMechanismSectionResult
             where TFailureMechanism : FailureMechanismBase, IHasSectionResults<TSectionResult>
-            where TFailureMechanismContext : IFailureMechanismContext<TFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<TFailureMechanism>
         {
             return new ViewInfo<TFailureMechanismContext, TFailureMechanism,
                 FailureMechanismWithDetailedAssessmentView<TFailureMechanism, TSectionResult>>
@@ -1575,7 +1576,7 @@
             Func<TFailureMechanismContext, FailureMechanismWithoutDetailedAssessmentView<TFailureMechanism, TSectionResult>> createInstanceFunc)
             where TSectionResult : FailureMechanismSectionResult
             where TFailureMechanism : FailureMechanismBase, IHasSectionResults<TSectionResult>
-            where TFailureMechanismContext : IFailureMechanismContext<TFailureMechanism>
+            where TFailureMechanismContext : IFailurePathContext<TFailureMechanism>
         {
             return new ViewInfo<TFailureMechanismContext, TFailureMechanism,
                 FailureMechanismWithoutDetailedAssessmentView<TFailureMechanism, TSectionResult>>
@@ -1606,7 +1607,7 @@
                                         .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults));
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<IFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<IFailureMechanism> failureMechanismContext)
             {
                 return failureMechanismContext.WrappedData is IHasSectionResults<FailureMechanismSectionResult> failureMechanismWithSectionResults
                        && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanismWithSectionResults.SectionResults);
@@ -1673,7 +1674,7 @@
                 return ReferenceEquals(commentView.Data, calculation.Comments);
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<IFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<IFailureMechanism> failureMechanismContext)
             {
                 return GetCommentElements(failureMechanismContext.WrappedData)
                     .Any(commentElement => ReferenceEquals(commentView.Data, commentElement));
@@ -2025,15 +2026,15 @@
 
         #region StandAloneFailurePath TreeNodeInfo
 
-        private static object[] StandAloneFailurePathDisabledChildNodeObjects(IFailureMechanismContext<IFailureMechanism> nodeData)
+        private static object[] StandAloneFailurePathDisabledChildNodeObjects(IFailurePathContext<IFailureMechanism> nodeData)
         {
             return new object[]
             {
                 nodeData.WrappedData.NotRelevantComments
             };
         }
 
-        private ContextMenuStrip StandAloneFailurePathEnabledContextMenuStrip(IFailureMechanismContext<IFailureMechanism> nodeData, object parentData, TreeViewControl treeViewControl)
+        private ContextMenuStrip StandAloneFailurePathEnabledContextMenuStrip(IFailurePathContext<IFailureMechanism> nodeData, object parentData, TreeViewControl treeViewControl)
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
 
@@ -2048,12 +2049,12 @@
                           .Build();
         }
 
-        private void RemoveAllViewsForItem(IFailureMechanismContext<IFailureMechanism> failureMechanismContext)
+        private void RemoveAllViewsForItem(IFailurePathContext<IFailureMechanism> failurePathContext)
         {
-            Gui.ViewCommands.RemoveAllViewsForItem(failureMechanismContext);
+            Gui.ViewCommands.RemoveAllViewsForItem(failurePathContext);
         }
 
-        private ContextMenuStrip StandAloneFailurePathDisabledContextMenuStrip(IFailureMechanismContext<IFailureMechanism> nodeData,
+        private ContextMenuStrip StandAloneFailurePathDisabledContextMenuStrip(IFailurePathContext<IFailureMechanism> nodeData,
                                                                                object parentData,
                                                                                TreeViewControl treeViewControl)
         {
@@ -2069,14 +2070,83 @@
         }
 
         #endregion
+
+        #region SpecificFailureMechanism TreeNodeInfo
+
+        private static object[] SpecificFailurePathDisabledChildNodeObjects(SpecificFailurePathContext nodeData)
+        {
+            return new object[]
+            {
+                nodeData.WrappedData.NotRelevantComments
+            };
+        }
+
+        private static object[] SpecificFailurePathEnabledChildNodeObjects(SpecificFailurePathContext nodeData)
+        {
+            return new object[]
+            {
+                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
+                                       GetSpecificFailurePathInputs(nodeData),
+                                       TreeFolderCategory.Input),
+                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName,
+                                       GetSpecificFailureMechanismPathOutputs(nodeData),
+                                       TreeFolderCategory.Output)
+            };
+        }
+
+        private static IEnumerable<object> GetSpecificFailurePathInputs(SpecificFailurePathContext nodeData)
+        {
+            return new object[]
+            {
+                nodeData.WrappedData.InputComments
+            };
+        }
+
+        private static IEnumerable<object> GetSpecificFailureMechanismPathOutputs(SpecificFailurePathContext nodeData)
+        {
+            return new object[]
+            {
+                nodeData.WrappedData.OutputComments
+            };
+        }
+        
+        private ContextMenuStrip StandAloneFailurePathEnabledContextMenuStrip(SpecificFailurePathContext nodeData, 
+                                                                              object parentData, 
+                                                                              TreeViewControl treeViewControl)
+        {
+            var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
+
+            return builder.AddOpenItem()
                           .AddSeparator()
+                          .AddToggleRelevancyOfFailurePathItem(nodeData, RemoveAllViewsForItem)
+                          .AddSeparator()
                           .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .AddSeparator()
                           .AddPropertiesItem()
                           .Build();
         }
 
+        private void RemoveAllViewsForItem(SpecificFailurePathContext failureMechanismContext)
+        {
+            Gui.ViewCommands.RemoveAllViewsForItem(failureMechanismContext);
+        }
+
+        private ContextMenuStrip StandAloneFailurePathDisabledContextMenuStrip(SpecificFailurePathContext nodeData,
+                                                                               object parentData,
+                                                                               TreeViewControl treeViewControl)
+        {
+            var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
+
+            return builder.AddToggleRelevancyOfFailurePathItem(nodeData, RemoveAllViewsForItem)
+                          .AddSeparator()
+                          .AddCollapseAllItem()
+                          .AddExpandAllItem()
+                          .AddSeparator()
+                          .AddPropertiesItem()
+                          .Build();
+        }
+
         #endregion
 
         #region GrassCoverSlipOffInwardsFailurePathContext TreeNodeInfo
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r6ec8744d807b10a4b863472cc334554b8d78515d -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision 6ec8744d807b10a4b863472cc334554b8d78515d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -54,7 +54,7 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(IFailureMechanismContext<IFailureMechanism>), info.DataType);
+            Assert.AreEqual(typeof(IFailurePathContext<IFailureMechanism>), info.DataType);
             Assert.AreEqual(typeof(StandAloneFailurePathProperties), info.PropertyObjectType);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r6ec8744d807b10a4b863472cc334554b8d78515d -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 6ec8744d807b10a4b863472cc334554b8d78515d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -258,7 +258,7 @@
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
-                    typeof(IFailureMechanismContext<IFailureMechanism>),
+                    typeof(IFailurePathContext<IFailureMechanism>),
                     typeof(StandAloneFailurePathProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -r53c1ab15d75a6d5819a71fb345ccdf3dc56dafe5 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 53c1ab15d75a6d5819a71fb345ccdf3dc56dafe5)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -398,9 +398,9 @@
             var calculation = mocks.Stub<ICalculation>();
             calculation.Stub(s => s.Comments).Return(new Comment());
             var failureMechanism = mocks.Stub<IFailureMechanism>();
-            var failureMechanismContext = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
 
-            failureMechanismContext.Expect(c => c.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(c => c.WrappedData).Return(failureMechanism);
             failureMechanism.Stub(fm => fm.Calculations).Return(new[]
             {
                 calculation
@@ -417,7 +417,7 @@
             })
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -436,9 +436,9 @@
             deletedCalculation.Stub(s => s.Comments).Return(new Comment());
 
             var deletedfailureMechanism = mocks.Stub<IFailureMechanism>();
-            var failureMechanismContext = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
 
-            failureMechanismContext.Stub(c => c.WrappedData).Return(deletedfailureMechanism);
+            failurePathContext.Stub(c => c.WrappedData).Return(deletedfailureMechanism);
             deletedfailureMechanism.Stub(fm => fm.Calculations).Return(new[]
             {
                 deletedCalculation
@@ -455,7 +455,7 @@
             })
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs
===================================================================
diff -u -r02b8e938d85fb0f0aa564fa93571ef50211eacbd -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision 02b8e938d85fb0f0aa564fa93571ef50211eacbd)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -167,7 +167,7 @@
                     new AssessmentSection(AssessmentSectionComposition.Dike));
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new HeightStructuresCalculationsContext(
                     new HeightStructuresFailureMechanism
@@ -216,7 +216,7 @@
                     new AssessmentSection(AssessmentSectionComposition.Dike));
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new ClosingStructuresCalculationsContext(
                     new ClosingStructuresFailureMechanism
@@ -265,7 +265,7 @@
                     new AssessmentSection(AssessmentSectionComposition.Dike));
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new StabilityPointStructuresCalculationsContext(
                     new StabilityPointStructuresFailureMechanism
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffInwardsResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffInwardsResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -179,16 +179,16 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new GrassCoverSlipOffInwardsResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -200,16 +200,16 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(new GrassCoverSlipOffInwardsFailureMechanism());
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            failurePathContext.Expect(fm => fm.WrappedData).Return(new GrassCoverSlipOffInwardsFailureMechanism());
             mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism();
 
             using (var view = new GrassCoverSlipOffInwardsResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -179,16 +179,16 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new GrassCoverSlipOffOutwardsResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -200,16 +200,16 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(new GrassCoverSlipOffOutwardsFailureMechanism());
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            failurePathContext.Expect(fm => fm.WrappedData).Return(new GrassCoverSlipOffOutwardsFailureMechanism());
             mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism();
 
             using (var view = new GrassCoverSlipOffOutwardsResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsResultViewInfoTest.cs	(.../MacroStabilityOutwardsResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsResultViewInfoTest.cs	(.../MacroStabilityOutwardsResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -186,16 +186,16 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new MacroStabilityOutwardsResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -209,7 +209,7 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failureMechanismContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             failureMechanismContext.Expect(fm => fm.WrappedData).Return(new MacroStabilityOutwardsFailureMechanism());
             mocks.ReplayAll();
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs	(.../MicrostabilityResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs	(.../MicrostabilityResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -178,16 +178,16 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new MicrostabilityFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new MicrostabilityResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -199,16 +199,16 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(new MicrostabilityFailureMechanism());
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            failurePathContext.Expect(fm => fm.WrappedData).Return(new MicrostabilityFailureMechanism());
             mocks.ReplayAll();
 
             var failureMechanism = new MicrostabilityFailureMechanism();
 
             using (var view = new MicrostabilityResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs	(.../PipingStructureResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs	(.../PipingStructureResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -178,16 +178,16 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new PipingStructureFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new PipingStructureResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -199,16 +199,16 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(new PipingStructureFailureMechanism());
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            failurePathContext.Expect(fm => fm.WrappedData).Return(new PipingStructureFailureMechanism());
             mocks.ReplayAll();
 
             var failureMechanism = new PipingStructureFailureMechanism();
 
             using (var view = new PipingStructureResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -181,16 +181,16 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new StrengthStabilityLengthwiseConstructionResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -203,16 +203,16 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(new StrengthStabilityLengthwiseConstructionFailureMechanism());
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            failurePathContext.Expect(fm => fm.WrappedData).Return(new StrengthStabilityLengthwiseConstructionFailureMechanism());
             mocks.ReplayAll();
 
             var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism();
 
             using (var view = new StrengthStabilityLengthwiseConstructionResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs	(.../TechnicalInnovationResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs	(.../TechnicalInnovationResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -178,16 +178,16 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new TechnicalInnovationFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new TechnicalInnovationResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -199,16 +199,16 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(new TechnicalInnovationFailureMechanism());
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            failurePathContext.Expect(fm => fm.WrappedData).Return(new TechnicalInnovationFailureMechanism());
             mocks.ReplayAll();
 
             var failureMechanism = new TechnicalInnovationFailureMechanism();
 
             using (var view = new TechnicalInnovationResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs
===================================================================
diff -u -r085a498bc066870390cef76b6ae8ec37573b2fdf -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverResultViewInfoTest.cs)	(revision 085a498bc066870390cef76b6ae8ec37573b2fdf)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverResultViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -180,16 +180,16 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
             var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
+            failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
 
             mocks.ReplayAll();
 
             using (var view = new WaterPressureAsphaltCoverResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -202,16 +202,16 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failureMechanismContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-            failureMechanismContext.Expect(fm => fm.WrappedData).Return(new WaterPressureAsphaltCoverFailureMechanism());
+            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            failurePathContext.Expect(fm => fm.WrappedData).Return(new WaterPressureAsphaltCoverFailureMechanism());
             mocks.ReplayAll();
 
             var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism();
 
             using (var view = new WaterPressureAsphaltCoverResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, failureMechanismContext);
+                bool closeForData = info.CloseForData(view, failurePathContext);
 
                 // Assert
                 Assert.IsFalse(closeForData);
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -478,9 +478,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<MacroStabilityInwardsFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<MacroStabilityInwardsFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs
===================================================================
diff -u -r17d7d42ce58b05e5e9fd879ca53e504b9717a515 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs	(.../MacroStabilityInwardsOutputViewInfoTest.cs)	(revision 17d7d42ce58b05e5e9fd879ca53e504b9717a515)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs	(.../MacroStabilityInwardsOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -169,7 +169,7 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new MacroStabilityInwardsCalculationsContext(
                     new MacroStabilityInwardsFailureMechanism
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -610,9 +610,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<PipingFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<PipingFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r71924dca81e2a8be834e16b111334fca035b3701 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -213,7 +213,7 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new PipingCalculationsContext(
                     new PipingFailureMechanism
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r71924dca81e2a8be834e16b111334fca035b3701 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -214,7 +214,7 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new PipingCalculationsContext(
                     new PipingFailureMechanism
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r71924dca81e2a8be834e16b111334fca035b3701 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -213,7 +213,7 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new PipingCalculationsContext(
                     new PipingFailureMechanism
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r71924dca81e2a8be834e16b111334fca035b3701 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 71924dca81e2a8be834e16b111334fca035b3701)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -214,7 +214,7 @@
                     new AssessmentSectionStub());
             }
 
-            protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+            protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
             {
                 return new PipingCalculationsContext(
                     new PipingFailureMechanism
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -308,9 +308,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<StabilityPointStructuresFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<StabilityPointStructuresFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -291,9 +291,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<StabilityStoneCoverFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<StabilityStoneCoverFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rb7678858ad514d847ac8fe5c445e1327200b2ac3 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs	(.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs)	(revision b7678858ad514d847ac8fe5c445e1327200b2ac3)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs	(.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -199,7 +199,7 @@
                 new AssessmentSectionStub());
         }
 
-        protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
         {
             return new StabilityStoneCoverHydraulicLoadsContext(
                 new StabilityStoneCoverFailureMechanism
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r61abae678f0799bdbf16a7ed09d1f20e2709a239 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 61abae678f0799bdbf16a7ed09d1f20e2709a239)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -290,9 +290,9 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailureMechanismContext<WaveImpactAsphaltCoverFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailurePathContext<WaveImpactAsphaltCoverFailureMechanism> failurePathContext)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                failureMechanism = failurePathContext.WrappedData;
             }
 
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rb7678858ad514d847ac8fe5c445e1327200b2ac3 -r33cd1d7a97d4fb49b252b0d4df3fa56b273625a1
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs)	(revision b7678858ad514d847ac8fe5c445e1327200b2ac3)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs)	(revision 33cd1d7a97d4fb49b252b0d4df3fa56b273625a1)
@@ -199,7 +199,7 @@
                 new AssessmentSectionStub());
         }
 
-        protected override IFailureMechanismContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+        protected override IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
         {
             return new WaveImpactAsphaltCoverHydraulicLoadsContext(
                 new WaveImpactAsphaltCoverFailureMechanism