Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rc001c83924455e2040eda334a044058f64d0f800 -r987fa65588b3001eb56d3a87f21f6fe781370af8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision c001c83924455e2040eda334a044058f64d0f800)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 987fa65588b3001eb56d3a87f21f6fe781370af8)
@@ -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,30 +487,30 @@
 
         #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))
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                MacrostabilityInwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                MacroStabilityInwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }