Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r086f83a97089b51a29a20af7c08b8220e2fb1a24 -r83a4659d69e1765235888b460b6c7cd3f3eb988c
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 086f83a97089b51a29a20af7c08b8220e2fb1a24)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 83a4659d69e1765235888b460b6c7cd3f3eb988c)
@@ -417,12 +417,12 @@
                                                                                  WaterPressureAsphaltCoverFailureMechanism failureMechanism,
                                                                                  ReadConversionCollector collector)
         {
-            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
-                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
@@ -614,12 +614,12 @@
                                                                               WaveImpactAsphaltCoverFailureMechanism failureMechanism,
                                                                               ReadConversionCollector collector)
         {
-            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
-                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
@@ -669,12 +669,12 @@
                                                                                  GrassCoverErosionOutwardsFailureMechanism failureMechanism,
                                                                                  ReadConversionCollector collector)
         {
-            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
-                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
@@ -714,12 +714,12 @@
                                                                                 GrassCoverSlipOffInwardsFailureMechanism failureMechanism,
                                                                                 ReadConversionCollector collector)
         {
-            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
-                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
@@ -749,12 +749,12 @@
                                                                                  GrassCoverSlipOffOutwardsFailureMechanism failureMechanism,
                                                                                  ReadConversionCollector collector)
         {
-            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
-                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
@@ -784,12 +784,12 @@
                                                                       MicrostabilityFailureMechanism failureMechanism,
                                                                       ReadConversionCollector collector)
         {
-            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
-                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
@@ -945,12 +945,12 @@
                                                                            StabilityStoneCoverFailureMechanism failureMechanism,
                                                                            ReadConversionCollector collector)
         {
-            IEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity> sectionResultEntities =
-                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities);
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
+            IEnumerable<NonAdoptableFailureMechanismSectionResultEntity> sectionResultEntities =
+                entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities);
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in sectionResultEntities)
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/SpecificFailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r086f83a97089b51a29a20af7c08b8220e2fb1a24 -r83a4659d69e1765235888b460b6c7cd3f3eb988c
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/SpecificFailureMechanismEntityReadExtensions.cs	(.../SpecificFailureMechanismEntityReadExtensions.cs)	(revision 086f83a97089b51a29a20af7c08b8220e2fb1a24)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/SpecificFailureMechanismEntityReadExtensions.cs	(.../SpecificFailureMechanismEntityReadExtensions.cs)	(revision 83a4659d69e1765235888b460b6c7cd3f3eb988c)
@@ -65,11 +65,11 @@
                                                                SpecificFailureMechanism specificFailureMechanism,
                                                                ReadConversionCollector collector)
         {
-            foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in
-                     entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities))
+            foreach (NonAdoptableFailureMechanismSectionResultEntity sectionResultEntity in
+                     entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities))
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult = specificFailureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                NonAdoptableFailureMechanismSectionResult sectionResult = specificFailureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(sectionResult);
             }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -rd6868fb5be38b75c277666c6fbcfc5184ba682af -r83a4659d69e1765235888b460b6c7cd3f3eb988c
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision d6868fb5be38b75c277666c6fbcfc5184ba682af)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 83a4659d69e1765235888b460b6c7cd3f3eb988c)
@@ -279,13 +279,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -389,13 +389,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -417,7 +417,7 @@
                             failureMechanism.FailureMechanismSectionSourcePath);
 
             SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities
-                                                              .SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities)
+                                                              .SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities)
                                                               .Single(),
                                                         failureMechanism.SectionResults.Single());
         }
@@ -502,13 +502,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -612,13 +612,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -2055,13 +2055,13 @@
             const string filePath = "failureMechanismSections/File/Path";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             var entity = new FailureMechanismEntity
             {
                 FailureMechanismSectionCollectionSourcePath = filePath,
@@ -2344,12 +2344,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
@@ -2591,12 +2591,12 @@
             const string filePath = "failureMechanismSections/FilePath";
 
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities.Add(sectionResultEntity);
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
 
             var entity = new FailureMechanismEntity
             {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r086f83a97089b51a29a20af7c08b8220e2fb1a24 -r83a4659d69e1765235888b460b6c7cd3f3eb988c
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs	(.../SpecificFailureMechanismEntityReadExtensionsTest.cs)	(revision 086f83a97089b51a29a20af7c08b8220e2fb1a24)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs	(.../SpecificFailureMechanismEntityReadExtensionsTest.cs)	(revision 83a4659d69e1765235888b460b6c7cd3f3eb988c)
@@ -178,7 +178,7 @@
             Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailureMechanism.Sections.Count());
 
             SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities
-                                                              .SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities)
+                                                              .SelectMany(fms => fms.NonAdoptableFailureMechanismSectionResultEntities)
                                                               .Single(),
                                                         specificFailureMechanism.SectionResults.Single());
         }