Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea -r5a36c286d8fba3ece9cf48061c66958a1feaa33e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5a36c286d8fba3ece9cf48061c66958a1feaa33e)
@@ -61,7 +61,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De toegestane peilverhoging komberging dat gebruikt wordt tijdens de berekening..
+        ///   Looks up a localized string similar to De toegestane peilverhoging op het kombergend oppervlak die gebruikt wordt tijdens de berekening..
         /// </summary>
         public static string AllowableIncreaseOfLevelForStorage_Description {
             get {
@@ -143,7 +143,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De faalkans kunstwerk gegeven erosie bodem..
+        ///   Looks up a localized string similar to De faalkans van het kunstwerk gegeven de erosie in de bodem..
         /// </summary>
         public static string FailureProbabilityOfStructureGivenErosion_Description {
             get {
@@ -321,7 +321,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kerende hoogte van het kunstwerk dat gebruikt wordt tijdens de berekening..
+        ///   Looks up a localized string similar to De kerende hoogte van het kunstwerk dat gebruikt wordt tijdens de berekening..
         /// </summary>
         public static string LevelOfCrestOfStructure_Description {
             get {
@@ -339,7 +339,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het modelfactor overloopdebiet volkomen overlaat dat gebruikt wordt tijdens de berekening..
+        ///   Looks up a localized string similar to Het modelfactor van overloopdebiet bij superkritische stroming dat gebruikt wordt tijdens de berekening..
         /// </summary>
         public static string ModelFactorOvertoppingSuperCriticalFlow_Description {
             get {
@@ -348,7 +348,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Modelfactor overloopdebiet volkomen overlaat [-].
+        ///   Looks up a localized string similar to Modelfactor van overloopdebiet bij superkritische stroming [-].
         /// </summary>
         public static string ModelFactorOvertoppingSuperCriticalFlow_DisplayName {
             get {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea -r5a36c286d8fba3ece9cf48061c66958a1feaa33e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 5a36c286d8fba3ece9cf48061c66958a1feaa33e)
@@ -170,7 +170,7 @@
     <value>Schematisatie</value>
   </data>
   <data name="AllowableIncreaseOfLevelForStorage_Description" xml:space="preserve">
-    <value>De toegestane peilverhoging komberging dat gebruikt wordt tijdens de berekening.</value>
+    <value>De toegestane peilverhoging op het kombergend oppervlak die gebruikt wordt tijdens de berekening.</value>
   </data>
   <data name="AllowableIncreaseOfLevelForStorage_DisplayName" xml:space="preserve">
     <value>Toegestane peilverhoging komberging [m]</value>
@@ -185,7 +185,7 @@
     <value>Kritiek overslagdebiet [m³/s/m]</value>
   </data>
   <data name="FailureProbabilityOfStructureGivenErosion_Description" xml:space="preserve">
-    <value>De faalkans kunstwerk gegeven erosie bodem.</value>
+    <value>De faalkans van het kunstwerk gegeven de erosie in de bodem.</value>
   </data>
   <data name="FailureProbabilityOfStructureGivenErosion_DisplayName" xml:space="preserve">
     <value>Faalkans kunstwerk gegeven erosie bodem [-]</value>
@@ -203,16 +203,16 @@
     <value>Locatie met hydraulische randvoorwaarden</value>
   </data>
   <data name="LevelOfCrestOfStructure_Description" xml:space="preserve">
-    <value>Kerende hoogte van het kunstwerk dat gebruikt wordt tijdens de berekening.</value>
+    <value>De kerende hoogte van het kunstwerk dat gebruikt wordt tijdens de berekening.</value>
   </data>
   <data name="LevelOfCrestOfStructure_DisplayName" xml:space="preserve">
     <value>Kerende hoogte [m]</value>
   </data>
   <data name="ModelFactorOvertoppingSuperCriticalFlow_Description" xml:space="preserve">
-    <value>Het modelfactor overloopdebiet volkomen overlaat dat gebruikt wordt tijdens de berekening.</value>
+    <value>Het modelfactor van overloopdebiet bij superkritische stroming dat gebruikt wordt tijdens de berekening.</value>
   </data>
   <data name="ModelFactorOvertoppingSuperCriticalFlow_DisplayName" xml:space="preserve">
-    <value>Modelfactor overloopdebiet volkomen overlaat [-]</value>
+    <value>Modelfactor van overloopdebiet bij superkritische stroming [-]</value>
   </data>
   <data name="OrientationOfTheNormalOfTheStructure_Description" xml:space="preserve">
     <value>Oriëntatie van het kunstwerk.</value>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c -r5a36c286d8fba3ece9cf48061c66958a1feaa33e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 5a36c286d8fba3ece9cf48061c66958a1feaa33e)
@@ -27,6 +27,7 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.Properties;
 using Ringtoets.HeightStructures.Forms.UITypeEditors;
@@ -73,8 +74,8 @@
         #endregion
 
         /// <summary>
-        /// Returns the available hydraulic boundary locations.
-        /// </summary>
+        /// Returns the available hydraulic boundary locations in order for the user to select one to 
+        /// set <see cref="HeightStructuresInput.HydraulicBoundaryLocation"/>. </summary>
         /// <returns>The available hydraulic boundary locations.</returns>
         public IEnumerable<HydraulicBoundaryLocation> GetAvailableHydraulicBoundaryLocations()
         {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs
===================================================================
diff -u -r006d96ecb9e7d838d7682912270c7d43e0ad67e1 -r5a36c286d8fba3ece9cf48061c66958a1feaa33e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision 006d96ecb9e7d838d7682912270c7d43e0ad67e1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision 5a36c286d8fba3ece9cf48061c66958a1feaa33e)
@@ -153,28 +153,31 @@
                 failureMechanismSection.Name, // TODO: Provide name of reference line instead
                 HydraRingTimeIntegrationSchemeType.FBC,
                 HydraRingUncertaintiesType.All,
-                new StructuresOvertoppingCalculationInput(hydraulicBoundaryLocationId,
-                                                          new HydraRingSection(1, failureMechanismSection.Name, sectionLength, inputParameters.OrientationOfTheNormalOfTheStructure),
-                                                          generalInputParameters.GravitationalAcceleration,
-                                                          generalInputParameters.ModelFactorOvertoppingFlow.Mean, generalInputParameters.ModelFactorOvertoppingFlow.StandardDeviation,
-                                                          inputParameters.LevelOfCrestOfStructure.Mean, inputParameters.LevelOfCrestOfStructure.StandardDeviation,
-                                                          inputParameters.OrientationOfTheNormalOfTheStructure,
-                                                          inputParameters.ModelFactorOvertoppingSuperCriticalFlow.Mean, inputParameters.ModelFactorOvertoppingSuperCriticalFlow.StandardDeviation,
-                                                          inputParameters.AllowableIncreaseOfLevelForStorage.Mean, inputParameters.AllowableIncreaseOfLevelForStorage.StandardDeviation,
-                                                          generalInputParameters.ModelFactorForStorageVolume.Mean, generalInputParameters.ModelFactorForStorageVolume.StandardDeviation,
-                                                          inputParameters.StorageStructureArea.Mean, inputParameters.StorageStructureArea.GetVariationCoefficient(),
-                                                          generalInputParameters.ModelFactorForIncomingFlowVolume,
-                                                          inputParameters.FlowWidthAtBottomProtection.Mean, inputParameters.FlowWidthAtBottomProtection.StandardDeviation,
-                                                          inputParameters.CriticalOvertoppingDischarge.Mean, inputParameters.CriticalOvertoppingDischarge.GetVariationCoefficient(),
-                                                          inputParameters.FailureProbabilityOfStructureGivenErosion,
-                                                          inputParameters.WidthOfFlowApertures.Mean, inputParameters.WidthOfFlowApertures.GetVariationCoefficient(),
-                                                          inputParameters.DeviationOfTheWaveDirection,
-                                                          inputParameters.StormDuration.Mean, inputParameters.StormDuration.GetVariationCoefficient()),
+                new StructuresOvertoppingCalculationInput(
+                    hydraulicBoundaryLocationId,
+                    new HydraRingSection(1, failureMechanismSection.Name, sectionLength, inputParameters.OrientationOfTheNormalOfTheStructure),
+                    generalInputParameters.GravitationalAcceleration,
+                    generalInputParameters.ModelFactorOvertoppingFlow.Mean, generalInputParameters.ModelFactorOvertoppingFlow.StandardDeviation,
+                    inputParameters.LevelOfCrestOfStructure.Mean, inputParameters.LevelOfCrestOfStructure.StandardDeviation,
+                    inputParameters.OrientationOfTheNormalOfTheStructure,
+                    inputParameters.ModelFactorOvertoppingSuperCriticalFlow.Mean, inputParameters.ModelFactorOvertoppingSuperCriticalFlow.StandardDeviation,
+                    inputParameters.AllowableIncreaseOfLevelForStorage.Mean, inputParameters.AllowableIncreaseOfLevelForStorage.StandardDeviation,
+                    generalInputParameters.ModelFactorForStorageVolume.Mean, generalInputParameters.ModelFactorForStorageVolume.StandardDeviation,
+                    inputParameters.StorageStructureArea.Mean, inputParameters.StorageStructureArea.GetVariationCoefficient(),
+                    generalInputParameters.ModelFactorForIncomingFlowVolume,
+                    inputParameters.FlowWidthAtBottomProtection.Mean, inputParameters.FlowWidthAtBottomProtection.StandardDeviation,
+                    inputParameters.CriticalOvertoppingDischarge.Mean, inputParameters.CriticalOvertoppingDischarge.GetVariationCoefficient(),
+                    inputParameters.FailureProbabilityOfStructureGivenErosion,
+                    inputParameters.WidthOfFlowApertures.Mean, inputParameters.WidthOfFlowApertures.GetVariationCoefficient(),
+                    inputParameters.DeviationOfTheWaveDirection,
+                    inputParameters.StormDuration.Mean, inputParameters.StormDuration.GetVariationCoefficient()),
                 calculation.ClearOutput,
                 output => { ParseHydraRingOutput(calculation, failureMechanism, assessmentSection, output); });
         }
 
-        private void CalculateAll(HeightStructuresFailureMechanism failureMechanism, IEnumerable<HeightStructuresCalculation> calculations, IAssessmentSection assessmentSection)
+        private void CalculateAll(HeightStructuresFailureMechanism failureMechanism,
+                                  IEnumerable<HeightStructuresCalculation> calculations,
+                                  IAssessmentSection assessmentSection)
         {
             // TODO: Remove "Where" filter when validation is implemented
             ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations.Where(calc => calc.InputParameters.HydraulicBoundaryLocation != null)
@@ -183,7 +186,7 @@
                                                                              calc,
                                                                              failureMechanism,
                                                                              assessmentSection
-                                                                             )).ToList());
+                                                                                             )).ToList());
         }
 
         private static string AllDataAvailable(IAssessmentSection assessmentSection, HeightStructuresFailureMechanism failureMechanism)
