Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="ClosingStructuresCalculation"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class ClosingStructuresCalculationContext : StructuresContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>,
+    public class ClosingStructuresCalculationContext : FailureMechanismItemContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>,
                                                        ICalculationContext<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -31,7 +31,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order to be able to create configurable closing structures calculations.
     /// </summary>
-    public class ClosingStructuresCalculationGroupContext : StructuresContextBase<CalculationGroup, ClosingStructuresFailureMechanism>,
+    public class ClosingStructuresCalculationGroupContext : FailureMechanismItemContextBase<CalculationGroup, ClosingStructuresFailureMechanism>,
                                                             ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs	(.../ClosingStructuresInputContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs	(.../ClosingStructuresInputContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="ClosingStructuresInput"/>
     /// in order to be able to configure closing structures calculations.
     /// </summary>
-    public class ClosingStructuresInputContext : StructuresContextBase<ClosingStructuresInput, ClosingStructuresFailureMechanism>
+    public class ClosingStructuresInputContext : FailureMechanismItemContextBase<ClosingStructuresInput, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresInputContext"/>.
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -46,7 +46,7 @@
             var context = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
             Assert.IsInstanceOf<ICalculationContext<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
             Assert.AreEqual(calculation, context.WrappedData);
             Assert.AreEqual(failureMechanism, context.FailureMechanism);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -47,7 +47,7 @@
             var groupContext = new ClosingStructuresCalculationGroupContext(calculationGroup, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<CalculationGroup, ClosingStructuresFailureMechanism>>(groupContext);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<CalculationGroup, ClosingStructuresFailureMechanism>>(groupContext);
             Assert.IsInstanceOf<ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>>(groupContext);
             Assert.AreSame(calculationGroup, groupContext.WrappedData);
             Assert.AreSame(failureMechanism, groupContext.FailureMechanism);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs	(.../ClosingStructuresInputContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs	(.../ClosingStructuresInputContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -46,7 +46,7 @@
             var context = new ClosingStructuresInputContext(input, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<ClosingStructuresInput, ClosingStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<ClosingStructuresInput, ClosingStructuresFailureMechanism>>(context);
             Assert.AreEqual(input, context.WrappedData);
             Assert.AreEqual(failureMechanism, context.FailureMechanism);
             Assert.AreEqual(assessmentSectionMock, context.AssessmentSection);
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismItemContextBase.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismItemContextBase.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismItemContextBase.cs	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -0,0 +1,91 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Presentation object for all data required to configure failure mechanism related items.
+    /// </summary>
+    /// <typeparam name="TData">The type of the data wrapped by the context object.</typeparam>
+    /// <typeparam name="TFailureMechanism">The type of the failure mechanism which the context belongs to.</typeparam>
+    public abstract class FailureMechanismItemContextBase<TData, TFailureMechanism> : ObservableWrappedObjectContextBase<TData>
+        where TData : IObservable
+        where TFailureMechanism : IFailureMechanism
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FailureMechanismItemContextBase{TData,TFailureMechanism}"/> class.
+        /// </summary>
+        /// <param name="wrappedData">The concrete data instance wrapped by this context object.</param>
+        /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
+        /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
+        /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
+        protected FailureMechanismItemContextBase(TData wrappedData,
+                                                  TFailureMechanism failureMechanism,
+                                                  IAssessmentSection assessmentSection)
+            : base(wrappedData)
+        {
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException("failureMechanism");
+            }
+
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException("assessmentSection");
+            }
+
+            FailureMechanism = failureMechanism;
+            AssessmentSection = assessmentSection;
+        }
+
+        /// <summary>
+        /// Gets the failure mechanism which the context belongs to.
+        /// </summary>
+        public TFailureMechanism FailureMechanism { get; private set; }
+
+        /// <summary>
+        /// Gets the assessment section which the context belongs to.
+        /// </summary>
+        public IAssessmentSection AssessmentSection { get; private set; }
+
+        /// <summary>
+        /// Gets the available hydraulic boundary locations.
+        /// </summary>
+        public IEnumerable<HydraulicBoundaryLocation> AvailableHydraulicBoundaryLocations
+        {
+            get
+            {
+                return AssessmentSection.HydraulicBoundaryDatabase != null
+                           ? AssessmentSection.HydraulicBoundaryDatabase.Locations
+                           : Enumerable.Empty<HydraulicBoundaryLocation>();
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag ca23b1b155ca87c0aa4665fd919727570f31c781 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/StructuresContextBase.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -63,7 +63,7 @@
     <Compile Include="PresentationObjects\FailureMechanismSectionsContext.cs" />
     <Compile Include="PresentationObjects\IFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\ReferenceLineContext.cs" />
-    <Compile Include="PresentationObjects\StructuresContextBase.cs" />
+    <Compile Include="PresentationObjects\FailureMechanismItemContextBase.cs" />
     <Compile Include="PresentationObjects\TreeFolderCategory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -0,0 +1,129 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class FailureMechanismItemContextBaseTest
+    {
+        [Test]
+        public void ParameteredConstructor_ExpectedValues()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            var observableStub = mockRepository.Stub<IObservable>();
+            var failureMechanismStub = mockRepository.Stub<IFailureMechanism>();
+            mockRepository.ReplayAll();
+
+            // Call
+            var context = new SimpleFailureMechanismItemContext<IObservable, IFailureMechanism>(observableStub, failureMechanismStub, assessmentSectionStub);
+
+            // Assert
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<IObservable>>(context);
+            Assert.AreSame(observableStub, context.WrappedData);
+            Assert.AreSame(failureMechanismStub, context.FailureMechanism);
+            Assert.AreSame(assessmentSectionStub, context.AssessmentSection);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ParameteredConstructor_FailureMechanismIsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            var observableStub = mockRepository.Stub<IObservable>();
+            mockRepository.ReplayAll();
+
+            // Call
+            TestDelegate call = () => new SimpleFailureMechanismItemContext<IObservable, IFailureMechanism>(observableStub, null, assessmentSectionStub);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ParameteredConstructor_AssessmentSectionIsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var observableStub = mockRepository.Stub<IObservable>();
+            var failureMechanismStub = mockRepository.Stub<IFailureMechanism>();
+            mockRepository.ReplayAll();
+
+            // Call
+            TestDelegate call = () => new SimpleFailureMechanismItemContext<IObservable, IFailureMechanism>(observableStub, failureMechanismStub, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void AvailableHydraulicBoundaryLocations_HydraulicBoundaryDatabaseSet_ReturnsAllHydraulicBoundaryLocations()
+        {
+            // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "name", 1.1, 2.2));
+
+            var mockRepository = new MockRepository();
+            var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            var observableStub = mockRepository.Stub<IObservable>();
+            var failureMechanismStub = mockRepository.Stub<IFailureMechanism>();
+            mockRepository.ReplayAll();
+
+            assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
+            var context = new SimpleFailureMechanismItemContext<IObservable, IFailureMechanism>(observableStub, failureMechanismStub, assessmentSectionStub);
+
+            // Call
+            var availableHydraulicBoundaryLocations = context.AvailableHydraulicBoundaryLocations;
+
+            // Assert
+            Assert.AreEqual(1, availableHydraulicBoundaryLocations.Count());
+            Assert.AreEqual(hydraulicBoundaryDatabase.Locations, availableHydraulicBoundaryLocations);
+            mockRepository.VerifyAll();
+        }
+
+        private class SimpleFailureMechanismItemContext<TData, TFailureMechanism> : FailureMechanismItemContextBase<TData, TFailureMechanism>
+            where TData : IObservable
+            where TFailureMechanism : IFailureMechanism
+        {
+            public SimpleFailureMechanismItemContext(TData target, TFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+                : base(target, failureMechanism, assessmentSection) {}
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag ca23b1b155ca87c0aa4665fd919727570f31c781 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/StructuresContextBaseTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -74,7 +74,7 @@
     <Compile Include="PresentationObjects\FailureMechanismSectionsContextTest.cs" />
     <Compile Include="PresentationObjects\ForeshoreProfilesContextTest.cs" />
     <Compile Include="PresentationObjects\ReferenceLineContextTest.cs" />
-    <Compile Include="PresentationObjects\StructuresContextBaseTest.cs" />
+    <Compile Include="PresentationObjects\FailureMechanismItemContextBaseTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\BreakWaterPropertiesTest.cs" />
     <Compile Include="PropertyClasses\ForeshoreGeometryPropertiesTest.cs" />
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="HeightStructuresCalculation"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class HeightStructuresCalculationContext : StructuresContextBase<HeightStructuresCalculation, HeightStructuresFailureMechanism>,
+    public class HeightStructuresCalculationContext : FailureMechanismItemContextBase<HeightStructuresCalculation, HeightStructuresFailureMechanism>,
                                                       ICalculationContext<HeightStructuresCalculation, HeightStructuresFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationGroupContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationGroupContext.cs	(.../HeightStructuresCalculationGroupContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationGroupContext.cs	(.../HeightStructuresCalculationGroupContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -31,7 +31,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order be able to create configurable height structures calculations.
     /// </summary>
-    public class HeightStructuresCalculationGroupContext : StructuresContextBase<CalculationGroup, HeightStructuresFailureMechanism>,
+    public class HeightStructuresCalculationGroupContext : FailureMechanismItemContextBase<CalculationGroup, HeightStructuresFailureMechanism>,
                                                            ICalculationContext<CalculationGroup, HeightStructuresFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="HeightStructuresInput"/>
     /// in order to be able to configure height structures calculations.
     /// </summary>
-    public class HeightStructuresInputContext : StructuresContextBase<HeightStructuresInput, HeightStructuresFailureMechanism>
+    public class HeightStructuresInputContext : FailureMechanismItemContextBase<HeightStructuresInput, HeightStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresInputContext"/>.
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -46,7 +46,7 @@
             var context = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<HeightStructuresCalculation, HeightStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<HeightStructuresCalculation, HeightStructuresFailureMechanism>>(context);
             Assert.IsInstanceOf<ICalculationContext<HeightStructuresCalculation, HeightStructuresFailureMechanism>>(context);
             Assert.AreEqual(calculation, context.WrappedData);
             Assert.AreEqual(failureMechanism, context.FailureMechanism);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs	(.../HeightStructuresCalculationGroupContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs	(.../HeightStructuresCalculationGroupContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -47,7 +47,7 @@
             var groupContext = new HeightStructuresCalculationGroupContext(calculationGroup, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<CalculationGroup, HeightStructuresFailureMechanism>>(groupContext);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<CalculationGroup, HeightStructuresFailureMechanism>>(groupContext);
             Assert.IsInstanceOf<ICalculationContext<CalculationGroup, HeightStructuresFailureMechanism>>(groupContext);
             Assert.AreSame(calculationGroup, groupContext.WrappedData);
             Assert.AreSame(failureMechanism, groupContext.FailureMechanism);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs	(.../HeightStructuresInputContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs	(.../HeightStructuresInputContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -67,7 +67,7 @@
             var context = new HeightStructuresInputContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<HeightStructuresInput, HeightStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<HeightStructuresInput, HeightStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation.InputParameters, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="StabilityPointStructuresCalculation"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class StabilityPointStructuresCalculationContext : StructuresContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>,
+    public class StabilityPointStructuresCalculationContext : FailureMechanismItemContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>,
                                                               ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(.../StabilityPointStructuresCalculationGroupContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(.../StabilityPointStructuresCalculationGroupContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -31,7 +31,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order be able to create configurable stability point structures calculations.
     /// </summary>
-    public class StabilityPointStructuresCalculationGroupContext : StructuresContextBase<CalculationGroup, StabilityPointStructuresFailureMechanism>,
+    public class StabilityPointStructuresCalculationGroupContext : FailureMechanismItemContextBase<CalculationGroup, StabilityPointStructuresFailureMechanism>,
                                                                    ICalculationContext<CalculationGroup, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(.../StabilityPointStructuresInputContext.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(.../StabilityPointStructuresInputContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -30,7 +30,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="StabilityPointStructuresInput"/>
     /// in order to be able to configure stability point structures calculations.
     /// </summary>
-    public class StabilityPointStructuresInputContext : StructuresContextBase<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>
+    public class StabilityPointStructuresInputContext : FailureMechanismItemContextBase<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresInputContext"/>.
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -46,7 +46,7 @@
             var context = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
             Assert.IsInstanceOf<ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation, context.WrappedData);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(.../StabilityPointStructuresCalculationGroupContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(.../StabilityPointStructuresCalculationGroupContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -47,7 +47,7 @@
             var groupContext = new StabilityPointStructuresCalculationGroupContext(calculationGroup, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<CalculationGroup, StabilityPointStructuresFailureMechanism>>(groupContext);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<CalculationGroup, StabilityPointStructuresFailureMechanism>>(groupContext);
             Assert.IsInstanceOf<ICalculationContext<CalculationGroup, StabilityPointStructuresFailureMechanism>>(groupContext);
             Assert.AreSame(calculationGroup, groupContext.WrappedData);
             Assert.AreSame(failureMechanism, groupContext.FailureMechanism);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs
===================================================================
diff -u -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e -rca23b1b155ca87c0aa4665fd919727570f31c781
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(.../StabilityPointStructuresInputContextTest.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(.../StabilityPointStructuresInputContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
@@ -54,7 +54,7 @@
             var context = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<StructuresContextBase<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>>(context);
             Assert.AreSame(input, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
             Assert.AreSame(failureMechanism, context.FailureMechanism);