Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContext.cs
===================================================================
diff -u -r399615e9134f349b27bc430199c03c0294c015df -r3123e3ad3dcb60de01021533ab8b6b6d1e71b173
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContext.cs	(.../ProbabilisticPipingOutputContext.cs)	(revision 399615e9134f349b27bc430199c03c0294c015df)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContext.cs	(.../ProbabilisticPipingOutputContext.cs)	(revision 3123e3ad3dcb60de01021533ab8b6b6d1e71b173)
@@ -26,15 +26,15 @@
 namespace Riskeer.Piping.Forms.PresentationObjects.Probabilistic
 {
     /// <summary>
-    /// A presentation layer object which wraps a <see cref="ProbabilisticPipingOutput"/>.
+    /// A presentation layer object which wraps a <see cref="ProbabilisticPipingCalculation"/>.
     /// </summary>
-    public class ProbabilisticPipingOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingOutput>
+    public class ProbabilisticPipingOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculation>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ProbabilisticPipingOutputContext"/>.
         /// </summary>
-        /// <param name="pipingOutput">The <see cref="ProbabilisticPipingOutput"/> object to wrap.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="pipingOutput"/> is <c>null</c>.</exception>
-        public ProbabilisticPipingOutputContext(ProbabilisticPipingOutput pipingOutput) : base(pipingOutput) {}
+        /// <param name="calculation">The <see cref="ProbabilisticPipingCalculation"/> object to wrap.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
+        public ProbabilisticPipingOutputContext(ProbabilisticPipingCalculation calculation) : base(calculation) {}
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs
===================================================================
diff -u -r399615e9134f349b27bc430199c03c0294c015df -r3123e3ad3dcb60de01021533ab8b6b6d1e71b173
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs	(.../ProbabilisticPipingOutputContextTest.cs)	(revision 399615e9134f349b27bc430199c03c0294c015df)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs	(.../ProbabilisticPipingOutputContextTest.cs)	(revision 3123e3ad3dcb60de01021533ab8b6b6d1e71b173)
@@ -22,6 +22,7 @@
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
 using Riskeer.Common.Data.TestUtil.IllustrationPoints;
+using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
 
@@ -34,15 +35,14 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var partialOutput = new PartialProbabilisticPipingOutput(0, new TestGeneralResultFaultTreeIllustrationPoint());
-            var output = new ProbabilisticPipingOutput(partialOutput, partialOutput);
+            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
 
             // Call
-            var context = new ProbabilisticPipingOutputContext(output);
+            var context = new ProbabilisticPipingOutputContext(calculation);
 
             // Assert
-            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ProbabilisticPipingOutput>>(context);
-            Assert.AreSame(output, context.WrappedData);
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ProbabilisticPipingCalculation>>(context);
+            Assert.AreSame(calculation, context.WrappedData);
         }
     }
 }
\ No newline at end of file