@@ -201,17 +204,24 @@
             var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
             if (!string.IsNullOrEmpty(validationProblem))
             {
-                return string.Format(RingtoetsCommonFormsResources.GuiPlugin_VerifyHydraulicBoundaryDatabasePath_Hydraulic_boundary_database_connection_failed_0_, validationProblem);
+                return string.Format(RingtoetsCommonFormsResources.GuiPlugin_VerifyHydraulicBoundaryDatabasePath_Hydraulic_boundary_database_connection_failed_0_,
+                                     validationProblem);
             }
 
             return null;
         }
 
-        private static void ParseHydraRingOutput(HeightStructuresCalculation calculation, HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection, ExceedanceProbabilityCalculationOutput output)
+        private static void ParseHydraRingOutput(HeightStructuresCalculation calculation,
+                                                 HeightStructuresFailureMechanism failureMechanism,
+                                                 IAssessmentSection assessmentSection,
+                                                 ExceedanceProbabilityCalculationOutput output)
         {
             if (output != null)
             {
-                calculation.Output = ProbabilityAssessmentService.Calculate(assessmentSection.FailureMechanismContribution.Norm, failureMechanism.Contribution, failureMechanism.GeneralInput.N, output.Beta);
+                calculation.Output = ProbabilityAssessmentService.Calculate(assessmentSection.FailureMechanismContribution.Norm,
+                                                                            failureMechanism.Contribution,
+                                                                            failureMechanism.GeneralInput.N,
+                                                                            output.Beta);
                 calculation.NotifyObservers();
             }
             else
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj
===================================================================
diff -u -r423c4f9a61452fd9253908a5c725ead06a07b4a8 -r5a36c286d8fba3ece9cf48061c66958a1feaa33e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision 423c4f9a61452fd9253908a5c725ead06a07b4a8)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision 5a36c286d8fba3ece9cf48061c66958a1feaa33e)
@@ -122,6 +122,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea -r5a36c286d8fba3ece9cf48061c66958a1feaa33e
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 5a36c286d8fba3ece9cf48061c66958a1feaa33e)
@@ -101,7 +101,7 @@
             {
                 Data = input.StorageStructureArea
             };
