Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs
===================================================================
diff -u -r6d84790ac64baca2a629327ff25a0a4a6fb33fa1 -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs	(.../ProbabilisticPipingCalculationService.cs)	(revision 6d84790ac64baca2a629327ff25a0a4a6fb33fa1)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs	(.../ProbabilisticPipingCalculationService.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -167,15 +167,15 @@
 
             try
             {
-                IPartialProbabilisticPipingOutput profileSpecificOutput = CalculateProfileSpecific(
+                PartialProbabilisticFaultTreePipingOutput profileSpecificOutput = CalculateProfileSpecific(
                     calculation, generalInput, hydraulicBoundaryDatabaseFilePath, usePreprocessor);
 
                 if (canceled)
                 {
                     return;
                 }
 
-                IPartialProbabilisticPipingOutput sectionSpecificOutput = CalculateSectionSpecific(
+                PartialProbabilisticFaultTreePipingOutput sectionSpecificOutput = CalculateSectionSpecific(
                     calculation, generalInput, sectionLength, hydraulicBoundaryDatabaseFilePath, usePreprocessor);
 
                 if (canceled)
@@ -201,10 +201,10 @@
         /// <param name="generalInput">The general piping calculation input parameters.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The path which points to the hydraulic boundary database file.</param>
         /// <param name="usePreprocessor">Indicator whether to use the preprocessor in the calculation.</param>
-        /// <returns>A <see cref="PartialProbabilisticPipingOutput{T}"/>.</returns>
+        /// <returns>A <see cref="PartialProbabilisticFaultTreePipingOutput"/>.</returns>
         /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
-        private IPartialProbabilisticPipingOutput CalculateProfileSpecific(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput,
-                                                                           string hydraulicBoundaryDatabaseFilePath, bool usePreprocessor)
+        private PartialProbabilisticFaultTreePipingOutput CalculateProfileSpecific(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput,
+                                                                                   string hydraulicBoundaryDatabaseFilePath, bool usePreprocessor)
         {
             NotifyProgress(string.Format(Resources.ProbabilisticPipingCalculationService_Calculate_Executing_calculation_of_type_0,
                                          Resources.ProbabilisticPipingCalculationService_ProfileSpecific),
@@ -245,10 +245,10 @@
         /// <param name="sectionLength">The length of the section.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The path which points to the hydraulic boundary database file.</param>
         /// <param name="usePreprocessor">Indicator whether to use the preprocessor in the calculation.</param>
-        /// <returns>A <see cref="PartialProbabilisticPipingOutput{T}"/>.</returns>
+        /// <returns>A <see cref="PartialProbabilisticFaultTreePipingOutput"/>.</returns>
         /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
-        private IPartialProbabilisticPipingOutput CalculateSectionSpecific(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput,
-                                                                           double sectionLength, string hydraulicBoundaryDatabaseFilePath, bool usePreprocessor)
+        private PartialProbabilisticFaultTreePipingOutput CalculateSectionSpecific(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput,
+                                                                                   double sectionLength, string hydraulicBoundaryDatabaseFilePath, bool usePreprocessor)
         {
             NotifyProgress(string.Format(Resources.ProbabilisticPipingCalculationService_Calculate_Executing_calculation_of_type_0,
                                          Resources.ProbabilisticPipingCalculationService_SectionSpecific),
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs
===================================================================
diff -u -rdd65da2990c97928228adfc407a0981c87c61331 -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -156,7 +156,7 @@
                                                                                     new AssessmentSectionStub());
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>>>(properties);
+            Assert.IsInstanceOf<ObjectProperties<PartialProbabilisticFaultTreePipingOutput>>(properties);
             Assert.AreSame(output, properties.Data);
         }
 
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs
===================================================================
diff -u -rdd65da2990c97928228adfc407a0981c87c61331 -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs)	(revision dd65da2990c97928228adfc407a0981c87c61331)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -73,7 +73,7 @@
             var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<PartialProbabilisticFaultTreePipingOutput>>(properties);
+            Assert.IsInstanceOf<PartialProbabilisticFaultTreePipingOutput>(properties);
             Assert.AreSame(output, properties.Data);
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r3e0ebf71d8d9015968bf707685f45015f387891b -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs	(.../ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs)	(revision 3e0ebf71d8d9015968bf707685f45015f387891b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs	(.../ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -266,9 +266,9 @@
             Assert.IsNotNull(outputEntity);
             Assert.AreEqual(output.ProfileSpecificOutput.Reliability, outputEntity.ProfileSpecificReliability);
             Assert.AreEqual(output.SectionSpecificOutput.Reliability, outputEntity.SectionSpecificReliability);
-            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.ProfileSpecificOutput).GeneralResult,
+            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticFaultTreePipingOutput) output.ProfileSpecificOutput).GeneralResult,
                                                                             outputEntity.GeneralResultFaultTreeIllustrationPointEntity);
-            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.SectionSpecificOutput).GeneralResult,
+            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticFaultTreePipingOutput) output.SectionSpecificOutput).GeneralResult,
                                                                             outputEntity.GeneralResultFaultTreeIllustrationPointEntity1);
         }
     }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs
