Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8 -r091428672ce70930856bf22a225701c6d04759b2
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 091428672ce70930856bf22a225701c6d04759b2)
@@ -1695,15 +1695,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to I&amp;s relevant.
-        /// </summary>
-        public static string FailureMechanismContextMenuStrip_Is_relevant {
-            get {
-                return ResourceManager.GetString("FailureMechanismContextMenuStrip_Is_relevant", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap FailureMechanismIcon {
@@ -2113,6 +2104,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to I&amp;s relevant.
+        /// </summary>
+        public static string FailurePathContextMenuStrip_Is_relevant {
+            get {
+                return ResourceManager.GetString("FailurePathContextMenuStrip_Is_relevant", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Voorlandprofiel.
         /// </summary>
         public static string Foreshore_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -re07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8 -r091428672ce70930856bf22a225701c6d04759b2
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 091428672ce70930856bf22a225701c6d04759b2)
@@ -311,7 +311,7 @@
   <data name="Checkbox_ticked" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Checkbox_ticked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FailureMechanismContextMenuStrip_Is_relevant" xml:space="preserve">
+  <data name="FailurePathContextMenuStrip_Is_relevant" xml:space="preserve">
     <value>I&amp;s relevant</value>
   </data>
   <data name="FailureMechanism_IsRelevant_Description" xml:space="preserve">
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs
===================================================================
diff -u -ref9f41ef150aee02d286c53de24660a19d948e02 -r091428672ce70930856bf22a225701c6d04759b2
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision 091428672ce70930856bf22a225701c6d04759b2)
@@ -29,6 +29,7 @@
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Forms.ChangeHandlers;
 using Riskeer.Common.Forms.PresentationObjects;
 
@@ -266,9 +267,9 @@
         public RiskeerContextMenuBuilder AddToggleRelevancyOfFailureMechanismItem<TFailureMechanismContext>(
             TFailureMechanismContext failureMechanismContext,
             Action<TFailureMechanismContext> onChangeAction)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+            where TFailureMechanismContext : IFailureMechanismContext<IFailurePath>
         {
-            contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailureMechanismItem(failureMechanismContext, onChangeAction));
+            contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailurePathItem(failureMechanismContext, onChangeAction));
             return this;
         }
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs
===================================================================
diff -u -rd111fd00799f9de4a529f6ebb9fdbd526fcc5f95 -r091428672ce70930856bf22a225701c6d04759b2
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision d111fd00799f9de4a529f6ebb9fdbd526fcc5f95)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision 091428672ce70930856bf22a225701c6d04759b2)
@@ -31,6 +31,7 @@
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Forms.ChangeHandlers;
 using Riskeer.Common.Forms.Helpers;
 using Riskeer.Common.Forms.PresentationObjects;
@@ -386,29 +387,29 @@
         }
 
         /// <summary>
-        /// Creates a <see cref="StrictContextMenuItem"/> which is bound to the action of changing the relevance of a failure mechanism.
+        /// Creates a <see cref="StrictContextMenuItem"/> which is bound to the action of changing the relevance of a failure path.
         /// </summary>
-        /// <typeparam name="TFailureMechanismContext">The type of the failure mechanism context.</typeparam>
-        /// <param name="failureMechanismContext">The failure mechanism context belonging to the failure mechanism.</param>
+        /// <typeparam name="TFailurePathContext">The type of the failure path context.</typeparam>
+        /// <param name="failurePathContext">The failure path context belonging to the failure path.</param>
         /// <param name="onChangeAction">The action to perform when relevance changes.</param>
         /// <returns>The created <see cref="StrictContextMenuItem"/>.</returns>
