Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs
===================================================================
diff -u -r94a8faf16d9871c71e343cf4bb5e68531459fb20 -r5e1c552bd6b82241abc970ef95c55b2b1c9169ec
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision 94a8faf16d9871c71e343cf4bb5e68531459fb20)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision 5e1c552bd6b82241abc970ef95c55b2b1c9169ec)
@@ -29,15 +29,14 @@
 namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
-    /// in order to prepare it for performing a calculation.
+    /// Presentation object for all data required to configure a closing structures calculation.
     /// </summary>
     public class ClosingStructuresCalculationContext : StructuresCalculationContext<ClosingStructuresInput, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresCalculationContext"/>.
         /// </summary>
-        /// <param name="wrappedData">The <see cref="StructuresCalculation{T}"/> instance wrapped by this context object.</param>
+        /// <param name="wrappedData">The calculation instance wrapped by this context object.</param>
         /// <param name="parent">The <see cref="CalculationGroup"/> that owns the wrapped calculation.</param>
         /// <param name="failureMechanism">The failure mechanism which the calculation belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs
===================================================================
diff -u -rc59d5c2acab71a0a5f1a179e1a1d394d935ef14b -r5e1c552bd6b82241abc970ef95c55b2b1c9169ec
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs	(.../StructuresCalculation.cs)	(revision c59d5c2acab71a0a5f1a179e1a1d394d935ef14b)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs	(.../StructuresCalculation.cs)	(revision 5e1c552bd6b82241abc970ef95c55b2b1c9169ec)
@@ -28,6 +28,7 @@
     /// <summary>
     /// This class holds information about a calculation for a structures failure mechanism.
     /// </summary>
+    /// <typeparam name="T">The type of input contained by the calculation.</typeparam>
     public class StructuresCalculation<T> : Observable, IStructuresCalculation, ICalculation<T> where T : IStructuresCalculationInput, new()
     {
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -rc59d5c2acab71a0a5f1a179e1a1d394d935ef14b -r5e1c552bd6b82241abc970ef95c55b2b1c9169ec
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs	(.../StructuresFailureMechanismSectionResult.cs)	(revision c59d5c2acab71a0a5f1a179e1a1d394d935ef14b)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs	(.../StructuresFailureMechanismSectionResult.cs)	(revision 5e1c552bd6b82241abc970ef95c55b2b1c9169ec)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 
 namespace Ringtoets.Common.Data.Structures
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/StructuresCalculationContext.cs
===================================================================
diff -u -r3a9daab3a208eb7bb29a44ad6d5646fe7cf85e11 -r5e1c552bd6b82241abc970ef95c55b2b1c9169ec
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/StructuresCalculationContext.cs	(.../StructuresCalculationContext.cs)	(revision 3a9daab3a208eb7bb29a44ad6d5646fe7cf85e11)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/StructuresCalculationContext.cs	(.../StructuresCalculationContext.cs)	(revision 5e1c552bd6b82241abc970ef95c55b2b1c9169ec)
@@ -29,9 +29,10 @@
 namespace Ringtoets.Common.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{TInput}"/>
-    /// in order to prepare it for performing a calculation.
+    /// Presentation object for all data required to configure a structures calculation.
     /// </summary>
+    /// <typeparam name="TInput">The type of calculation wrapped by this context.</typeparam>
+    /// <typeparam name="TFailureMechanism">The type of failure mechanism which the context belongs to.</typeparam>
     public class StructuresCalculationContext<TInput, TFailureMechanism> : FailureMechanismItemContextBase<StructuresCalculation<TInput>, TFailureMechanism>,
                                                                            ICalculationContext<StructuresCalculation<TInput>, TFailureMechanism>
         where TInput : IStructuresCalculationInput, new()
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/StructuresCalculationContextTest.cs
===================================================================
diff -u -r3a9daab3a208eb7bb29a44ad6d5646fe7cf85e11 -r5e1c552bd6b82241abc970ef95c55b2b1c9169ec
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/StructuresCalculationContextTest.cs	(.../StructuresCalculationContextTest.cs)	(revision 3a9daab3a208eb7bb29a44ad6d5646fe7cf85e11)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/StructuresCalculationContextTest.cs	(.../StructuresCalculationContextTest.cs)	(revision 5e1c552bd6b82241abc970ef95c55b2b1c9169ec)
@@ -41,7 +41,7 @@
             var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var calculation = new StructuresCalculation<TestStructuresInput>();
+            var calculation = new TestStructuresCalculation();
             var failureMechanism = new TestFailureMechanism();
             var parent = new CalculationGroup();
 
@@ -66,7 +66,7 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            var calculation = new StructuresCalculation<TestStructuresInput>();
+            var calculation = new TestStructuresCalculation();
             var failureMechanism = new TestFailureMechanism();
 
             // Call
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs
===================================================================
diff -u -r9fe25ebfb1f70f00d66564ef2a89f6e22c27dce4 -r5e1c552bd6b82241abc970ef95c55b2b1c9169ec
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision 9fe25ebfb1f70f00d66564ef2a89f6e22c27dce4)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision 5e1c552bd6b82241abc970ef95c55b2b1c9169ec)
@@ -29,15 +29,14 @@
 namespace Ringtoets.HeightStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
-    /// in order to prepare it for performing a calculation.
+    /// Presentation object for all data required to configure a height structures calculation.
     /// </summary>
     public class HeightStructuresCalculationContext : StructuresCalculationContext<HeightStructuresInput, HeightStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresCalculationContext"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> instance wrapped by this context object.</param>
+        /// <param name="calculation">The calculation instance wrapped by this context object.</param>
         /// <param name="parent">The <see cref="CalculationGroup"/> that owns the wrapped calculation.</param>
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs
===================================================================
diff -u -r94a8faf16d9871c71e343cf4bb5e68531459fb20 -r5e1c552bd6b82241abc970ef95c55b2b1c9169ec
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision 94a8faf16d9871c71e343cf4bb5e68531459fb20)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision 5e1c552bd6b82241abc970ef95c55b2b1c9169ec)
@@ -29,15 +29,14 @@
 namespace Ringtoets.StabilityPointStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
-    /// in order to prepare it for performing a calculation.
+    /// Presentation object for all data required to configure a stability point structures calculation.
     /// </summary>
     public class StabilityPointStructuresCalculationContext : StructuresCalculationContext<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresCalculationContext"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> instance wrapped by this context object.</param>
+        /// <param name="calculation">The calculation instance wrapped by this context object.</param>
         /// <param name="parent">The <see cref="CalculationGroup"/> that owns the wrapped calculation.</param>
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>