-            AssertDistributionProperties(storageStructureAreaProperties, properties.StorageStructureArea);
+            AssertLogNormalDistributionVariationProperties(storageStructureAreaProperties, properties.StorageStructureArea);
 
             var flowWidthAtBottomProtectionProperties = new LogNormalDistributionProperties
             {
@@ -119,7 +119,7 @@
             {
                 Data = input.CriticalOvertoppingDischarge
             };
-            AssertDistributionProperties(criticalOvertoppingDischargeProperties, properties.CriticalOvertoppingDischarge);
+            AssertLogNormalDistributionVariationProperties(criticalOvertoppingDischargeProperties, properties.CriticalOvertoppingDischarge);
 
             var expectedFailureProbabilityOfStructureGivenErosion = string.Format(CoreCommonBasePropertiesResources.ProbabilityPerYearFormat,
                                                                                   input.FailureProbabilityOfStructureGivenErosion);
@@ -131,7 +131,7 @@
             {
                 Data = input.StormDuration
             };
-            AssertDistributionProperties(stormDurationProperties, properties.StormDuration);
+            AssertLogNormalDistributionVariationProperties(stormDurationProperties, properties.StormDuration);
 
             mockRepository.VerifyAll();
         }
@@ -207,12 +207,12 @@
             PropertyDescriptor levelOfCrestOfStructureProperty = dynamicProperties[levelOfCrestOfStructurePropertyIndex];
             Assert.AreEqual("Schematisatie", levelOfCrestOfStructureProperty.Category);
             Assert.AreEqual("Kerende hoogte [m]", levelOfCrestOfStructureProperty.DisplayName);
