Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r049bc71c645535030b367944fb2d44f2c5fba61d -r77d59bcd30168fe47d03c74bc66b928be03d1d01
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 049bc71c645535030b367944fb2d44f2c5fba61d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 77d59bcd30168fe47d03c74bc66b928be03d1d01)
@@ -340,25 +340,25 @@
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(WaterPressureAsphaltCoverFailureMechanismSectionResultContext),
-                    typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>),
+                    typeof(IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>),
                     typeof(NonAdoptableFailureMechanismResultView<WaterPressureAsphaltCoverFailureMechanism>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(GrassCoverSlipOffInwardsFailureMechanismSectionResultContext),
-                    typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>),
+                    typeof(IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>),
                     typeof(NonAdoptableFailureMechanismResultView<GrassCoverSlipOffInwardsFailureMechanism>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(GrassCoverSlipOffOutwardsFailureMechanismSectionResultContext),
-                    typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>),
+                    typeof(IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>),
                     typeof(NonAdoptableFailureMechanismResultView<GrassCoverSlipOffOutwardsFailureMechanism>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(MicrostabilityFailureMechanismSectionResultContext),
-                    typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>),
+                    typeof(IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>),
                     typeof(NonAdoptableFailureMechanismResultView<MicrostabilityFailureMechanism>));
 
                 PluginTestHelper.AssertViewInfoDefined(
@@ -370,7 +370,7 @@
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(SpecificFailureMechanismSectionResultContext),
-                    typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>),
+                    typeof(IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>),
                     typeof(NonAdoptableFailureMechanismResultView<SpecificFailureMechanism>));
 
                 PluginTestHelper.AssertViewInfoDefined(
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rce9df7288493eb17374e3c3845c63aa04f2c97a8 -r77d59bcd30168fe47d03c74bc66b928be03d1d01
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs)	(revision ce9df7288493eb17374e3c3845c63aa04f2c97a8)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs)	(revision 77d59bcd30168fe47d03c74bc66b928be03d1d01)
@@ -62,7 +62,7 @@
         {
             // Assert
             Assert.AreEqual(typeof(WaterPressureAsphaltCoverFailureMechanismSectionResultContext), info.DataType);
-            Assert.AreEqual(typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>), info.ViewDataType);
+            Assert.AreEqual(typeof(IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>), info.ViewDataType);
         }
 
         [Test]
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r83a4659d69e1765235888b460b6c7cd3f3eb988c -r77d59bcd30168fe47d03c74bc66b928be03d1d01
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs	(.../SpecificFailureMechanismEntityReadExtensionsTest.cs)	(revision 83a4659d69e1765235888b460b6c7cd3f3eb988c)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/SpecificFailureMechanismEntityReadExtensionsTest.cs	(.../SpecificFailureMechanismEntityReadExtensionsTest.cs)	(revision 77d59bcd30168fe47d03c74bc66b928be03d1d01)
@@ -147,13 +147,13 @@
             const string filePath = "sections/File/Path";
             FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity();
 
-            var sectionResultEntity = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity
+            var sectionResultEntity = new NonAdoptableFailureMechanismSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
             SectionResultTestHelper.SetSectionResult(sectionResultEntity);
 
-            failureMechanismSectionEntity.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities = new List<NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity>
+            failureMechanismSectionEntity.NonAdoptableFailureMechanismSectionResultEntities = new List<NonAdoptableFailureMechanismSectionResultEntity>
             {
                 sectionResultEntity
             };