Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategy.cs
===================================================================
diff -u -rf968b408989ac750bb93b47d8f91cc7d159f6d25 -rcacdb7e4c96c30b4b7f7867570114ecb73d2be7a
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategy.cs	(.../PipingStructureFailureMechanismSectionResultUpdateStrategy.cs)	(revision f968b408989ac750bb93b47d8f91cc7d159f6d25)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategy.cs	(.../PipingStructureFailureMechanismSectionResultUpdateStrategy.cs)	(revision cacdb7e4c96c30b4b7f7867570114ecb73d2be7a)
@@ -28,10 +28,10 @@
 {
     /// <summary>
     /// An update strategy that can be used to update either a <see cref="PipingStructureFailureMechanismSectionResultOld"/>
-    /// or an <see cref="AdoptableFailureMechanismSectionResult"/> instance with data from an old instance;
+    /// or an <see cref="NonAdoptableFailureMechanismSectionResult"/> instance with data from an old instance;
     /// </summary>
     public class PipingStructureFailureMechanismSectionResultUpdateStrategy
-        : IFailureMechanismSectionResultUpdateStrategy<PipingStructureFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult>
+        : IFailureMechanismSectionResultUpdateStrategy<PipingStructureFailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>
     {
         public void UpdateSectionResultOld(PipingStructureFailureMechanismSectionResultOld origin, PipingStructureFailureMechanismSectionResultOld target)
         {
@@ -52,7 +52,7 @@
             target.ManualAssemblyCategoryGroup = origin.ManualAssemblyCategoryGroup;
         }
 
-        public void UpdateSectionResult(AdoptableFailureMechanismSectionResult origin, AdoptableFailureMechanismSectionResult target)
+        public void UpdateSectionResult(NonAdoptableFailureMechanismSectionResult origin, NonAdoptableFailureMechanismSectionResult target)
         {
             if (origin == null)
             {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rc1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4 -rcacdb7e4c96c30b4b7f7867570114ecb73d2be7a
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision c1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision cacdb7e4c96c30b4b7f7867570114ecb73d2be7a)
@@ -851,7 +851,7 @@
                 new MicrostabilityFailureMechanismSectionResultUpdateStrategy());
 
             yield return RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
-                PipingStructureFailureMechanismSectionsContext, PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld>(
+                PipingStructureFailureMechanismSectionsContext, PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>(
                 new PipingStructureFailureMechanismSectionResultUpdateStrategy());
 
             yield return RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo<
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs
===================================================================
diff -u -rf968b408989ac750bb93b47d8f91cc7d159f6d25 -rcacdb7e4c96c30b4b7f7867570114ecb73d2be7a
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs	(.../PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs)	(revision f968b408989ac750bb93b47d8f91cc7d159f6d25)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs	(.../PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs)	(revision cacdb7e4c96c30b4b7f7867570114ecb73d2be7a)
@@ -32,7 +32,7 @@
 {
     [TestFixture]
     public class PipingStructureFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture<
-        PipingStructureFailureMechanismSectionResultUpdateStrategy, PipingStructureFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult>
+        PipingStructureFailureMechanismSectionResultUpdateStrategy, PipingStructureFailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>
     {
         protected override PipingStructureFailureMechanismSectionResultOld CreateEmptySectionResultOld()
         {
@@ -61,25 +61,25 @@
             Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup);
         }
 
-        protected override AdoptableFailureMechanismSectionResult CreateEmptySectionResult()
+        protected override NonAdoptableFailureMechanismSectionResult CreateEmptySectionResult()
         {
-            return new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            return new NonAdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
         }
 
-        protected override AdoptableFailureMechanismSectionResult CreateConfiguredSectionResult()
+        protected override NonAdoptableFailureMechanismSectionResult CreateConfiguredSectionResult()
         {
             var random = new Random(39);
-            return new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
+            return new NonAdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 IsRelevant = true,
-                InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual,
+                InitialFailureMechanismResult = NonAdoptableInitialFailureMechanismResultType.Manual,
                 ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(),
                 FurtherAnalysisNeeded = true,
                 RefinedSectionProbability = random.NextDouble()
             };
         }
 
-        protected override void AssertSectionResult(AdoptableFailureMechanismSectionResult originResult, AdoptableFailureMechanismSectionResult targetResult)
+        protected override void AssertSectionResult(NonAdoptableFailureMechanismSectionResult originResult, NonAdoptableFailureMechanismSectionResult targetResult)
         {
             Assert.AreEqual(originResult.IsRelevant, targetResult.IsRelevant);
             Assert.AreEqual(originResult.InitialFailureMechanismResult, targetResult.InitialFailureMechanismResult);