Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r7fe371dd6b57c27b2a41f73b942a57f9e9a6e8df -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 7fe371dd6b57c27b2a41f73b942a57f9e9a6e8df)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -310,7 +310,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<ClosingStructuresFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<ClosingStructuresFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
@@ -329,7 +329,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<ClosingStructuresFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<ClosingStructuresFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismContext.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -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>, IFailurePathContext<T>
+    public abstract class FailureMechanismContext<T> : ObservableWrappedObjectContextBase<T>, IFailureMechanismContext<T>
         where T : IFailureMechanism
     {
         /// <summary>
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?
Fisheye: Tag 1656dcdbad8f28c0a84ec6636efe0004c62029d2 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/IFailurePathContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -229,7 +229,7 @@
             TFailureMechanismContext failureMechanismContext,
             Action<TFailureMechanismContext> calculateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction = null)
-            where TFailureMechanismContext : IFailurePathContext<ICalculatableFailureMechanism>
+            where TFailureMechanismContext : IFailureMechanismContext<ICalculatableFailureMechanism>
         {
             contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInFailureMechanismItem(failureMechanismContext, calculateAllAction, enableMenuItemFunction));
             return this;
@@ -250,7 +250,7 @@
             TFailureMechanismContext failureMechanism,
             Action<TFailureMechanismContext> validateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction = null)
-            where TFailureMechanismContext : IFailurePathContext<ICalculatableFailureMechanism>
+            where TFailureMechanismContext : IFailureMechanismContext<ICalculatableFailureMechanism>
         {
             contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateValidateAllCalculationsInFailureMechanismItem(failureMechanism, validateAllAction, enableMenuItemFunction));
             return this;
@@ -266,7 +266,7 @@
         public RiskeerContextMenuBuilder AddToggleInAssemblyOfFailurePathItem<TFailurePathContext>(
             TFailurePathContext failurePathContext,
             Action<TFailurePathContext> onChangeAction)
-            where TFailurePathContext : IFailurePathContext<IFailureMechanism>
+            where TFailurePathContext : IFailureMechanismContext<IFailureMechanism>
         {
             contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateToggleInAssemblyOfFailurePathItem(failurePathContext, onChangeAction));
             return this;
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -329,7 +329,7 @@
             TFailureMechanismContext failureMechanismContext,
             Action<TFailureMechanismContext> calculateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction)