===================================================================
diff -u -r6d84790ac64baca2a629327ff25a0a4a6fb33fa1 -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs	(.../ProbabilisticPipingOutputCreateExtensionsTest.cs)	(revision 6d84790ac64baca2a629327ff25a0a4a6fb33fa1)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs	(.../ProbabilisticPipingOutputCreateExtensionsTest.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -92,9 +92,9 @@
             // Assert
             Assert.AreEqual(output.ProfileSpecificOutput.Reliability, entity.ProfileSpecificReliability);
             Assert.AreEqual(output.SectionSpecificOutput.Reliability, entity.SectionSpecificReliability);
-            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)output.ProfileSpecificOutput).GeneralResult,
+            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticFaultTreePipingOutput)output.ProfileSpecificOutput).GeneralResult,
                                                                             entity.GeneralResultFaultTreeIllustrationPointEntity);
-            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)output.SectionSpecificOutput).GeneralResult,
+            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticFaultTreePipingOutput)output.SectionSpecificOutput).GeneralResult,
                                                                             entity.GeneralResultFaultTreeIllustrationPointEntity1);
         }
     }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rea609f4592fa0a0df54670689af45c1c6462816d -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision ea609f4592fa0a0df54670689af45c1c6462816d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -1336,14 +1336,14 @@
                 return;
             }
 
-            AssertPartialProbabilisticPipingOutput((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) expectedOutput.ProfileSpecificOutput,
-                                                   (PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) actualOutput.ProfileSpecificOutput);
-            AssertPartialProbabilisticPipingOutput((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) expectedOutput.SectionSpecificOutput,
-                                                   (PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) actualOutput.SectionSpecificOutput);
+            AssertPartialProbabilisticPipingOutput((PartialProbabilisticFaultTreePipingOutput) expectedOutput.ProfileSpecificOutput,
+                                                   (PartialProbabilisticFaultTreePipingOutput) actualOutput.ProfileSpecificOutput);
+            AssertPartialProbabilisticPipingOutput((PartialProbabilisticFaultTreePipingOutput) expectedOutput.SectionSpecificOutput,
+                                                   (PartialProbabilisticFaultTreePipingOutput) actualOutput.SectionSpecificOutput);
         }
 
-        private static void AssertPartialProbabilisticPipingOutput(PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> expectedOutput,
-                                                                   PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint> actualOutput)
+        private static void AssertPartialProbabilisticPipingOutput(PartialProbabilisticFaultTreePipingOutput expectedOutput,
+                                                                   PartialProbabilisticFaultTreePipingOutput actualOutput)
         {
             Assert.AreEqual(expectedOutput.Reliability, actualOutput.Reliability);
             AssertGeneralResultTopLevelFaultTreeIllustrationPoint(expectedOutput.GeneralResult, actualOutput.GeneralResult);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rea609f4592fa0a0df54670689af45c1c6462816d -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationEntityReadExtensionsTest.cs)	(revision ea609f4592fa0a0df54670689af45c1c6462816d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationEntityReadExtensionsTest.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -326,9 +326,9 @@
             Assert.IsNotNull(output);
 
             Assert.IsNaN(output.ProfileSpecificOutput.Reliability);
-            Assert.IsNull(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)output.ProfileSpecificOutput).GeneralResult);
+            Assert.IsNull(((PartialProbabilisticFaultTreePipingOutput)output.ProfileSpecificOutput).GeneralResult);
             Assert.IsNaN(output.SectionSpecificOutput.Reliability);
-            Assert.IsNull(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)output.ProfileSpecificOutput).GeneralResult);
+            Assert.IsNull(((PartialProbabilisticFaultTreePipingOutput)output.ProfileSpecificOutput).GeneralResult);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r3e0ebf71d8d9015968bf707685f45015f387891b -rdf869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs)	(revision 3e0ebf71d8d9015968bf707685f45015f387891b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs)	(revision df869c447b6d194ea3b7938c0b5a5e1eaa8ac2b4)
@@ -75,9 +75,9 @@
             Assert.AreEqual(entity.SectionSpecificReliability, output.SectionSpecificOutput.Reliability);
 
             GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(
-                ((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.ProfileSpecificOutput).GeneralResult, profileSpecificGeneralResultEntity);
+                ((PartialProbabilisticFaultTreePipingOutput) output.ProfileSpecificOutput).GeneralResult, profileSpecificGeneralResultEntity);
             GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(
-                ((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.SectionSpecificOutput).GeneralResult, sectionSpecificGeneralResultEntity);
+                ((PartialProbabilisticFaultTreePipingOutput) output.SectionSpecificOutput).GeneralResult, sectionSpecificGeneralResultEntity);
         }
 
         [Test]