Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -ra56dd3e055db1b59336e7599ab9568562f909655 -r8c4d35d0b96951a340d4ba22d2671284918188b9
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision a56dd3e055db1b59336e7599ab9568562f909655)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 8c4d35d0b96951a340d4ba22d2671284918188b9)
@@ -302,15 +302,15 @@
                 FailureMechanismDisabledContextMenuStrip);
 
             yield return RiskeerTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo<SemiProbabilisticPipingCalculationScenarioContext>(
-                SemiProbabilisticCalculationContextChildNodeObjects,
-                SemiProbabilisticCalculationContextContextMenuStrip,
-                SemiProbabilisticCalculationContextOnNodeRemoved,
+                SemiProbabilisticPipingCalculationScenarioContextChildNodeObjects,
+                SemiProbabilisticPipingCalculationScenarioContextContextMenuStrip,
+                SemiProbabilisticPipingCalculationScenarioContextOnNodeRemoved,
                 CalculationType.SemiProbabilistic);
 
             yield return RiskeerTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo<ProbabilisticPipingCalculationScenarioContext>(
-                ProbabilisticCalculationContextChildNodeObjects,
-                ProbabilisticCalculationContextContextMenuStrip,
-                ProbabilisticCalculationContextOnNodeRemoved,
+                ProbabilisticPipingCalculationScenarioContextChildNodeObjects,
+                ProbabilisticPipingCalculationScenarioContextContextMenuStrip,
+                ProbabilisticPipingCalculationScenarioContextOnNodeRemoved,
                 CalculationType.Probabilistic);
 
             yield return RiskeerTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<PipingCalculationGroupContext>(
@@ -745,16 +745,16 @@
             {
                 switch (item)
                 {
-                    case SemiProbabilisticPipingCalculationScenario semiProbabilisticCalculation:
-                        childNodeObjects.Add(new SemiProbabilisticPipingCalculationScenarioContext(semiProbabilisticCalculation,
+                    case SemiProbabilisticPipingCalculationScenario semiProbabilisticPipingCalculationScenario:
+                        childNodeObjects.Add(new SemiProbabilisticPipingCalculationScenarioContext(semiProbabilisticPipingCalculationScenario,
                                                                                                    nodeData.WrappedData,
                                                                                                    nodeData.AvailablePipingSurfaceLines,
                                                                                                    nodeData.AvailableStochasticSoilModels,
                                                                                                    nodeData.FailureMechanism,
                                                                                                    nodeData.AssessmentSection));
                         break;
-                    case ProbabilisticPipingCalculationScenario probabilisticCalculation:
-                        childNodeObjects.Add(new ProbabilisticPipingCalculationScenarioContext(probabilisticCalculation,
+                    case ProbabilisticPipingCalculationScenario probabilisticPipingCalculationScenario:
+                        childNodeObjects.Add(new ProbabilisticPipingCalculationScenarioContext(probabilisticPipingCalculationScenario,
                                                                                                nodeData.WrappedData,
                                                                                                nodeData.AvailablePipingSurfaceLines,
                                                                                                nodeData.AvailableStochasticSoilModels,
@@ -987,7 +987,7 @@
 
         #region PipingCalculationScenarioContext TreeNodeInfo
 
-        private static object[] SemiProbabilisticCalculationContextChildNodeObjects(SemiProbabilisticPipingCalculationScenarioContext context)
+        private static object[] SemiProbabilisticPipingCalculationScenarioContextChildNodeObjects(SemiProbabilisticPipingCalculationScenarioContext context)
         {
             SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = context.WrappedData;
 
@@ -1017,7 +1017,7 @@
             return childNodes.ToArray();
         }
 
-        private ContextMenuStrip SemiProbabilisticCalculationContextContextMenuStrip(SemiProbabilisticPipingCalculationScenarioContext nodeData,
+        private ContextMenuStrip SemiProbabilisticPipingCalculationScenarioContextContextMenuStrip(SemiProbabilisticPipingCalculationScenarioContext nodeData,
                                                                                      object parentData, TreeViewControl treeViewControl)
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
@@ -1051,7 +1051,7 @@
                           .Build();
         }
 
-        private static void SemiProbabilisticCalculationContextOnNodeRemoved(SemiProbabilisticPipingCalculationScenarioContext context, object parentNodeData)
+        private static void SemiProbabilisticPipingCalculationScenarioContextOnNodeRemoved(SemiProbabilisticPipingCalculationScenarioContext context, object parentNodeData)
         {
             CalculationContextOnNodeRemoved(parentNodeData, context.WrappedData);
         }
@@ -1075,7 +1075,7 @@
 
         #region ProbabilisticPipingCalculationScenarioContext TreeNodeInfo
 
-        private static object[] ProbabilisticCalculationContextChildNodeObjects(ProbabilisticPipingCalculationScenarioContext context)
+        private static object[] ProbabilisticPipingCalculationScenarioContextChildNodeObjects(ProbabilisticPipingCalculationScenarioContext context)
         {
             ProbabilisticPipingCalculation calculation = context.WrappedData;
 
@@ -1094,7 +1094,7 @@
             return childNodes.ToArray();
         }
 
-        private ContextMenuStrip ProbabilisticCalculationContextContextMenuStrip(ProbabilisticPipingCalculationScenarioContext nodeData,
+        private ContextMenuStrip ProbabilisticPipingCalculationScenarioContextContextMenuStrip(ProbabilisticPipingCalculationScenarioContext nodeData,
                                                                                  object parentData, TreeViewControl treeViewControl)
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
@@ -1128,7 +1128,7 @@
                           .Build();
         }
 
-        private static void ProbabilisticCalculationContextOnNodeRemoved(ProbabilisticPipingCalculationScenarioContext calculationContext, object parentNodeData)
+        private static void ProbabilisticPipingCalculationScenarioContextOnNodeRemoved(ProbabilisticPipingCalculationScenarioContext calculationContext, object parentNodeData)
         {
             CalculationContextOnNodeRemoved(parentNodeData, calculationContext.WrappedData);
         }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -r3abae3ffadc247fae0acf081edaf8e0deaec0aae -r8c4d35d0b96951a340d4ba22d2671284918188b9
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 3abae3ffadc247fae0acf081edaf8e0deaec0aae)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 8c4d35d0b96951a340d4ba22d2671284918188b9)
@@ -153,7 +153,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(SemiProbabilisticPipingOutputContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingScenariosContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptySemiProbabilisticPipingOutput)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilisticPipingCalculationContext)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilisticPipingCalculationScenarioContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilisticPipingInputContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilisticPipingOutputContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilisticPipingSectionSpecificOutputContext)));
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfbbcb30a2f475ee2a8f2055e741e91713f266720 -r8c4d35d0b96951a340d4ba22d2671284918188b9
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision fbbcb30a2f475ee2a8f2055e741e91713f266720)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8c4d35d0b96951a340d4ba22d2671284918188b9)
@@ -181,15 +181,15 @@
             Assert.AreEqual(group.Children.Count, children.Length);
             Assert.AreSame(calculationItem, children[0]);
 
-            var returnedSemiProbabilisticCalculationContext = (SemiProbabilisticPipingCalculationScenarioContext) children[1];
-            Assert.AreSame(semiProbabilisticChildCalculation, returnedSemiProbabilisticCalculationContext.WrappedData);
-            Assert.AreSame(group, returnedSemiProbabilisticCalculationContext.Parent);
-            Assert.AreSame(pipingFailureMechanism, returnedSemiProbabilisticCalculationContext.FailureMechanism);
+            var returnedSemiProbabilisticPipingCalculationScenarioContext = (SemiProbabilisticPipingCalculationScenarioContext) children[1];
+            Assert.AreSame(semiProbabilisticChildCalculation, returnedSemiProbabilisticPipingCalculationScenarioContext.WrappedData);
+            Assert.AreSame(group, returnedSemiProbabilisticPipingCalculationScenarioContext.Parent);
+            Assert.AreSame(pipingFailureMechanism, returnedSemiProbabilisticPipingCalculationScenarioContext.FailureMechanism);
 
-            var returnedProbabilisticCalculationContext = (ProbabilisticPipingCalculationContext) children[2];
-            Assert.AreSame(probabilisticChildCalculation, returnedProbabilisticCalculationContext.WrappedData);
-            Assert.AreSame(group, returnedProbabilisticCalculationContext.Parent);
-            Assert.AreSame(pipingFailureMechanism, returnedProbabilisticCalculationContext.FailureMechanism);
+            var returnedProbabilisticPipingCalculationScenarioContext = (ProbabilisticPipingCalculationScenarioContext) children[2];
+            Assert.AreSame(probabilisticChildCalculation, returnedProbabilisticPipingCalculationScenarioContext.WrappedData);
+            Assert.AreSame(group, returnedProbabilisticPipingCalculationScenarioContext.Parent);
+            Assert.AreSame(pipingFailureMechanism, returnedProbabilisticPipingCalculationScenarioContext.FailureMechanism);
 
             var returnedCalculationGroupContext = (PipingCalculationGroupContext) children[3];
             Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData);