Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r521d10695326519942a95db0d8746da32c586668 -rca4b9f1619eb4428219ff5414e067f3e3982d769
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs	(.../MicrostabilityFailureMechanismCreateExtensions.cs)	(revision 521d10695326519942a95db0d8746da32c586668)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs	(.../MicrostabilityFailureMechanismCreateExtensions.cs)	(revision ca4b9f1619eb4428219ff5414e067f3e3982d769)
@@ -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.Microstability
@@ -43,18 +44,18 @@
         {
             FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.Microstability, registry);
             AddEntitiesForFailureMechanismMeta(mechanism, entity);
-            AddEntitiesForSectionResults(mechanism.SectionResultsOld, registry);
+            AddEntitiesForSectionResults(mechanism.SectionResults, registry);
 
             return entity;
         }
 
         private static void AddEntitiesForSectionResults(
-            IEnumerable<MicrostabilityFailureMechanismSectionResultOld> sectionResults,
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> sectionResults,
             PersistenceRegistry registry)
         {
-            foreach (MicrostabilityFailureMechanismSectionResultOld failureMechanismSectionResult in sectionResults)
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResult failureMechanismSectionResult in sectionResults)
             {
-                MicrostabilitySectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create();
+                var sectionResultEntity = failureMechanismSectionResult.Create<MicrostabilitySectionResultEntity>();
                 FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section);
                 section.MicrostabilitySectionResultEntities.Add(sectionResultEntity);
             }
Fisheye: Tag ca4b9f1619eb4428219ff5414e067f3e3982d769 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r8858dcdf5d4cec2dfa3492666a001146a7e6d849 -rca4b9f1619eb4428219ff5414e067f3e3982d769
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 8858dcdf5d4cec2dfa3492666a001146a7e6d849)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision ca4b9f1619eb4428219ff5414e067f3e3982d769)
@@ -847,7 +847,7 @@
             foreach (MicrostabilitySectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MicrostabilitySectionResultEntities))
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                MicrostabilityFailureMechanismSectionResultOld result = failureMechanism.SectionResultsOld.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
Fisheye: Tag ca4b9f1619eb4428219ff5414e067f3e3982d769 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/MicrostabilitySectionResultEntityReadExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ca4b9f1619eb4428219ff5414e067f3e3982d769 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ca4b9f1619eb4428219ff5414e067f3e3982d769 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?