Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re7423204b7d614fbd894dbadfa4d4c7a7e894e94 -r76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e7423204b7d614fbd894dbadfa4d4c7a7e894e94)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -1902,6 +1902,78 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Modelfactor instromend volume.
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorInflowVolume_Description {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorInflowVolume_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor instromend volume [-].
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorInflowVolume_DisplayName {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorInflowVolume_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor voor het overslagdebiet..
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor overslagdebiet [-].
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor kombergend vermogen..
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor kombergend vermogen [-].
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor voor onvolkomen stroming.
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_Description {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Modelfactor voor onvolkomen stroming [-].
+        /// </summary>
+        public static string StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_DisplayName {
+            get {
+                return ResourceManager.GetString("StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to &amp;Valideren.
         /// </summary>
         public static string Validate {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -re7423204b7d614fbd894dbadfa4d4c7a7e894e94 -r76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e7423204b7d614fbd894dbadfa4d4c7a7e894e94)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b)
@@ -742,4 +742,28 @@
   <data name="Categories_CriticalValues" xml:space="preserve">
     <value>Kritieke waarden</value>
   </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorInflowVolume_Description" xml:space="preserve">
+    <value>Modelfactor instromend volume</value>
+  </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorInflowVolume_DisplayName" xml:space="preserve">
+    <value>Modelfactor instromend volume [-]</value>
+  </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description" xml:space="preserve">
+    <value>Modelfactor voor het overslagdebiet.</value>
+  </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName" xml:space="preserve">
+    <value>Modelfactor overslagdebiet [-]</value>
+  </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description" xml:space="preserve">
+    <value>Modelfactor kombergend vermogen.</value>
+  </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName" xml:space="preserve">
+    <value>Modelfactor kombergend vermogen [-]</value>
+  </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_Description" xml:space="preserve">
+    <value>Modelfactor voor onvolkomen stroming</value>
+  </data>
+  <data name="StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_DisplayName" xml:space="preserve">
+    <value>Modelfactor voor onvolkomen stroming [-]</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r790d12a1b8f6bb77d03a9fb4ef48892f71d7f778 -r76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 790d12a1b8f6bb77d03a9fb4ef48892f71d7f778)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -163,46 +163,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Modelfactor voor het overslagdebiet..
-        /// </summary>
-        public static string HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description {
-            get {
-                return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Descripti" +
-                        "on", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Modelfactor overslagdebiet [-].
-        /// </summary>
-        public static string HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName {
-            get {
-                return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayNa" +
-                        "me", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Modelfactor kombergend vermogen..
-        /// </summary>
-        public static string HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description {
-            get {
-                return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description" +
-                        "", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Modelfactor kombergend vermogen [-].
-        /// </summary>
-        public static string HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName {
-            get {
-                return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName" +
-                        "", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Modelfactor voor het overloopdebiet over een volkomen overlaat..
         /// </summary>
         public static string ModelFactorSuperCriticalFlow_Description {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r790d12a1b8f6bb77d03a9fb4ef48892f71d7f778 -r76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 790d12a1b8f6bb77d03a9fb4ef48892f71d7f778)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b)
@@ -117,18 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description" xml:space="preserve">
-    <value>Modelfactor kombergend vermogen.</value>
-  </data>
-  <data name="HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName" xml:space="preserve">
-    <value>Modelfactor kombergend vermogen [-]</value>
-  </data>
-  <data name="HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description" xml:space="preserve">
-    <value>Modelfactor voor het overslagdebiet.</value>
-  </data>
-  <data name="HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName" xml:space="preserve">
-    <value>Modelfactor overslagdebiet [-]</value>
-  </data>
   <data name="FailureProbabilityStructureWithErosion_Description" xml:space="preserve">
     <value>Faalkans kunstwerk gegeven erosie bodem.</value>
   </data>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs
===================================================================
diff -u -rabfd273f3a6555566460d1c0cf829f847d4e887a -r76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs	(.../HeightStructuresFailureMechanismContextProperties.cs)	(revision abfd273f3a6555566460d1c0cf829f847d4e887a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs	(.../HeightStructuresFailureMechanismContextProperties.cs)	(revision 76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b)
@@ -109,8 +109,8 @@
         [PropertyOrder(modelFactorOvertoppingFlowPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")]
-        [ResourcesDisplayName(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "StructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description")]
         public LogNormalDistributionProperties ModelFactorOvertoppingFlow
         {
             get
@@ -125,8 +125,8 @@
         [PropertyOrder(modelFactorStorageVolumePropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")]
-        [ResourcesDisplayName(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "StructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "StructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description")]
         public LogNormalDistributionProperties ModelFactorStorageVolume
         {
             get
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -rabfd273f3a6555566460d1c0cf829f847d4e887a -r76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs	(.../HeightStructuresFailureMechanismContextPropertiesTest.cs)	(revision abfd273f3a6555566460d1c0cf829f847d4e887a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs	(.../HeightStructuresFailureMechanismContextPropertiesTest.cs)	(revision 76bf9c7fbdfb0822c5d7e6bb7ee221467ec8734b)
@@ -65,22 +65,22 @@
         public void Data_SetNewFailureMechanismContextInstance_ReturnCorrectPropertyValues()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
             var properties = new HeightStructuresFailureMechanismContextProperties();
 
             // Call
-            properties.Data = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            properties.Data = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreEqual(Resources.HeightStructuresFailureMechanism_DisplayName, properties.Name);
             Assert.AreEqual(Resources.HeightStructuresFailureMechanism_Code, properties.Code);
-            Assert.AreEqual(failureMechanism.GeneralInput.GravitationalAcceleration, properties.GravitationalAcceleration);
             Assert.AreEqual(2, properties.LengthEffect);
 
-            var generalInput = failureMechanism.GeneralInput;
+            GeneralHeightStructuresInput generalInput = failureMechanism.GeneralInput;
+            Assert.AreEqual(generalInput.GravitationalAcceleration, properties.GravitationalAcceleration);
             Assert.AreEqual(generalInput.ModelFactorOvertoppingFlow.Mean, properties.ModelFactorOvertoppingFlow.Mean);
             Assert.AreEqual(generalInput.ModelFactorOvertoppingFlow.StandardDeviation, properties.ModelFactorOvertoppingFlow.StandardDeviation);