Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -ra3acfc43c74e601ed4e7d3a80f9a7daa58a836c6 -r1b6400211b923fc8d0c5ee4d692d71b468890f5e
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a3acfc43c74e601ed4e7d3a80f9a7daa58a836c6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1b6400211b923fc8d0c5ee4d692d71b468890f5e)
@@ -91,6 +91,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Piping.
+        /// </summary>
+        public static string Categories_Piping {
+            get {
+                return ResourceManager.GetString("Categories_Piping", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Terugschrijdende erosie (Sellmeijer).
         /// </summary>
         public static string Categories_Sellmeijer {
@@ -100,6 +109,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Opbarsten.
+        /// </summary>
+        public static string Categories_Uplift {
+            get {
+                return ResourceManager.GetString("Categories_Uplift", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Hoek in het krachtenevenwicht die aangeeft hoeveel weerstand de korrels bieden tegen rollen; ook beddingshoek genoemd..
         /// </summary>
         public static string GeneralPipingInput_BeddingAngle_Description {
@@ -644,362 +662,344 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Piping.
-        /// </summary>
-        public static string PipingOutputContext_Categories_Piping {
-            get {
-                return ResourceManager.GetString("PipingOutputContext_Categories_Piping", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Opbarsten.
-        /// </summary>
-        public static string PipingOutputContext_Categories_Uplift {
-            get {
-                return ResourceManager.GetString("PipingOutputContext_Categories_Uplift", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to De veiligheidsfactor voor het submechanisme heave voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_HeaveFactorOfSafety_Description {
+        public static string PipingOutput_HeaveFactorOfSafety_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveFactorOfSafety_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveFactorOfSafety_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Veiligheidsfactor [-].
         /// </summary>
-        public static string PipingOutputContext_HeaveFactorOfSafety_DisplayName {
+        public static string PipingOutput_HeaveFactorOfSafety_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveFactorOfSafety_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveFactorOfSafety_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De optredende verticale gradiënt in het opbarstkanaal..
         /// </summary>
-        public static string PipingOutputContext_HeaveGradient_Description {
+        public static string PipingOutput_HeaveGradient_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveGradient_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveGradient_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Heave gradiënt [-].
         /// </summary>
-        public static string PipingOutputContext_HeaveGradient_DisplayName {
+        public static string PipingOutput_HeaveGradient_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveGradient_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveGradient_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De kans dat het submechanisme heave optreedt voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_HeaveProbability_Description {
+        public static string PipingOutput_HeaveProbability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveProbability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveProbability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Kans van voorkomen [1/jaar].
         /// </summary>
-        public static string PipingOutputContext_HeaveProbability_DisplayName {
+        public static string PipingOutput_HeaveProbability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveProbability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveProbability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De betrouwbaarheidsindex voor het submechanisme heave voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_HeaveReliability_Description {
+        public static string PipingOutput_HeaveReliability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveReliability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveReliability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Betrouwbaarheidsindex [-].
         /// </summary>
-        public static string PipingOutputContext_HeaveReliability_DisplayName {
+        public static string PipingOutput_HeaveReliability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_HeaveReliability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_HeaveReliability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De veiligheidsfactor voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_PipingFactorOfSafety_Description {
+        public static string PipingOutput_PipingFactorOfSafety_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_PipingFactorOfSafety_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_PipingFactorOfSafety_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Veiligheidsfactor [-].
         /// </summary>
-        public static string PipingOutputContext_PipingFactorOfSafety_DisplayName {
+        public static string PipingOutput_PipingFactorOfSafety_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_PipingFactorOfSafety_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_PipingFactorOfSafety_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De benaderde kans dat het toetsspoor piping optreedt voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_PipingProbability_Description {
+        public static string PipingOutput_PipingProbability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_PipingProbability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_PipingProbability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Benaderde faalkans [1/jaar].
         /// </summary>
-        public static string PipingOutputContext_PipingProbability_DisplayName {
+        public static string PipingOutput_PipingProbability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_PipingProbability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_PipingProbability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De betrouwbaarheidsindex van de faalkans voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_PipingReliability_Description {
+        public static string PipingOutput_PipingReliability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_PipingReliability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_PipingReliability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Betrouwbaarheidsindex faalkans [-].
         /// </summary>
-        public static string PipingOutputContext_PipingReliability_DisplayName {
+        public static string PipingOutput_PipingReliability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_PipingReliability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_PipingReliability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De maximaal toegestane kans dat het toetsspoor piping optreedt..
         /// </summary>
-        public static string PipingOutputContext_RequiredProbability_Description {
+        public static string PipingOutput_RequiredProbability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_RequiredProbability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_RequiredProbability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Faalkanseis [1/jaar].
         /// </summary>
-        public static string PipingOutputContext_RequiredProbability_DisplayName {
+        public static string PipingOutput_RequiredProbability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_RequiredProbability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_RequiredProbability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping..
         /// </summary>
-        public static string PipingOutputContext_RequiredReliability_Description {
+        public static string PipingOutput_RequiredReliability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_RequiredReliability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_RequiredReliability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Betrouwbaarheidsindex faalkanseis [-].
         /// </summary>
-        public static string PipingOutputContext_RequiredReliability_DisplayName {
+        public static string PipingOutput_RequiredReliability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_RequiredReliability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_RequiredReliability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De verhouding tussen de kwelweglengte en het berekende kritieke verval op basis van de regel van Sellmeijer (analoog aan de vuistregel van Bligh)..
         /// </summary>
-        public static string PipingOutputContext_SellmeijerCreepCoefficient_Description {
+        public static string PipingOutput_SellmeijerCreepCoefficient_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerCreepCoefficient_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerCreepCoefficient_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Creep coëfficiënt [-].
         /// </summary>
-        public static string PipingOutputContext_SellmeijerCreepCoefficient_DisplayName {
+        public static string PipingOutput_SellmeijerCreepCoefficient_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerCreepCoefficient_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerCreepCoefficient_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Het kritieke verval over de waterkering..
         /// </summary>
-        public static string PipingOutputContext_SellmeijerCriticalFall_Description {
+        public static string PipingOutput_SellmeijerCriticalFall_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerCriticalFall_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerCriticalFall_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Kritiek verval [m].
         /// </summary>
-        public static string PipingOutputContext_SellmeijerCriticalFall_DisplayName {
+        public static string PipingOutput_SellmeijerCriticalFall_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerCriticalFall_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerCriticalFall_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De veiligheidsfactor voor het submechanisme terugschrijdende erosie (Sellmeijer) voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_SellmeijerFactorOfSafety_Description {
+        public static string PipingOutput_SellmeijerFactorOfSafety_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerFactorOfSafety_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerFactorOfSafety_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Veiligheidsfactor [-].
         /// </summary>
-        public static string PipingOutputContext_SellmeijerFactorOfSafety_DisplayName {
+        public static string PipingOutput_SellmeijerFactorOfSafety_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerFactorOfSafety_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerFactorOfSafety_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De kans dat het submechanisme terugschrijdende erosie (Sellmeijer) optreedt voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_SellmeijerProbability_Description {
+        public static string PipingOutput_SellmeijerProbability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerProbability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerProbability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Kans van voorkomen [1/jaar].
         /// </summary>
-        public static string PipingOutputContext_SellmeijerProbability_DisplayName {
+        public static string PipingOutput_SellmeijerProbability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerProbability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerProbability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Het verschil tussen de buitenwaterstand en de binnenwaterstand, gecorrigeerd voor de drukval in het opbarstkanaal..
         /// </summary>
-        public static string PipingOutputContext_SellmeijerReducedFall_Description {
+        public static string PipingOutput_SellmeijerReducedFall_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerReducedFall_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerReducedFall_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Gereduceerd verval [m].
         /// </summary>
-        public static string PipingOutputContext_SellmeijerReducedFall_DisplayName {
+        public static string PipingOutput_SellmeijerReducedFall_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerReducedFall_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerReducedFall_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De betrouwbaarheidsindex voor het submechanisme terugschrijdende erosie (Sellmeijer) voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_SellmeijerReliability_Description {
+        public static string PipingOutput_SellmeijerReliability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerReliability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerReliability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Betrouwbaarheidsindex [-].
         /// </summary>
-        public static string PipingOutputContext_SellmeijerReliability_DisplayName {
+        public static string PipingOutput_SellmeijerReliability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_SellmeijerReliability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_SellmeijerReliability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Het effectieve gewicht van de deklaag..
         /// </summary>
-        public static string PipingOutputContext_UpliftEffectiveStress_Description {
+        public static string PipingOutput_UpliftEffectiveStress_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftEffectiveStress_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftEffectiveStress_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Gewicht van de deklaag [kN/m²].
         /// </summary>
-        public static string PipingOutputContext_UpliftEffectiveStress_DisplayName {
+        public static string PipingOutput_UpliftEffectiveStress_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftEffectiveStress_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftEffectiveStress_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De veiligheidsfactor voor het submechanisme opbarsten voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_UpliftFactorOfSafety_Description {
+        public static string PipingOutput_UpliftFactorOfSafety_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftFactorOfSafety_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftFactorOfSafety_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Veiligheidsfactor [-].
         /// </summary>
-        public static string PipingOutputContext_UpliftFactorOfSafety_DisplayName {
+        public static string PipingOutput_UpliftFactorOfSafety_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftFactorOfSafety_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftFactorOfSafety_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De kans dat het submechanisme opbarsten optreedt voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_UpliftProbability_Description {
+        public static string PipingOutput_UpliftProbability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftProbability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftProbability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Kans van voorkomen [1/jaar].
         /// </summary>
-        public static string PipingOutputContext_UpliftProbability_DisplayName {
+        public static string PipingOutput_UpliftProbability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftProbability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftProbability_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De betrouwbaarheidsindex voor het submechanisme opbarsten voor deze berekening..
         /// </summary>
-        public static string PipingOutputContext_UpliftReliability_Description {
+        public static string PipingOutput_UpliftReliability_Description {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftReliability_Description", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftReliability_Description", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Betrouwbaarheidsindex [-].
         /// </summary>
-        public static string PipingOutputContext_UpliftReliability_DisplayName {
+        public static string PipingOutput_UpliftReliability_DisplayName {
             get {
-                return ResourceManager.GetString("PipingOutputContext_UpliftReliability_DisplayName", resourceCulture);
+                return ResourceManager.GetString("PipingOutput_UpliftReliability_DisplayName", resourceCulture);
             }
         }
         
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -ra3acfc43c74e601ed4e7d3a80f9a7daa58a836c6 -r1b6400211b923fc8d0c5ee4d692d71b468890f5e
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision a3acfc43c74e601ed4e7d3a80f9a7daa58a836c6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 1b6400211b923fc8d0c5ee4d692d71b468890f5e)
@@ -225,22 +225,22 @@
   <data name="GeneralPipingInput_WhitesDragCoefficient_DisplayName" xml:space="preserve">
     <value>Coëfficiënt van White [-]</value>
   </data>
-  <data name="PipingOutputContext_HeaveFactorOfSafety_Description" xml:space="preserve">
+  <data name="PipingOutput_HeaveFactorOfSafety_Description" xml:space="preserve">
     <value>De veiligheidsfactor voor het submechanisme heave voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_HeaveFactorOfSafety_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_HeaveFactorOfSafety_DisplayName" xml:space="preserve">
     <value>Veiligheidsfactor [-]</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerFactorOfSafety_Description" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerFactorOfSafety_Description" xml:space="preserve">
     <value>De veiligheidsfactor voor het submechanisme terugschrijdende erosie (Sellmeijer) voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerFactorOfSafety_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerFactorOfSafety_DisplayName" xml:space="preserve">
     <value>Veiligheidsfactor [-]</value>
   </data>
-  <data name="PipingOutputContext_UpliftFactorOfSafety_Description" xml:space="preserve">
+  <data name="PipingOutput_UpliftFactorOfSafety_Description" xml:space="preserve">
     <value>De veiligheidsfactor voor het submechanisme opbarsten voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_UpliftFactorOfSafety_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_UpliftFactorOfSafety_DisplayName" xml:space="preserve">
     <value>Veiligheidsfactor [-]</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -295,76 +295,76 @@
   <data name="PipingInput_HydraulicBoundaryLocation_DisplayName" xml:space="preserve">
     <value>Locatie met hydraulische randvoorwaarden</value>
   </data>
-  <data name="PipingOutputContext_PipingFactorOfSafety_Description" xml:space="preserve">
+  <data name="PipingOutput_PipingFactorOfSafety_Description" xml:space="preserve">
     <value>De veiligheidsfactor voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_PipingFactorOfSafety_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_PipingFactorOfSafety_DisplayName" xml:space="preserve">
     <value>Veiligheidsfactor [-]</value>
   </data>
-  <data name="PipingOutputContext_HeaveProbability_Description" xml:space="preserve">
+  <data name="PipingOutput_HeaveProbability_Description" xml:space="preserve">
     <value>De kans dat het submechanisme heave optreedt voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_HeaveProbability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_HeaveProbability_DisplayName" xml:space="preserve">
     <value>Kans van voorkomen [1/jaar]</value>
   </data>
-  <data name="PipingOutputContext_Categories_Piping" xml:space="preserve">
+  <data name="Categories_Piping" xml:space="preserve">
     <value>Piping</value>
   </data>
-  <data name="PipingOutputContext_Categories_Uplift" xml:space="preserve">
+  <data name="Categories_Uplift" xml:space="preserve">
     <value>Opbarsten</value>
   </data>
-  <data name="PipingOutputContext_HeaveReliability_Description" xml:space="preserve">
+  <data name="PipingOutput_HeaveReliability_Description" xml:space="preserve">
     <value>De betrouwbaarheidsindex voor het submechanisme heave voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_HeaveReliability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_HeaveReliability_DisplayName" xml:space="preserve">
     <value>Betrouwbaarheidsindex [-]</value>
   </data>
-  <data name="PipingOutputContext_PipingProbability_Description" xml:space="preserve">
+  <data name="PipingOutput_PipingProbability_Description" xml:space="preserve">
     <value>De benaderde kans dat het toetsspoor piping optreedt voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_PipingProbability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_PipingProbability_DisplayName" xml:space="preserve">
     <value>Benaderde faalkans [1/jaar]</value>
   </data>
-  <data name="PipingOutputContext_PipingReliability_Description" xml:space="preserve">
+  <data name="PipingOutput_PipingReliability_Description" xml:space="preserve">
     <value>De betrouwbaarheidsindex van de faalkans voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_PipingReliability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_PipingReliability_DisplayName" xml:space="preserve">
     <value>Betrouwbaarheidsindex faalkans [-]</value>
   </data>
-  <data name="PipingOutputContext_RequiredProbability_Description" xml:space="preserve">
+  <data name="PipingOutput_RequiredProbability_Description" xml:space="preserve">
     <value>De maximaal toegestane kans dat het toetsspoor piping optreedt.</value>
   </data>
-  <data name="PipingOutputContext_RequiredProbability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_RequiredProbability_DisplayName" xml:space="preserve">
     <value>Faalkanseis [1/jaar]</value>
   </data>
-  <data name="PipingOutputContext_RequiredReliability_Description" xml:space="preserve">
+  <data name="PipingOutput_RequiredReliability_Description" xml:space="preserve">
     <value>De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping.</value>
   </data>
-  <data name="PipingOutputContext_RequiredReliability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_RequiredReliability_DisplayName" xml:space="preserve">
     <value>Betrouwbaarheidsindex faalkanseis [-]</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerProbability_Description" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerProbability_Description" xml:space="preserve">
     <value>De kans dat het submechanisme terugschrijdende erosie (Sellmeijer) optreedt voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerProbability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerProbability_DisplayName" xml:space="preserve">
     <value>Kans van voorkomen [1/jaar]</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerReliability_Description" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerReliability_Description" xml:space="preserve">
     <value>De betrouwbaarheidsindex voor het submechanisme terugschrijdende erosie (Sellmeijer) voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerReliability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerReliability_DisplayName" xml:space="preserve">
     <value>Betrouwbaarheidsindex [-]</value>
   </data>
-  <data name="PipingOutputContext_UpliftProbability_Description" xml:space="preserve">
+  <data name="PipingOutput_UpliftProbability_Description" xml:space="preserve">
     <value>De kans dat het submechanisme opbarsten optreedt voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_UpliftProbability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_UpliftProbability_DisplayName" xml:space="preserve">
     <value>Kans van voorkomen [1/jaar]</value>
   </data>
-  <data name="PipingOutputContext_UpliftReliability_Description" xml:space="preserve">
+  <data name="PipingOutput_UpliftReliability_Description" xml:space="preserve">
     <value>De betrouwbaarheidsindex voor het submechanisme opbarsten voor deze berekening.</value>
   </data>
-  <data name="PipingOutputContext_UpliftReliability_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_UpliftReliability_DisplayName" xml:space="preserve">
     <value>Betrouwbaarheidsindex [-]</value>
   </data>
   <data name="PipingInput_SaturatedVolumicWeightOfCoverageLayer_Description" xml:space="preserve">
@@ -415,28 +415,28 @@
   <data name="PipingSurfaceLineSelectionDialog_Select_SurfaceLines" xml:space="preserve">
     <value>Selecteer profielschematisaties</value>
   </data>
-  <data name="PipingOutputContext_HeaveGradient_Description" xml:space="preserve">
+  <data name="PipingOutput_HeaveGradient_Description" xml:space="preserve">
     <value>De optredende verticale gradiënt in het opbarstkanaal.</value>
   </data>
-  <data name="PipingOutputContext_HeaveGradient_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_HeaveGradient_DisplayName" xml:space="preserve">
     <value>Heave gradiënt [-]</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerCreepCoefficient_Description" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerCreepCoefficient_Description" xml:space="preserve">
     <value>De verhouding tussen de kwelweglengte en het berekende kritieke verval op basis van de regel van Sellmeijer (analoog aan de vuistregel van Bligh).</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerCreepCoefficient_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerCreepCoefficient_DisplayName" xml:space="preserve">
     <value>Creep coëfficiënt [-]</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerCriticalFall_Description" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerCriticalFall_Description" xml:space="preserve">
     <value>Het kritieke verval over de waterkering.</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerCriticalFall_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerCriticalFall_DisplayName" xml:space="preserve">
     <value>Kritiek verval [m]</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerReducedFall_Description" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerReducedFall_Description" xml:space="preserve">
     <value>Het verschil tussen de buitenwaterstand en de binnenwaterstand, gecorrigeerd voor de drukval in het opbarstkanaal.</value>
   </data>
-  <data name="PipingOutputContext_SellmeijerReducedFall_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_SellmeijerReducedFall_DisplayName" xml:space="preserve">
     <value>Gereduceerd verval [m]</value>
   </data>
   <data name="PipingInput_EffectiveThicknessCoverageLayer_Description" xml:space="preserve">
@@ -451,10 +451,10 @@
   <data name="PipingInput_UseAssessmentLevelManualInput_DisplayName" xml:space="preserve">
     <value>Handmatig toetspeil invoeren</value>
   </data>
-  <data name="PipingOutputContext_UpliftEffectiveStress_Description" xml:space="preserve">
+  <data name="PipingOutput_UpliftEffectiveStress_Description" xml:space="preserve">
     <value>Het effectieve gewicht van de deklaag.</value>
   </data>
-  <data name="PipingOutputContext_UpliftEffectiveStress_DisplayName" xml:space="preserve">
+  <data name="PipingOutput_UpliftEffectiveStress_DisplayName" xml:space="preserve">
     <value>Gewicht van de deklaag [kN/m²]</value>
   </data>
   <data name="PipingSoilLayerTable_ColumnHeader_MaterialName" xml:space="preserve">
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs
===================================================================
diff -u -raf990fe02513d7cd12034e597037025ecf5aa948 -r1b6400211b923fc8d0c5ee4d692d71b468890f5e
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs	(.../PipingOutputProperties.cs)	(revision af990fe02513d7cd12034e597037025ecf5aa948)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs	(.../PipingOutputProperties.cs)	(revision 1b6400211b923fc8d0c5ee4d692d71b468890f5e)
@@ -61,9 +61,9 @@
             this.semiProbabilisticOutput = semiProbabilisticOutput;
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Uplift), 1, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftEffectiveStress_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftEffectiveStress_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Uplift), 1, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_UpliftEffectiveStress_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_UpliftEffectiveStress_Description))]
         [PropertyOrder(1)]
         public RoundedDouble UpliftEffectiveStress
         {
@@ -73,9 +73,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Uplift), 1, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftFactorOfSafety_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftFactorOfSafety_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Uplift), 1, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_UpliftFactorOfSafety_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_UpliftFactorOfSafety_Description))]
         [PropertyOrder(2)]
         public RoundedDouble UpliftFactorOfSafety
         {
@@ -85,9 +85,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Uplift), 1, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftReliability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftReliability_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Uplift), 1, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_UpliftReliability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_UpliftReliability_Description))]
         [PropertyOrder(3)]
         public RoundedDouble UpliftReliability
         {
@@ -97,9 +97,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Uplift), 1, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_UpliftProbability_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Uplift), 1, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_UpliftProbability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_UpliftProbability_Description))]
         [PropertyOrder(4)]
         public string UpliftProbability
         {
@@ -110,8 +110,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Heave), 2, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveGradient_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveGradient_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_HeaveGradient_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_HeaveGradient_Description))]
         [PropertyOrder(11)]
         public RoundedDouble HeaveGradient
         {
@@ -122,8 +122,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Heave), 2, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveFactorOfSafety_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveFactorOfSafety_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_HeaveFactorOfSafety_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_HeaveFactorOfSafety_Description))]
         [PropertyOrder(12)]
         public RoundedDouble HeaveFactorOfSafety
         {
@@ -134,8 +134,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Heave), 2, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveReliability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveReliability_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_HeaveReliability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_HeaveReliability_Description))]
         [PropertyOrder(13)]
         public RoundedDouble HeaveReliability
         {
@@ -146,8 +146,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Heave), 2, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_HeaveProbability_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_HeaveProbability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_HeaveProbability_Description))]
         [PropertyOrder(14)]
         public string HeaveProbability
         {
@@ -158,8 +158,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Sellmeijer), 3, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerCreepCoefficient_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerCreepCoefficient_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerCreepCoefficient_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerCreepCoefficient_Description))]
         [PropertyOrder(21)]
         public RoundedDouble SellmeijerCreepCoefficient
         {
@@ -170,8 +170,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Sellmeijer), 3, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerCriticalFall_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerCriticalFall_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerCriticalFall_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerCriticalFall_Description))]
         [PropertyOrder(22)]
         public RoundedDouble SellmeijerCriticalFall
         {
@@ -182,8 +182,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Sellmeijer), 3, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerReducedFall_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerReducedFall_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerReducedFall_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerReducedFall_Description))]
         [PropertyOrder(23)]
         public RoundedDouble SellmeijerReducedFall
         {
@@ -194,8 +194,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Sellmeijer), 3, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerFactorOfSafety_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerFactorOfSafety_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerFactorOfSafety_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerFactorOfSafety_Description))]
         [PropertyOrder(24)]
         public RoundedDouble SellmeijerFactorOfSafety
         {
@@ -206,8 +206,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Sellmeijer), 3, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerReliability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerReliability_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerReliability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerReliability_Description))]
         [PropertyOrder(25)]
         public RoundedDouble SellmeijerReliability
         {
@@ -218,8 +218,8 @@
         }
 
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Sellmeijer), 3, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_SellmeijerProbability_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerProbability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_SellmeijerProbability_Description))]
         [PropertyOrder(26)]
         public string SellmeijerProbability
         {
@@ -229,9 +229,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Piping), 4, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_RequiredProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_RequiredProbability_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_RequiredProbability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_RequiredProbability_Description))]
         [PropertyOrder(31)]
         public string RequiredProbability
         {
@@ -241,9 +241,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Piping), 4, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_RequiredReliability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_RequiredReliability_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_RequiredReliability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_RequiredReliability_Description))]
         [PropertyOrder(32)]
         public RoundedDouble RequiredReliability
         {
@@ -253,9 +253,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Piping), 4, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_PipingProbability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_PipingProbability_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_PipingProbability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_PipingProbability_Description))]
         [PropertyOrder(33)]
         public string PipingProbability
         {
@@ -265,9 +265,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Piping), 4, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_PipingReliability_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_PipingReliability_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_PipingReliability_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_PipingReliability_Description))]
         [PropertyOrder(34)]
         public RoundedDouble PipingReliability
         {
@@ -277,9 +277,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Piping), 4, 4)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutputContext_PipingFactorOfSafety_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutputContext_PipingFactorOfSafety_Description))]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_PipingFactorOfSafety_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_PipingFactorOfSafety_Description))]
         [PropertyOrder(35)]
         public RoundedDouble PipingFactorOfSafety
         {