Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Factories/PipingMapDataFactory.cs
===================================================================
diff -u -ra276c10f8c13dad6cddcac346efd52d82c563fae -ra294cc60eaef7c400f1dfb2ea745b9c6e3d0d6ed
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Factories/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision a276c10f8c13dad6cddcac346efd52d82c563fae)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Factories/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision a294cc60eaef7c400f1dfb2ea745b9c6e3d0d6ed)
@@ -34,7 +34,7 @@
     public static class PipingMapDataFactory
     {
         /// <summary>
-        /// Create <see cref="MapLineData"/> with default styling for collections of <see cref="SemiProbabilisticPipingCalculation"/>.
+        /// Create <see cref="MapLineData"/> with default styling for collections of <see cref="SemiProbabilisticPipingCalculationScenario"/>.
         /// </summary>
         /// <returns>The created <see cref="MapLineData"/>.</returns>
         public static MapLineData CreateSemiProbabilisticCalculationsMapData()
@@ -44,7 +44,7 @@
         }
 
         /// <summary>
-        /// Create <see cref="MapLineData"/> with custom styling for collections of <see cref="ProbabilisticPipingCalculation"/>.
+        /// Create <see cref="MapLineData"/> with custom styling for collections of <see cref="ProbabilisticPipingCalculationScenario"/>.
         /// </summary>
         /// <returns>The created <see cref="MapLineData"/>.</returns>
         public static MapLineData CreateProbabilisticCalculationsMapData()
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs
===================================================================
diff -u -ra276c10f8c13dad6cddcac346efd52d82c563fae -ra294cc60eaef7c400f1dfb2ea745b9c6e3d0d6ed
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision a276c10f8c13dad6cddcac346efd52d82c563fae)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision a294cc60eaef7c400f1dfb2ea745b9c6e3d0d6ed)
@@ -27,8 +27,6 @@
 using Riskeer.Common.Forms.Factories;
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Piping.Data;
-using Riskeer.Piping.Data.Probabilistic;
-using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Primitives;
 using RiskeerCommonUtilResources = Riskeer.Common.Util.Properties.Resources;
@@ -98,7 +96,8 @@
         /// <summary>
         /// Create calculation features based on the provided <paramref name="calculations"/>.
         /// </summary>
-        /// <param name="calculations">The collection of <see cref="SemiProbabilisticPipingCalculationScenario"/> to create the calculation features for.</param>
+        /// <param name="calculations">The collection of <see cref="TCalculationScenario"/> to create the calculation features for.</param>
+        /// <typeparam name="TCalculationScenario">The type of calculation scenario.</typeparam>
         /// <returns>A collection of features or an empty collection when <paramref name="calculations"/> is <c>null</c> or empty.</returns>
         public static IEnumerable<MapFeature> CreateCalculationFeatures<TCalculationScenario>(IEnumerable<TCalculationScenario> calculations)
             where TCalculationScenario : IPipingCalculationScenario<PipingInput>