Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r4613f112c78c8a1ea1c69d07a0e08e5a69b3689e -r21793a296d0cd97d04a07d8287878a7b9ae16145
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs	(.../ClosingStructuresFailureMechanismSectionResultRow.cs)	(revision 4613f112c78c8a1ea1c69d07a0e08e5a69b3689e)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs	(.../ClosingStructuresFailureMechanismSectionResultRow.cs)	(revision 21793a296d0cd97d04a07d8287878a7b9ae16145)
@@ -204,7 +204,7 @@
         {
             get
             {
-                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(simpleAssemblyCategoryGroup);
+                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(simpleAssemblyCategoryGroup);
             }
         }
 
@@ -215,7 +215,7 @@
         {
             get
             {
-                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(detailedAssemblyCategoryGroup);
+                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(detailedAssemblyCategoryGroup);
             }
         }
 
@@ -226,7 +226,7 @@
         {
             get
             {
-                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(tailorMadeAssemblyCategoryGroup);
+                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(tailorMadeAssemblyCategoryGroup);
             }
         }
 
@@ -237,7 +237,7 @@
         {
             get
             {
-                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(combinedAssemblyCategoryGroup);
+                return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(combinedAssemblyCategoryGroup);
             }
         }
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r380459377e7c18685753cc9bf6f67a85eeb323f6 -r21793a296d0cd97d04a07d8287878a7b9ae16145
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision 380459377e7c18685753cc9bf6f67a85eeb323f6)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision 21793a296d0cd97d04a07d8287878a7b9ae16145)
@@ -104,30 +104,30 @@
             return new ClosingStructuresCalculationConfigurationReader(xmlFilePath);
         }
 
-        protected override ICalculation ParseReadCalculation(ClosingStructuresCalculationConfiguration readCalculation)
+        protected override ICalculation ParseReadCalculation(ClosingStructuresCalculationConfiguration calculationConfiguration)
         {
             var calculation = new StructuresCalculation<ClosingStructuresInput>
             {
-                Name = readCalculation.Name
+                Name = calculationConfiguration.Name
             };
 
-            if (TrySetStructure(readCalculation.StructureId, calculation)
-                && TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
-                && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation)
-                && TrySetStochasts(readCalculation, calculation)
-                && TrySetOrientation(readCalculation, calculation)
-                && TrySetFailureProbabilityStructureWithErosion(readCalculation, calculation)
-                && TrySetFailureProbabilityOpenStructure(readCalculation, calculation)
-                && TrySetFailureProbabilityReparation(readCalculation, calculation)
-                && TrySetProbabilityOpenStructureBeforeFlooding(readCalculation, calculation)
-                && TrySetInflowModelType(readCalculation, calculation)
-                && TrySetIdenticalApertures(readCalculation, calculation)
-                && readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile,
+            if (TrySetStructure(calculationConfiguration.StructureId, calculation)
+                && TrySetHydraulicBoundaryLocation(calculationConfiguration.HydraulicBoundaryLocationName, calculation)
+                && TrySetForeshoreProfile(calculationConfiguration.ForeshoreProfileId, calculation)
+                && TrySetStochasts(calculationConfiguration, calculation)
+                && TrySetOrientation(calculationConfiguration, calculation)
+                && TrySetFailureProbabilityStructureWithErosion(calculationConfiguration, calculation)
+                && TrySetFailureProbabilityOpenStructure(calculationConfiguration, calculation)
+                && TrySetFailureProbabilityReparation(calculationConfiguration, calculation)
+                && TrySetProbabilityOpenStructureBeforeFlooding(calculationConfiguration, calculation)
+                && TrySetInflowModelType(calculationConfiguration, calculation)
+                && TrySetIdenticalApertures(calculationConfiguration, calculation)
+                && calculationConfiguration.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile,
                                                                        calculation.Name, Log))
             {
-                SetFactorStormDurationOpenStructure(readCalculation, calculation);
-                SetWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
-                SetShouldIllustrationPointsBeCalculated(readCalculation, calculation);
+                SetFactorStormDurationOpenStructure(calculationConfiguration, calculation);
+                SetWaveReductionParameters(calculationConfiguration.WaveReduction, calculation.InputParameters);
+                SetShouldIllustrationPointsBeCalculated(calculationConfiguration, calculation);
                 return calculation;
             }
             return null;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r21793a296d0cd97d04a07d8287878a7b9ae16145
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs	(.../ClosingStructuresCalculationStochastAssigner.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs	(.../ClosingStructuresCalculationStochastAssigner.cs)	(revision 21793a296d0cd97d04a07d8287878a7b9ae16145)
@@ -45,7 +45,7 @@
             StructuresCalculation<ClosingStructuresInput> calculation)
             : base(configuration, calculation) {}
 
