Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointRow.cs
===================================================================
diff -u -rc2866a9d5e5990afc0f141fe2616c3c43d9ab1f9 -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointRow.cs	(.../IllustrationPointRow.cs)	(revision c2866a9d5e5990afc0f141fe2616c3c43d9ab1f9)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointRow.cs	(.../IllustrationPointRow.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -25,7 +25,7 @@
 namespace Ringtoets.Common.Forms.Views
 {
     /// <summary>
-    /// This class represents a row of <see cref="SubmechanismIllustrationPoint"/> in the <see cref="IllustrationPointsTableControl"/>.
+    /// This class represents a row of <see cref="SubMechanismIllustrationPoint"/> in the <see cref="IllustrationPointsTableControl"/>.
     /// </summary>
     internal class IllustrationPointRow
     {
Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs	(.../GeneralResultConverter.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs	(.../GeneralResultConverter.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -27,7 +27,7 @@
 using HydraIllustrationPointTreeNode = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointTreeNode;
 using HydraGeneralResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.GeneralResult;
 using IHydraRingIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IIllustrationPoint;
-using SubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint;
+using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint;
 
 namespace Ringtoets.Common.Service.IllustrationPoints
 {
@@ -72,7 +72,7 @@
                 IHydraRingIllustrationPoint hydraIllustrationPoint = illustrationPointTreeNode.Value.Data;
                 HydraWindDirectionClosingSituation hydraWindDirectionClosingSituation = illustrationPointTreeNode.Key;
 
-                var subMechanismIllustrationPoint = hydraIllustrationPoint as SubmechanismIllustrationPoint;
+                var subMechanismIllustrationPoint = hydraIllustrationPoint as HydraSubMechanismIllustrationPoint;
                 if (subMechanismIllustrationPoint != null)
                 {
                     combinations.Add(TopLevelSubMechanismIllustrationPointConverter.CreateTopLevelSubMechanismIllustrationPoint(
Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs	(.../StochastConverter.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs	(.../StochastConverter.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -22,7 +22,7 @@
 using System;
 using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
 using HydraStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.Stochast;
-using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast;
+using HydraSubMechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPointStochast;
 
 namespace Ringtoets.Common.Service.IllustrationPoints
 {
@@ -49,23 +49,25 @@
         }
 
         /// <summary>
-        /// Creates a new instance of <see cref="SubMechanismIllustrationPointStochast"/> based on the information of <paramref name="hydraSubmechanismIllustrationPointStochast"/>.
+        /// Creates a new instance of <see cref="SubMechanismIllustrationPointStochast"/> 
+        /// based on the information of <paramref name="hydraSubMechanismIllustrationPointStochast"/>.
         /// </summary>
-        /// <param name="hydraSubmechanismIllustrationPointStochast">The <see cref="HydraSubmechanismIllustrationPointStochast"/> to base the 
-        /// <see cref="SubMechanismIllustrationPointStochast"/> to create on.</param>
+        /// <param name="hydraSubMechanismIllustrationPointStochast">The <see cref="HydraSubMechanismIllustrationPointStochast"/> 
+        /// to base the  <see cref="SubMechanismIllustrationPointStochast"/> to create on.</param>
         /// <returns>The newly created <see cref="Stochast"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraSubmechanismIllustrationPointStochast"/> 
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraSubMechanismIllustrationPointStochast"/> 
         /// is <c>null</c>.</exception>
-        public static SubMechanismIllustrationPointStochast CreateSubMechanismIllustrationStochast(HydraSubmechanismIllustrationPointStochast hydraSubmechanismIllustrationPointStochast)
+        public static SubMechanismIllustrationPointStochast CreateSubMechanismIllustrationStochast(
+            HydraSubMechanismIllustrationPointStochast hydraSubMechanismIllustrationPointStochast)
         {
-            if (hydraSubmechanismIllustrationPointStochast == null)
+            if (hydraSubMechanismIllustrationPointStochast == null)
             {
-                throw new ArgumentNullException(nameof(hydraSubmechanismIllustrationPointStochast));
+                throw new ArgumentNullException(nameof(hydraSubMechanismIllustrationPointStochast));
             }
-            return new SubMechanismIllustrationPointStochast(hydraSubmechanismIllustrationPointStochast.Name,
-                                                             hydraSubmechanismIllustrationPointStochast.Duration,
-                                                             hydraSubmechanismIllustrationPointStochast.Alpha,
-                                                             hydraSubmechanismIllustrationPointStochast.Realization);
+            return new SubMechanismIllustrationPointStochast(hydraSubMechanismIllustrationPointStochast.Name,
+                                                             hydraSubMechanismIllustrationPointStochast.Duration,
+                                                             hydraSubMechanismIllustrationPointStochast.Alpha,
+                                                             hydraSubMechanismIllustrationPointStochast.Realization);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubMechanismIllustrationPointConverter.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubMechanismIllustrationPointConverter.cs	(.../SubMechanismIllustrationPointConverter.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubMechanismIllustrationPointConverter.cs	(.../SubMechanismIllustrationPointConverter.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -22,27 +22,30 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
 using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints;
-using HydraSubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint;
+using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint;
 using IllustrationPointResult = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.IllustrationPointResult;
+using SubMechanismIllustrationPoint = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.SubMechanismIllustrationPoint;
+using SubMechanismIllustrationPointStochast = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.SubMechanismIllustrationPointStochast;
 
 namespace Ringtoets.Common.Service.IllustrationPoints
 {
     /// <summary>
-    /// The converter that converts <see cref="IIllustrationPoint"/> data into <see cref="HydraSubmechanismIllustrationPoint"/> data.
+    /// The converter that converts <see cref="IIllustrationPoint"/> data into <see cref="HydraSubMechanismIllustrationPoint"/> data.
     /// </summary>
     public static class SubMechanismIllustrationPointConverter
     {
         /// <summary>
-        /// Creates a new instance of <see cref="SubMechanismIllustrationPoint"/> based on the information of <paramref name="subMechanismIllustrationPoint"/>.
+        /// Creates a new instance of <see cref="SubMechanismIllustrationPoint"/> based on the information of 
+        /// <paramref name="subMechanismIllustrationPoint"/>.
         /// </summary>
-        /// <param name="subMechanismIllustrationPoint">The <see cref="SubMechanismIllustrationPoint"/> to base the 
+        /// <param name="subMechanismIllustrationPoint">The <see cref="HydraSubMechanismIllustrationPoint"/> to base the 
         /// <see cref="SubMechanismIllustrationPoint"/> to create on.</param>
         /// <returns>The newly created <see cref="SubMechanismIllustrationPoint"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="subMechanismIllustrationPoint"/> 
         /// is <c>null</c>.</exception>
-        public static SubMechanismIllustrationPoint CreateSubMechanismIllustrationPoint(HydraSubmechanismIllustrationPoint subMechanismIllustrationPoint)
+        public static SubMechanismIllustrationPoint CreateSubMechanismIllustrationPoint(
+            HydraSubMechanismIllustrationPoint subMechanismIllustrationPoint)
         {
             if (subMechanismIllustrationPoint == null)
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverter.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverter.cs	(.../TopLevelSubMechanismIllustrationPointConverter.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverter.cs	(.../TopLevelSubMechanismIllustrationPointConverter.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -22,45 +22,46 @@
 using System;
 using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
 using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints;
-using HydraSubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint;
+using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint;
+using SubMechanismIllustrationPoint = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.SubMechanismIllustrationPoint;
 using WindDirection = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.WindDirection;
 
 namespace Ringtoets.Common.Service.IllustrationPoints
 {
     /// <summary>
     /// Converter for <see cref="WindDirectionClosingSituation"/> and 
-    /// <see cref="HydraSubmechanismIllustrationPoint"/> related to creating a 
+    /// <see cref="HydraSubMechanismIllustrationPoint"/> related to creating a 
     /// <see cref="TopLevelSubMechanismIllustrationPoint"/>.
     /// </summary>
     public static class TopLevelSubMechanismIllustrationPointConverter
     {
         /// <summary>
         /// Creates a new instance of <see cref="TopLevelSubMechanismIllustrationPoint"/>
         /// based on the information of <paramref name="hydraWindDirectionClosingSituation"/>
-        /// and <paramref name="hydraSubmechanismIllustrationPoint"/>.
+        /// and <paramref name="hydraSubMechanismIllustrationPoint"/>.
         /// </summary>
         /// <param name="hydraWindDirectionClosingSituation">The <see cref="WindDirectionClosingSituation"/>
         /// to base the <see cref="TopLevelSubMechanismIllustrationPoint"/> on.</param>
-        /// <param name="hydraSubmechanismIllustrationPoint">The <see cref="HydraSubmechanismIllustrationPoint"/>
+        /// <param name="hydraSubMechanismIllustrationPoint">The <see cref="HydraSubMechanismIllustrationPoint"/>
         /// to base the <see cref="TopLevelSubMechanismIllustrationPoint"/> on.</param>
         /// <returns>A <see cref="TopLevelSubMechanismIllustrationPoint"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public static TopLevelSubMechanismIllustrationPoint CreateTopLevelSubMechanismIllustrationPoint(
             WindDirectionClosingSituation hydraWindDirectionClosingSituation,
-            HydraSubmechanismIllustrationPoint hydraSubmechanismIllustrationPoint)
+            HydraSubMechanismIllustrationPoint hydraSubMechanismIllustrationPoint)
         {
             if (hydraWindDirectionClosingSituation == null)
             {
                 throw new ArgumentNullException(nameof(hydraWindDirectionClosingSituation));
             }
-            if (hydraSubmechanismIllustrationPoint == null)
+            if (hydraSubMechanismIllustrationPoint == null)
             {
-                throw new ArgumentNullException(nameof(hydraSubmechanismIllustrationPoint));
+                throw new ArgumentNullException(nameof(hydraSubMechanismIllustrationPoint));
             }
 
             WindDirection windDirection = WindDirectionConverter.CreateWindDirection(hydraWindDirectionClosingSituation.WindDirection);
             SubMechanismIllustrationPoint subMechanismIllustrationPoint =
-                SubMechanismIllustrationPointConverter.CreateSubMechanismIllustrationPoint(hydraSubmechanismIllustrationPoint);
+                SubMechanismIllustrationPointConverter.CreateSubMechanismIllustrationPoint(hydraSubMechanismIllustrationPoint);
 
             return new TopLevelSubMechanismIllustrationPoint(windDirection,
                                                              hydraWindDirectionClosingSituation.ClosingSituation,
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs	(.../TopLevelSubMechanismIllustrationPointTest.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs	(.../TopLevelSubMechanismIllustrationPointTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -61,7 +61,7 @@
         }
 
         [Test]
-        public void Constructor_SubmechanismIllustationPointNull_ThrowsArgumentNullException()
+        public void Constructor_SubMechanismIllustationPointNull_ThrowsArgumentNullException()
         {
             // Setup
             var windDirection = new TestWindDirection();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs	(.../GeneralResultConverterTest.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs	(.../GeneralResultConverterTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -35,8 +35,8 @@
 using HydraCombinationType = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.CombinationType;
 using HydraIllustrationPointResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointResult;
 using HydraFaultTreeIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.FaultTreeIllustrationPoint;
-using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast;
-using HydrasubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint;
+using HydraSubMechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPointStochast;
+using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint;
 
 namespace Ringtoets.Common.Service.Test.IllustrationPoints
 {
@@ -93,8 +93,8 @@
 
             double beta = random.NextDouble();
             var hydraIllustrationPoint =
-                new HydrasubmechanismIllustrationPoint("Illustration Point",
-                                                       Enumerable.Empty<HydraSubmechanismIllustrationPointStochast>(),
+                new HydraSubMechanismIllustrationPoint("Illustration Point",
+                                                       Enumerable.Empty<HydraSubMechanismIllustrationPointStochast>(),
                                                        Enumerable.Empty<HydraIllustrationPointResult>(),
                                                        beta);
             var hydraIllustrationTreeNode = new HydraIllustrationPointTreeNode(hydraIllustrationPoint);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs	(.../StochastConverterTest.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs	(.../StochastConverterTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -25,7 +25,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.IllustrationPoints;
 using HydraStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.Stochast;
-using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast;
+using HydraSubMechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPointStochast;
 
 namespace Ringtoets.Common.Service.Test.IllustrationPoints
 {
@@ -71,7 +71,7 @@
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("hydraSubmechanismIllustrationPointStochast", paramName);
+            Assert.AreEqual("hydraSubMechanismIllustrationPointStochast", paramName);
         }
 
         [Test]
@@ -85,7 +85,7 @@
             double alpha = random.NextDouble();
             double realization = random.NextDouble();
 
-            var hydraStochast = new HydraSubmechanismIllustrationPointStochast(name, duration, alpha, realization);
+            var hydraStochast = new HydraSubMechanismIllustrationPointStochast(name, duration, alpha, realization);
 
             // Call
             SubMechanismIllustrationPointStochast stochast = StochastConverter.CreateSubMechanismIllustrationStochast(hydraStochast);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs	(.../SubMechanismIllustrationPointConverterTest.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs	(.../SubMechanismIllustrationPointConverterTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -26,8 +26,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.IllustrationPoints;
 using HydraIllustrationPointResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointResult;
-using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast;
-using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint;
+using HydraSubMechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPointStochast;
 
 namespace Ringtoets.Common.Service.Test.IllustrationPoints
 {
@@ -53,17 +52,17 @@
             var hydraIllustrationPointResult = new HydraIllustrationPointResult("HydraIllustrationPointResult",
                                                                                 random.NextDouble());
 
-            const string name = "hydraSubmechanismIllustrationPointStochast";
+            const string name = "hydraSubMechanismIllustrationPointStochast";
             double alpha = random.NextDouble();
             double duration = random.NextDouble();
             double realization = random.NextDouble();
-            var hydraSubmechanismIllustrationPointStochast =
-                new HydraSubmechanismIllustrationPointStochast(name, duration, alpha, realization);
+            var hydraSubMechanismIllustrationPointStochast =
+                new HydraSubMechanismIllustrationPointStochast(name, duration, alpha, realization);
 
             double beta = random.NextDouble();
-            var hydraSubMechanismIllustrationPoint = new HydraSubMechanismIllustrationPoint("name", new[]
+            var hydraSubMechanismIllustrationPoint = new HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint("name", new[]
             {
-                hydraSubmechanismIllustrationPointStochast
+                hydraSubMechanismIllustrationPointStochast
             }, new[]
             {
                 hydraIllustrationPointResult
@@ -82,10 +81,10 @@
             Assert.AreEqual(hydraIllustrationPointResult.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy());
 
             SubMechanismIllustrationPointStochast stochast = subMechanismIllustrationPoint.Stochasts.Single();
-            Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy());
+            Assert.AreEqual(hydraSubMechanismIllustrationPointStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy());
             Assert.AreEqual(duration, stochast.Duration, stochast.Duration.GetAccuracy());
-            Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Name, stochast.Name);
-            Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Realization, stochast.Realization, stochast.Realization.GetAccuracy());
+            Assert.AreEqual(hydraSubMechanismIllustrationPointStochast.Name, stochast.Name);
+            Assert.AreEqual(hydraSubMechanismIllustrationPointStochast.Realization, stochast.Realization, stochast.Realization.GetAccuracy());
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs	(.../TopLevelSubMechanismIllustrationPointConverterTest.cs)	(revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs	(.../TopLevelSubMechanismIllustrationPointConverterTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -29,8 +29,7 @@
 using HydraWindDirectionClosingSituation = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.WindDirectionClosingSituation;
 using HydraIllustrationPointResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointResult;
 using HydraRingTestWindDirection = Ringtoets.HydraRing.Calculation.TestUtil.IllustrationPoints.TestWindDirection;
-using HydraSubmechanismIllustrationPointStochast = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPointStochast;
-using HydraSubmechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubmechanismIllustrationPoint;
+using HydraSubMechanismIllustrationPoint = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPoint;
 
 namespace Ringtoets.Common.Service.Test.IllustrationPoints
 {
@@ -42,8 +41,8 @@
         {
             // Setup
             var hydraSubMechanismIllustrationPoint =
-                new HydraSubmechanismIllustrationPoint("name",
-                                                       Enumerable.Empty<HydraSubmechanismIllustrationPointStochast>(),
+                new HydraSubMechanismIllustrationPoint("name",
+                                                       Enumerable.Empty<HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPointStochast>(),
                                                        Enumerable.Empty<HydraIllustrationPointResult>(),
                                                        double.NaN);
 
@@ -71,7 +70,7 @@
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("hydraSubmechanismIllustrationPoint", paramName);
+            Assert.AreEqual("hydraSubMechanismIllustrationPoint", paramName);
         }
 
         [Test]
@@ -89,17 +88,17 @@
             var hydraIllustrationPointResult = new HydraIllustrationPointResult("HydraIllustrationPointResult",
                                                                                 random.NextDouble());
 
-            const string name = "HydraSubmechanismIllustrationPointStochast";
+            const string name = "HydraSubMechanismIllustrationPointStochast";
             double alpha = random.NextDouble();
             double duration = random.NextDouble();
             double realization = random.NextDouble();
-            var hydraSubmechanismIllustrationPointStochast =
-                new HydraSubmechanismIllustrationPointStochast(name, duration, alpha, realization);
+            var hydraSubMechanismIllustrationPointStochast =
+                new HydraRing.Calculation.Data.Output.IllustrationPoints.SubMechanismIllustrationPointStochast(name, duration, alpha, realization);
 
             double beta = random.NextDouble();
-            var hydraSubmechanismIllustrationPoint = new HydraSubmechanismIllustrationPoint("name", new[]
+            var hydraSubMechanismIllustrationPoint = new HydraSubMechanismIllustrationPoint("name", new[]
             {
-                hydraSubmechanismIllustrationPointStochast
+                hydraSubMechanismIllustrationPointStochast
             }, new[]
             {
                 hydraIllustrationPointResult
@@ -108,7 +107,7 @@
             // Call
             TopLevelSubMechanismIllustrationPoint combination =
                 TopLevelSubMechanismIllustrationPointConverter.CreateTopLevelSubMechanismIllustrationPoint(
-                    windDirectionClosingSituation, hydraSubmechanismIllustrationPoint);
+                    windDirectionClosingSituation, hydraSubMechanismIllustrationPoint);
 
             // Assert
             WindDirection windDirection = combination.WindDirection;
@@ -118,18 +117,18 @@
             Assert.AreEqual(closingScenario, combination.ClosingSituation);
 
             SubMechanismIllustrationPoint subMechanismIllustrationPoint = combination.SubMechanismIllustrationPoint;
-            Assert.AreEqual(hydraSubmechanismIllustrationPoint.Beta, subMechanismIllustrationPoint.Beta, subMechanismIllustrationPoint.Beta.GetAccuracy());
-            Assert.AreEqual(hydraSubmechanismIllustrationPoint.Name, subMechanismIllustrationPoint.Name);
+            Assert.AreEqual(hydraSubMechanismIllustrationPoint.Beta, subMechanismIllustrationPoint.Beta, subMechanismIllustrationPoint.Beta.GetAccuracy());
+            Assert.AreEqual(hydraSubMechanismIllustrationPoint.Name, subMechanismIllustrationPoint.Name);
 
             IllustrationPointResult illustrationPointResult = subMechanismIllustrationPoint.IllustrationPointResults.Single();
             Assert.AreEqual(hydraIllustrationPointResult.Description, illustrationPointResult.Description);
             Assert.AreEqual(hydraIllustrationPointResult.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy());
 
             SubMechanismIllustrationPointStochast stochast = subMechanismIllustrationPoint.Stochasts.Single();
-            Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy());
-            Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Duration, stochast.Duration, stochast.Duration.GetAccuracy());
-            Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Name, stochast.Name);
-            Assert.AreEqual(hydraSubmechanismIllustrationPointStochast.Realization, stochast.Realization, stochast.Realization.GetAccuracy());
+            Assert.AreEqual(hydraSubMechanismIllustrationPointStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy());
+            Assert.AreEqual(hydraSubMechanismIllustrationPointStochast.Duration, stochast.Duration, stochast.Duration.GetAccuracy());
+            Assert.AreEqual(hydraSubMechanismIllustrationPointStochast.Name, stochast.Name);
+            Assert.AreEqual(hydraSubMechanismIllustrationPointStochast.Realization, stochast.Realization, stochast.Realization.GetAccuracy());
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPoint.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPoint.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPoint.cs	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -0,0 +1,88 @@
+// Copyright (C) Stichting Deltares 2017. 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;
+
+namespace Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints
+{
+    /// <summary>
+    /// Illustration point which contains the result of applying the sub mechanism.
+    /// </summary>
+    public class SubMechanismIllustrationPoint : IIllustrationPoint
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="SubMechanismIllustrationPoint"/>.
+        /// </summary>
+        /// <param name="name">The name of the illustration point.</param>
+        /// <param name="stochasts">A collection of <see cref="SubMechanismIllustrationPointStochast"/>
+        /// that are associated with this illustration point.</param>
+        /// <param name="illustrationPointResults">A collection of 
+        /// <see cref="IllustrationPointResult"/> that are associated with this 
+        /// illustration point.</param>
+        /// <param name="beta">The beta value of the illustration point</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/>, <paramref name="stochasts"/>
+        /// , or <paramref name="illustrationPointResults"/> is <c>null</c>.</exception>
+        public SubMechanismIllustrationPoint(string name,
+                                             IEnumerable<SubMechanismIllustrationPointStochast> stochasts,
+                                             IEnumerable<IllustrationPointResult> illustrationPointResults,
+                                             double beta)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+            if (stochasts == null)
+            {
+                throw new ArgumentNullException(nameof(stochasts));
+            }
+            if (illustrationPointResults == null)
+            {
+                throw new ArgumentNullException(nameof(illustrationPointResults));
+            }
+
+            Name = name;
+            Beta = beta;
+            Stochasts = stochasts;
+            Results = illustrationPointResults;
+        }
+
+        /// <summary>
+        /// Gets the name of the illustration point.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the realized stochasts that belong to this submechanism illustration point.
+        /// </summary>
+        public IEnumerable<SubMechanismIllustrationPointStochast> Stochasts { get; }
+
+        /// <summary>
+        /// Gets the beta values that were realized.
+        /// </summary>
+        public double Beta { get; }
+
+        /// <summary>
+        /// Gets the output variables.
+        /// </summary>
+        public IEnumerable<IllustrationPointResult> Results { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPointStochast.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPointStochast.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPointStochast.cs	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2017. 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;
+
+namespace Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints
+{
+    /// <summary>
+    /// Container of alpha value definitions read from a Hydra-Ring output database with
+    /// a realization of the described stochast.
+    /// </summary>
+    public class SubMechanismIllustrationPointStochast : Stochast
+    {
+        /// <summary>
+        /// Creates an new instance of <see cref="SubMechanismIllustrationPointStochast"/>.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="duration">The duration.</param>
+        /// <param name="alpha">The alpha.</param>
+        /// <param name="realization">The realization.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/>
+        /// is <c>null</c>.</exception>
+        public SubMechanismIllustrationPointStochast(string name, double duration, double alpha, double realization)
+            : base(name, duration, alpha)
+        {
+            Realization = realization;
+        }
+
+        /// <summary>
+        /// Gets the realization.
+        /// </summary>
+        public double Realization { get; }
+    }
+}
\ No newline at end of file
Fisheye: Tag c2c7e9621863d470ddd3a1d5c0e4913844066aae refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubmechanismIllustrationPoint.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c2c7e9621863d470ddd3a1d5c0e4913844066aae refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubmechanismIllustrationPointStochast.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs
===================================================================
diff -u -rbc298d659aee58c83cabc8094b0404e08dca5aca -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs	(.../IllustrationPointsParser.cs)	(revision bc298d659aee58c83cabc8094b0404e08dca5aca)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs	(.../IllustrationPointsParser.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -38,7 +38,7 @@
         private readonly Dictionary<ThreeKeyIndex, IList<Stochast>> faultTreeStochasts = new Dictionary<ThreeKeyIndex, IList<Stochast>>();
         private readonly Dictionary<ThreeKeyIndex, double> faultTreeBetaValues = new Dictionary<ThreeKeyIndex, double>();
 
-        private readonly Dictionary<ThreeKeyIndex, IList<SubmechanismIllustrationPointStochast>> subMechanismStochasts = new Dictionary<ThreeKeyIndex, IList<SubmechanismIllustrationPointStochast>>();
+        private readonly Dictionary<ThreeKeyIndex, IList<SubMechanismIllustrationPointStochast>> subMechanismStochasts = new Dictionary<ThreeKeyIndex, IList<SubMechanismIllustrationPointStochast>>();
         private readonly Dictionary<ThreeKeyIndex, double> subMechanismBetaValues = new Dictionary<ThreeKeyIndex, double>();
         private readonly Dictionary<ThreeKeyIndex, IList<IllustrationPointResult>> subMechanismResults = new Dictionary<ThreeKeyIndex, IList<IllustrationPointResult>>();
 
@@ -152,13 +152,13 @@
 
                 double subMechanismIllustrationPointBeta = subMechanismBetaValues[key];
 
-                var illustrationPointStochasts = new List<SubmechanismIllustrationPointStochast>();
+                var illustrationPointStochasts = new List<SubMechanismIllustrationPointStochast>();
                 AddRange(illustrationPointStochasts, subMechanismStochasts[key]);
 
                 var illustrationPointResults = new List<IllustrationPointResult>();
                 AddRange(illustrationPointResults, subMechanismResults[key]);
 
-                var illustrationPoint = new SubmechanismIllustrationPoint(submechanismIllustrationPointName,
+                var illustrationPoint = new SubMechanismIllustrationPoint(submechanismIllustrationPointName,
                                                                           illustrationPointStochasts,
                                                                           illustrationPointResults,
                                                                           subMechanismIllustrationPointBeta);
@@ -226,7 +226,7 @@
         }
 
         /// <summary>
-        /// Parses <see cref="SubmechanismIllustrationPointStochast"/> objects from the <paramref name="reader"/>.
+        /// Parses <see cref="SubMechanismIllustrationPointStochast"/> objects from the <paramref name="reader"/>.
         /// </summary>
         /// <param name="reader">The database reader.</param>
         /// <exception cref="HydraRingFileParserException">Throw when the read <see cref="IllustrationPointsDatabaseConstants.Duration"/>, 
@@ -250,10 +250,10 @@
                 var key = new ThreeKeyIndex(windDirectionId, closingSituationid, subMechanismId);
                 if (!subMechanismStochasts.ContainsKey(key))
                 {
-                    subMechanismStochasts[key] = new List<SubmechanismIllustrationPointStochast>();
+                    subMechanismStochasts[key] = new List<SubMechanismIllustrationPointStochast>();
                 }
 
-                subMechanismStochasts[key].Add(new SubmechanismIllustrationPointStochast(name, duration, alpha, realization));
+                subMechanismStochasts[key].Add(new SubMechanismIllustrationPointStochast(name, duration, alpha, realization));
             }
         }
 
@@ -349,7 +349,7 @@
                 results.Add(Tuple.Create(
                                 parentId,
                                 id,
-                                type == "faulttree" ? typeof(FaultTreeIllustrationPoint) : typeof(SubmechanismIllustrationPoint),
+                                type == "faulttree" ? typeof(FaultTreeIllustrationPoint) : typeof(SubMechanismIllustrationPoint),
                                 combine == "and" ? CombinationType.And : CombinationType.Or));
             }
             return results;
@@ -394,7 +394,7 @@
         {
             var dataKey = new ThreeKeyIndex(windDirectionClosingSituation.Item1, windDirectionClosingSituation.Item3, subMechanismId);
 
-            var illustrationPointStochasts = new List<SubmechanismIllustrationPointStochast>();
+            var illustrationPointStochasts = new List<SubMechanismIllustrationPointStochast>();
             var illustrationPointResults = new List<IllustrationPointResult>();
 
             if (subMechanismStochasts.ContainsKey(dataKey))
@@ -408,7 +408,7 @@
 
             string submechanismIllustrationPointName = subMechanisms[subMechanismId];
             double subMechanismIllustrationPointBeta = subMechanismBetaValues[dataKey];
-            var illustrationPoint = new SubmechanismIllustrationPoint(submechanismIllustrationPointName,
+            var illustrationPoint = new SubMechanismIllustrationPoint(submechanismIllustrationPointName,
                                                                       illustrationPointStochasts,
                                                                       illustrationPointResults,
                                                                       subMechanismIllustrationPointBeta);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r20c6cddf9031f8721e60fceba6b3a6bc2791522a -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 20c6cddf9031f8721e60fceba6b3a6bc2791522a)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -120,9 +120,9 @@
     <Compile Include="Parsers\IllustrationPoints\IllustrationPointsDatabaseConstants.cs" />
     <Compile Include="Parsers\IllustrationPoints\IllustrationPointsParser.cs" />
     <Compile Include="Data\Output\IllustrationPoints\IllustrationPointTreeNode.cs" />
-    <Compile Include="Data\Output\IllustrationPoints\SubmechanismIllustrationPointStochast.cs" />
+    <Compile Include="Data\Output\IllustrationPoints\SubMechanismIllustrationPointStochast.cs" />
     <Compile Include="Data\Output\IllustrationPoints\Stochast.cs" />
-    <Compile Include="Data\Output\IllustrationPoints\SubmechanismIllustrationPoint.cs" />
+    <Compile Include="Data\Output\IllustrationPoints\SubMechanismIllustrationPoint.cs" />
     <Compile Include="Data\Output\IllustrationPoints\WindDirection.cs" />
     <Compile Include="Data\Output\IllustrationPoints\WindDirectionClosingSituation.cs" />
     <Compile Include="Readers\HydraRingDatabaseReader.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointStochastTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointStochastTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointStochastTest.cs	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -0,0 +1,64 @@
+// Copyright (C) Stichting Deltares 2017. 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 NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Data.Output.IllustrationPoints
+{
+    [TestFixture]
+    public class SubMechanismIllustrationPointStochastTest
+    {
+        [Test]
+        public void Constructor_NameNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new SubMechanismIllustrationPointStochast(null, double.NaN, double.NaN, double.NaN);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("name", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WithParameters_ReturnsNewInstance()
+        {
+            // Setup
+            const string name = "stochast name";
+
+            var random = new Random(21);
+            double duration = random.NextDouble();
+            double alpha = random.NextDouble();
+            double realization = random.NextDouble();
+
+            // Call
+            var stochast = new SubMechanismIllustrationPointStochast(name, duration, alpha, realization);
+
+            // Assert
+            Assert.IsInstanceOf<Stochast>(stochast);
+            Assert.AreEqual(name, stochast.Name);
+            Assert.AreEqual(duration, stochast.Duration);
+            Assert.AreEqual(alpha, stochast.Alpha);
+            Assert.AreEqual(realization, stochast.Realization);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointTest.cs
===================================================================
diff -u -rbc298d659aee58c83cabc8094b0404e08dca5aca -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointTest.cs	(.../SubMechanismIllustrationPointTest.cs)	(revision bc298d659aee58c83cabc8094b0404e08dca5aca)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubMechanismIllustrationPointTest.cs	(.../SubMechanismIllustrationPointTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -28,14 +28,14 @@
 namespace Ringtoets.HydraRing.Calculation.Test.Data.Output.IllustrationPoints
 {
     [TestFixture]
-    public class SubmechanismIllustrationPointTest
+    public class SubMechanismIllustrationPointTest
     {
         [Test]
         public void Constructor_NameNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new SubmechanismIllustrationPoint(null,
-                                                                        Enumerable.Empty<SubmechanismIllustrationPointStochast>(),
+            TestDelegate call = () => new SubMechanismIllustrationPoint(null,
+                                                                        Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
                                                                         Enumerable.Empty<IllustrationPointResult>(),
                                                                         123);
 
@@ -48,7 +48,7 @@
         public void Constructor_StochastNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new SubmechanismIllustrationPoint("Name", null, Enumerable.Empty<IllustrationPointResult>(), 123);
+            TestDelegate call = () => new SubMechanismIllustrationPoint("Name", null, Enumerable.Empty<IllustrationPointResult>(), 123);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -59,7 +59,7 @@
         public void Constructor_IllustrationPointResultsNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new SubmechanismIllustrationPoint("Name", Enumerable.Empty<SubmechanismIllustrationPointStochast>(), null, 123);
+            TestDelegate call = () => new SubMechanismIllustrationPoint("Name", Enumerable.Empty<SubMechanismIllustrationPointStochast>(), null, 123);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -75,11 +75,11 @@
             var random = new Random(21);
             double beta = random.NextDouble();
 
-            IEnumerable<SubmechanismIllustrationPointStochast> stochasts = Enumerable.Empty<SubmechanismIllustrationPointStochast>();
+            IEnumerable<SubMechanismIllustrationPointStochast> stochasts = Enumerable.Empty<SubMechanismIllustrationPointStochast>();
             IEnumerable<IllustrationPointResult> illustrationPointResults = Enumerable.Empty<IllustrationPointResult>();
 
             // Call
-            var illustrationPoint = new SubmechanismIllustrationPoint(name, stochasts, illustrationPointResults, beta);
+            var illustrationPoint = new SubMechanismIllustrationPoint(name, stochasts, illustrationPointResults, beta);
 
             // Assert
             Assert.IsInstanceOf<IIllustrationPoint>(illustrationPoint);
Fisheye: Tag c2c7e9621863d470ddd3a1d5c0e4913844066aae refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/SubmechanismIllustrationPointStochastTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs
===================================================================
diff -u -rbc298d659aee58c83cabc8094b0404e08dca5aca -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs	(.../IllustrationPointsParserTest.cs)	(revision bc298d659aee58c83cabc8094b0404e08dca5aca)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs	(.../IllustrationPointsParserTest.cs)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -174,22 +174,22 @@
             CollectionAssert.AllItemsAreInstancesOfType(illustrationPointNodes.Values.Select(ip => ip.Data), typeof(FaultTreeIllustrationPoint));
 
             ICollection<FaultTreeIllustrationPoint> faultTrees = new List<FaultTreeIllustrationPoint>();
-            ICollection<SubmechanismIllustrationPoint> subMechanisms = new List<SubmechanismIllustrationPoint>();
+            ICollection<SubMechanismIllustrationPoint> subMechanisms = new List<SubMechanismIllustrationPoint>();
             GetAllNodes(illustrationPointNodes.Values.First(), faultTrees, subMechanisms);
 
             Assert.AreEqual(11, faultTrees.Count);
             Assert.AreEqual(12, subMechanisms.Count);
-            SubmechanismIllustrationPoint submechanismIllustrationPoint = subMechanisms.First();
-            Assert.AreEqual("Structure 2017 Z12", submechanismIllustrationPoint.Name);
-            Assert.AreEqual(-7.94268, submechanismIllustrationPoint.Beta);
+            SubMechanismIllustrationPoint subMechanismIllustrationPoint = subMechanisms.First();
+            Assert.AreEqual("Structure 2017 Z12", subMechanismIllustrationPoint.Name);
+            Assert.AreEqual(-7.94268, subMechanismIllustrationPoint.Beta);
             Assert.AreEqual(new[]
             {
                 Tuple.Create("Faalkans kunstwerk gegeven erosie bodem", -1.0, 4383.0, -7.94268)
-            }, submechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization)));
-            Assert.IsEmpty(submechanismIllustrationPoint.Results);
+            }, subMechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization)));
+            Assert.IsEmpty(subMechanismIllustrationPoint.Results);
 
             FaultTreeIllustrationPoint faultTreeIllustrationPoint = faultTrees.First();
-            Assert.AreEqual("Structure 2017 Z12", submechanismIllustrationPoint.Name);
+            Assert.AreEqual("Structure 2017 Z12", subMechanismIllustrationPoint.Name);
             Assert.AreEqual(2.23881, faultTreeIllustrationPoint.Beta);
             Assert.AreEqual(46, faultTreeIllustrationPoint.Stochasts.Count);
             Assert.AreEqual(new[]
@@ -204,7 +204,7 @@
         }
 
         [Test]
-        public void Parse_ValidDesignWaterLevelData_SetsGeneralResultAndSubmechanismOutputForAWindDirectionAsExpected()
+        public void Parse_ValidDesignWaterLevelData_SetsGeneralResultAndSubMechanismOutputForAWindDirectionAsExpected()
         {
             // Setup
             string path = Path.Combine(testDirectory, "ValidDesignWaterLevelOutputSection1");
@@ -223,16 +223,16 @@
             Assert.AreEqual(6, generalResult.Stochasts.Count());
             Dictionary<WindDirectionClosingSituation, IllustrationPointTreeNode> illustrationPointNodes = generalResult.IllustrationPoints;
             Assert.AreEqual(16, illustrationPointNodes.Count);
-            CollectionAssert.AllItemsAreInstancesOfType(illustrationPointNodes.Values.Select(ip => ip.Data), typeof(SubmechanismIllustrationPoint));
+            CollectionAssert.AllItemsAreInstancesOfType(illustrationPointNodes.Values.Select(ip => ip.Data), typeof(SubMechanismIllustrationPoint));
 
             ICollection<FaultTreeIllustrationPoint> faultTrees = new List<FaultTreeIllustrationPoint>();
-            ICollection<SubmechanismIllustrationPoint> subMechanisms = new List<SubmechanismIllustrationPoint>();
+            ICollection<SubMechanismIllustrationPoint> subMechanisms = new List<SubMechanismIllustrationPoint>();
             GetAllNodes(illustrationPointNodes.Values.ElementAt(4), faultTrees, subMechanisms);
 
             Assert.IsEmpty(faultTrees);
-            SubmechanismIllustrationPoint submechanismIllustrationPoint = subMechanisms.Single();
-            Assert.AreEqual(5.30273, submechanismIllustrationPoint.Beta);
-            Assert.AreEqual("Reference water level", submechanismIllustrationPoint.Name);
+            SubMechanismIllustrationPoint subMechanismIllustrationPoint = subMechanisms.Single();
+            Assert.AreEqual(5.30273, subMechanismIllustrationPoint.Beta);
+            Assert.AreEqual("Reference water level", subMechanismIllustrationPoint.Name);
             Assert.AreEqual(new[]
             {
                 Tuple.Create("Windrichting", 0.0, 12.0, 0.0),
@@ -241,13 +241,13 @@
                 Tuple.Create("Onzekerheid waterstand IJsselmeer", -0.0695709, 96.0, 0.0146771),
                 Tuple.Create("Onzekerheid windsnelheid Schiphol 16 richtingen", -0.121567, 12.0, 1.0303),
                 Tuple.Create("Modelonzekerheid lokale waterstand", -0.295595, 4383.0, 0.235119)
-            }, submechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization)));
+            }, subMechanismIllustrationPoint.Stochasts.Select(s => Tuple.Create(s.Name, s.Alpha, s.Duration, s.Realization)));
             Assert.AreEqual(new[]
             {
                 Tuple.Create("Z", -0.00136652),
                 Tuple.Create("Considered water level", 1.24846),
                 Tuple.Create("Computed local water level", 1.24983)
-            }, submechanismIllustrationPoint.Results.Select(s => Tuple.Create(s.Description, s.Value)));
+            }, subMechanismIllustrationPoint.Results.Select(s => Tuple.Create(s.Description, s.Value)));
         }
 
         [Test]
@@ -265,9 +265,9 @@
             Assert.NotNull(generalResult);
         }
 
-        private static void GetAllNodes(IllustrationPointTreeNode tree, ICollection<FaultTreeIllustrationPoint> faultTrees, ICollection<SubmechanismIllustrationPoint> subMechanisms)
+        private static void GetAllNodes(IllustrationPointTreeNode tree, ICollection<FaultTreeIllustrationPoint> faultTrees, ICollection<SubMechanismIllustrationPoint> subMechanisms)
         {
-            var subMechanism = tree.Data as SubmechanismIllustrationPoint;
+            var subMechanism = tree.Data as SubMechanismIllustrationPoint;
             var faultTree = tree.Data as FaultTreeIllustrationPoint;
             if (subMechanism != null)
             {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r20c6cddf9031f8721e60fceba6b3a6bc2791522a -rc2c7e9621863d470ddd3a1d5c0e4913844066aae
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 20c6cddf9031f8721e60fceba6b3a6bc2791522a)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision c2c7e9621863d470ddd3a1d5c0e4913844066aae)
@@ -119,7 +119,7 @@
     <Compile Include="Data\Output\IllustrationPoints\IllustrationPointResultTest.cs" />
     <Compile Include="Parsers\IllustrationPoints\IllustrationPointsParserTest.cs" />
     <Compile Include="Data\Output\IllustrationPoints\IllustrationPointTreeNodeTest.cs" />
-    <Compile Include="Data\Output\IllustrationPoints\SubmechanismIllustrationPointStochastTest.cs" />
+    <Compile Include="Data\Output\IllustrationPoints\SubMechanismIllustrationPointStochastTest.cs" />
     <Compile Include="Data\Output\IllustrationPoints\StochastTest.cs" />
     <Compile Include="Data\Output\IllustrationPoints\SubMechanismIllustrationPointTest.cs" />
     <Compile Include="Data\Output\IllustrationPoints\WindDirectionClosingSituationTest.cs" />