Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs
===================================================================
diff -u -rb4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7 -r0abe26d381a9120149abe6438b8c1af9829db4b5
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision b4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision 0abe26d381a9120149abe6438b8c1af9829db4b5)
@@ -145,7 +145,7 @@
         /// Creates a probabilistic calculation scenario with valid input.
         /// </summary>
         /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
-        /// <returns>A new <see cref="ProbabilisticPipingCalculation"/>.</returns>
+        /// <returns>A new <see cref="ProbabilisticPipingCalculationScenario"/>.</returns>
         /// <remarks>The caller is responsible for actually providing a valid hydraulic boundary location
         /// (for instance when it comes to the presence of a normative assessment level).</remarks>
         /// <exception cref="ArgumentNullException">Throw when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r0abe26d381a9120149abe6438b8c1af9829db4b5
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 0abe26d381a9120149abe6438b8c1af9829db4b5)
@@ -67,7 +67,7 @@
         public void CreateSemiProbabilisticPipingCalculationActivity_GeneralPipingInputNull_ThrowsArgumentNullException()
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+            SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
 
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -88,7 +88,7 @@
         public void CreateSemiProbabilisticPipingCalculationActivity_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+            SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
 
             // Call
             TestDelegate test = () => PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(calculation,
@@ -123,7 +123,7 @@
             HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Single();
             hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble());
 
-            SemiProbabilisticPipingCalculationScenario calculation = CreateValidCalculation(hydraulicBoundaryLocation);
+            SemiProbabilisticPipingCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation);
 
             var generalPipingInput = new GeneralPipingInput();
 
@@ -216,8 +216,8 @@
             HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1);
             hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble());
 
-            SemiProbabilisticPipingCalculationScenario calculation1 = CreateValidCalculation(hydraulicBoundaryLocation1);
-            SemiProbabilisticPipingCalculationScenario calculation2 = CreateValidCalculation(hydraulicBoundaryLocation2);
+            SemiProbabilisticPipingCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation1);
+            SemiProbabilisticPipingCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation2);
 
             var calculations = new CalculationGroup
             {
@@ -298,8 +298,8 @@
             HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1);
             hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble());
 
-            SemiProbabilisticPipingCalculationScenario calculation1 = CreateValidCalculation(hydraulicBoundaryLocation1);
-            SemiProbabilisticPipingCalculationScenario calculation2 = CreateValidCalculation(hydraulicBoundaryLocation2);
+            SemiProbabilisticPipingCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation1);
+            SemiProbabilisticPipingCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation2);
 
             var failureMechanism = new PipingFailureMechanism();
             failureMechanism.CalculationsGroup.Children.AddRange(new[]
@@ -320,15 +320,15 @@
             AssertPipingCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryLocationCalculation2);
         }
 
-        private static SemiProbabilisticPipingCalculationScenario CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+        private static SemiProbabilisticPipingCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+            SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
             calculation.InputParameters.ExitPointL = new Random(39).NextRoundedDouble(0.5, 1.0);
             return calculation;
         }
 
         private static void AssertPipingCalculationActivity(Activity activity,
-                                                            SemiProbabilisticPipingCalculationScenario calculation,
+                                                            SemiProbabilisticPipingCalculation calculation,
                                                             HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
         {
             using (new PipingSubCalculatorFactoryConfig())