Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -re58fd3d0920465fa2d6ee49dab42f0de4f6f13a5 -rfb1e163a7d3787f21bb120cecc2b373a8a7d3e64
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision e58fd3d0920465fa2d6ee49dab42f0de4f6f13a5)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision fb1e163a7d3787f21bb120cecc2b373a8a7d3e64)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Data;
 using Riskeer.ClosingStructures.Data;
@@ -229,7 +230,9 @@
                                                               PipingFailureMechanism failureMechanism,
                                                               ReadConversionCollector collector)
         {
-            foreach (PipingSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingSectionResultEntities))
+            IEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.AdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 AdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(
@@ -243,7 +246,8 @@
                                                                                       PipingFailureMechanism failureMechanism,
                                                                                       ReadConversionCollector collector)
         {
-            foreach (PipingScenarioConfigurationPerFailureMechanismSectionEntity sectionConfigurationEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingScenarioConfigurationPerFailureMechanismSectionEntities))
+            IEnumerable<PipingScenarioConfigurationPerFailureMechanismSectionEntity> pipingScenarioConfigurationPerFailureMechanismSectionEntities = entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingScenarioConfigurationPerFailureMechanismSectionEntities);
+            foreach (PipingScenarioConfigurationPerFailureMechanismSectionEntity sectionConfigurationEntity in pipingScenarioConfigurationPerFailureMechanismSectionEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionConfigurationEntity.FailureMechanismSectionEntity);
                 PipingScenarioConfigurationPerFailureMechanismSection configuration = failureMechanism.ScenarioConfigurationsPerFailureMechanismSection.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -310,7 +314,9 @@
                                                                                 GrassCoverErosionInwardsFailureMechanism failureMechanism,
                                                                                 ReadConversionCollector collector)
         {
-            foreach (GrassCoverErosionInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities))
+            IEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.AdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 AdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -358,7 +364,9 @@
                                                                         HeightStructuresFailureMechanism failureMechanism,
                                                                         ReadConversionCollector collector)
         {
-            foreach (HeightStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.HeightStructuresSectionResultEntities))
+            IEnumerable<AdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.AdoptableFailureMechanismSectionResultEntities);
+            foreach (AdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 AdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -422,7 +430,9 @@
                                                                                  WaterPressureAsphaltCoverFailureMechanism failureMechanism,
                                                                                  ReadConversionCollector collector)
         {
-            foreach (WaterPressureAsphaltCoverSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaterPressureAsphaltCoverSectionResultEntities))
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -470,7 +480,9 @@
                                                                          ClosingStructuresFailureMechanism failureMechanism,
                                                                          ReadConversionCollector collector)
         {
-            foreach (ClosingStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.ClosingStructuresSectionResultEntities))
+            IEnumerable<AdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.AdoptableFailureMechanismSectionResultEntities);
+            foreach (AdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 AdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -575,7 +587,9 @@
                                                                              MacroStabilityInwardsFailureMechanism failureMechanism,
                                                                              ReadConversionCollector collector)
         {
-            foreach (MacroStabilityInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacroStabilityInwardsSectionResultEntities))
+            IEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.AdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 AdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -624,7 +638,9 @@
                                                                               WaveImpactAsphaltCoverFailureMechanism failureMechanism,
                                                                               ReadConversionCollector collector)
         {
-            foreach (WaveImpactAsphaltCoverSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaveImpactAsphaltCoverSectionResultEntities))
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -688,7 +704,9 @@
                                                                                  GrassCoverErosionOutwardsFailureMechanism failureMechanism,
                                                                                  ReadConversionCollector collector)
         {
-            foreach (GrassCoverErosionOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionOutwardsSectionResultEntities))
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -735,7 +753,9 @@
                                                                                 GrassCoverSlipOffInwardsFailureMechanism failureMechanism,
                                                                                 ReadConversionCollector collector)
         {
-            foreach (GrassCoverSlipOffInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffInwardsSectionResultEntities))
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -772,7 +792,9 @@
                                                                                  GrassCoverSlipOffOutwardsFailureMechanism failureMechanism,
                                                                                  ReadConversionCollector collector)
         {
-            foreach (GrassCoverSlipOffOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffOutwardsSectionResultEntities))
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -809,7 +831,9 @@
                                                                       MicrostabilityFailureMechanism failureMechanism,
                                                                       ReadConversionCollector collector)
         {
-            foreach (MicrostabilitySectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MicrostabilitySectionResultEntities))
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -863,7 +887,8 @@
                                                                        PipingStructureFailureMechanism failureMechanism,
                                                                        ReadConversionCollector collector)
         {
-            foreach (PipingStructureSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingStructureSectionResultEntities))
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities = entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -904,7 +929,9 @@
                                                                    DuneErosionFailureMechanism failureMechanism,
                                                                    ReadConversionCollector collector)
         {
-            foreach (DuneErosionSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.DuneErosionSectionResultEntities))
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -975,7 +1002,9 @@
                                                                            StabilityStoneCoverFailureMechanism failureMechanism,
                                                                            ReadConversionCollector collector)
         {
-            foreach (StabilityStoneCoverSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityStoneCoverSectionResultEntities))
+            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
@@ -1035,7 +1064,9 @@
                                                                                 StabilityPointStructuresFailureMechanism failureMechanism,
                                                                                 ReadConversionCollector collector)
         {
-            foreach (StabilityPointStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityPointStructuresSectionResultEntities))
+            IEnumerable<AdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.AdoptableFailureMechanismSectionResultEntities);
+            foreach (AdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
                 AdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -re58fd3d0920465fa2d6ee49dab42f0de4f6f13a5 -rfb1e163a7d3787f21bb120cecc2b373a8a7d3e64
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision e58fd3d0920465fa2d6ee49dab42f0de4f6f13a5)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision fb1e163a7d3787f21bb120cecc2b373a8a7d3e64)
@@ -59,21 +59,6 @@
     [TestFixture]
     public class FailureMechanismEntityReadExtensionsTest
     {
-        private static FailureMechanismSectionEntity CreateSimpleFailureMechanismSectionEntity()
-        {
-            var dummyPoints = new[]
-            {
-                new Point2D(0, 0)
-            };
-            string dummyPointXml = new Point2DCollectionXmlSerializer().ToXml(dummyPoints);
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity
-            {
-                Name = "section",
-                FailureMechanismSectionPointXml = dummyPointXml
-            };
-            return failureMechanismSectionEntity;
-        }
-
         [Test]
         public void ReadCommonFailureMechanismProperties_EntityNull_ThrowsArgumentNullException()
         {
@@ -201,7 +186,22 @@
             Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count());
             Assert.AreEqual(filePath, failureMechanism.FailureMechanismSectionSourcePath);
         }
