Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -ra44dfc868b71b3ac991cd5536e9e8a1c62adce24 -r43e9d6c77a1c6cb0f79e0af389128a479a46ee11
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision a44dfc868b71b3ac991cd5536e9e8a1c62adce24)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 43e9d6c77a1c6cb0f79e0af389128a479a46ee11)
@@ -113,8 +113,8 @@
 
             yield return new RiskeerViewInfo<
                 WaveImpactAsphaltCoverFailureMechanismSectionResultContext,
-                IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>,
-                NonAdoptableWithProfileProbabilityFailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanism>>(() => Gui)
+                IObservableEnumerable<NonAdoptableFailureMechanismSectionResult>,
+                NonAdoptableFailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanism>>(() => Gui)
             {
                 GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 CloseForData = CloseFailureMechanismResultViewForData,
@@ -124,12 +124,11 @@
                     var failureMechanism = (WaveImpactAsphaltCoverFailureMechanism) context.FailureMechanism;
                     IAssessmentSection assessmentSection = context.AssessmentSection;
 
-                    return new NonAdoptableWithProfileProbabilityFailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanism>(
+                    return new NonAdoptableFailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanism>(
                         context.WrappedData,
                         failureMechanism,
                         assessmentSection,
-                        WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism,
-                        sr => WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleSection(sr, failureMechanism, assessmentSection));
+                        WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism);
                 }
             };
 
@@ -272,8 +271,8 @@
         public override IEnumerable<UpdateInfo> GetUpdateInfos()
         {
             yield return RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                WaveImpactAsphaltCoverFailureMechanismSectionsContext, WaveImpactAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
-                new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategy());
+                WaveImpactAsphaltCoverFailureMechanismSectionsContext, WaveImpactAsphaltCoverFailureMechanism, NonAdoptableFailureMechanismSectionResult>(
+                new NonAdoptableFailureMechanismSectionResultUpdateStrategy());
         }
 
         private static FileFilterGenerator GetWaveConditionsFileFilterGenerator()
@@ -294,7 +293,7 @@
         }
 
         private static bool CloseFailureMechanismResultViewForData(
-            NonAdoptableWithProfileProbabilityFailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanism> view, object dataToCloseFor)
+            NonAdoptableFailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanism> view, object dataToCloseFor)
         {
             var failureMechanism = dataToCloseFor as WaveImpactAsphaltCoverFailureMechanism;