Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rc1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4 -r49b9661d0b96b18030ed894946b7d5b5025f7744
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs	(.../PipingStructureFailureMechanismCreateExtensions.cs)	(revision c1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs	(.../PipingStructureFailureMechanismCreateExtensions.cs)	(revision 49b9661d0b96b18030ed894946b7d5b5025f7744)
@@ -21,8 +21,9 @@
 
 using System;
 using System.Collections.Generic;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
+using Riskeer.Storage.Core.Create.FailureMechanismSectionResults;
 using Riskeer.Storage.Core.DbContext;
 
 namespace Riskeer.Storage.Core.Create.PipingStructure
@@ -42,18 +43,18 @@
         internal static FailureMechanismEntity Create(this PipingStructureFailureMechanism mechanism, PersistenceRegistry registry)
         {
             FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.PipingAtStructure, registry);
-            AddEntitiesForSectionResults(mechanism.SectionResultsOld, registry);
+            AddEntitiesForSectionResults(mechanism.SectionResults, registry);
             AddEntitiesForFailureMechanismMeta(mechanism, entity);
             return entity;
         }
 
         private static void AddEntitiesForSectionResults(
-            IEnumerable<PipingStructureFailureMechanismSectionResultOld> sectionResults,
+            IEnumerable<NonAdoptableFailureMechanismSectionResult> sectionResults,
             PersistenceRegistry registry)
         {
-            foreach (PipingStructureFailureMechanismSectionResultOld failureMechanismSectionResult in sectionResults)
+            foreach (NonAdoptableFailureMechanismSectionResult failureMechanismSectionResult in sectionResults)
             {
-                PipingStructureSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create();
+                PipingStructureSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create<PipingStructureSectionResultEntity>();
                 FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section);
                 section.PipingStructureSectionResultEntities.Add(sectionResultEntity);
             }
Fisheye: Tag 49b9661d0b96b18030ed894946b7d5b5025f7744 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rb456ef8d3145ac3b434af49704b12b02afcb9b38 -r49b9661d0b96b18030ed894946b7d5b5025f7744
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision b456ef8d3145ac3b434af49704b12b02afcb9b38)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 49b9661d0b96b18030ed894946b7d5b5025f7744)
@@ -47,7 +47,6 @@
 using Riskeer.Storage.Core.Read.MacroStabilityInwards;
 using Riskeer.Storage.Core.Read.MacroStabilityOutwards;
 using Riskeer.Storage.Core.Read.Piping;
-using Riskeer.Storage.Core.Read.PipingStructure;
 using Riskeer.Storage.Core.Read.StabilityPointStructures;
 using Riskeer.Storage.Core.Read.StabilityStoneCover;
 using Riskeer.Storage.Core.Read.WaveImpactAsphaltCover;
@@ -902,7 +901,7 @@
             foreach (PipingStructureSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingStructureSectionResultEntities))
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                PipingStructureFailureMechanismSectionResultOld result = failureMechanism.SectionResultsOld.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
Fisheye: Tag 49b9661d0b96b18030ed894946b7d5b5025f7744 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 49b9661d0b96b18030ed894946b7d5b5025f7744 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 49b9661d0b96b18030ed894946b7d5b5025f7744 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?