Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingProbabilityFailureMechanismSectionResultContext.cs
===================================================================
diff -u
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingProbabilityFailureMechanismSectionResultContext.cs	(revision 0)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingProbabilityFailureMechanismSectionResultContext.cs	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Forms.PresentationObjects;
+using Riskeer.Piping.Data;
+
+namespace Riskeer.Piping.Forms.PresentationObjects
+{
+    /// <summary>
+    /// This class is a presentation object for a collection of <see cref="AdoptableWithProfileProbabilityFailureMechanismSectionResult"/>
+    /// for the <see cref="PipingFailureMechanism"/>.
+    /// </summary>
+    public class PipingProbabilityFailureMechanismSectionResultContext : ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PipingProbabilityFailureMechanismSectionResultContext"/>.
+        /// </summary>
+        /// <param name="wrappedSectionResults">The <see cref="IObservableEnumerable{T}"/>
+        /// of <see cref="AdoptableFailureMechanismSectionResult"/> to wrap.</param>
+        /// <param name="failureMechanism">The <see cref="PipingFailureMechanism"/>
+        /// the <paramref name="wrappedSectionResults"/> belongs to.</param>
+        /// <param name="assessmentSection">The assessment section the section results belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public PipingProbabilityFailureMechanismSectionResultContext(IObservableEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResult> wrappedSectionResults,
+                                                                     PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+            : base(wrappedSectionResults, failureMechanism, assessmentSection) {}
+    }
+}
\ No newline at end of file
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r5b1bf9e3b1471bf8358d2a0462ed468393908083 -r1a74cf8870ea2f43e667b624b90347a5a3b71704
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 5b1bf9e3b1471bf8358d2a0462ed468393908083)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
@@ -258,7 +258,7 @@
             };
 
             yield return new RiskeerViewInfo<
-                ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>,
+                PipingProbabilityFailureMechanismSectionResultContext,
                 IObservableEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResult>,
                 PipingFailureMechanismResultView>(() => Gui)
             {
@@ -395,7 +395,7 @@
                 CalculationGroupContextContextMenuStrip,
                 CalculationGroupContextOnNodeRemoved);
 
-            yield return new TreeNodeInfo<ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>>
+            yield return new TreeNodeInfo<PipingProbabilityFailureMechanismSectionResultContext>
             {
                 Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon,
@@ -887,7 +887,7 @@
                                                               assessmentSection,
                                                               () => probabilityAssessmentInput.GetN(assessmentSection.ReferenceLine.Length)),
                 new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection),
-                new ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                new PipingProbabilityFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
             };
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingProbabilityFailureMechanismSectionResultContextTest.cs
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingProbabilityFailureMechanismSectionResultContextTest.cs	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingProbabilityFailureMechanismSectionResultContextTest.cs	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
@@ -0,0 +1,54 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+using Rhino.Mocks;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Forms.PresentationObjects;
+using Riskeer.Piping.Data;
+using Riskeer.Piping.Forms.PresentationObjects;
+
+namespace Riskeer.Piping.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class PipingProbabilityFailureMechanismSectionResultContextTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var failureMechanism = new PipingFailureMechanism();
+
+            // Call
+            var context = new PipingProbabilityFailureMechanismSectionResultContext(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection);
+
+            // Assert
+            Assert.IsInstanceOf<ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>>(context);
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -r5b1bf9e3b1471bf8358d2a0462ed468393908083 -r1a74cf8870ea2f43e667b624b90347a5a3b71704
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 5b1bf9e3b1471bf8358d2a0462ed468393908083)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
@@ -34,7 +34,6 @@
 using Rhino.Mocks;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Forms.PropertyClasses;
 using Riskeer.Common.Forms.Views;
 using Riskeer.Piping.Data.Probabilistic;
@@ -166,7 +165,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(SemiProbabilisticPipingCalculationScenarioContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingCalculationGroupContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(SemiProbabilisticPipingInputContext)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingProbabilityFailureMechanismSectionResultContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(SemiProbabilisticPipingOutputContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingScenariosContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptySemiProbabilisticPipingOutput)));
@@ -214,7 +213,7 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>),
+                    typeof(PipingProbabilityFailureMechanismSectionResultContext),
                     typeof(IObservableEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResult>),
                     typeof(PipingFailureMechanismResultView));
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5b1bf9e3b1471bf8358d2a0462ed468393908083 -r1a74cf8870ea2f43e667b624b90347a5a3b71704
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision 5b1bf9e3b1471bf8358d2a0462ed468393908083)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
@@ -32,7 +32,6 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.PresentationObjects;
@@ -163,7 +162,7 @@
             Assert.AreSame(failureMechanism.CalculationsGroup, failureMechanismScenariosContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismScenariosContext.AssessmentSection);
 
-            var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (PipingProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5b1bf9e3b1471bf8358d2a0462ed468393908083 -r1a74cf8870ea2f43e667b624b90347a5a3b71704
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 5b1bf9e3b1471bf8358d2a0462ed468393908083)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
@@ -28,9 +28,8 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Piping.Data;
+using Riskeer.Piping.Forms.PresentationObjects;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
 namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos
@@ -47,7 +46,7 @@
         {
             mocks = new MockRepository();
             plugin = new PipingPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>));
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingProbabilityFailureMechanismSectionResultContext));
         }
 
         [TearDown]
@@ -92,7 +91,7 @@
             mocks.ReplayAll();
 
             var mechanism = new PipingFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>(mechanism.SectionResults, mechanism, assessmentSection);
+            var context = new PipingProbabilityFailureMechanismSectionResultContext(mechanism.SectionResults, mechanism, assessmentSection);
 
             // Call
             string text = info.Text(context);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r5b1bf9e3b1471bf8358d2a0462ed468393908083 -r1a74cf8870ea2f43e667b624b90347a5a3b71704
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 5b1bf9e3b1471bf8358d2a0462ed468393908083)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
@@ -29,7 +29,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Forms.PresentationObjects;
 using Riskeer.Piping.Forms.Views;
@@ -61,7 +60,7 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>), info.DataType);
+            Assert.AreEqual(typeof(PipingProbabilityFailureMechanismSectionResultContext), info.DataType);
             Assert.AreEqual(typeof(IObservableEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResult>), info.ViewDataType);
         }
 
@@ -73,7 +72,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             mocks.ReplayAll();
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+            var context = new PipingProbabilityFailureMechanismSectionResultContext(
                 failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
@@ -266,7 +265,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             mocks.ReplayAll();
 
-            var context = new ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+            var context = new PipingProbabilityFailureMechanismSectionResultContext(
                 failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call