Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r638081278e33e132e3ffedd52fff0d6c00ab4728 -ra52ec667ab711f4d1d532fe91fb875145bc21ad2
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 638081278e33e132e3ffedd52fff0d6c00ab4728)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision a52ec667ab711f4d1d532fe91fb875145bc21ad2)
@@ -45,10 +45,13 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
+using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Data;
+using GeneralPipingInput = Ringtoets.Piping.Data.GeneralPipingInput;
+using PipingFailureMechanismSectionResult = Ringtoets.Piping.Data.PipingFailureMechanismSectionResult;
 
 namespace Application.Ringtoets.Storage.Read
 {
@@ -484,24 +487,24 @@
 
         #endregion
 
-        #region Macrostability Inwards
+        #region MacroStability Inwards
 
         /// <summary>
-        /// Read the <see cref="FailureMechanismEntity"/> and use the information to update a <see cref="MacrostabilityInwardsFailureMechanism"/>.
+        /// Read the <see cref="FailureMechanismEntity"/> and use the information to update a <see cref="MacroStabilityInwardsFailureMechanism"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="FailureMechanismEntity"/> to create <see cref="MacrostabilityInwardsFailureMechanism"/> for.</param>
+        /// <param name="entity">The <see cref="FailureMechanismEntity"/> to create <see cref="MacroStabilityInwardsFailureMechanism"/> for.</param>
         /// <param name="failureMechanism">The target of the read operation.</param>
         /// <param name="collector">The object keeping track of read operations.</param>
-        internal static void ReadAsMacrostabilityInwardsFailureMechanism(this FailureMechanismEntity entity,
-                                                                         MacrostabilityInwardsFailureMechanism failureMechanism,
+        internal static void ReadAsMacroStabilityInwardsFailureMechanism(this FailureMechanismEntity entity,
+                                                                         MacroStabilityInwardsFailureMechanism failureMechanism,
                                                                          ReadConversionCollector collector)
         {
             entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadMacrostabilityInwardsMechanismSectionResults(failureMechanism, collector);
         }
 
         private static void ReadMacrostabilityInwardsMechanismSectionResults(this FailureMechanismEntity entity,
-                                                                             MacrostabilityInwardsFailureMechanism failureMechanism,
+                                                                             MacroStabilityInwardsFailureMechanism failureMechanism,
                                                                              ReadConversionCollector collector)
         {
             foreach (MacrostabilityInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacrostabilityInwardsSectionResultEntities))