Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -rdf1a90382c0fed0db059d0fd4d533ca3c8c8304b -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision df1a90382c0fed0db059d0fd4d533ca3c8c8304b)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -89,7 +89,7 @@
             assessmentSection.GrassCoverErosionOutwards.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations);
 
             AddGrassCoverErosionInwardsCalculation(assessmentSection, hydraulicBoundaryLocation);
-            AddPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation);
+            AddSemiProbabilisticPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation);
             AddMacroStabilityInwardsCalculationScenario(assessmentSection, hydraulicBoundaryLocation);
             AddStabilityStoneCoverCalculation(assessmentSection, hydraulicBoundaryLocation);
             AddWaveImpactAsphaltCoverCalculation(assessmentSection, hydraulicBoundaryLocation);
@@ -252,7 +252,7 @@
         private static IEnumerable<TestCaseData> GetFailureMechanismTestCases()
         {
             yield return new TestCaseData(new Action<AssessmentSection>(section => section.Piping.IsRelevant = false),
-                                          new Action<AssessmentSection>(section => AddPipingCalculationScenario(section, new TestHydraulicBoundaryLocation())))
+                                          new Action<AssessmentSection>(section => AddSemiProbabilisticPipingCalculationScenario(section, new TestHydraulicBoundaryLocation())))
                 .SetName("Piping");
             yield return new TestCaseData(new Action<AssessmentSection>(section => section.GrassCoverErosionInwards.IsRelevant = false),
                                           new Action<AssessmentSection>(section => AddGrassCoverErosionInwardsCalculation(section, new TestHydraulicBoundaryLocation())))
@@ -310,8 +310,8 @@
             });
         }
 
-        private static void AddPipingCalculationScenario(AssessmentSection assessmentSection,
-                                                         HydraulicBoundaryLocation hydraulicBoundaryLocation)
+        private static void AddSemiProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection,
+                                                                          HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
             pipingCalculationScenario.InputParameters.UseAssessmentLevelManualInput = true;
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs
===================================================================
diff -u -rae6913dc9e65387cd005077a2f056b5cd2fd159f -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision ae6913dc9e65387cd005077a2f056b5cd2fd159f)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -284,7 +284,7 @@
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism containing <paramref name="soilProfile"/>.</param>
         /// <param name="soilProfile">The soil profile residing in <paramref name="failureMechanism"/>
-        /// that has beeen removed.</param>
+        /// that has been removed.</param>
         /// <returns>All observable objects affected by this method.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// or <paramref name="soilProfile"/> is <c>null</c>.</exception>
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r5fd9d01d1ab8bbc4f1f447ecd64f9152baa164d8 -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 5fd9d01d1ab8bbc4f1f447ecd64f9152baa164d8)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -543,9 +543,9 @@
 
         private static bool ClosePipingInputViewForData(PipingInputView view, object o)
         {
-            if (o is ProbabilisticPipingCalculationContext probabilisticPipingCalculationScenarioContext)
+            if (o is ProbabilisticPipingCalculationContext probabilisticPipingCalculationContext)
             {
-                return ReferenceEquals(view.Data, probabilisticPipingCalculationScenarioContext.WrappedData);
+                return ReferenceEquals(view.Data, probabilisticPipingCalculationContext.WrappedData);
             }
 
             if (o is SemiProbabilisticPipingCalculationScenarioContext semiProbabilisticPipingCalculationScenarioContext)
Index: Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs
===================================================================
diff -u -r984b298e426bd997cb17196b8d4e1a06f1395eb2 -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision 984b298e426bd997cb17196b8d4e1a06f1395eb2)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -287,7 +287,7 @@
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism containing <paramref name="soilProfile"/>.</param>
         /// <param name="soilProfile">The soil profile residing in <paramref name="failureMechanism"/>
-        /// that has beeen removed.</param>
+        /// that has been removed.</param>
         /// <returns>All observable objects affected by this method.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// or <paramref name="soilProfile"/> is <c>null</c>.</exception>