-        public static StrictContextMenuItem CreateToggleRelevancyOfFailureMechanismItem<TFailureMechanismContext>(
-            TFailureMechanismContext failureMechanismContext,
-            Action<TFailureMechanismContext> onChangeAction)
-            where TFailureMechanismContext : IFailureMechanismContext<IFailureMechanism>
+        public static StrictContextMenuItem CreateToggleRelevancyOfFailurePathItem<TFailurePathContext>(
+            TFailurePathContext failurePathContext,
+            Action<TFailurePathContext> onChangeAction)
+            where TFailurePathContext : IFailureMechanismContext<IFailurePath>
         {
-            bool isRelevant = failureMechanismContext.WrappedData.IsRelevant;
+            bool isRelevant = failurePathContext.WrappedData.IsRelevant;
             Bitmap checkboxImage = isRelevant ? Resources.Checkbox_ticked : Resources.Checkbox_empty;
             return new StrictContextMenuItem(
-                Resources.FailureMechanismContextMenuStrip_Is_relevant,
+                Resources.FailurePathContextMenuStrip_Is_relevant,
                 Resources.FailureMechanism_IsRelevant_Description,
                 checkboxImage,
                 (sender, args) =>
                 {
-                    onChangeAction?.Invoke(failureMechanismContext);
+                    onChangeAction?.Invoke(failurePathContext);
 
-                    failureMechanismContext.WrappedData.IsRelevant = !isRelevant;
-                    failureMechanismContext.WrappedData.NotifyObservers();
+                    failurePathContext.WrappedData.IsRelevant = !isRelevant;
+                    failurePathContext.WrappedData.NotifyObservers();
                 });
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs
===================================================================
diff -u -re07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8 -r091428672ce70930856bf22a225701c6d04759b2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision e07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision 091428672ce70930856bf22a225701c6d04759b2)
@@ -24,16 +24,17 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.TestUtil;
 using Core.Gui.ContextMenu;
 using Core.Gui.Helpers;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.ChangeHandlers;
 using Riskeer.Common.Forms.PresentationObjects;
@@ -445,21 +446,18 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void CreateToggleRelevancyOfFailureMechanismItem_IsRelevant_CreateDecoratedItem(bool isRelevant)
+        public void CreateToggleRelevancyOfFailurePathItem_IsRelevant_CreateDecoratedItem(bool isRelevant)
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSection = mocks.StrictMock<IAssessmentSection>();
-
+            var failurePath = mocks.StrictMock<IFailurePath>();
+            failurePath.Expect(fp => fp.IsRelevant).Return(isRelevant);
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailurePath>>();
+            failurePathContext.Expect(fpc => fpc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
-            var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>())
-            {
-                IsRelevant = isRelevant
-            };
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
 
             // Call
-            StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailureMechanismItem(failureMechanismContext, null);
+            StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailurePathItem(failurePathContext, null);
 
             // Assert
             Assert.AreEqual("I&s relevant", toolStripItem.Text);
@@ -473,20 +471,21 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void CreateToggleRelevancyOfFailureMechanismItem_PerformClickOnRelevanceItem_RelevanceChangedAndObserversNotified(bool isRelevant)
+        public void CreateToggleRelevancyOfFailurePathItem_PerformClickOnRelevanceItem_RelevanceChangedAndObserversNotified(bool isRelevant)
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.StrictMock<IFailureMechanism>();
-            failureMechanism.Expect(fm => fm.NotifyObservers());
-            failureMechanism.Expect(fm => fm.IsRelevant).Return(isRelevant);
-            failureMechanism.Expect(fm => fm.IsRelevant).SetPropertyWithArgument(!isRelevant);
-            var assessmentSection = mocks.StrictMock<IAssessmentSection>();
+            var failurePath = mocks.StrictMock<IFailurePath>();
+            failurePath.Expect(fp => fp.IsRelevant).Return(isRelevant);
+            failurePath.Expect(fp => fp.IsRelevant).SetPropertyWithArgument(!isRelevant);
+            failurePath.Expect(fp => fp.NotifyObservers());
+
+            var failurePathContext = mocks.StrictMock<IFailureMechanismContext<IFailurePath>>();
+            failurePathContext.Stub(fmc => fmc.WrappedData).Return(failurePath);
             mocks.ReplayAll();
 
-            var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection);
             var actionCounter = 0;
-            StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailureMechanismItem(failureMechanismContext, context => actionCounter++);
+            StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailurePathItem(failurePathContext, context => actionCounter++);
 
             // Call
             toolStripItem.PerformClick();