Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r0a471fe7dc7ab650097ee062f19961e8801d253c -r08c5c5b0e220db9a2477dff80fd35d61cfaa18f0
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 08c5c5b0e220db9a2477dff80fd35d61cfaa18f0)
@@ -1062,7 +1062,7 @@
         private void CalculateSemiProbabilistic(SemiProbabilisticPipingCalculation calculation, SemiProbabilisticPipingCalculationScenarioContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             PipingCalculationActivityFactory.CreateCalculationActivity(calculation, context.AssessmentSection));
+                                             PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(calculation, context.AssessmentSection));
         }
 
         #endregion
Index: Riskeer/Piping/src/Riskeer.Piping.Service/PipingCalculationActivityFactory.cs
===================================================================
diff -u -rdf1942940ece42a98d022f8c4a8bd873274462fc -r08c5c5b0e220db9a2477dff80fd35d61cfaa18f0
--- Riskeer/Piping/src/Riskeer.Piping.Service/PipingCalculationActivityFactory.cs	(.../PipingCalculationActivityFactory.cs)	(revision df1942940ece42a98d022f8c4a8bd873274462fc)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/PipingCalculationActivityFactory.cs	(.../PipingCalculationActivityFactory.cs)	(revision 08c5c5b0e220db9a2477dff80fd35d61cfaa18f0)
@@ -86,7 +86,7 @@
 
             return calculationGroup.GetCalculations()
                                    .Cast<SemiProbabilisticPipingCalculation>()
-                                   .Select(calc => CreateCalculationActivity(calc, assessmentSection))
+                                   .Select(calc => CreateSemiProbabilisticPipingCalculationActivity(calc, assessmentSection))
                                    .ToArray();
         }
 
@@ -98,8 +98,8 @@
         /// belongs to.</param>
         /// <returns>A <see cref="CalculatableActivity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static CalculatableActivity CreateCalculationActivity(SemiProbabilisticPipingCalculation calculation,
-                                                                     IAssessmentSection assessmentSection)
+        public static CalculatableActivity CreateSemiProbabilisticPipingCalculationActivity(SemiProbabilisticPipingCalculation calculation,
+                                                                                            IAssessmentSection assessmentSection)
         {
             if (calculation == null)
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs
===================================================================
diff -u -r61bcc66f70536f9f03e5bdfe2fe3243402694017 -r08c5c5b0e220db9a2477dff80fd35d61cfaa18f0
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 61bcc66f70536f9f03e5bdfe2fe3243402694017)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 08c5c5b0e220db9a2477dff80fd35d61cfaa18f0)
@@ -45,15 +45,15 @@
     public class PipingCalculationActivityFactoryTest
     {
         [Test]
-        public void CreateCalculationActivity_CalculationNull_ThrowsArgumentNullException()
+        public void CreateSemiProbabilisticPipingCalculationActivity_CalculationNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => PipingCalculationActivityFactory.CreateCalculationActivity(null, assessmentSection);
+            TestDelegate test = () => PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(null, assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -62,21 +62,21 @@
         }
 
         [Test]
-        public void CreateCalculationActivity_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void CreateSemiProbabilisticPipingCalculationActivity_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Setup
             SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
 
             // Call
-            TestDelegate test = () => PipingCalculationActivityFactory.CreateCalculationActivity(calculation, null);
+            TestDelegate test = () => PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(calculation, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         [Test]
-        public void CreateCalculationActivity_WithValidCalculation_ReturnsPipingCalculationActivityWithParametersSet()
+        public void CreateSemiProbabilisticPipingCalculationActivity_WithValidCalculation_ReturnsActivityWithParametersSet()
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
@@ -101,7 +101,7 @@
             SemiProbabilisticPipingCalculationScenario calculation = CreateValidCalculation(hydraulicBoundaryLocation);
 
             // Call
-            CalculatableActivity activity = PipingCalculationActivityFactory.CreateCalculationActivity(calculation, assessmentSection);
+            CalculatableActivity activity = PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(calculation, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<SemiProbabilisticPipingCalculationActivity>(activity);