Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -rca384bd58b63dfb6cabd38747444db5d5c55d218 -rc776e6d282fc2843a50de09d76266dd879f606eb
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision ca384bd58b63dfb6cabd38747444db5d5c55d218)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision c776e6d282fc2843a50de09d76266dd879f606eb)
@@ -90,8 +90,8 @@
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<DuneErosionHydraulicLoadsContext>(
-                CalculationsChildNodeObjects,
-                CalculationsContextMenuStrip);
+                HydraulicLoadsChildNodeObjects,
+                HydraulicLoadsContextMenuStrip);
 
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<DuneErosionFailurePathContext>(
                 FailurePathChildNodeObjects,
@@ -262,30 +262,30 @@
 
         #region TreeNodeInfos
 
-        #region DuneErosionCalculationsContext TreeNodeInfo
+        #region DuneErosionHydraulicLoadsContext TreeNodeInfo
 
-        private static object[] CalculationsChildNodeObjects(DuneErosionHydraulicLoadsContext context)
+        private static object[] HydraulicLoadsChildNodeObjects(DuneErosionHydraulicLoadsContext context)
         {
             DuneErosionFailureMechanism wrappedData = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
 
             return new object[]
             {
                 new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
-                                       GetCalculationsInputs(wrappedData), TreeFolderCategory.Input),
+                                       GetHydraulicLoadsInputs(wrappedData), TreeFolderCategory.Input),
                 new DuneLocationCalculationsGroupContext(context.WrappedData.DuneLocations, context.WrappedData, assessmentSection)
             };
         }
 
-        private static IEnumerable<object> GetCalculationsInputs(DuneErosionFailureMechanism failureMechanism)
+        private static IEnumerable<object> GetHydraulicLoadsInputs(DuneErosionFailureMechanism failureMechanism)
         {
             return new object[]
             {
                 failureMechanism.InputComments
             };
         }
 
-        private ContextMenuStrip CalculationsContextMenuStrip(DuneErosionHydraulicLoadsContext context,
+        private ContextMenuStrip HydraulicLoadsContextMenuStrip(DuneErosionHydraulicLoadsContext context,
                                                               object parentData,
                                                               TreeViewControl treeViewControl)
         {
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r6fa58773f92dd68cb7cc02acbf87cc9bd21f2e60 -rc776e6d282fc2843a50de09d76266dd879f606eb
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 6fa58773f92dd68cb7cc02acbf87cc9bd21f2e60)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision c776e6d282fc2843a50de09d76266dd879f606eb)
@@ -237,8 +237,8 @@
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<GrassCoverErosionOutwardsHydraulicLoadsContext>(
-                CalculationsChildNodeObjects,
-                CalculationsContextMenuStrip);
+                HydraulicLoadsChildNodeObjects,
+                HydraulicLoadsContextMenuStrip);
 
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<GrassCoverErosionOutwardsFailurePathContext>(
                 FailurePathChildNodeObjects,
@@ -468,23 +468,23 @@
 
         #region TreeNodeInfos
 
-        #region GrassCoverErosionOutwardsCalculationsContext TreeNodeInfo
+        #region GrassCoverErosionOutwardsHydraulicLoadsContext TreeNodeInfo
 
-        private static object[] CalculationsChildNodeObjects(GrassCoverErosionOutwardsHydraulicLoadsContext context)
+        private static object[] HydraulicLoadsChildNodeObjects(GrassCoverErosionOutwardsHydraulicLoadsContext context)
         {
             GrassCoverErosionOutwardsFailureMechanism failureMechanism = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
 
             return new object[]
             {
                 new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
-                                       GetCalculationsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
+                                       GetHydraulicLoadsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
                 new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase,
                                                                               failureMechanism, assessmentSection)
             };
         }
 
-        private static IEnumerable<object> GetCalculationsInputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        private static IEnumerable<object> GetHydraulicLoadsInputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new object[]
             {
@@ -493,7 +493,7 @@
             };
         }
 