-        protected override IEnumerable<StandardDeviationDefinition> GetStandardDeviationStochasts(bool onlyStructureDependent = false)
+        protected override IEnumerable<StandardDeviationDefinition> GetStandardDeviationStochasts(bool structureDependent = false)
         {
             yield return new StandardDeviationDefinition(
                 ClosingStructuresConfigurationSchemaIdentifiers.LevelCrestStructureNotClosingStochastName,
@@ -89,7 +89,7 @@
                 i => i.WidthFlowApertures,
                 (i, d) => i.WidthFlowApertures = (NormalDistribution) d);
 
-            if (!onlyStructureDependent)
+            if (!structureDependent)
             {
                 yield return new StandardDeviationDefinition(
                     ClosingStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
@@ -105,7 +105,7 @@
             }
         }
 
-        protected override IEnumerable<VariationCoefficientDefinition> GetVariationCoefficientStochasts(bool onlyStructureDependent = false)
+        protected override IEnumerable<VariationCoefficientDefinition> GetVariationCoefficientStochasts(bool structureDependent = false)
         {
             yield return new VariationCoefficientDefinition(
                 ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
@@ -119,7 +119,7 @@
                 i => i.StorageStructureArea,
                 (i, d) => i.StorageStructureArea = (VariationCoefficientLogNormalDistribution) d);
 
-            if (!onlyStructureDependent)
+            if (!structureDependent)
             {
                 yield return new VariationCoefficientDefinition(
                     ConfigurationSchemaIdentifiers.StormDurationStochastName,
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r37d015e59a004f7deb5f1a9657016bd9c13c6539 -r21793a296d0cd97d04a07d8287878a7b9ae16145
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs	(.../ClosingStructuresFailureMechanismSectionResultRowTest.cs)	(revision 37d015e59a004f7deb5f1a9657016bd9c13c6539)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs	(.../ClosingStructuresFailureMechanismSectionResultRowTest.cs)	(revision 21793a296d0cd97d04a07d8287878a7b9ae16145)
@@ -228,13 +228,13 @@
                 var row = new ClosingStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection, ConstructionProperties);
 
                 // Assert
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.SimpleAssessmentAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.SimpleAssessmentAssemblyOutput.Group),
                                 row.SimpleAssemblyCategoryGroup);
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.DetailedAssessmentAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.DetailedAssessmentAssemblyOutput.Group),
                                 row.DetailedAssemblyCategoryGroup);
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.TailorMadeAssessmentAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.TailorMadeAssessmentAssemblyOutput.Group),
                                 row.TailorMadeAssemblyCategoryGroup);
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.CombinedAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.CombinedAssemblyOutput.Group),
                                 row.CombinedAssemblyCategoryGroup);
                 Assert.AreEqual(calculator.CombinedAssemblyOutput.Probability, row.CombinedAssemblyProbability);
                 mocks.VerifyAll();
@@ -375,13 +375,13 @@
                                                                                 ConstructionProperties);
 
                 // Precondition
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.SimpleAssessmentAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.SimpleAssessmentAssemblyOutput.Group),
                                 row.SimpleAssemblyCategoryGroup);
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.DetailedAssessmentAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.DetailedAssessmentAssemblyOutput.Group),
                                 row.DetailedAssemblyCategoryGroup);
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.TailorMadeAssessmentAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.TailorMadeAssessmentAssemblyOutput.Group),
                                 row.TailorMadeAssemblyCategoryGroup);
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(calculator.CombinedAssemblyOutput.Group),
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.CombinedAssemblyOutput.Group),
                                 row.CombinedAssemblyCategoryGroup);
                 Assert.AreEqual(calculator.CombinedAssemblyOutput.Probability, row.CombinedAssemblyProbability);
 
@@ -390,7 +390,7 @@
                 row.SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther;
 
                 // Then
-                string expectedAssemblyDisplayName = FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(FailureMechanismSectionAssemblyCategoryGroup.None);
+                string expectedAssemblyDisplayName = FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(FailureMechanismSectionAssemblyCategoryGroup.None);
                 Assert.AreEqual(expectedAssemblyDisplayName, row.SimpleAssemblyCategoryGroup);
                 Assert.AreEqual(expectedAssemblyDisplayName, row.DetailedAssemblyCategoryGroup);
                 Assert.AreEqual(expectedAssemblyDisplayName, row.TailorMadeAssemblyCategoryGroup);