Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -rd4d24f72de2e86b7215351ed29e1debb8dd1de0d -r6e68772763eff7e38ef3e2c4dcfcbc18aff21cd4
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision d4d24f72de2e86b7215351ed29e1debb8dd1de0d)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 6e68772763eff7e38ef3e2c4dcfcbc18aff21cd4)
@@ -57,14 +57,14 @@
         private const int criticalOvertoppingDischargePropertyIndex = 9;
         private const int failureProbabilityStructureWithErosionPropertyIndex = 10;
         private const int foreshoreProfilePropertyIndex = 11;
-        private const int breakWaterPropertyIndex = 12;
-        private const int foreshoreGeometryPropertyIndex = 13;
+        private const int useBreakWaterPropertyIndex = 12;
+        private const int useForeshorePropertyIndex = 13;
         private const int modelFactorSuperCriticalFlowPropertyIndex = 14;
         private const int hydraulicBoundaryLocationPropertyIndex = 15;
         private const int stormDurationPropertyIndex = 16;
         private const int deviationWaveDirectionPropertyIndex = 17;
 
-        #region Model settings
+        #region Model factors
 
         [PropertyOrder(modelFactorSuperCriticalFlowPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
@@ -313,12 +313,12 @@
             }
         }
 
-        [PropertyOrder(breakWaterPropertyIndex)]
+        [PropertyOrder(useBreakWaterPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_Description")]
-        public UseBreakWaterProperties BreakWater
+        public UseBreakWaterProperties UseBreakWater
         {
             get
             {
@@ -328,12 +328,12 @@
             }
         }
 
-        [PropertyOrder(foreshoreGeometryPropertyIndex)]
+        [PropertyOrder(useForeshorePropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_Description")]
-        public UseForeshoreProperties ForeshoreGeometry
+        public UseForeshoreProperties UseForeshore
         {
             get
             {