Index: Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/PartialProbabilisticPipingOutput.cs
===================================================================
diff -u -ra36569a4e6c4a7b2369e8322e6150067f9d64845 -r6d84790ac64baca2a629327ff25a0a4a6fb33fa1
--- Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/PartialProbabilisticPipingOutput.cs	(.../PartialProbabilisticPipingOutput.cs)	(revision a36569a4e6c4a7b2369e8322e6150067f9d64845)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/PartialProbabilisticPipingOutput.cs	(.../PartialProbabilisticPipingOutput.cs)	(revision 6d84790ac64baca2a629327ff25a0a4a6fb33fa1)
@@ -35,7 +35,7 @@
         /// </summary>
         /// <param name="reliability">The reliability of the calculation.</param>
         /// <param name="generalResult">The general result of this output with the fault tree illustration points.</param>
-        public PartialProbabilisticPipingOutput(
+        protected PartialProbabilisticPipingOutput(
             double reliability, GeneralResult<T> generalResult)
         {
             Reliability = reliability;
Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs
===================================================================
diff -u -ra36569a4e6c4a7b2369e8322e6150067f9d64845 -r6d84790ac64baca2a629327ff25a0a4a6fb33fa1
--- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs	(.../ProbabilisticPipingCalculationService.cs)	(revision a36569a4e6c4a7b2369e8322e6150067f9d64845)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs	(.../ProbabilisticPipingCalculationService.cs)	(revision 6d84790ac64baca2a629327ff25a0a4a6fb33fa1)
@@ -233,8 +233,8 @@
                                calculation.Name, Resources.ProbabilisticPipingCalculationService_ProfileSpecific, e.Message);
             }
 
-            return new PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>(profileSpecificCalculator.ExceedanceProbabilityBeta,
-                                                                                            generalResult);
+            return new PartialProbabilisticFaultTreePipingOutput(profileSpecificCalculator.ExceedanceProbabilityBeta,
+                                                                 generalResult);
         }
 
         /// <summary>
@@ -278,8 +278,8 @@
                                calculation.Name, Resources.ProbabilisticPipingCalculationService_SectionSpecific, e.Message);
             }
 
-            return new PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>(sectionSpecificCalculator.ExceedanceProbabilityBeta,
-                                                                                            generalResult);
+            return new PartialProbabilisticFaultTreePipingOutput(sectionSpecificCalculator.ExceedanceProbabilityBeta,
+                                                                 generalResult);
         }
 
         /// <summary>
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -r9d1525ff8b7757cf754ddd7dbc0d73c5ce41769c -r6d84790ac64baca2a629327ff25a0a4a6fb33fa1
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 9d1525ff8b7757cf754ddd7dbc0d73c5ce41769c)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 6d84790ac64baca2a629327ff25a0a4a6fb33fa1)
@@ -603,29 +603,34 @@
         public static PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> GetRandomPartialProbabilisticPipingOutput(
             GeneralResult<TestTopLevelIllustrationPoint> generalResult)
         {
-            return GetRandomPartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint>(generalResult);
+            var random = new Random(21);
+
+            return new TestPartialProbabilisticPipingOutput(random.NextDouble(),
+                                                            generalResult);
         }
 
         /// <summary>
-        /// Creates a random instance of <see cref="PartialProbabilisticPipingOutput{T}"/>
-        /// with <see cref="TopLevelFaultTreeIllustrationPoint"/>. 
+        /// Creates a random instance of <see cref="PartialProbabilisticFaultTreePipingOutput"/>.
         /// </summary>
-        /// <returns>The created <see cref="PartialProbabilisticPipingOutput{T}"/>.</returns>
-        public static PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> GetRandomPartialProbabilisticFaultTreePipingOutput()
+        /// <returns>The created <see cref="PartialProbabilisticFaultTreePipingOutput"/>.</returns>
+        public static PartialProbabilisticFaultTreePipingOutput GetRandomPartialProbabilisticFaultTreePipingOutput()
         {
             return GetRandomPartialProbabilisticFaultTreePipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
         }
 
         /// <summary>