-        private ContextMenuStrip CalculationsContextMenuStrip(GrassCoverErosionOutwardsHydraulicLoadsContext context,
+        private ContextMenuStrip HydraulicLoadsContextMenuStrip(GrassCoverErosionOutwardsHydraulicLoadsContext context,
                                                               object parentData,
                                                               TreeViewControl treeViewControl)
         {
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r6151e5228a403b3476d0945c9b6797bd7874b086 -rc776e6d282fc2843a50de09d76266dd879f606eb
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 6151e5228a403b3476d0945c9b6797bd7874b086)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision c776e6d282fc2843a50de09d76266dd879f606eb)
@@ -137,8 +137,8 @@
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<StabilityStoneCoverHydraulicLoadsContext>(
-                CalculationsChildNodeObjects,
-                CalculationsContextMenuStrip);
+                HydraulicLoadsChildNodeObjects,
+                HydraulicLoadsContextMenuStrip);
 
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<StabilityStoneCoverFailurePathContext>(
                 FailurePathChildNodeObjects,
@@ -283,23 +283,23 @@
 
         #region TreeNodeInfos
 
-        #region StabilityStoneCoverCalculationsContext TreeNodeInfo
+        #region StabilityStoneCoverHydraulicLoadsContext TreeNodeInfo
 
-        private static object[] CalculationsChildNodeObjects(StabilityStoneCoverHydraulicLoadsContext context)
+        private static object[] HydraulicLoadsChildNodeObjects(StabilityStoneCoverHydraulicLoadsContext context)
         {
             StabilityStoneCoverFailureMechanism failureMechanism = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
 
             return new object[]
             {
                 new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
-                                       GetCalculationsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
+                                       GetHydraulicLoadsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
                 new StabilityStoneCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, null,
                                                                              failureMechanism, assessmentSection)
             };
         }
 
-        private static IEnumerable<object> GetCalculationsInputs(StabilityStoneCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        private static IEnumerable<object> GetHydraulicLoadsInputs(StabilityStoneCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new object[]
             {
@@ -308,7 +308,7 @@
             };
         }
 
-        private ContextMenuStrip CalculationsContextMenuStrip(StabilityStoneCoverHydraulicLoadsContext context,
+        private ContextMenuStrip HydraulicLoadsContextMenuStrip(StabilityStoneCoverHydraulicLoadsContext context,
                                                               object parentData,
                                                               TreeViewControl treeViewControl)
         {
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r42b5598732d84341529bc3188cf120606eeac52a -rc776e6d282fc2843a50de09d76266dd879f606eb
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 42b5598732d84341529bc3188cf120606eeac52a)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision c776e6d282fc2843a50de09d76266dd879f606eb)
@@ -146,8 +146,8 @@
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<WaveImpactAsphaltCoverHydraulicLoadsContext>(
-                CalculationsChildNodeObjects,
-                CalculationsContextMenuStrip);
+                HydraulicLoadsChildNodeObjects,
+                HydraulicLoadsContextMenuStrip);
 
             yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<WaveImpactAsphaltCoverFailurePathContext>(
                 FailurePathChildNodeObjects,
@@ -283,23 +283,23 @@
 
         #region TreeNodeInfos
 
-        #region WaveImpactAsphaltCoverCalculationsContext TreeNodeInfo
+        #region WaveImpactAsphaltCoverHydraulicLoadsContext TreeNodeInfo
 
-        private static object[] CalculationsChildNodeObjects(WaveImpactAsphaltCoverHydraulicLoadsContext context)
+        private static object[] HydraulicLoadsChildNodeObjects(WaveImpactAsphaltCoverHydraulicLoadsContext context)
         {
             WaveImpactAsphaltCoverFailureMechanism failureMechanism = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
 
             return new object[]
             {
                 new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
-                                       GetCalculationsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
+                                       GetHydraulicLoadsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
                 new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, null,
                                                                                 failureMechanism, assessmentSection)
             };
         }
 
-        private static IEnumerable<object> GetCalculationsInputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        private static IEnumerable<object> GetHydraulicLoadsInputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new object[]
             {
@@ -308,7 +308,7 @@
             };
         }
 
-        private ContextMenuStrip CalculationsContextMenuStrip(WaveImpactAsphaltCoverHydraulicLoadsContext context,
+        private ContextMenuStrip HydraulicLoadsContextMenuStrip(WaveImpactAsphaltCoverHydraulicLoadsContext context,
                                                               object parentData,
                                                               TreeViewControl treeViewControl)
         {