Index: Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationActivity.cs
===================================================================
diff -u -r61bcc66f70536f9f03e5bdfe2fe3243402694017 -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationActivity.cs	(.../SemiProbabilisticPipingCalculationActivity.cs)	(revision 61bcc66f70536f9f03e5bdfe2fe3243402694017)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationActivity.cs	(.../SemiProbabilisticPipingCalculationActivity.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -28,7 +28,7 @@
 namespace Riskeer.Piping.Service.SemiProbabilistic
 {
     /// <summary>
-    /// <see cref="CalculatableActivity"/> for running a semi-probabilistic piping calculation.
+    /// <see cref="CalculatableActivity"/> for running a <see cref="SemiProbabilisticPipingCalculation"/>.
     /// </summary>
     internal class SemiProbabilisticPipingCalculationActivity : CalculatableActivity
     {
@@ -38,7 +38,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="SemiProbabilisticPipingCalculationActivity"/>.
         /// </summary>
-        /// <param name="calculation">The piping calculation to perform.</param>
+        /// <param name="calculation">The <see cref="SemiProbabilisticPipingCalculation"/> to perform.</param>
         /// <param name="normativeAssessmentLevel">The normative assessment level to use in case the manual assessment level is not applicable.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
         public SemiProbabilisticPipingCalculationActivity(SemiProbabilisticPipingCalculation calculation,
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs
===================================================================
diff -u -r133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956 -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs	(.../ProbabilisticPipingOutputTest.cs)	(revision 133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs	(.../ProbabilisticPipingOutputTest.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -36,8 +36,10 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            PartialProbabilisticPipingOutput sectionSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
-            PartialProbabilisticPipingOutput profileSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
+            PartialProbabilisticPipingOutput sectionSpecificOutput =
+                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
+            PartialProbabilisticPipingOutput profileSpecificOutput =
+                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
 
             // Call
             var output = new ProbabilisticPipingOutput(sectionSpecificOutput, profileSpecificOutput);
@@ -66,7 +68,9 @@
         public void Clone_OnlySectionSpecificOutputSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
-            var original = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null);
+            var original = new ProbabilisticPipingOutput(
+                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint()),
+                null);
 
             // Call
             object clone = original.Clone();
@@ -79,7 +83,9 @@
         public void Clone_OnlyProfileSpecificOutputSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
-            var original = new ProbabilisticPipingOutput(null, PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint()));
+            var original = new ProbabilisticPipingOutput(
+                null,
+                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint()));
 
             // Call
             object clone = original.Clone();
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingOutputTest.cs
===================================================================
diff -u -r3d70629d1f535013e1cdf9637e1f050e5da126f1 -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingOutputTest.cs	(.../SemiProbabilisticPipingOutputTest.cs)	(revision 3d70629d1f535013e1cdf9637e1f050e5da126f1)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingOutputTest.cs	(.../SemiProbabilisticPipingOutputTest.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -48,17 +48,17 @@
         public void Constructor_ConstructionPropertiesWithoutValuesSet_PropertiesAreDefault()
         {
             // Call
-            var actual = new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties());
+            var semiProbabilisticPipingOutput = new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties());
 
             // Assert
-            Assert.IsNaN(actual.UpliftFactorOfSafety);
-            Assert.IsNaN(actual.HeaveFactorOfSafety);
-            Assert.IsNaN(actual.SellmeijerFactorOfSafety);
-            Assert.IsNaN(actual.UpliftEffectiveStress);
-            Assert.IsNaN(actual.HeaveGradient);
-            Assert.IsNaN(actual.SellmeijerCreepCoefficient);
-            Assert.IsNaN(actual.SellmeijerCriticalFall);
-            Assert.IsNaN(actual.SellmeijerReducedFall);
+            Assert.IsNaN(semiProbabilisticPipingOutput.UpliftFactorOfSafety);
+            Assert.IsNaN(semiProbabilisticPipingOutput.HeaveFactorOfSafety);
+            Assert.IsNaN(semiProbabilisticPipingOutput.SellmeijerFactorOfSafety);
+            Assert.IsNaN(semiProbabilisticPipingOutput.UpliftEffectiveStress);
+            Assert.IsNaN(semiProbabilisticPipingOutput.HeaveGradient);
+            Assert.IsNaN(semiProbabilisticPipingOutput.SellmeijerCreepCoefficient);
+            Assert.IsNaN(semiProbabilisticPipingOutput.SellmeijerCriticalFall);
+            Assert.IsNaN(semiProbabilisticPipingOutput.SellmeijerReducedFall);
         }
 
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs
===================================================================
diff -u -r7b503435cfa703797c85458fe2130f6f2ae75b1a -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs	(.../PipingCalculatorResultTest.cs)	(revision 7b503435cfa703797c85458fe2130f6f2ae75b1a)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs	(.../PipingCalculatorResultTest.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -42,17 +42,17 @@
         public void Constructor_ConstructionPropertiesWithoutValuesSet_PropertiesAreDefault()
         {
             // Call
-            var actual = new PipingCalculatorResult(new PipingCalculatorResult.ConstructionProperties());
+            var pipingCalculatorResult = new PipingCalculatorResult(new PipingCalculatorResult.ConstructionProperties());
 
             // Assert
-            Assert.IsNaN(actual.UpliftFactorOfSafety);
-            Assert.IsNaN(actual.HeaveFactorOfSafety);
-            Assert.IsNaN(actual.SellmeijerFactorOfSafety);
-            Assert.IsNaN(actual.UpliftEffectiveStress);
-            Assert.IsNaN(actual.HeaveGradient);
-            Assert.IsNaN(actual.SellmeijerCreepCoefficient);
-            Assert.IsNaN(actual.SellmeijerCriticalFall);
-            Assert.IsNaN(actual.SellmeijerReducedFall);
+            Assert.IsNaN(pipingCalculatorResult.UpliftFactorOfSafety);
+            Assert.IsNaN(pipingCalculatorResult.HeaveFactorOfSafety);
+            Assert.IsNaN(pipingCalculatorResult.SellmeijerFactorOfSafety);
+            Assert.IsNaN(pipingCalculatorResult.UpliftEffectiveStress);
+            Assert.IsNaN(pipingCalculatorResult.HeaveGradient);
+            Assert.IsNaN(pipingCalculatorResult.SellmeijerCreepCoefficient);
+            Assert.IsNaN(pipingCalculatorResult.SellmeijerCriticalFall);
+            Assert.IsNaN(pipingCalculatorResult.SellmeijerReducedFall);
         }
 
         [Test]
@@ -82,17 +82,17 @@
             };
 
             // Call
-            var actual = new PipingCalculatorResult(constructionProperties);
+            var pipingCalculatorResult = new PipingCalculatorResult(constructionProperties);
 
             // Assert
-            Assert.AreEqual(foSuValue, actual.UpliftFactorOfSafety);
-            Assert.AreEqual(foShValue, actual.HeaveFactorOfSafety);
-            Assert.AreEqual(foSsValue, actual.SellmeijerFactorOfSafety);
-            Assert.AreEqual(upliftEffectiveStress, actual.UpliftEffectiveStress);
-            Assert.AreEqual(heaveGradient, actual.HeaveGradient);
-            Assert.AreEqual(sellmeijerCreepCoefficient, actual.SellmeijerCreepCoefficient);
-            Assert.AreEqual(sellmeijerCriticalFall, actual.SellmeijerCriticalFall);
-            Assert.AreEqual(sellmeijerReducedFall, actual.SellmeijerReducedFall);
+            Assert.AreEqual(foSuValue, pipingCalculatorResult.UpliftFactorOfSafety);
+            Assert.AreEqual(foShValue, pipingCalculatorResult.HeaveFactorOfSafety);
+            Assert.AreEqual(foSsValue, pipingCalculatorResult.SellmeijerFactorOfSafety);
+            Assert.AreEqual(upliftEffectiveStress, pipingCalculatorResult.UpliftEffectiveStress);
+            Assert.AreEqual(heaveGradient, pipingCalculatorResult.HeaveGradient);
+            Assert.AreEqual(sellmeijerCreepCoefficient, pipingCalculatorResult.SellmeijerCreepCoefficient);
+            Assert.AreEqual(sellmeijerCriticalFall, pipingCalculatorResult.SellmeijerCriticalFall);
+            Assert.AreEqual(sellmeijerReducedFall, pipingCalculatorResult.SellmeijerReducedFall);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd0198ad14598394ebbc2ccdf8454716374263d80 -r0a471fe7dc7ab650097ee062f19961e8801d253c
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingOutputContextTreeNodeInfoTest.cs	(.../SemiProbabilisticPipingOutputContextTreeNodeInfoTest.cs)	(revision d0198ad14598394ebbc2ccdf8454716374263d80)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingOutputContextTreeNodeInfoTest.cs	(.../SemiProbabilisticPipingOutputContextTreeNodeInfoTest.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
@@ -35,14 +35,12 @@
     [TestFixture]
     public class SemiProbabilisticPipingOutputContextTreeNodeInfoTest
     {
-        private MockRepository mocks;
         private PipingPlugin plugin;
         private TreeNodeInfo info;
 
         [SetUp]
         public void SetUp()
         {
-            mocks = new MockRepository();
             plugin = new PipingPlugin();
             info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(SemiProbabilisticPipingOutputContext));
         }
@@ -51,15 +49,11 @@
         public void TearDown()
         {
             plugin.Dispose();
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
-            // Setup
-            mocks.ReplayAll();
-
             // Assert
             Assert.IsNotNull(info.Text);
             Assert.IsNull(info.ForeColor);
@@ -105,6 +99,7 @@
         public void ContextMenuStrip_Always_CallsBuilder()
         {
             // Setup
+            var mocks = new MockRepository();
             var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
             menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
             menuBuilder.Expect(mb => mb.Build()).Return(null);
@@ -122,7 +117,7 @@
             }
 
             // Assert
-            // Assert expectancies are called in TearDown()
+            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file