Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/CloseForFailureMechanismView.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r26691c7407e3ec151feeef0f79f1953483591938
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/CloseForFailureMechanismView.cs	(.../CloseForFailureMechanismView.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/CloseForFailureMechanismView.cs	(.../CloseForFailureMechanismView.cs)	(revision 26691c7407e3ec151feeef0f79f1953483591938)
@@ -23,6 +23,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Views;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.Common.Forms.Views
 {
@@ -34,23 +35,23 @@
         /// <summary>
         /// Creates a new instance of <see cref="CloseForFailureMechanismView"/>.
         /// </summary>
-        /// <param name="failureMechanism">The failure mechanism belonging to the view.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
+        /// <param name="failurePath">The failure path belonging to the view.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failurePath"/>
         /// is <c>null</c>.</exception>
-        protected CloseForFailureMechanismView(IFailureMechanism failureMechanism)
+        protected CloseForFailureMechanismView(IFailurePath failurePath)
         {
-            if (failureMechanism == null)
+            if (failurePath == null)
             {
-                throw new ArgumentNullException(nameof(failureMechanism));
+                throw new ArgumentNullException(nameof(failurePath));
             }
 
-            FailureMechanism = failureMechanism;
+            FailurePath = failurePath;
         }
 
         /// <summary>
-        /// Gets the <see cref="IFailureMechanism"/> the view belongs to.
+        /// Gets the <see cref="IFailurePath"/> the view belongs to.
         /// </summary>
-        public IFailureMechanism FailureMechanism { get; }
+        public IFailurePath FailurePath { get; }
 
         public object Data { get; set; }
     }
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionsView.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r26691c7407e3ec151feeef0f79f1953483591938
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionsView.cs	(.../FailureMechanismSectionsView.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionsView.cs	(.../FailureMechanismSectionsView.cs)	(revision 26691c7407e3ec151feeef0f79f1953483591938)
@@ -24,6 +24,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Forms.Helpers;
 using Riskeer.Common.Forms.Properties;
 
@@ -44,19 +45,19 @@
         /// Creates a new instance of <see cref="FailureMechanismSectionsView"/>.
         /// </summary>
         /// <param name="sections">The sections to be displayed in the view.</param>
-        /// <param name="failureMechanism">The failure mechanism the view belongs to.</param>
+        /// <param name="failurePath">The failure path the view belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public FailureMechanismSectionsView(IEnumerable<FailureMechanismSection> sections, IFailureMechanism failureMechanism)
-            : base(failureMechanism)
+        public FailureMechanismSectionsView(IEnumerable<FailureMechanismSection> sections, IFailurePath failurePath)
+            : base(failurePath)
         {
             if (sections == null)
             {
                 throw new ArgumentNullException(nameof(sections));
             }
 
-            if (failureMechanism == null)
+            if (failurePath == null)
             {
-                throw new ArgumentNullException(nameof(failureMechanism));
+                throw new ArgumentNullException(nameof(failurePath));
             }
 
             InitializeComponent();
@@ -76,7 +77,7 @@
 
             failureMechanismObserver = new Observer(HandleFailureMechanismSectionsChange)
             {
-                Observable = failureMechanism
+                Observable = failurePath
             };
 
             Sections = sections;
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r26691c7407e3ec151feeef0f79f1953483591938
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs	(.../FailureMechanismTestHelper.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs	(.../FailureMechanismTestHelper.cs)	(revision 26691c7407e3ec151feeef0f79f1953483591938)
@@ -25,6 +25,7 @@
 using Core.Common.Base.Geometry;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.Common.Data.TestUtil
 {
@@ -34,17 +35,17 @@
     public static class FailureMechanismTestHelper
     {
         /// <summary>
-        /// Sets a collection of <see cref="FailureMechanismSection"/> to <see cref="IFailureMechanism.Sections"/>
+        /// Sets a collection of <see cref="FailureMechanismSection"/> to <see cref="IFailurePath.Sections"/>
         /// with an empty source path.
         /// </summary>
-        /// <param name="failureMechanism">The failure mechanism to set the sections to.</param>
+        /// <param name="failurePath">The failure path to set the sections to.</param>
         /// <param name="sections">The sections to set.</param>
         /// <exception cref="ArgumentNullException">Thrown when <see cref="sections"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="sections"/> contains elements that
         /// are not properly connected.</exception>
-        public static void SetSections(IFailureMechanism failureMechanism, IEnumerable<FailureMechanismSection> sections)
+        public static void SetSections(IFailurePath failurePath, IEnumerable<FailureMechanismSection> sections)
         {
-            failureMechanism.SetSections(sections, string.Empty);
+            failurePath.SetSections(sections, string.Empty);
         }
 
         /// <summary>
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/CloseForFailureMechanismViewTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r26691c7407e3ec151feeef0f79f1953483591938
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/CloseForFailureMechanismViewTest.cs	(.../CloseForFailureMechanismViewTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/CloseForFailureMechanismViewTest.cs	(.../CloseForFailureMechanismViewTest.cs)	(revision 26691c7407e3ec151feeef0f79f1953483591938)
@@ -23,8 +23,8 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Views;
 using NUnit.Framework;
-using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.TestUtil;
+using Rhino.Mocks;
+using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Forms.Views;
 
 namespace Riskeer.Common.Forms.Test.Views
@@ -33,36 +33,40 @@
     public class CloseForFailureMechanismViewTest
     {
         [Test]
-        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+        public void Constructor_FailurePathNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () => new TestCloseForFailureMechanismView(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("failureMechanism", exception.ParamName);
+            Assert.AreEqual("failurePath", exception.ParamName);
         }
 
         [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var failureMechanism = new TestFailureMechanism();
+            var mocks = new MockRepository();
+            var failurePath = mocks.Stub<IFailurePath>();
+            mocks.ReplayAll();
 
             // Call
-            var view = new TestCloseForFailureMechanismView(failureMechanism);
+            var view = new TestCloseForFailureMechanismView(failurePath);
 
             // Assert
             Assert.IsInstanceOf<UserControl>(view);
             Assert.IsInstanceOf<IView>(view);
             Assert.IsNull(view.Data);
-            Assert.AreSame(failureMechanism, view.FailureMechanism);
+            Assert.AreSame(failurePath, view.FailurePath);
             CollectionAssert.IsEmpty(view.Controls);
+            
+            mocks.VerifyAll();
         }
 
         private class TestCloseForFailureMechanismView : CloseForFailureMechanismView
         {
-            public TestCloseForFailureMechanismView(IFailureMechanism failureMechanism) : base(failureMechanism) {}
+            public TestCloseForFailureMechanismView(IFailurePath failurePath) : base(failurePath) {}
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r26691c7407e3ec151feeef0f79f1953483591938
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs	(.../FailureMechanismSectionsViewTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs	(.../FailureMechanismSectionsViewTest.cs)	(revision 26691c7407e3ec151feeef0f79f1953483591938)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.TestUtil;
 using Riskeer.Common.Forms.Views;
@@ -81,18 +82,18 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var failurePath = mocks.Stub<IFailurePath>();
             mocks.ReplayAll();
 
             IEnumerable<FailureMechanismSection> sections = Enumerable.Empty<FailureMechanismSection>();
 
             // Call
-            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(sections, failureMechanism))
+            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(sections, failurePath))
             {
                 // Assert
                 Assert.IsInstanceOf<CloseForFailureMechanismView>(view);
                 Assert.IsNull(view.Data);
-                Assert.AreSame(failureMechanism, view.FailureMechanism);
+                Assert.AreSame(failurePath, view.FailurePath);
                 Assert.AreEqual(1, view.Controls.Count);
 
                 DataGridViewControl sectionsDataGridViewControl = GetSectionsDataGridViewControl(view);
@@ -116,13 +117,13 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var failurePath = mocks.Stub<IFailurePath>();
             mocks.ReplayAll();
 
             IEnumerable<FailureMechanismSection> sections = Enumerable.Empty<FailureMechanismSection>();
 
             // Call
-            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(sections, failureMechanism))
+            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(sections, failurePath))
             {
                 // Assert
                 CollectionAssert.IsEmpty(GetSectionsDataGridViewControl(view).Rows);
@@ -136,7 +137,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var failurePath = mocks.Stub<IFailurePath>();
             mocks.ReplayAll();
 
             FailureMechanismSection[] sections =
@@ -147,7 +148,7 @@
             };
 
             // Call
-            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(sections, failureMechanism))
+            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(sections, failurePath))
             {
                 // Assert
                 DataGridViewControl sectionsDataGridViewControl = GetSectionsDataGridViewControl(view);
@@ -162,7 +163,7 @@
         public void GivenViewWithSections_WhenFailureMechanismNotifiesChangeAndSectionsUpdated_ThenDataGridViewUpdated()
         {
             // Given
-            var failureMechanism = new TestFailureMechanism();
+            var failureMechanism = new SpecificFailurePath();
             FailureMechanismTestHelper.SetSections(failureMechanism, new[]
             {
                 CreateFailureMechanismSection("a")
@@ -191,13 +192,13 @@
         public void GivenViewWithSections_WhenFailureMechanismNotifiesChangeAndSectionsNotUpdated_ThenDataGridViewNotUpdated()
         {
             // Given
-            var failureMechanism = new TestFailureMechanism();
-            FailureMechanismTestHelper.SetSections(failureMechanism, new[]
+            var failurePath = new SpecificFailurePath();
+            FailureMechanismTestHelper.SetSections(failurePath, new[]
             {
                 CreateFailureMechanismSection("a")
             });
 
-            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(failureMechanism.Sections, failureMechanism))
+            using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(failurePath.Sections, failurePath))
             {
                 DataGridView sectionsDataGridView = GetSectionsDataGridView(view);
 
@@ -206,7 +207,7 @@
                 sectionsDataGridView.Invalidated += (s, e) => { invalidated = true; };
 
                 // When
-                failureMechanism.NotifyObservers();
+                failurePath.NotifyObservers();
 
                 // Then
                 Assert.IsFalse(invalidated);
@@ -260,9 +261,9 @@
         }
 
         private FailureMechanismSectionsView ShowFailureMechanismSectionsView(IEnumerable<FailureMechanismSection> sections,
-                                                                              IFailureMechanism failureMechanism)
+                                                                              IFailurePath failurePath)
         {
-            var view = new FailureMechanismSectionsView(sections, failureMechanism);
+            var view = new FailureMechanismSectionsView(sections, failurePath);
 
             testForm.Controls.Add(view);
             testForm.Show();