-        /// Creates a random instance of <see cref="PartialProbabilisticPipingOutput{T}"/>
+        /// Creates a random instance of <see cref="PartialProbabilisticFaultTreePipingOutput"/>
         /// with <see cref="TopLevelFaultTreeIllustrationPoint"/>. 
         /// </summary>
         /// <param name="generalResult">The <see cref="GeneralResult{T}"/> to set to the output.</param>
-        /// <returns>The created <see cref="PartialProbabilisticPipingOutput{T}"/>.</returns>
-        public static PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> GetRandomPartialProbabilisticFaultTreePipingOutput(
+        /// <returns>The created <see cref="PartialProbabilisticFaultTreePipingOutput"/>.</returns>
+        public static PartialProbabilisticFaultTreePipingOutput GetRandomPartialProbabilisticFaultTreePipingOutput(
             GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult)
         {
-            return GetRandomPartialProbabilisticPipingOutput(generalResult);
+            var random = new Random(21);
+
+            return new PartialProbabilisticFaultTreePipingOutput(random.NextDouble(),
+                                                                 generalResult);
         }
 
         /// <summary>
@@ -647,20 +652,5 @@
             return new ProbabilisticPipingOutput(GetRandomPartialProbabilisticPipingOutput(null),
                                                  GetRandomPartialProbabilisticPipingOutput(null));
         }
-
-        /// <summary>
-        /// Creates a random instance of <see cref="PartialProbabilisticPipingOutput{T}"/>.
-        /// </summary>
-        /// <param name="generalResult">The general result to set to the output.</param>
-        /// <returns>The created <see cref="PartialProbabilisticPipingOutput{T}"/>.</returns>
-        /// <typeparam name="T">The type of the top level illustration point.</typeparam>
-        private static PartialProbabilisticPipingOutput<T> GetRandomPartialProbabilisticPipingOutput<T>(GeneralResult<T> generalResult)
-            where T : TopLevelIllustrationPointBase
-        {
-            var random = new Random(21);
-
-            return new PartialProbabilisticPipingOutput<T>(random.NextDouble(),
-                                                           generalResult);
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensions.cs
===================================================================
diff -u -rea609f4592fa0a0df54670689af45c1c6462816d -r6d84790ac64baca2a629327ff25a0a4a6fb33fa1
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensions.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensions.cs)	(revision ea609f4592fa0a0df54670689af45c1c6462816d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensions.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensions.cs)	(revision 6d84790ac64baca2a629327ff25a0a4a6fb33fa1)
@@ -50,10 +50,10 @@
             }
 
             return new ProbabilisticPipingOutput(
-                new PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>(
+                new PartialProbabilisticFaultTreePipingOutput(
                     entity.SectionSpecificReliability.ToNullAsNaN(),
                     entity.GeneralResultFaultTreeIllustrationPointEntity1?.Read()),
-                new PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>(
+                new PartialProbabilisticFaultTreePipingOutput(
                     entity.ProfileSpecificReliability.ToNullAsNaN(),
                     entity.GeneralResultFaultTreeIllustrationPointEntity?.Read()));
         }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs
===================================================================
diff -u -r3e0ebf71d8d9015968bf707685f45015f387891b -r6d84790ac64baca2a629327ff25a0a4a6fb33fa1
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs	(.../ProbabilisticPipingOutputCreateExtensionsTest.cs)	(revision 3e0ebf71d8d9015968bf707685f45015f387891b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs	(.../ProbabilisticPipingOutputCreateExtensionsTest.cs)	(revision 6d84790ac64baca2a629327ff25a0a4a6fb33fa1)
@@ -66,8 +66,8 @@
         {
             // Setup
             var output = new ProbabilisticPipingOutput(
-                new PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>(double.NaN, null),
-                new PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>(double.NaN, null));
+                new PartialProbabilisticFaultTreePipingOutput(double.NaN, null),
+                new PartialProbabilisticFaultTreePipingOutput(double.NaN, null));
 
             // Call
             ProbabilisticPipingCalculationOutputEntity entity = output.Create();