Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs
===================================================================
diff -u -r84bbd7997930ce609be01fa84204442a286bff19 -rdd65da2990c97928228adfc407a0981c87c61331
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs	(.../CommonCloneAssert.cs)	(revision 84bbd7997930ce609be01fa84204442a286bff19)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs	(.../CommonCloneAssert.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
@@ -226,7 +226,7 @@
         /// <param name="clone">The cloned object.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="original"/> and
         /// <paramref name="clone"/> are not clones.</exception>
-        /// <typeparam name="T">The type of the illustration point.</typeparam>
+        /// <typeparam name="T">The type of the top level illustration point.</typeparam>
         public static void AreClones<T>(GeneralResult<T> original, GeneralResult<T> clone)
             where T : TopLevelIllustrationPointBase
         {
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputProperties.cs
===================================================================
diff -u -rf5ee938161e04a74dbfd9db0f497ba8a38737594 -rdd65da2990c97928228adfc407a0981c87c61331
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputProperties.cs	(.../ProbabilisticPipingProfileSpecificOutputProperties.cs)	(revision f5ee938161e04a74dbfd9db0f497ba8a38737594)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputProperties.cs	(.../ProbabilisticPipingProfileSpecificOutputProperties.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
@@ -40,9 +40,9 @@
 namespace Riskeer.Piping.Forms.PropertyClasses.Probabilistic
 {
     /// <summary>
-    /// ViewModel of profile specific <see cref="PartialProbabilisticPipingOutput"/> for properties panel.
+    /// ViewModel of profile specific <see cref="PartialProbabilisticFaultTreePipingOutput"/> for properties panel.
     /// </summary>
-    public class ProbabilisticPipingProfileSpecificOutputProperties : ObjectProperties<PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>>
+    public class ProbabilisticPipingProfileSpecificOutputProperties : ObjectProperties<PartialProbabilisticFaultTreePipingOutput>
     {
         private readonly ProbabilityAssessmentOutput derivedOutput;
 
@@ -54,7 +54,7 @@
         /// <param name="failureMechanism">The failure mechanism the output belongs to.</param>
         /// <param name="assessmentSection">The assessment section the output belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public ProbabilisticPipingProfileSpecificOutputProperties(PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output,
+        public ProbabilisticPipingProfileSpecificOutputProperties(PartialProbabilisticFaultTreePipingOutput output,
                                                                   ProbabilisticPipingCalculationScenario calculation,
                                                                   PipingFailureMechanism failureMechanism,
                                                                   IAssessmentSection assessmentSection)
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputProperties.cs
===================================================================
diff -u -rf5ee938161e04a74dbfd9db0f497ba8a38737594 -rdd65da2990c97928228adfc407a0981c87c61331
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputProperties.cs	(.../ProbabilisticPipingSectionSpecificOutputProperties.cs)	(revision f5ee938161e04a74dbfd9db0f497ba8a38737594)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputProperties.cs	(.../ProbabilisticPipingSectionSpecificOutputProperties.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
@@ -38,16 +38,16 @@
 namespace Riskeer.Piping.Forms.PropertyClasses.Probabilistic
 {
     /// <summary>
-    /// ViewModel of section specific <see cref="PartialProbabilisticPipingOutput"/> for properties panel.
+    /// ViewModel of section specific <see cref="PartialProbabilisticFaultTreePipingOutput"/> for properties panel.
     /// </summary>
-    public class ProbabilisticPipingSectionSpecificOutputProperties : ObjectProperties<PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>>
+    public class ProbabilisticPipingSectionSpecificOutputProperties : ObjectProperties<PartialProbabilisticFaultTreePipingOutput>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ProbabilisticPipingSectionSpecificOutputProperties"/>.
         /// </summary>
         /// <param name="output">The output to show the properties for.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="output"/> is <c>null</c>.</exception>
-        public ProbabilisticPipingSectionSpecificOutputProperties(PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output)
+        public ProbabilisticPipingSectionSpecificOutputProperties(PartialProbabilisticFaultTreePipingOutput output)
         {
             if (output == null)
             {
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r12d93225efe19973f24f0c9d0ff427d4aad39957 -rdd65da2990c97928228adfc407a0981c87c61331
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 12d93225efe19973f24f0c9d0ff427d4aad39957)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
@@ -129,14 +129,14 @@
             };
             yield return new PropertyInfo<ProbabilisticPipingProfileSpecificOutputContext, ProbabilisticPipingProfileSpecificOutputProperties>
             {
-                CreateInstance = context => new ProbabilisticPipingProfileSpecificOutputProperties((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) context.WrappedData.Output?.ProfileSpecificOutput,
+                CreateInstance = context => new ProbabilisticPipingProfileSpecificOutputProperties((PartialProbabilisticFaultTreePipingOutput) context.WrappedData.Output?.ProfileSpecificOutput,
                                                                                                    context.WrappedData,
                                                                                                    context.FailureMechanism,
                                                                                                    context.AssessmentSection)
             };
             yield return new PropertyInfo<ProbabilisticPipingSectionSpecificOutputContext, ProbabilisticPipingSectionSpecificOutputProperties>
             {
-                CreateInstance = context => new ProbabilisticPipingSectionSpecificOutputProperties((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) context.WrappedData.Output?.SectionSpecificOutput)
+                CreateInstance = context => new ProbabilisticPipingSectionSpecificOutputProperties((PartialProbabilisticFaultTreePipingOutput) context.WrappedData.Output?.SectionSpecificOutput)
             };
         }
 
@@ -321,7 +321,7 @@
                 Image = RiskeerCommonFormsResources.GeneralOutputIcon,
                 CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
                 CreateInstance = context => new ProbabilisticPipingProfileSpecificOutputView(
-                    () => ((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)context.WrappedData.Output?.ProfileSpecificOutput)?.GeneralResult)
+                    () => ((PartialProbabilisticFaultTreePipingOutput)context.WrappedData.Output?.ProfileSpecificOutput)?.GeneralResult)
             };
 
             yield return new ViewInfo<ProbabilisticPipingSectionSpecificOutputContext, ProbabilisticPipingCalculationScenario, ProbabilisticPipingSectionSpecificOutputView>
@@ -331,7 +331,7 @@
                 Image = RiskeerCommonFormsResources.GeneralOutputIcon,
                 CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
                 CreateInstance = context => new ProbabilisticPipingSectionSpecificOutputView(
-                    () => ((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)context.WrappedData.Output?.ProfileSpecificOutput)?.GeneralResult)
+                    () => ((PartialProbabilisticFaultTreePipingOutput)context.WrappedData.Output?.SectionSpecificOutput)?.GeneralResult)
             };
         }
 
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs
===================================================================
diff -u -r5a1523cf9ad3cf1bf5c66e1f8a3323efe5afe061 -rdd65da2990c97928228adfc407a0981c87c61331
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs)	(revision 5a1523cf9ad3cf1bf5c66e1f8a3323efe5afe061)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
@@ -138,7 +138,7 @@
         public void Constructor_WithParameters_ExpectedValues()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
             TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
 
             var calculation = new ProbabilisticPipingCalculationScenario
@@ -164,7 +164,7 @@
         public void Constructor_HasGeneralResult_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
             TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
 
             var calculation = new ProbabilisticPipingCalculationScenario
@@ -259,7 +259,7 @@
         public void Constructor_NoGeneralResult_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
             TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
 
             var calculation = new ProbabilisticPipingCalculationScenario
@@ -331,7 +331,7 @@
                 }
             };
 
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
 
             // Call
             var properties = new ProbabilisticPipingProfileSpecificOutputProperties(output,
@@ -371,7 +371,7 @@
         public void IllustrationPoints_WithoutGeneralResult_ReturnsEmptyTopLevelFaultTreeIllustrationPointPropertiesArray()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
             var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
 
             // Call
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs
===================================================================
diff -u -r5a1523cf9ad3cf1bf5c66e1f8a3323efe5afe061 -rdd65da2990c97928228adfc407a0981c87c61331
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs)	(revision 5a1523cf9ad3cf1bf5c66e1f8a3323efe5afe061)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
@@ -67,21 +67,21 @@
         public void Constructor_WithParameters_ExpectedValues()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
 
             // Call
             var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>>>(properties);
+            Assert.IsInstanceOf<ObjectProperties<PartialProbabilisticFaultTreePipingOutput>>(properties);
             Assert.AreSame(output, properties.Data);
         }
 
         [Test]
         public void Constructor_HasGeneralResult_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
 
             // Call
             var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
@@ -143,7 +143,7 @@
         public void Constructor_NoGeneralResult_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
 
             // Call
             var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
@@ -182,7 +182,7 @@
                 }
             };
 
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
 
             // Call
             var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
@@ -217,7 +217,7 @@
         public void IllustrationPoints_WithoutGeneralResult_ReturnsEmptyTopLevelFaultTreeIllustrationPointPropertiesArray()
         {
             // Setup
-            PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
+            PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null);
             var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
 
             // Call