Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -r96c601320c699dc4e97e3568049f0b5e96067604 -r4c16454e3b11df918816195e24fa56dc4e352eee
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 96c601320c699dc4e97e3568049f0b5e96067604)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 4c16454e3b11df918816195e24fa56dc4e352eee)
@@ -80,7 +80,7 @@
             {
                 CreateInstance = context => new MacroStabilityInwardsFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler<MacroStabilityInwardsFailureMechanism>())
             };
-            yield return new PropertyInfo<PipingInputContext, PipingInputContextProperties>
+            yield return new PropertyInfo<MacroStabilityInwardsInputContext, PipingInputContextProperties>
             {
                 CreateInstance = context => new PipingInputContextProperties(context, new ObservablePropertyChangeHandler(context.PipingCalculation, context.WrappedData))
             };
@@ -207,7 +207,7 @@
                 }
             };
 
-            yield return new ViewInfo<PipingInputContext, PipingCalculationScenario, PipingInputView>
+            yield return new ViewInfo<MacroStabilityInwardsInputContext, PipingCalculationScenario, PipingInputView>
             {
                 GetViewData = context => context.PipingCalculation,
                 GetViewName = (view, input) => RingtoetsCommonFormsResources.Calculation_Input,
@@ -253,7 +253,7 @@
                                                                                  .Build()
             };
 
-            yield return new TreeNodeInfo<PipingInputContext>
+            yield return new TreeNodeInfo<MacroStabilityInwardsInputContext>
             {
                 Text = pipingInputContext => RingtoetsCommonFormsResources.Calculation_Input,
                 Image = pipingInputContext => MacroStabilityInwardsFormsResources.PipingInputIcon,
@@ -736,7 +736,7 @@
             var childNodes = new List<object>
             {
                 pipingCalculationScenario.Comments,
-                new PipingInputContext(pipingCalculationScenario.InputParameters,
+                new MacroStabilityInwardsInputContext(pipingCalculationScenario.InputParameters,
                                        pipingCalculationScenario,
                                        pipingCalculationScenarioContext.AvailablePipingSurfaceLines,
                                        pipingCalculationScenarioContext.AvailableStochasticSoilModels,
@@ -997,7 +997,7 @@
             nodeData.NotifyObservers();
         }
 
-        private static void GeneratePipingCalculations(CalculationGroup target, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> soilModels, GeneralPipingInput generalInput)
+        private static void GeneratePipingCalculations(CalculationGroup target, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> soilModels, GeneralMacroStabilityInwardsInput generalInput)
         {
             foreach (ICalculationBase group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput))
             {