Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -raa4f44030799130241257aa7e2e10f7dd7017cc6 -r1dd2c22368f99235c15314f434505d4b5fc27a90
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision aa4f44030799130241257aa7e2e10f7dd7017cc6)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 1dd2c22368f99235c15314f434505d4b5fc27a90)
@@ -68,7 +68,7 @@
     {
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
-            yield return new PropertyInfo<WaveImpactAsphaltCoverCalculationsContext, WaveImpactAsphaltCoverCalculationsProperties>
+            yield return new PropertyInfo<WaveImpactAsphaltCoverHydraulicLoadsContext, WaveImpactAsphaltCoverCalculationsProperties>
             {
                 CreateInstance = context => new WaveImpactAsphaltCoverCalculationsProperties(context.WrappedData)
             };
@@ -89,7 +89,7 @@
 
         public override IEnumerable<ViewInfo> GetViewInfos()
         {
-            yield return new ViewInfo<WaveImpactAsphaltCoverCalculationsContext, WaveImpactAsphaltCoverFailureMechanismView>
+            yield return new ViewInfo<WaveImpactAsphaltCoverHydraulicLoadsContext, WaveImpactAsphaltCoverFailureMechanismView>
             {
                 GetViewName = (view, context) => context.WrappedData.Name,
                 Image = RiskeerCommonFormsResources.FailureMechanismIcon,
@@ -145,7 +145,7 @@
 
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
-            yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<WaveImpactAsphaltCoverCalculationsContext>(
+            yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismStateContextTreeNodeInfo<WaveImpactAsphaltCoverHydraulicLoadsContext>(
                 CalculationsChildNodeObjects,
                 CalculationsContextMenuStrip);
 
@@ -285,7 +285,7 @@
 
         #region WaveImpactAsphaltCoverCalculationsContext TreeNodeInfo
 
-        private static object[] CalculationsChildNodeObjects(WaveImpactAsphaltCoverCalculationsContext context)
+        private static object[] CalculationsChildNodeObjects(WaveImpactAsphaltCoverHydraulicLoadsContext context)
         {
             WaveImpactAsphaltCoverFailureMechanism failureMechanism = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
@@ -308,7 +308,7 @@
             };
         }
 
-        private ContextMenuStrip CalculationsContextMenuStrip(WaveImpactAsphaltCoverCalculationsContext context,
+        private ContextMenuStrip CalculationsContextMenuStrip(WaveImpactAsphaltCoverHydraulicLoadsContext context,
                                                               object parentData,
                                                               TreeViewControl treeViewControl)
         {
@@ -328,12 +328,12 @@
                           .Build();
         }
 
-        private static string EnableValidateAndCalculateMenuItemForFailureMechanism(WaveImpactAsphaltCoverCalculationsContext context)
+        private static string EnableValidateAndCalculateMenuItemForFailureMechanism(WaveImpactAsphaltCoverHydraulicLoadsContext context)
         {
             return EnableValidateAndCalculateMenuItem(context.Parent);
         }
 
-        private void CalculateAllInFailureMechanism(WaveImpactAsphaltCoverCalculationsContext context)
+        private void CalculateAllInFailureMechanism(WaveImpactAsphaltCoverHydraulicLoadsContext context)
         {
             ActivityProgressDialogRunner.Run(
                 Gui.MainWindow,