Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -r228f2e1b1297e24c82c34e76eb5280ca245c8318
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs	(.../ClosingStructuresFailureMechanismCreateExtensions.cs)	(revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs	(.../ClosingStructuresFailureMechanismCreateExtensions.cs)	(revision 228f2e1b1297e24c82c34e76eb5280ca245c8318)
@@ -41,7 +41,7 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="registry"/> is <c>null</c>.</exception>
         internal static FailureMechanismEntity Create(this ClosingStructuresFailureMechanism mechanism, PersistenceRegistry registry)
         {
-            var entity = mechanism.Create(FailureMechanismType.ReliabilityClosingOfStructure, registry);
+            FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.ReliabilityClosingOfStructure, registry);
             AddEntitiesForSectionResults(mechanism.SectionResults, registry);
             AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry);
             AddEntitiesForFailureMechanismMeta(mechanism.GeneralInput, entity);
@@ -55,8 +55,8 @@
         {
             foreach (var failureMechanismSectionResult in sectionResults)
             {
-                var sectionResultEntity = failureMechanismSectionResult.Create(registry);
-                var section = registry.Get(failureMechanismSectionResult.Section);
+                ClosingStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry);
+                FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section);
                 section.ClosingStructuresSectionResultEntities.Add(sectionResultEntity);
             }
         }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -r228f2e1b1297e24c82c34e76eb5280ca245c8318
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs	(.../HeightStructuresFailureMechanismCreateExtensions.cs)	(revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs	(.../HeightStructuresFailureMechanismCreateExtensions.cs)	(revision 228f2e1b1297e24c82c34e76eb5280ca245c8318)
@@ -55,8 +55,8 @@
         {
             foreach (var failureMechanismSectionResult in sectionResults)
             {
-                var sectionResultEntity = failureMechanismSectionResult.Create(registry);
-                var section = registry.Get(failureMechanismSectionResult.Section);
+                HeightStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry);
+                FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section);
                 section.HeightStructuresSectionResultEntities.Add(sectionResultEntity);
             }
         }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -r228f2e1b1297e24c82c34e76eb5280ca245c8318
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensions.cs)	(revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensions.cs)	(revision 228f2e1b1297e24c82c34e76eb5280ca245c8318)
@@ -41,7 +41,7 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="registry"/> is <c>null</c>.</exception>
         internal static FailureMechanismEntity Create(this StabilityPointStructuresFailureMechanism mechanism, PersistenceRegistry registry)
         {
-            var entity = mechanism.Create(FailureMechanismType.StabilityPointStructures, registry);
+            FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.StabilityPointStructures, registry);
             AddEntitiesForSectionResults(mechanism.SectionResults, registry);
             AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry);
             AddEntitiesForFailureMechanismMeta(mechanism.GeneralInput, entity);
@@ -55,8 +55,8 @@
         {
             foreach (var failureMechanismSectionResult in sectionResults)
             {
-                var sectionResultEntity = failureMechanismSectionResult.Create(registry);
-                var section = registry.Get(failureMechanismSectionResult.Section);
+                StabilityPointStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry);
+                FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section);
                 section.StabilityPointStructuresSectionResultEntities.Add(sectionResultEntity);
             }
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -r228f2e1b1297e24c82c34e76eb5280ca245c8318
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 228f2e1b1297e24c82c34e76eb5280ca245c8318)
@@ -798,7 +798,7 @@
         public void Read_WithHeightStructuresWithProperties_ReturnsHeightStructuresWithProperties(bool isRelevant)
         {
             // Setup
-            var entity = CreateAssessmentSectionEntity();
+            AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
             const string comments = "Some text";
 
             var failureMechanismEntity = new FailureMechanismEntity
@@ -833,7 +833,7 @@
         public void Read_WithClosingStructuresWithProperties_ReturnsClosingStructuresWithProperties(bool isRelevant)
         {
             // Setup
-            var entity = CreateAssessmentSectionEntity();
+            AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
             const string comments = "Some text";
 
             var failureMechanismEntity = new FailureMechanismEntity
@@ -869,7 +869,7 @@
         public void Read_WithStabilityPointStructuresWithProperties_ReturnsStabilityPointStructuresWithProperties(bool isRelevant)
         {
             // Setup
-            var entity = CreateAssessmentSectionEntity();
+            AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
             const string comments = "Some text";
 
             var failureMechanismEntity = new FailureMechanismEntity