Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -re72b7c913b164e9dc9ca4aeafb52aa1e85ba6346 -r4aacf6e6a26c58c87916eff2025de429150669d1
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision e72b7c913b164e9dc9ca4aeafb52aa1e85ba6346)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 4aacf6e6a26c58c87916eff2025de429150669d1)
@@ -39,9 +39,9 @@
     /// <typeparam name="TSectionResultRow">The type of the row that is used to show the data.</typeparam>
     /// <typeparam name="TFailureMechanism">The type of the failure mechanism this view belongs to.</typeparam>
     public abstract partial class FailureMechanismResultView<TSectionResult, TSectionResultRow, TFailureMechanism> : UserControl, IView
-        where TSectionResult : FailureMechanismSectionResultOld
-        where TSectionResultRow : FailureMechanismSectionResultRowOld<TSectionResult>
-        where TFailureMechanism : IHasSectionResults<TSectionResult>
+        where TSectionResult : FailureMechanismSectionResult
+        where TSectionResultRow : FailureMechanismSectionResultRow<TSectionResult>
+        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
     {
         private readonly IObservableEnumerable<TSectionResult> failureMechanismSectionResults;
         private readonly Observer failureMechanismObserver;
@@ -52,7 +52,7 @@
         private bool rowUpdating;
 
         /// <summary>
-        /// Creates a new instance of <see cref="FailureMechanismResultViewOld{TSectionResult,TSectionResultRow,TFailureMechanism,TAssemblyResultControl}"/>.
+        /// Creates a new instance of <see cref="FailureMechanismResultView{TSectionResult,TSectionResultRow,TFailureMechanism}"/>.
         /// </summary>
         /// <param name="failureMechanismSectionResults">The collection of <typeparamref name="TSectionResult"/> to
         /// show in the view.</param>
@@ -112,7 +112,7 @@
 
         /// <summary>
         /// Creates a display object for <paramref name="sectionResult"/> which is added to the
-        /// <see cref="DataGridView"/> on the <see cref="FailureMechanismResultViewOld{TSectionResult,TSectionResultRow,TFailureMechanism,TAssemblyResultControl}"/>.
+        /// <see cref="DataGridView"/> on the <see cref="FailureMechanismResultView{TSectionResult,TSectionResultRow,TFailureMechanism}"/>.
         /// </summary>
         /// <param name="sectionResult">The <typeparamref name="TSectionResult"/> for which to create a
         /// display object.</param>
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -rac43a498c0b19cdf26f6007192ef9904f3a6fae3 -r4aacf6e6a26c58c87916eff2025de429150669d1
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision ac43a498c0b19cdf26f6007192ef9904f3a6fae3)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision 4aacf6e6a26c58c87916eff2025de429150669d1)
@@ -76,7 +76,7 @@
         public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => new TestFailureMechanismResultView(new ObservableList<FailureMechanismSectionResultOld>(), null);
