Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContext.cs
===================================================================
diff -u -r4e585df705f7695feba0d39c24e4ca04396b754b -r2ebb464e7e1e88253d336c8e78a39afb9161639b
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContext.cs	(.../ProbabilisticPipingOutputContext.cs)	(revision 4e585df705f7695feba0d39c24e4ca04396b754b)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContext.cs	(.../ProbabilisticPipingOutputContext.cs)	(revision 2ebb464e7e1e88253d336c8e78a39afb9161639b)
@@ -28,7 +28,7 @@
     /// <summary>
     /// Presentation object for the output of <see cref="ProbabilisticPipingCalculationScenario"/>.
     /// </summary>
-    public class ProbabilisticPipingOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculation>
+    public class ProbabilisticPipingOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculationScenario>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ProbabilisticPipingOutputContext"/>.
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContext.cs
===================================================================
diff -u -rfeb204abbb8d24726ee0dbf9284b8e6648b22c88 -r2ebb464e7e1e88253d336c8e78a39afb9161639b
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContext.cs	(.../ProbabilisticPipingProfileSpecificOutputContext.cs)	(revision feb204abbb8d24726ee0dbf9284b8e6648b22c88)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingProfileSpecificOutputContext.cs	(.../ProbabilisticPipingProfileSpecificOutputContext.cs)	(revision 2ebb464e7e1e88253d336c8e78a39afb9161639b)
@@ -28,7 +28,7 @@
     /// <summary>
     /// Presentation object for the profile specific output of <see cref="ProbabilisticPipingCalculationScenario"/>.
     /// </summary>
-    public class ProbabilisticPipingProfileSpecificOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculation>
+    public class ProbabilisticPipingProfileSpecificOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculationScenario>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ProbabilisticPipingOutputContext"/>.
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContext.cs
===================================================================
diff -u -rfeb204abbb8d24726ee0dbf9284b8e6648b22c88 -r2ebb464e7e1e88253d336c8e78a39afb9161639b
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContext.cs	(.../ProbabilisticPipingSectionSpecificOutputContext.cs)	(revision feb204abbb8d24726ee0dbf9284b8e6648b22c88)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/Probabilistic/ProbabilisticPipingSectionSpecificOutputContext.cs	(.../ProbabilisticPipingSectionSpecificOutputContext.cs)	(revision 2ebb464e7e1e88253d336c8e78a39afb9161639b)
@@ -28,7 +28,7 @@
     /// <summary>
     /// Presentation object for the section specific output of <see cref="ProbabilisticPipingCalculationScenario"/>.
     /// </summary>
-    public class ProbabilisticPipingSectionSpecificOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculation>
+    public class ProbabilisticPipingSectionSpecificOutputContext : ObservableWrappedObjectContextBase<ProbabilisticPipingCalculationScenario>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ProbabilisticPipingOutputContext"/>.
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r0cd788f660b6cea84656a2b98279b9d728b81e5d -r2ebb464e7e1e88253d336c8e78a39afb9161639b
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 0cd788f660b6cea84656a2b98279b9d728b81e5d)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 2ebb464e7e1e88253d336c8e78a39afb9161639b)
@@ -1018,7 +1018,7 @@
         }
 
         private ContextMenuStrip SemiProbabilisticPipingCalculationScenarioContextContextMenuStrip(SemiProbabilisticPipingCalculationScenarioContext nodeData,
-                                                                                     object parentData, TreeViewControl treeViewControl)
+                                                                                                   object parentData, TreeViewControl treeViewControl)
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
 
@@ -1077,7 +1077,7 @@
 
         private static object[] ProbabilisticPipingCalculationScenarioContextChildNodeObjects(ProbabilisticPipingCalculationScenarioContext context)
         {
-            ProbabilisticPipingCalculation calculation = context.WrappedData;
+            ProbabilisticPipingCalculationScenario calculation = context.WrappedData;
 
             var childNodes = new List<object>
             {
@@ -1095,7 +1095,7 @@
         }
 
         private ContextMenuStrip ProbabilisticPipingCalculationScenarioContextContextMenuStrip(ProbabilisticPipingCalculationScenarioContext nodeData,
-                                                                                 object parentData, TreeViewControl treeViewControl)
+                                                                                               object parentData, TreeViewControl treeViewControl)
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
 
@@ -1143,7 +1143,7 @@
 
         private static object[] ProbabilisticOutputChildNodeObjects(ProbabilisticPipingOutputContext context)
         {
-            ProbabilisticPipingCalculation calculation = context.WrappedData;
+            ProbabilisticPipingCalculationScenario calculation = context.WrappedData;
 
             return new object[]
             {