-            where TFailureMechanismContext : IFailurePathContext<ICalculatableFailureMechanism>
+            where TFailureMechanismContext : IFailureMechanismContext<ICalculatableFailureMechanism>
         {
             var menuItem = new StrictContextMenuItem(
                 Resources.Calculate_All,
@@ -364,7 +364,7 @@
             TFailureMechanismContext failureMechanism,
             Action<TFailureMechanismContext> validateAllAction,
             Func<TFailureMechanismContext, string> enableMenuItemFunction)
-            where TFailureMechanismContext : IFailurePathContext<ICalculatableFailureMechanism>
+            where TFailureMechanismContext : IFailureMechanismContext<ICalculatableFailureMechanism>
         {
             var menuItem = new StrictContextMenuItem(
                 Resources.Validate_All,
@@ -396,7 +396,7 @@
         public static StrictContextMenuItem CreateToggleInAssemblyOfFailurePathItem<TFailurePathContext>(
             TFailurePathContext failurePathContext,
             Action<TFailurePathContext> onChangeAction)
-            where TFailurePathContext : IFailurePathContext<IFailureMechanism>
+            where TFailurePathContext : IFailureMechanismContext<IFailureMechanism>
         {
             bool inAssembly = failurePathContext.WrappedData.InAssembly;
             Bitmap checkboxImage = inAssembly ? Resources.Checkbox_ticked : Resources.Checkbox_empty;
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs	(.../RiskeerTreeNodeInfoFactory.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs	(.../RiskeerTreeNodeInfoFactory.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -122,7 +122,7 @@
             Func<TFailurePathContext, object[]> disabledChildNodeObjects,
             Func<TFailurePathContext, object, TreeViewControl, ContextMenuStrip> enabledContextMenuStrip,
             Func<TFailurePathContext, object, TreeViewControl, ContextMenuStrip> disabledContextMenuStrip)
-            where TFailurePathContext : IFailurePathContext<IFailureMechanism>
+            where TFailurePathContext : IFailureMechanismContext<IFailureMechanism>
         {
             return new TreeNodeInfo<TFailurePathContext>
             {
@@ -150,7 +150,7 @@
         public static TreeNodeInfo<TFailureMechanismContext> CreateFailureMechanismStateContextTreeNodeInfo<TFailureMechanismContext>(
             Func<TFailureMechanismContext, object[]> childNodeObjects,
             Func<TFailureMechanismContext, object, TreeViewControl, ContextMenuStrip> contextMenuStrip)
-            where TFailureMechanismContext : IFailurePathContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
         {
             return new TreeNodeInfo<TFailureMechanismContext>
             {
Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -77,7 +77,7 @@
         public static bool ShouldCloseForFailureMechanismView(CloseForFailurePathView view, object removedObject)
         {
             var assessmentSection = removedObject as IAssessmentSection;
-            var failurePathContext = removedObject as IFailurePathContext<IFailureMechanism>;
+            var failurePathContext = removedObject as IFailureMechanismContext<IFailureMechanism>;
             var failureMechanism = removedObject as IFailureMechanism;
 
             if (failurePathContext != null)
@@ -105,7 +105,7 @@
         {
             var failurePath = removedObject as IFailureMechanism;
 
-            if (removedObject is IFailurePathContext<IFailureMechanism> failurePathContext)
+            if (removedObject is IFailureMechanismContext<IFailureMechanism> failurePathContext)
             {
                 failurePath = failurePathContext.WrappedData;
             }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs	(.../FailureMechanismContextTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs	(.../FailureMechanismContextTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -46,7 +46,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<IFailureMechanism>>(context);
-            Assert.IsInstanceOf<IFailurePathContext<IFailureMechanism>>(context);
+            Assert.IsInstanceOf<IFailureMechanismContext<IFailureMechanism>>(context);
             Assert.AreSame(assessmentSection, context.Parent);
             Assert.AreSame(failureMechanism, context.WrappedData);
             mocks.VerifyAll();
@@ -61,10 +61,10 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new SimpleFailureMechanismContext(failureMechanism, null);
+            void Call() => new SimpleFailureMechanismContext(failureMechanism, null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("parent", exception.ParamName);
             mocks.VerifyAll();
         }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs	(.../RiskeerContextMenuBuilderTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -329,7 +329,7 @@
             var viewCommands = mocks.StrictMock<IViewCommands>();
             var failurePath = mocks.StrictMock<IFailureMechanism>();
             failurePath.Expect(fm => fm.InAssembly).Return(inAssembly);
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fmc => fmc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -451,7 +451,7 @@
             var mocks = new MockRepository();
             var failurePath = mocks.StrictMock<IFailureMechanism>();
             failurePath.Expect(fp => fp.InAssembly).Return(inAssembly);
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fpc => fpc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
@@ -479,7 +479,7 @@
             failurePath.Expect(fp => fp.InAssembly).SetPropertyWithArgument(!inAssembly);
             failurePath.Expect(fp => fp.NotifyObservers());
 
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Stub(fmc => fmc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs	(.../RiskeerTreeNodeInfoFactoryTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs	(.../RiskeerTreeNodeInfoFactoryTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -842,12 +842,12 @@
             var mocks = new MockRepository();
             var failurePath = mocks.Stub<IFailureMechanism>();
             failurePath.Stub(fm => fm.Name).Return(name);
-            var context = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+            var context = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
             context.Stub(c => c.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
-            TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(null, null, null, null);
+            TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(null, null, null, null);
 
             // Call
             string text = treeNodeInfo.Text(context);
@@ -861,8 +861,8 @@
         public void Image_FailurePath_Always_ReturnsFailureMechanismIcon()
         {
             // Setup
-            TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(null, null, null, null);
+            TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(null, null, null, null);
 
             // Call
             Image image = treeNodeInfo.Image(null);
@@ -877,14 +877,14 @@
             // Setup
             var mocks = new MockRepository();
             var failurePath = mocks.Stub<IFailureMechanism>();
-            var context = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+            var context = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
             context.Stub(c => c.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
             failurePath.InAssembly = true;
 
-            TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(null, null, null, null);
+            TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(null, null, null, null);
 
             // Call
             Color color = treeNodeInfo.ForeColor(context);
@@ -900,14 +900,14 @@
             // Setup
             var mocks = new MockRepository();
             var failurePath = mocks.Stub<IFailureMechanism>();
-            var context = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+            var context = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
             context.Stub(c => c.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
             failurePath.InAssembly = false;
 
-            TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(null, null, null, null);
+            TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(null, null, null, null);
 
             // Call
             Color color = treeNodeInfo.ForeColor(context);
@@ -923,7 +923,7 @@
             // Setup
             var mocks = new MockRepository();
             var failurePath = mocks.Stub<IFailureMechanism>();
-            var context = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+            var context = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
             context.Stub(c => c.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
@@ -941,8 +941,8 @@
                 new object()
             };
 
-            TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(pathContext => resultInAssembly,
+            TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(pathContext => resultInAssembly,
                                                                                                                         pathContext => resultNotInAssembly,
                                                                                                                         null, null);
 
@@ -961,7 +961,7 @@
             // Setup
             var mocks = new MockRepository();
             var failurePath = mocks.Stub<IFailureMechanism>();
-            var context = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+            var context = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
             context.Stub(c => c.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
@@ -979,8 +979,8 @@
                 new object()
             };
 
-            TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(pathContext => resultInAssembly,
+            TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(pathContext => resultInAssembly,
                                                                                                                         pathContext => resultNotInAssembly,
                                                                                                                         null, null);
 
@@ -1004,15 +1004,15 @@
                 var mocks = new MockRepository();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var failurePath = mocks.Stub<IFailureMechanism>();
-                var context = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+                var context = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
                 context.Stub(c => c.WrappedData).Return(failurePath);
                 context.Stub(c => c.Parent).Return(assessmentSection);
                 mocks.ReplayAll();
 
                 failurePath.InAssembly = true;
 
-                TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                    RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(
+                TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                    RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(
                         null,
                         null,
                         (mechanismContext, parent, treeViewControl) =>
@@ -1054,15 +1054,15 @@
                 var mocks = new MockRepository();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var failurePath = mocks.Stub<IFailureMechanism>();
-                var context = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+                var context = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
                 context.Stub(c => c.WrappedData).Return(failurePath);
                 context.Stub(c => c.Parent).Return(assessmentSection);
                 mocks.ReplayAll();
 
                 failurePath.InAssembly = false;
 
-                TreeNodeInfo<IFailurePathContext<IFailureMechanism>> treeNodeInfo =
-                    RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailurePathContext<IFailureMechanism>>(
+                TreeNodeInfo<IFailureMechanismContext<IFailureMechanism>> treeNodeInfo =
+                    RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo<IFailureMechanismContext<IFailureMechanism>>(
                         null,
                         null,
                         (mechanismContext, parent, treeViewControl) =>
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs	(.../FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs	(.../FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -41,13 +41,13 @@
     /// Test fixture for verifying the InAssembly behavior of a TreeNodeInfo.
     /// </summary>
     /// <typeparam name="TPlugin">The type of plugin to create the tests for.</typeparam>
-    /// <typeparam name="TFailurePath">The type of <see cref="IFailureMechanism"/> to create the tests for.</typeparam>
-    /// <typeparam name="TFailurePathContext">The type of <see cref="IFailurePathContext{T}"/> to create the tests for.</typeparam>
+    /// <typeparam name="TFailureMechanism">The type of <see cref="IFailureMechanism"/> to create the tests for.</typeparam>
+    /// <typeparam name="TContext">The type of <see cref="IFailureMechanismContext{T}"/> to create the tests for.</typeparam>
     [TestFixture]
-    public abstract class FailurePathInAssemblyTreeNodeInfoTestFixtureBase<TPlugin, TFailurePath, TFailurePathContext>
+    public abstract class FailurePathInAssemblyTreeNodeInfoTestFixtureBase<TPlugin, TFailureMechanism, TContext>
         where TPlugin : PluginBase, new()
-        where TFailurePath : IFailureMechanism, new()
-        where TFailurePathContext : IFailurePathContext<TFailurePath>
+        where TFailureMechanism : IFailureMechanism, new()
+        where TContext : IFailureMechanismContext<TFailureMechanism>
     {
         private readonly int contextMenuIndexWhenInAssemblyFalse;
         private readonly int contextMenuIndexWhenInAssemblyTrue;
@@ -58,9 +58,9 @@
             // Setup
             var mocks = new MockRepository();
 
-            var failureMechanism = new TFailurePath();
+            var failureMechanism = new TFailureMechanism();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            TFailurePathContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
+            TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
             var viewCommands = mocks.StrictMock<IViewCommands>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -101,13 +101,13 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = new TFailurePath
+            var failureMechanism = new TFailureMechanism
             {
                 InAssembly = false
             };
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            TFailurePathContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
+            TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
             var viewCommands = mocks.StrictMock<IViewCommands>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -151,8 +151,8 @@
             using (var treeView = new TreeViewControl())
             {
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                var failureMechanism = new TFailurePath();
-                TFailurePathContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
+                var failureMechanism = new TFailureMechanism();
+                TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
                 var gui = mocks.Stub<IGui>();
@@ -192,12 +192,12 @@
             using (var treeView = new TreeViewControl())
             {
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                var failureMechanism = new TFailurePath
+                var failureMechanism = new TFailureMechanism
                 {
                     InAssembly = false
                 };
 
-                TFailurePathContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
+                TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection);
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
                 var gui = mocks.Stub<IGui>();
@@ -232,9 +232,9 @@
         /// <summary>
         /// Creates a new instance of <see cref="FailurePathInAssemblyTreeNodeInfoTestFixtureBase{TPlugin,TFailurePath,TFailurePathContext}"/>.
         /// </summary>
-        /// <param name="contextMenuIndexWhenInAssemblyTrue">The index of the InAssembly context menu item when the <typeparamref name="TFailurePath"/>
+        /// <param name="contextMenuIndexWhenInAssemblyTrue">The index of the InAssembly context menu item when the <typeparamref name="TFailureMechanism"/>
         /// is part of the assembly.</param>
-        /// <param name="contextMenuIndexWhenInAssemblyFalse">The index of the InAssembly context menu item when the <typeparamref name="TFailurePath"/>
+        /// <param name="contextMenuIndexWhenInAssemblyFalse">The index of the InAssembly context menu item when the <typeparamref name="TFailureMechanism"/>
         /// is not part of the assembly.</param>
         protected FailurePathInAssemblyTreeNodeInfoTestFixtureBase(int contextMenuIndexWhenInAssemblyTrue,
                                                                    int contextMenuIndexWhenInAssemblyFalse)
@@ -243,11 +243,11 @@
             this.contextMenuIndexWhenInAssemblyFalse = contextMenuIndexWhenInAssemblyFalse;
         }
 
-        protected abstract TFailurePathContext CreateFailureMechanismContext(TFailurePath failureMechanism, IAssessmentSection assessmentSection);
+        protected abstract TContext CreateFailureMechanismContext(TFailureMechanism failureMechanism, IAssessmentSection assessmentSection);
 
         private static TreeNodeInfo GetInfo(TPlugin plugin)
         {
-            return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(TFailurePathContext));
+            return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(TContext));
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs	(.../ShouldCloseViewWithFailurePathTester.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs	(.../ShouldCloseViewWithFailurePathTester.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -224,7 +224,7 @@
             mocks.ReplayAll();
 
             var failurePath = new TestFailurePath();
-            var failurePathContext = new TestFailurePathContext(otherFailurePath, assessmentSection);
+            var failurePathContext = new TestFailureMechanismContext(otherFailurePath, assessmentSection);
 
             using (IView view = GetView(failurePath))
             {
@@ -247,7 +247,7 @@
             mocks.ReplayAll();
 
             var failurePath = new TestFailurePath();
-            var failurePathContext = new TestFailurePathContext(failurePath, assessmentSection);
+            var failurePathContext = new TestFailureMechanismContext(failurePath, assessmentSection);
 
             using (IView view = GetView(failurePath))
             {
@@ -276,9 +276,9 @@
         /// <returns>A view object.</returns>
         protected abstract IView GetView(IFailureMechanism failurePath);
 
-        private class TestFailurePathContext : IFailurePathContext<IFailureMechanism>
+        private class TestFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
         {
-            public TestFailurePathContext(IFailureMechanism wrappedFailurePath, IAssessmentSection parent)
+            public TestFailureMechanismContext(IFailureMechanism wrappedFailurePath, IAssessmentSection parent)
             {
                 WrappedData = wrappedFailurePath;
                 Parent = parent;
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -rf923887556cf2bb4815be25d3359d6d3662d3dd7 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision f923887556cf2bb4815be25d3359d6d3662d3dd7)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -345,7 +345,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<DuneErosionFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<DuneErosionFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r66715bdf0e3f627ce3339d0e6926ee0d4af3b58d -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 66715bdf0e3f627ce3339d0e6926ee0d4af3b58d)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -432,7 +432,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<GrassCoverErosionInwardsFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<GrassCoverErosionInwardsFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r9269be836f6f781c4357487dc6f890562181403c -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 9269be836f6f781c4357487dc6f890562181403c)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -302,7 +302,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<GrassCoverErosionOutwardsFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<GrassCoverErosionOutwardsFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r630b69f6fd84eba406323c9c709f3d45d9cfc747 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 630b69f6fd84eba406323c9c709f3d45d9cfc747)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -330,7 +330,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<HeightStructuresFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<HeightStructuresFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathContext.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathContext.cs	(.../SpecificFailurePathContext.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathContext.cs	(.../SpecificFailurePathContext.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -30,7 +30,7 @@
     /// <summary>
     /// This class is a presentation object for a <see cref="SpecificFailurePath"/> instance.
     /// </summary>
-    public class SpecificFailurePathContext : ObservableWrappedObjectContextBase<SpecificFailurePath>, IFailurePathContext<SpecificFailurePath>
+    public class SpecificFailurePathContext : ObservableWrappedObjectContextBase<SpecificFailurePath>, IFailureMechanismContext<SpecificFailurePath>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SpecificFailurePathContext"/> class.
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -236,7 +236,7 @@
                     context.WrappedData,
                     new FailureMechanismContributionNormChangeHandler(context.AssessmentSection))
             };
-            yield return new PropertyInfo<IFailurePathContext<IHasGeneralInput>, StandAloneFailurePathProperties>
+            yield return new PropertyInfo<IFailureMechanismContext<IHasGeneralInput>, StandAloneFailurePathProperties>
             {
                 CreateInstance = context => new StandAloneFailurePathProperties(context.WrappedData)
             };
@@ -1407,7 +1407,7 @@
             TFailureMechanismContext, TFailureMechanism, TSectionResult>(Func<TFailureMechanismContext, TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
             where TSectionResult : FailureMechanismSectionResult
             where TFailureMechanism : FailureMechanismBase<TSectionResult>
-            where TFailureMechanismContext : IFailurePathContext<TFailureMechanism>
+            where TFailureMechanismContext : IFailureMechanismContext<TFailureMechanism>
         {
             return new RiskeerViewInfo<TFailureMechanismContext, TFailureMechanism,
                 StandAloneFailureMechanismView<TFailureMechanism, TSectionResult>>(() => Gui)
@@ -1442,7 +1442,7 @@
                                                        .FirstOrDefault(fp => fp == view.FailureMechanism);
             }
 
-            if (dataToCloseFor is IFailurePathContext<IFailureMechanism> failureMechanismContext)
+            if (dataToCloseFor is IFailureMechanismContext<IFailureMechanism> failureMechanismContext)
             {
                 failureMechanism = failureMechanismContext.WrappedData as TFailureMechanism;
             }
@@ -1508,7 +1508,7 @@
                 return ReferenceEquals(commentView.Data, calculation.Comments);
             }
 
-            if (dataToCloseFor is IFailurePathContext<IFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<IFailureMechanism> failurePathContext)
             {
                 return GetCommentElements(failurePathContext.WrappedData)
                     .Any(commentElement => ReferenceEquals(commentView.Data, commentElement));
@@ -2069,15 +2069,15 @@
 
         #region StandAloneFailurePath TreeNodeInfo
 
-        private static object[] StandAloneFailurePathDisabledChildNodeObjects(IFailurePathContext<IFailureMechanism> nodeData)
+        private static object[] StandAloneFailurePathDisabledChildNodeObjects(IFailureMechanismContext<IFailureMechanism> nodeData)
         {
             return new object[]
             {
                 nodeData.WrappedData.NotInAssemblyComments
             };
         }
 
-        private ContextMenuStrip StandAloneFailurePathEnabledContextMenuStrip(IFailurePathContext<IFailureMechanism> nodeData, object parentData, TreeViewControl treeViewControl)
+        private ContextMenuStrip StandAloneFailurePathEnabledContextMenuStrip(IFailureMechanismContext<IFailureMechanism> nodeData, object parentData, TreeViewControl treeViewControl)
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
 
@@ -2092,12 +2092,12 @@
                           .Build();
         }
 
-        private void RemoveAllViewsForFailureMechanismContext(IFailurePathContext<IFailureMechanism> failureMechanismContext)
+        private void RemoveAllViewsForFailureMechanismContext(IFailureMechanismContext<IFailureMechanism> failureMechanismContext)
         {
             Gui.ViewCommands.RemoveAllViewsForItem(failureMechanismContext);
         }
 
-        private ContextMenuStrip StandAloneFailurePathDisabledContextMenuStrip(IFailurePathContext<IFailureMechanism> nodeData,
+        private ContextMenuStrip StandAloneFailurePathDisabledContextMenuStrip(IFailureMechanismContext<IFailureMechanism> nodeData,
                                                                                object parentData,
                                                                                TreeViewControl treeViewControl)
         {
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathContextTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathContextTest.cs	(.../SpecificFailurePathContextTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathContextTest.cs	(.../SpecificFailurePathContextTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -48,7 +48,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<SpecificFailurePath>>(context);
-            Assert.IsInstanceOf<IFailurePathContext<SpecificFailurePath>>(context);
+            Assert.IsInstanceOf<IFailureMechanismContext<SpecificFailurePath>>(context);
             Assert.AreSame(assessmentSection, context.Parent);
             Assert.AreSame(failurePath, context.WrappedData);
             mocks.VerifyAll();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r8d667bcf47df168bda37270bdf8ea0cee98398d1 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision 8d667bcf47df168bda37270bdf8ea0cee98398d1)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -54,7 +54,7 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(IFailurePathContext<IHasGeneralInput>), info.DataType);
+            Assert.AreEqual(typeof(IFailureMechanismContext<IHasGeneralInput>), info.DataType);
             Assert.AreEqual(typeof(StandAloneFailurePathProperties), info.PropertyObjectType);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -239,7 +239,7 @@
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
-                    typeof(IFailurePathContext<IHasGeneralInput>),
+                    typeof(IFailureMechanismContext<IHasGeneralInput>),
                     typeof(StandAloneFailurePathProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -524,7 +524,7 @@
             failurePath.Stub(fm => fm.InAssemblyInputComments).Return(affectedComment);
             failurePath.Stub(fm => fm.InAssemblyOutputComments).Return(new Comment());
             failurePath.Stub(fm => fm.NotInAssemblyComments).Return(new Comment());
-            var failurePathContext = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
 
             failurePathContext.Expect(c => c.WrappedData).Return(failurePath);
             mocks.ReplayAll();
@@ -554,7 +554,7 @@
             failurePath.Stub(fm => fm.InAssemblyInputComments).Return(new Comment());
             failurePath.Stub(fm => fm.InAssemblyOutputComments).Return(new Comment());
             failurePath.Stub(fm => fm.NotInAssemblyComments).Return(new Comment());
-            var failurePathContext = mocks.Stub<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.Stub<IFailureMechanismContext<IFailureMechanism>>();
 
             failurePathContext.Expect(c => c.WrappedData).Return(failurePath);
             mocks.ReplayAll();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -187,7 +187,7 @@
             var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism();
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
             mocks.ReplayAll();
 
@@ -213,7 +213,7 @@
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
 
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(new GrassCoverSlipOffInwardsFailureMechanism());
             mocks.ReplayAll();
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -183,7 +183,7 @@
             var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism();
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
             mocks.ReplayAll();
 
@@ -207,7 +207,7 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(new GrassCoverSlipOffOutwardsFailureMechanism());
             mocks.ReplayAll();
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs	(.../MicrostabilityFailureMechanismResultViewInfoTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs	(.../MicrostabilityFailureMechanismResultViewInfoTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -186,7 +186,7 @@
             var failureMechanism = new MicrostabilityFailureMechanism();
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
             mocks.ReplayAll();
 
@@ -211,7 +211,7 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(new MicrostabilityFailureMechanism());
             mocks.ReplayAll();
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs	(.../PipingStructureFailureMechanismResultViewInfoTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs	(.../PipingStructureFailureMechanismResultViewInfoTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -174,7 +174,7 @@
             // Setup
             var failureMechanism = new PipingStructureFailureMechanism();
 
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
@@ -196,7 +196,7 @@
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(new PipingStructureFailureMechanism());
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -185,7 +185,7 @@
             var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism();
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(failureMechanism);
             mocks.ReplayAll();
 
@@ -210,7 +210,7 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failurePathContext = mocks.StrictMock<IFailurePathContext<IFailureMechanism>>();
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failurePathContext.Expect(fm => fm.WrappedData).Return(new WaterPressureAsphaltCoverFailureMechanism());
             mocks.ReplayAll();
 
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -471,7 +471,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<MacroStabilityInwardsFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<MacroStabilityInwardsFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -598,7 +598,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<PipingFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<PipingFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r630b69f6fd84eba406323c9c709f3d45d9cfc747 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 630b69f6fd84eba406323c9c709f3d45d9cfc747)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -308,7 +308,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<StabilityPointStructuresFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<StabilityPointStructuresFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r55786df7f5abe3fbda43470b70929ed7aeaee54f -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 55786df7f5abe3fbda43470b70929ed7aeaee54f)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -298,7 +298,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<StabilityStoneCoverFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<StabilityStoneCoverFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r8da89db9c186cedc26c4baa657f2dd8961877ec4 -r1656dcdbad8f28c0a84ec6636efe0004c62029d2
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 8da89db9c186cedc26c4baa657f2dd8961877ec4)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2)
@@ -299,7 +299,7 @@
                                                     .FirstOrDefault();
             }
 
-            if (dataToCloseFor is IFailurePathContext<WaveImpactAsphaltCoverFailureMechanism> failurePathContext)
+            if (dataToCloseFor is IFailureMechanismContext<WaveImpactAsphaltCoverFailureMechanism> failurePathContext)
             {
                 failureMechanism = failurePathContext.WrappedData;
             }