Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rc4b0663c2ee423e2fdf08b374299c5f6326c0dbb -r714c7ce2697c5d1cb022d5fd5d65fe720e95c129
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision c4b0663c2ee423e2fdf08b374299c5f6326c0dbb)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 714c7ce2697c5d1cb022d5fd5d65fe720e95c129)
@@ -319,14 +319,14 @@
                                                                                                   ((PipingFailureMechanism) context.WrappedData).PipingProbabilityAssessmentInput)
             };
 
-            yield return new ViewInfo<ProbabilisticPipingProfileSpecificOutputContext, ProbabilisticPipingCalculationScenario, ProbabilisticFaultTreePipingProfileSpecificOutputView>
+            yield return new ViewInfo<ProbabilisticPipingProfileSpecificOutputContext, ProbabilisticPipingCalculationScenario, ProbabilisticFaultTreePipingOutputView>
             {
                 GetViewData = context => context.WrappedData,
                 GetViewName = (view, context) => PipingFormsResources.ProbabilisticProfileSpecificOutput_DisplayName,
                 Image = RiskeerCommonFormsResources.GeneralOutputIcon,
                 CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
                 AdditionalDataCheck = context => !context.WrappedData.HasOutput || context.WrappedData.Output.ProfileSpecificOutput is PartialProbabilisticFaultTreePipingOutput,
-                CreateInstance = context => new ProbabilisticFaultTreePipingProfileSpecificOutputView(
+                CreateInstance = context => new ProbabilisticFaultTreePipingOutputView(
                     context.WrappedData,
                     () => ((PartialProbabilisticFaultTreePipingOutput) context.WrappedData.Output?.ProfileSpecificOutput)?.GeneralResult)
             };
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -rc4b0663c2ee423e2fdf08b374299c5f6326c0dbb -r714c7ce2697c5d1cb022d5fd5d65fe720e95c129
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision c4b0663c2ee423e2fdf08b374299c5f6326c0dbb)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 714c7ce2697c5d1cb022d5fd5d65fe720e95c129)
@@ -240,7 +240,7 @@
                     viewInfos,
                     typeof(ProbabilisticPipingProfileSpecificOutputContext),
                     typeof(ProbabilisticPipingCalculationScenario),
-                    typeof(ProbabilisticFaultTreePipingProfileSpecificOutputView));
+                    typeof(ProbabilisticFaultTreePipingOutputView));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r1cca1c0441944245b1bfbcae16646737ad11a8df -r714c7ce2697c5d1cb022d5fd5d65fe720e95c129
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 1cca1c0441944245b1bfbcae16646737ad11a8df)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 714c7ce2697c5d1cb022d5fd5d65fe720e95c129)
@@ -54,7 +54,7 @@
         public void SetUp()
         {
             plugin = new PipingPlugin();
-            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingProfileSpecificOutputView));
+            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingOutputView));
         }
 
         [TearDown]
@@ -157,7 +157,7 @@
             IView view = info.CreateInstance(context);
 
             // Assert
-            Assert.IsInstanceOf<ProbabilisticFaultTreePipingProfileSpecificOutputView>(view);
+            Assert.IsInstanceOf<ProbabilisticFaultTreePipingOutputView>(view);
         }
 
         [TestFixture]
@@ -168,14 +168,14 @@
                 using (var plugin = new PipingPlugin())
                 {
                     return plugin.GetViewInfos()
-                                 .First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingProfileSpecificOutputView))
+                                 .First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingOutputView))
                                  .CloseForData(view, o);
                 }
             }
 
             protected override IView GetView(ICalculation data)
             {
-                return new ProbabilisticFaultTreePipingProfileSpecificOutputView(
+                return new ProbabilisticFaultTreePipingOutputView(
                     (ProbabilisticPipingCalculationScenario) data,
                     () => new TestGeneralResultFaultTreeIllustrationPoint());
             }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r490dd2a8094c31d61e77723ef8f9cbe9e9305d63 -r714c7ce2697c5d1cb022d5fd5d65fe720e95c129
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 490dd2a8094c31d61e77723ef8f9cbe9e9305d63)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 714c7ce2697c5d1cb022d5fd5d65fe720e95c129)
@@ -168,14 +168,14 @@
                 using (var plugin = new PipingPlugin())
                 {
                     return plugin.GetViewInfos()
-                                 .First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingProfileSpecificOutputView))
+                                 .First(tni => tni.ViewType == typeof(ProbabilisticFaultTreePipingOutputView))
                                  .CloseForData(view, o);
                 }
             }
 
             protected override IView GetView(ICalculation data)
             {
-                return new ProbabilisticFaultTreePipingProfileSpecificOutputView(
+                return new ProbabilisticFaultTreePipingOutputView(
                     (ProbabilisticPipingCalculationScenario) data,
                     () => new TestGeneralResultFaultTreeIllustrationPoint());
             }