Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -r2b5e7af8a6e2d69697a2586dab34dd5733107e73 -rc97fd064782b2ee5f5758c902261f3e89d169ac7
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision 2b5e7af8a6e2d69697a2586dab34dd5733107e73)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision c97fd064782b2ee5f5758c902261f3e89d169ac7)
@@ -127,11 +127,11 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
 
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 =
+            var pipingCalculationScenario1 =
                 SemiProbabilisticPipingCalculationTestFactory.CreateCalculation<SemiProbabilisticPipingCalculationScenario>(section);
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 =
+            var pipingCalculationScenario2 =
                 SemiProbabilisticPipingCalculationTestFactory.CreateCalculation<SemiProbabilisticPipingCalculationScenario>(section);
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 =
+            var pipingCalculationScenario3 =
                 SemiProbabilisticPipingCalculationTestFactory.CreateCalculation<SemiProbabilisticPipingCalculationScenario>(section);
 
             pipingCalculationScenario1.IsRelevant = true;
@@ -223,7 +223,7 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
 
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario =
+            var pipingCalculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
 
             // Call
@@ -253,9 +253,9 @@
             const double contribution1 = 0.2;
             const double contribution2 = 0.8;
 
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 =
+            var pipingCalculationScenario1 =
                 SemiProbabilisticPipingCalculationTestFactory.CreateCalculation<SemiProbabilisticPipingCalculationScenario>(section);
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 =
+            var pipingCalculationScenario2 =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
 
             pipingCalculationScenario1.IsRelevant = true;
@@ -294,20 +294,20 @@
 
             var failureMechanism = new PipingFailureMechanism();
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            SemiProbabilisticPipingCalculationScenario scenarioA =
+            var pipingCalculationScenarioA =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
-            SemiProbabilisticPipingCalculationScenario scenarioB =
+            var pipingCalculationScenarioB =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
-            scenarioA.Contribution = (RoundedDouble) contributionA;
-            scenarioB.Contribution = (RoundedDouble) contributionB;
+            pipingCalculationScenarioA.Contribution = (RoundedDouble) contributionA;
+            pipingCalculationScenarioB.Contribution = (RoundedDouble) contributionB;
 
             var result = new PipingFailureMechanismSectionResult(section);
 
             // Call
             double detailedAssessmentProbability = result.GetDetailedAssessmentProbability(new[]
             {
-                scenarioA,
-                scenarioB
+                pipingCalculationScenarioA,
+                pipingCalculationScenarioB
             }, failureMechanism, assessmentSection);
 
             // Assert
@@ -348,19 +348,19 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
 
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario =
+            var pipingCalculationScenario1 =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
-            pipingCalculationScenario.Contribution = (RoundedDouble) 0.3211;
+            pipingCalculationScenario1.Contribution = (RoundedDouble) 0.3211;
 
-            SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 =
+            var pipingCalculationScenario2 =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
             pipingCalculationScenario2.Contribution = (RoundedDouble) 0.5435;
 
             SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = CreateIrrelevantPipingCalculationScenario(section);
 
             SemiProbabilisticPipingCalculationScenario[] calculationScenarios =
             {
-                pipingCalculationScenario,
+                pipingCalculationScenario1,
                 pipingCalculationScenario2,
                 pipingCalculationScenario3
             };
@@ -404,7 +404,7 @@
             // Setup
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var sectionResult = new PipingFailureMechanismSectionResult(section);
-            SemiProbabilisticPipingCalculationScenario calculationScenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
             SemiProbabilisticPipingCalculationScenario calculationScenario2 = CreateIrrelevantPipingCalculationScenario(section);
 
@@ -429,7 +429,7 @@
                 new Point2D(998, 998)
             });
             var sectionResult = new PipingFailureMechanismSectionResult(section);
-            SemiProbabilisticPipingCalculationScenario calculationScenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(
                     FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
@@ -445,12 +445,12 @@
 
         private static SemiProbabilisticPipingCalculationScenario CreateIrrelevantPipingCalculationScenario(FailureMechanismSection section)
         {
-            SemiProbabilisticPipingCalculationScenario scenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
 
-            scenario.IsRelevant = false;
+            calculationScenario.IsRelevant = false;
 
-            return scenario;
+            return calculationScenario;
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -rdea6b4ac04c9ba4c983db2296e55972fdf260ce4 -rc97fd064782b2ee5f5758c902261f3e89d169ac7
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision dea6b4ac04c9ba4c983db2296e55972fdf260ce4)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision c97fd064782b2ee5f5758c902261f3e89d169ac7)
@@ -736,7 +736,7 @@
                 SimpleAssessmentResult = simpleAssessmentResult
             };
 
-            SemiProbabilisticPipingCalculationScenario calculationScenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateCalculation<SemiProbabilisticPipingCalculationScenario>(section);
             calculationScenario.Contribution = (RoundedDouble) 0.3;
 
@@ -820,7 +820,7 @@
                 SimpleAssessmentResult = simpleAssessmentResult
             };
 
-            SemiProbabilisticPipingCalculationScenario calculationScenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
             calculationScenario.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(double.NaN, double.NaN, double.NaN);
 
@@ -901,7 +901,7 @@
                 SimpleAssessmentResult = simpleAssessmentResult
             };
 
-            SemiProbabilisticPipingCalculationScenario calculationScenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
 
             calculationScenario.IsRelevant = false;
@@ -1039,7 +1039,7 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var sectionResult = new PipingFailureMechanismSectionResult(section);
 
-            SemiProbabilisticPipingCalculationScenario scenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
 
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -1048,7 +1048,7 @@
                     sectionResult,
                     new[]
                     {
-                        scenario
+                        calculationScenario
                     },
                     failureMechanism,
                     assessmentSection,
@@ -1076,18 +1076,18 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var sectionResult = new PipingFailureMechanismSectionResult(section);
 
-            SemiProbabilisticPipingCalculationScenario scenario =
+            var calculationScenario =
                 SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation<SemiProbabilisticPipingCalculationScenario>(section);
-            scenario.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
-            scenario.Contribution = (RoundedDouble) 0.3;
+            calculationScenario.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
+            calculationScenario.Contribution = (RoundedDouble) 0.3;
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var resultRow = new PipingFailureMechanismSectionResultRow(
                     sectionResult,
                     new[]
                     {
-                        scenario
+                        calculationScenario
                     },
                     failureMechanism,
                     assessmentSection,