-        
+
+        private static FailureMechanismSectionEntity CreateSimpleFailureMechanismSectionEntity()
+        {
+            var dummyPoints = new[]
+            {
+                new Point2D(0, 0)
+            };
+            string dummyPointXml = new Point2DCollectionXmlSerializer().ToXml(dummyPoints);
+            var failureMechanismSectionEntity = new FailureMechanismSectionEntity
+            {
+                Name = "section",
+                FailureMechanismSectionPointXml = dummyPointXml
+            };
+            return failureMechanismSectionEntity;
+        }
+
         #region GrassCoverSlipOffInwards
 
         [Test]
@@ -250,13 +250,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var grassCoverSlipOffInwardsSectionResultEntity = new GrassCoverSlipOffInwardsSectionResultEntity
+            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(grassCoverSlipOffInwardsSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.GrassCoverSlipOffInwardsSectionResultEntities.Add(grassCoverSlipOffInwardsSectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -284,7 +284,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffInwardsSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -337,13 +337,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var waterPressureAsphaltCoverSectionResultEntity = new WaterPressureAsphaltCoverSectionResultEntity
+            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(waterPressureAsphaltCoverSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.WaterPressureAsphaltCoverSectionResultEntities.Add(waterPressureAsphaltCoverSectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -371,7 +371,10 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaterPressureAsphaltCoverSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities
+                                                              .SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities)
+                                                              .Single(),
+                                                        failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -424,13 +427,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var grassCoverSlipOffOutwardsSectionResultEntity = new GrassCoverSlipOffOutwardsSectionResultEntity
+            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(grassCoverSlipOffOutwardsSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.GrassCoverSlipOffOutwardsSectionResultEntities.Add(grassCoverSlipOffOutwardsSectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -458,7 +461,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffOutwardsSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -511,13 +514,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var microStabilitySectionResultEntity = new MicrostabilitySectionResultEntity
+            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(microStabilitySectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.MicrostabilitySectionResultEntities.Add(microStabilitySectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -545,7 +548,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MicrostabilitySectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -599,13 +602,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var duneErosionSectionResultEntity = new DuneErosionSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(duneErosionSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.DuneErosionSectionResultEntities.Add(duneErosionSectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -633,7 +636,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.DuneErosionSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         [Test]
@@ -1083,17 +1086,17 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var pipingSectionResultEntity = new PipingSectionResultEntity
+            var sectionResultEntity = new AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(pipingSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
             var pipingScenarioConfigurationPerFailureMechanismSectionEntity = new PipingScenarioConfigurationPerFailureMechanismSectionEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            failureMechanismSectionEntity.PipingSectionResultEntities.Add(pipingSectionResultEntity);
+            failureMechanismSectionEntity.AdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             failureMechanismSectionEntity.PipingScenarioConfigurationPerFailureMechanismSectionEntities.Add(pipingScenarioConfigurationPerFailureMechanismSectionEntity);
             var entity = new FailureMechanismEntity
             {
@@ -1120,7 +1123,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         [Test]
@@ -1459,12 +1462,12 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var macroStabilityInwardsSectionResultEntity = new MacroStabilityInwardsSectionResultEntity
+            var sectionResultEntity = new AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(macroStabilityInwardsSectionResultEntity);
-            failureMechanismSectionEntity.MacroStabilityInwardsSectionResultEntities.Add(macroStabilityInwardsSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.AdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -1491,7 +1494,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacroStabilityInwardsSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         [Test]
@@ -1646,12 +1649,12 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var grassCoverErosionInwardsSectionResultEntity = new GrassCoverErosionInwardsSectionResultEntity
+            var sectionResultEntity = new AdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(grassCoverErosionInwardsSectionResultEntity);
-            failureMechanismSectionEntity.GrassCoverErosionInwardsSectionResultEntities.Add(grassCoverErosionInwardsSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.AdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -1679,7 +1682,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count());
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath, failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         [Test]
@@ -1864,13 +1867,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var grassCoverErosionOutwardsSectionResultEntity = new GrassCoverErosionOutwardsSectionResultEntity
+            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(grassCoverErosionOutwardsSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.GrassCoverErosionOutwardsSectionResultEntities.Add(grassCoverErosionOutwardsSectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -1897,7 +1900,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count());
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath, failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionOutwardsSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         [Test]
@@ -2130,12 +2133,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var stabilityStoneCoverSectionResultEntity = new StabilityStoneCoverSectionResultEntity
+            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(stabilityStoneCoverSectionResultEntity);
-            failureMechanismSectionEntity.StabilityStoneCoverSectionResultEntities.Add(stabilityStoneCoverSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -2165,7 +2168,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityStoneCoverSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -2351,12 +2354,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var waveImpactAsphaltCoverSectionResultEntity = new WaveImpactAsphaltCoverSectionResultEntity
+            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(waveImpactAsphaltCoverSectionResultEntity);
-            failureMechanismSectionEntity.WaveImpactAsphaltCoverSectionResultEntities.Add(waveImpactAsphaltCoverSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -2386,7 +2389,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaveImpactAsphaltCoverSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -2636,12 +2639,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var heightStructuresSectionResultEntity = new HeightStructuresSectionResultEntity
+            var sectionResultEntity = new AdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(heightStructuresSectionResultEntity);
-            failureMechanismSectionEntity.HeightStructuresSectionResultEntities.Add(heightStructuresSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.AdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -2671,7 +2674,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.HeightStructuresSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -2934,12 +2937,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var closingStructuresSectionResultEntity = new ClosingStructuresSectionResultEntity
+            var sectionResultEntity = new AdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(closingStructuresSectionResultEntity);
-            failureMechanismSectionEntity.ClosingStructuresSectionResultEntities.Add(closingStructuresSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.AdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -2966,7 +2969,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.ClosingStructuresSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -3239,12 +3242,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var stabilityPointStructuresSectionResultEntity = new StabilityPointStructuresSectionResultEntity
+            var sectionResultEntity = new AdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(stabilityPointStructuresSectionResultEntity);
-            failureMechanismSectionEntity.StabilityPointStructuresSectionResultEntities.Add(stabilityPointStructuresSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.AdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -3274,7 +3277,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityPointStructuresSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion
@@ -3370,12 +3373,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var pipingStructureSectionResultEntity = new PipingStructureSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            SectionResultTestHelper.SetSectionResult(pipingStructureSectionResultEntity);
-            failureMechanismSectionEntity.PipingStructureSectionResultEntities.Add(pipingStructureSectionResultEntity);
+            SectionResultTestHelper.SetSectionResult(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -3405,7 +3408,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionCollectionSourcePath,
                             failureMechanism.FailureMechanismSectionSourcePath);
 
-            SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingStructureSectionResultEntities).Single(), failureMechanism.SectionResults.Single());
+            SectionResultTestHelper.AssertSectionResult(sectionResultEntity, failureMechanism.SectionResults.Single());
         }
 
         #endregion