Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PipingCalculationConfigurationHelper.cs
===================================================================
diff -u -rcaf4f0f0d8b0a7272a1577db7c341546a83e6d40 -re46e231e6277972e97178f325322751beb283667
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PipingCalculationConfigurationHelper.cs	(.../PipingCalculationConfigurationHelper.cs)	(revision caf4f0f0d8b0a7272a1577db7c341546a83e6d40)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PipingCalculationConfigurationHelper.cs	(.../PipingCalculationConfigurationHelper.cs)	(revision e46e231e6277972e97178f325322751beb283667)
@@ -49,7 +49,7 @@
         /// <param name="surfaceLines">Surface lines to generate the structure for and to use to configure
         /// <see cref="PipingCalculation{TPipingInput}"/> with.</param>
         /// <param name="generateSemiProbabilistic">Indicator whether to generate <see cref="SemiProbabilisticPipingCalculationScenario"/>.</param>
-        /// <param name="generateProbabilistic">Indicator whether to generate <see cref="ProbabilisticPipingCalculation"/>.</param>
+        /// <param name="generateProbabilistic">Indicator whether to generate <see cref="ProbabilisticPipingCalculationScenario"/>.</param>
         /// <param name="soilModels">The soil models from which profiles are taken to configure
         /// <see cref="PipingCalculation{TPipingInput}"/> with.</param>
         /// <returns>A structure of <see cref="ICalculationBase"/> matching combinations of <paramref name="surfaceLines"/> and
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r9d02c1eeff92891cdc33860019dfb4f56aec2710 -re46e231e6277972e97178f325322751beb283667
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 9d02c1eeff92891cdc33860019dfb4f56aec2710)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision e46e231e6277972e97178f325322751beb283667)
@@ -264,7 +264,7 @@
                 CloseForData = ClosePipingInputViewForData
             };
 
-            yield return new ViewInfo<ProbabilisticPipingInputContext, ProbabilisticPipingCalculation, PipingInputView>
+            yield return new ViewInfo<ProbabilisticPipingInputContext, ProbabilisticPipingCalculationScenario, PipingInputView>
             {
                 GetViewData = context => context.PipingCalculation,
                 GetViewName = (view, context) => RiskeerCommonFormsResources.Calculation_Input,
@@ -1124,7 +1124,7 @@
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
 
-            ProbabilisticPipingCalculation calculation = nodeData.WrappedData;
+            ProbabilisticPipingCalculationScenario calculation = nodeData.WrappedData;
 
             StrictContextMenuItem updateEntryAndExitPoint = CreateUpdateEntryAndExitPointItem(calculation);
 
@@ -1160,7 +1160,7 @@
 
         private static void ValidateProbabilistic(ProbabilisticPipingCalculationScenarioContext context) {}
 
-        private static void CalculateProbabilistic(ProbabilisticPipingCalculation calculation, ProbabilisticPipingCalculationScenarioContext context) {}
+        private static void CalculateProbabilistic(ProbabilisticPipingCalculationScenario calculation, ProbabilisticPipingCalculationScenarioContext context) {}
 
         #endregion
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingInputViewInfoTest.cs
===================================================================
diff -u -r5ccb834d0a0e27be862c4a8bf5875ba0af19903a -re46e231e6277972e97178f325322751beb283667
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingInputViewInfoTest.cs	(.../ProbabilisticPipingInputViewInfoTest.cs)	(revision 5ccb834d0a0e27be862c4a8bf5875ba0af19903a)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticPipingInputViewInfoTest.cs	(.../ProbabilisticPipingInputViewInfoTest.cs)	(revision e46e231e6277972e97178f325322751beb283667)
@@ -62,7 +62,7 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(ProbabilisticPipingCalculation), info.ViewDataType);
+            Assert.AreEqual(typeof(ProbabilisticPipingCalculationScenario), info.ViewDataType);
             TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingInputIcon, info.Image);
         }