-            Assert.AreEqual("Kerende hoogte van het kunstwerk dat gebruikt wordt tijdens de berekening.", levelOfCrestOfStructureProperty.Description);
+            Assert.AreEqual("De kerende hoogte van het kunstwerk dat gebruikt wordt tijdens de berekening.", levelOfCrestOfStructureProperty.Description);
 
             PropertyDescriptor allowableIncreaseOfLevelForStorageProperty = dynamicProperties[allowableIncreaseOfLevelForStoragePropertyIndex];
             Assert.AreEqual("Schematisatie", allowableIncreaseOfLevelForStorageProperty.Category);
             Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowableIncreaseOfLevelForStorageProperty.DisplayName);
-            Assert.AreEqual("De toegestane peilverhoging komberging dat gebruikt wordt tijdens de berekening.", allowableIncreaseOfLevelForStorageProperty.Description);
+            Assert.AreEqual("De toegestane peilverhoging op het kombergend oppervlak die gebruikt wordt tijdens de berekening.", allowableIncreaseOfLevelForStorageProperty.Description);
 
             PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureAreaPropertyIndex];
             Assert.AreEqual("Schematisatie", storageStructureAreaProperty.Category);
@@ -238,12 +238,12 @@
             Assert.IsFalse(failureProbabilityOfStructureGivenErosionProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", failureProbabilityOfStructureGivenErosionProperty.Category);
             Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityOfStructureGivenErosionProperty.DisplayName);
-            Assert.AreEqual("De faalkans kunstwerk gegeven erosie bodem.", failureProbabilityOfStructureGivenErosionProperty.Description);
+            Assert.AreEqual("De faalkans van het kunstwerk gegeven de erosie in de bodem.", failureProbabilityOfStructureGivenErosionProperty.Description);
 
             PropertyDescriptor modelFactorOvertoppingSuperCriticalFlowProperty = dynamicProperties[modelFactorOvertoppingSuperCriticalFlowPropertyIndex];
             Assert.AreEqual("Modelfactoren", modelFactorOvertoppingSuperCriticalFlowProperty.Category);
-            Assert.AreEqual("Modelfactor overloopdebiet volkomen overlaat [-]", modelFactorOvertoppingSuperCriticalFlowProperty.DisplayName);
-            Assert.AreEqual("Het modelfactor overloopdebiet volkomen overlaat dat gebruikt wordt tijdens de berekening.", modelFactorOvertoppingSuperCriticalFlowProperty.Description);
+            Assert.AreEqual("Modelfactor van overloopdebiet bij superkritische stroming [-]", modelFactorOvertoppingSuperCriticalFlowProperty.DisplayName);
+            Assert.AreEqual("Het modelfactor van overloopdebiet bij superkritische stroming dat gebruikt wordt tijdens de berekening.", modelFactorOvertoppingSuperCriticalFlowProperty.Description);
 
             PropertyDescriptor hydraulicBoundaryLocationProperty = dynamicProperties[hydraulicBoundaryLocationPropertyIndex];
             Assert.IsFalse(hydraulicBoundaryLocationProperty.IsReadOnly);
@@ -265,7 +265,8 @@
             Assert.AreEqual(expected.Data, actual.Data);
         }
 
-        private static void AssertDistributionProperties(LogNormalDistributionVariationProperties expected, LogNormalDistributionVariationProperties actual)
+        private static void AssertLogNormalDistributionVariationProperties(LogNormalDistributionVariationProperties expected,
+                                                                           LogNormalDistributionVariationProperties actual)
         {
             Assert.AreEqual(expected.Data, actual.Data);
         }