Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs
===================================================================
diff -u -r87452d01a3f950c5ac75374dd3e75aa72b4a4844 -r64772edbdba3ee8ef1b86596b90e971435891467
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs	(.../RiskeerTreeNodeInfoFactory.cs)	(revision 87452d01a3f950c5ac75374dd3e75aa72b4a4844)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerTreeNodeInfoFactory.cs	(.../RiskeerTreeNodeInfoFactory.cs)	(revision 64772edbdba3ee8ef1b86596b90e971435891467)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r6d2fb301541e5a6e394b4d20cd7b53e459a235a0 -r64772edbdba3ee8ef1b86596b90e971435891467
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 6d2fb301541e5a6e394b4d20cd7b53e459a235a0)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 64772edbdba3ee8ef1b86596b90e971435891467)
@@ -1020,11 +1020,11 @@
                           .AddSeparator()
                           .AddValidateCalculationItem(
                               nodeData,
-                              Validate)
+                              ValidateSemiProbabilistic)
                           .AddPerformCalculationItem(
                               calculation,
                               nodeData,
-                              Calculate)
+                              CalculateSemiProbabilistic)
                           .AddSeparator()
                           .AddClearCalculationOutputItem(calculation)
                           .AddDeleteItem()
@@ -1041,12 +1041,12 @@
             CalculationContextOnNodeRemoved(parentNodeData, context.WrappedData);
         }
 
-        private static void Validate(SemiProbabilisticPipingCalculationScenarioContext context)
+        private static void ValidateSemiProbabilistic(SemiProbabilisticPipingCalculationScenarioContext context)
         {
             SemiProbabilisticPipingCalculationService.Validate(context.WrappedData, GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData));
         }
 
-        private void Calculate(SemiProbabilisticPipingCalculation calculation, SemiProbabilisticPipingCalculationScenarioContext context)
+        private void CalculateSemiProbabilistic(SemiProbabilisticPipingCalculation calculation, SemiProbabilisticPipingCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
                                              PipingCalculationActivityFactory.CreateCalculationActivity(calculation, context.AssessmentSection));
@@ -1093,11 +1093,11 @@
                           .AddSeparator()
                           .AddValidateCalculationItem(
                               nodeData,
-                              Validate)
+                              ValidateProbabilistic)
                           .AddPerformCalculationItem(
                               calculation,
                               nodeData,
-                              Calculate)
+                              CalculateProbabilistic)
                           .AddSeparator()
                           .AddClearCalculationOutputItem(calculation)
                           .AddDeleteItem()
@@ -1114,9 +1114,9 @@
             CalculationContextOnNodeRemoved(parentNodeData, calculationContext.WrappedData);
         }
 
-        private static void Validate(ProbabilisticPipingCalculationContext context) {}
+        private static void ValidateProbabilistic(ProbabilisticPipingCalculationContext context) {}
 
-        private static void Calculate(ProbabilisticPipingCalculation calculation, ProbabilisticPipingCalculationContext context) {}
+        private static void CalculateProbabilistic(ProbabilisticPipingCalculation calculation, ProbabilisticPipingCalculationContext context) {}
 
         #endregion