Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/PipingPlugin.cs
===================================================================
diff -u -rcbf104c75fe0dda56a0eab7a5f7ff60c89d8c112 -r4bd71eca0b6db2959ccb01d6504d1bf5058603bd
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision cbf104c75fe0dda56a0eab7a5f7ff60c89d8c112)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 4bd71eca0b6db2959ccb01d6504d1bf5058603bd)
@@ -62,7 +62,7 @@
 namespace Ringtoets.MacroStabilityInwards.Plugin
 {
     /// <summary>
-    /// The plug-in for the <see cref="PipingFailureMechanism"/>.
+    /// The plug-in for the <see cref="MacroStabilityInwardsFailureMechanism"/>.
     /// </summary>
     public class PipingPlugin : PluginBase
     {
@@ -76,9 +76,9 @@
 
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
-            yield return new PropertyInfo<PipingFailureMechanismContext, PipingFailureMechanismContextProperties>
+            yield return new PropertyInfo<MacroStabilityInwardsFailureMechanismContext, PipingFailureMechanismContextProperties>
             {
-                CreateInstance = context => new PipingFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler<PipingFailureMechanism>())
+                CreateInstance = context => new PipingFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler<MacroStabilityInwardsFailureMechanism>())
             };
             yield return new PropertyInfo<PipingInputContext, PipingInputContextProperties>
             {
@@ -173,7 +173,7 @@
 
         public override IEnumerable<ViewInfo> GetViewInfos()
         {
-            yield return new ViewInfo<PipingFailureMechanismContext, PipingFailureMechanismView>
+            yield return new ViewInfo<MacroStabilityInwardsFailureMechanismContext, PipingFailureMechanismView>
             {
                 GetViewName = (view, mechanism) => mechanism.WrappedData.Name,
                 Image = RingtoetsCommonFormsResources.CalculationIcon,
@@ -203,7 +203,7 @@
                 AfterCreate = (view, context) =>
                 {
                     view.AssessmentSection = context.AssessmentSection;
-                    view.PipingFailureMechanism = context.FailureMechanism;
+                    view.MacroStabilityInwardsFailureMechanism = context.FailureMechanism;
                 }
             };
 
@@ -222,13 +222,13 @@
                 Image = RingtoetsCommonFormsResources.ScenariosIcon,
                 AdditionalDataCheck = context => context.WrappedData == context.ParentFailureMechanism.CalculationsGroup,
                 CloseForData = ClosePipingScenariosViewForData,
-                AfterCreate = (view, context) => { view.PipingFailureMechanism = context.ParentFailureMechanism; }
+                AfterCreate = (view, context) => { view.MacroStabilityInwardsFailureMechanism = context.ParentFailureMechanism; }
             };
         }
 
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
-            yield return RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo<PipingFailureMechanismContext>(
+            yield return RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo<MacroStabilityInwardsFailureMechanismContext>(
                 FailureMechanismEnabledChildNodeObjects,
                 FailureMechanismDisabledChildNodeObjects,
                 FailureMechanismEnabledContextMenuStrip,
@@ -374,14 +374,14 @@
         private static bool ClosePipingFailureMechanismViewForData(PipingFailureMechanismView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            var pipingFailureMechanism = o as PipingFailureMechanism;
+            var pipingFailureMechanism = o as MacroStabilityInwardsFailureMechanism;
 
-            var viewPipingFailureMechanismContext = (PipingFailureMechanismContext) view.Data;
-            PipingFailureMechanism viewPipingFailureMechanism = viewPipingFailureMechanismContext.WrappedData;
+            var viewPipingFailureMechanismContext = (MacroStabilityInwardsFailureMechanismContext) view.Data;
+            MacroStabilityInwardsFailureMechanism viewMacroStabilityInwardsFailureMechanism = viewPipingFailureMechanismContext.WrappedData;
 
             return assessmentSection != null
                        ? ReferenceEquals(viewPipingFailureMechanismContext.Parent, assessmentSection)
-                       : ReferenceEquals(viewPipingFailureMechanism, pipingFailureMechanism);
+                       : ReferenceEquals(viewMacroStabilityInwardsFailureMechanism, pipingFailureMechanism);
         }
 
         #endregion
@@ -391,13 +391,13 @@
         private static bool CloseFailureMechanismResultViewForData(PipingFailureMechanismResultView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            var failureMechanism = o as PipingFailureMechanism;
-            var failureMechanismContext = o as IFailureMechanismContext<PipingFailureMechanism>;
+            var failureMechanism = o as MacroStabilityInwardsFailureMechanism;
+            var failureMechanismContext = o as IFailureMechanismContext<MacroStabilityInwardsFailureMechanism>;
             if (assessmentSection != null)
             {
                 return assessmentSection
                     .GetFailureMechanisms()
-                    .OfType<PipingFailureMechanism>()
+                    .OfType<MacroStabilityInwardsFailureMechanism>()
                     .Any(fm => ReferenceEquals(view.Data, fm.SectionResults));
             }
             if (failureMechanismContext != null)
@@ -414,8 +414,8 @@
         private static bool ClosePipingCalculationsViewForData(PipingCalculationsView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            var pipingFailureMechanism = o as PipingFailureMechanism;
-            var pipingFailureMechanismContext = o as PipingFailureMechanismContext;
+            var pipingFailureMechanism = o as MacroStabilityInwardsFailureMechanism;
+            var pipingFailureMechanismContext = o as MacroStabilityInwardsFailureMechanismContext;
 
             if (pipingFailureMechanismContext != null)
             {
@@ -424,7 +424,7 @@
             if (assessmentSection != null)
             {
                 pipingFailureMechanism = assessmentSection.GetFailureMechanisms()
-                                                          .OfType<PipingFailureMechanism>()
+                                                          .OfType<MacroStabilityInwardsFailureMechanism>()
                                                           .FirstOrDefault();
             }
 
@@ -438,8 +438,8 @@
         private static bool ClosePipingScenariosViewForData(PipingScenariosView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            var pipingFailureMechanism = o as PipingFailureMechanism;
-            var pipingFailureMechanismContext = o as PipingFailureMechanismContext;
+            var pipingFailureMechanism = o as MacroStabilityInwardsFailureMechanism;
+            var pipingFailureMechanismContext = o as MacroStabilityInwardsFailureMechanismContext;
 
             if (pipingFailureMechanismContext != null)
             {
@@ -448,7 +448,7 @@
             if (assessmentSection != null)
             {
                 pipingFailureMechanism = assessmentSection.GetFailureMechanisms()
-                                                          .OfType<PipingFailureMechanism>()
+                                                          .OfType<MacroStabilityInwardsFailureMechanism>()
                                                           .FirstOrDefault();
             }
 
@@ -476,9 +476,9 @@
                                                             .OfType<PipingCalculationScenario>();
             }
 
-            var failureMechanism = o as PipingFailureMechanism;
+            var failureMechanism = o as MacroStabilityInwardsFailureMechanism;
 
-            var failureMechanismContext = o as PipingFailureMechanismContext;
+            var failureMechanismContext = o as MacroStabilityInwardsFailureMechanismContext;
             if (failureMechanismContext != null)
             {
                 failureMechanism = failureMechanismContext.WrappedData;
@@ -488,7 +488,7 @@
             if (assessmentSection != null)
             {
                 failureMechanism = assessmentSection.GetFailureMechanisms()
-                                                    .OfType<PipingFailureMechanism>()
+                                                    .OfType<MacroStabilityInwardsFailureMechanism>()
                                                     .FirstOrDefault();
             }
 
@@ -503,7 +503,7 @@
 
         #endregion
 
-        private void CalculateAll(PipingFailureMechanismContext failureMechanismContext)
+        private void CalculateAll(MacroStabilityInwardsFailureMechanismContext failureMechanismContext)
         {
             IEnumerable<PipingCalculation> calculations = GetAllPipingCalculations(failureMechanismContext.WrappedData);
             PipingProbabilityAssessmentInput assessmentInput = failureMechanismContext.WrappedData.PipingProbabilityAssessmentInput;
@@ -588,28 +588,28 @@
 
         #endregion
 
-        #region PipingFailureMechanismContext TreeNodeInfo
+        #region MacroStabilityInwardsFailureMechanismContext TreeNodeInfo
 
-        private ContextMenuStrip FailureMechanismEnabledContextMenuStrip(PipingFailureMechanismContext pipingFailureMechanismContext,
+        private ContextMenuStrip FailureMechanismEnabledContextMenuStrip(MacroStabilityInwardsFailureMechanismContext macroStabilityInwardsFailureMechanismContext,
                                                                          object parentData,
                                                                          TreeViewControl treeViewControl)
         {
-            var builder = new RingtoetsContextMenuBuilder(Gui.Get(pipingFailureMechanismContext, treeViewControl));
+            var builder = new RingtoetsContextMenuBuilder(Gui.Get(macroStabilityInwardsFailureMechanismContext, treeViewControl));
 
             return builder.AddOpenItem()
                           .AddSeparator()
-                          .AddToggleRelevancyOfFailureMechanismItem(pipingFailureMechanismContext, RemoveAllViewsForItem)
+                          .AddToggleRelevancyOfFailureMechanismItem(macroStabilityInwardsFailureMechanismContext, RemoveAllViewsForItem)
                           .AddSeparator()
                           .AddValidateAllCalculationsInFailureMechanismItem(
-                              pipingFailureMechanismContext,
+                              macroStabilityInwardsFailureMechanismContext,
                               ValidateAll,
                               ValidateAllDataAvailableAndGetErrorMessage)
                           .AddPerformAllCalculationsInFailureMechanismItem(
-                              pipingFailureMechanismContext,
+                              macroStabilityInwardsFailureMechanismContext,
                               CalculateAll,
                               ValidateAllDataAvailableAndGetErrorMessage)
                           .AddSeparator()
-                          .AddClearAllCalculationOutputInFailureMechanismItem(pipingFailureMechanismContext.WrappedData)
+                          .AddClearAllCalculationOutputInFailureMechanismItem(macroStabilityInwardsFailureMechanismContext.WrappedData)
                           .AddSeparator()
                           .AddCollapseAllItem()
                           .AddExpandAllItem()
@@ -618,59 +618,59 @@
                           .Build();
         }
 
-        private void RemoveAllViewsForItem(PipingFailureMechanismContext failureMechanismContext)
+        private void RemoveAllViewsForItem(MacroStabilityInwardsFailureMechanismContext failureMechanismContext)
         {
             Gui.ViewCommands.RemoveAllViewsForItem(failureMechanismContext);
         }
 
-        private static void ValidateAll(PipingFailureMechanismContext context)
+        private static void ValidateAll(MacroStabilityInwardsFailureMechanismContext context)
         {
             ValidateAll(context.WrappedData.Calculations.OfType<PipingCalculation>());
         }
 
-        private ContextMenuStrip FailureMechanismDisabledContextMenuStrip(PipingFailureMechanismContext pipingFailureMechanismContext,
+        private ContextMenuStrip FailureMechanismDisabledContextMenuStrip(MacroStabilityInwardsFailureMechanismContext macroStabilityInwardsFailureMechanismContext,
                                                                           object parentData,
                                                                           TreeViewControl treeViewControl)
         {
-            var builder = new RingtoetsContextMenuBuilder(Gui.Get(pipingFailureMechanismContext, treeViewControl));
+            var builder = new RingtoetsContextMenuBuilder(Gui.Get(macroStabilityInwardsFailureMechanismContext, treeViewControl));
 
-            return builder.AddToggleRelevancyOfFailureMechanismItem(pipingFailureMechanismContext, RemoveAllViewsForItem)
+            return builder.AddToggleRelevancyOfFailureMechanismItem(macroStabilityInwardsFailureMechanismContext, RemoveAllViewsForItem)
                           .AddSeparator()
                           .AddCollapseAllItem()
                           .AddExpandAllItem()
                           .Build();
         }
 
-        private static string ValidateAllDataAvailableAndGetErrorMessage(PipingFailureMechanismContext context)
+        private static string ValidateAllDataAvailableAndGetErrorMessage(MacroStabilityInwardsFailureMechanismContext context)
         {
             return ValidateAllDataAvailableAndGetErrorMessage(context.WrappedData);
         }
 
-        private static IEnumerable<PipingCalculation> GetAllPipingCalculations(PipingFailureMechanism failureMechanism)
+        private static IEnumerable<PipingCalculation> GetAllPipingCalculations(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
             return failureMechanism.Calculations.OfType<PipingCalculation>();
         }
 
-        private static object[] FailureMechanismEnabledChildNodeObjects(PipingFailureMechanismContext pipingFailureMechanismContext)
+        private static object[] FailureMechanismEnabledChildNodeObjects(MacroStabilityInwardsFailureMechanismContext macroStabilityInwardsFailureMechanismContext)
         {
-            PipingFailureMechanism wrappedData = pipingFailureMechanismContext.WrappedData;
+            MacroStabilityInwardsFailureMechanism wrappedData = macroStabilityInwardsFailureMechanismContext.WrappedData;
             return new object[]
             {
-                new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, pipingFailureMechanismContext.Parent), TreeFolderCategory.Input),
-                new PipingCalculationGroupContext(wrappedData.CalculationsGroup, wrappedData.SurfaceLines, wrappedData.StochasticSoilModels, wrappedData, pipingFailureMechanismContext.Parent),
+                new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, macroStabilityInwardsFailureMechanismContext.Parent), TreeFolderCategory.Input),
+                new PipingCalculationGroupContext(wrappedData.CalculationsGroup, wrappedData.SurfaceLines, wrappedData.StochasticSoilModels, wrappedData, macroStabilityInwardsFailureMechanismContext.Parent),
                 new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData), TreeFolderCategory.Output)
             };
         }
 
-        private static object[] FailureMechanismDisabledChildNodeObjects(PipingFailureMechanismContext pipingFailureMechanismContext)
+        private static object[] FailureMechanismDisabledChildNodeObjects(MacroStabilityInwardsFailureMechanismContext macroStabilityInwardsFailureMechanismContext)
         {
             return new object[]
             {
-                pipingFailureMechanismContext.WrappedData.NotRelevantComments
+                macroStabilityInwardsFailureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
-        private static IList GetInputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        private static IList GetInputs(MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new ArrayList
             {
@@ -681,7 +681,7 @@
             };
         }
 
-        private static IList GetOutputs(PipingFailureMechanism failureMechanism)
+        private static IList GetOutputs(MacroStabilityInwardsFailureMechanism failureMechanism)
         {
             return new ArrayList
             {