+            void Call() => new TestFailureMechanismResultView(new ObservableList<FailureMechanismSectionResult>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -90,7 +90,7 @@
             var failureMechanism = new TestFailureMechanism();
 
             // Call
-            using (var view = new TestFailureMechanismResultView(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new TestFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 testForm.Controls.Add(view);
                 testForm.Show();
@@ -124,7 +124,7 @@
             const int stringColumnIndex = 1;
 
             // Call
-            using (ShowFailureMechanismResultsView(new ObservableList<TestFailureMechanismSectionResultOld>()))
+            using (ShowFailureMechanismResultsView(new ObservableList<TestFailureMechanismSectionResult>()))
             {
                 // Assert
                 DataGridView dataGridView = GetDataGridView();
@@ -141,9 +141,9 @@
         public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObservers_ThenDataGridViewInvalidated()
         {
             // Given
-            TestFailureMechanismSectionResultOld sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
+            TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
 
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
                 sectionResult
             };
@@ -169,7 +169,7 @@
         public void GivenFailureMechanismResultView_WhenFailureMechanismSectionResultCollectionUpdatedAndNotifiesObservers_ThenDataGridViewUpdated()
         {
             // Given
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>();
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>();
             using (ShowFailureMechanismResultsView(sectionResults))
             {
                 DataGridView dataGridView = GetDataGridView();
@@ -178,7 +178,7 @@
                 Assert.AreEqual(0, dataGridView.RowCount);
 
                 // When
-                sectionResults.Add(FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld());
+                sectionResults.Add(FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult());
                 sectionResults.NotifyObservers();
 
                 // Then
@@ -190,14 +190,14 @@
         public void GivenFailureMechanismResultView_WhenSingleFailureMechanismSectionResultNotifiesObservers_ThenDataGridViewInvalidated()
         {
             // Given
-            TestFailureMechanismSectionResultOld sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
+            TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
 
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
                 sectionResult
             };
 
-            using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(sectionResults))
+            using (ShowFailureMechanismResultsView(sectionResults))
             {
                 var invalidated = false;
                 DataGridView dataGridView = GetDataGridView();
@@ -220,9 +220,9 @@
             bool readOnly, string errorText, CellStyle style)
         {
             // Given
-            TestFailureMechanismSectionResultOld sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
+            TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
 
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
                 sectionResult
             };
@@ -252,9 +252,9 @@
         public void GivenFailureMechanismResultView_WhenRowUpdatingAndSectionResultNotified_ThenNothingUpdates()
         {
             // Given
-            TestFailureMechanismSectionResultOld sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
+            TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
 
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
                 sectionResult
             };
@@ -284,10 +284,10 @@
         public void GivenFailureMechanismResultView_WhenSectionResultNotified_ThenAllRowsUpdatedAndViewInvalidated()
         {
             // Given
-            TestFailureMechanismSectionResultOld sectionResult1 = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
-            TestFailureMechanismSectionResultOld sectionResult2 = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
+            TestFailureMechanismSectionResult sectionResult1 = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
+            TestFailureMechanismSectionResult sectionResult2 = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
 
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
                 sectionResult1,
                 sectionResult2
@@ -320,9 +320,9 @@
         public void GivenFailureMechanismResultView_WhenRowUpdated_ThenColumnDoesNotAutoResize()
         {
             // Given
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
-                FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld()
+                FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult()
             };
 
             using (ShowFailureMechanismResultsView(sectionResults))
@@ -347,8 +347,8 @@
         public void GivenFailureMechanismResultView_WhenSectionResultNotified_ThenColumnDoesAutoResize()
         {
             // Given
-            TestFailureMechanismSectionResultOld sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
                 sectionResult
             };
@@ -376,9 +376,9 @@
         public void GivenFailureMechanismResultView_WhenResultRemovedAndSectionResultsNotified_ThenEventHandlersDisconnected()
         {
             // Given
-            TestFailureMechanismSectionResultOld sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResultOld();
+            TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult();
 
-            var sectionResults = new ObservableList<TestFailureMechanismSectionResultOld>
+            var sectionResults = new ObservableList<TestFailureMechanismSectionResult>
             {
                 sectionResult
             };
@@ -415,7 +415,7 @@
             return (DataGridView) new ControlTester("dataGridView").TheObject;
         }
 
-        private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable<FailureMechanismSectionResultOld> sectionResults)
+        private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable<FailureMechanismSectionResult> sectionResults)
         {
             var failureMechanismResultView = new TestFailureMechanismResultView(sectionResults, new TestFailureMechanism());
             testForm.Controls.Add(failureMechanismResultView);
@@ -424,16 +424,14 @@
             return failureMechanismResultView;
         }
 
-        private class TestFailureMechanismResultView : FailureMechanismResultView<FailureMechanismSectionResultOld,
-            TestRow,
-            TestFailureMechanism>
+        private class TestFailureMechanismResultView : FailureMechanismResultView<FailureMechanismSectionResult, TestRow, TestFailureMechanism>
         {
-            public TestFailureMechanismResultView(IObservableEnumerable<FailureMechanismSectionResultOld> failureMechanismSectionResults,
+            public TestFailureMechanismResultView(IObservableEnumerable<FailureMechanismSectionResult> failureMechanismSectionResults,
                                                   TestFailureMechanism failureMechanism)
                 : base(failureMechanismSectionResults, failureMechanism) {}
 
             protected override TestRow CreateFailureMechanismSectionResultRow(
-                FailureMechanismSectionResultOld sectionResult)
+                FailureMechanismSectionResult sectionResult)
             {
                 return new TestRow(sectionResult);
             }
@@ -445,11 +443,11 @@
             }
         }
 
-        private class TestRow : FailureMechanismSectionResultRowOld<FailureMechanismSectionResultOld>
+        private class TestRow : FailureMechanismSectionResultRow<FailureMechanismSectionResult>
         {
             private string testString;
 
-            public TestRow(FailureMechanismSectionResultOld sectionResult) : base(sectionResult)
+            public TestRow(FailureMechanismSectionResult sectionResult) : base(sectionResult)
             {
                 ColumnStateDefinitions.Add(0, new DataGridViewColumnStateDefinition());
             }