Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs
===================================================================
diff -u -rbe9cffbc5ed8f0a3787298d5693574e49bf94981 -r13f17219d61663607e32c0ee25011a5271b393f3
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs	(.../ClosingStructuresCalculationsView.cs)	(revision be9cffbc5ed8f0a3787298d5693574e49bf94981)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs	(.../ClosingStructuresCalculationsView.cs)	(revision 13f17219d61663607e32c0ee25011a5271b393f3)
@@ -154,7 +154,7 @@
 
             dataGridViewControl.AddComboBoxColumn<DataGridViewComboBoxItemWrapper<ForeshoreProfile>>(
                 nameof(ClosingStructuresCalculationRow.ForeshoreProfile),
-                RiskeerCommonFormsResources.ForeshoreProfile_Name_Description,
+                RiskeerCommonFormsResources.Structure_ForeshoreProfile_DisplayName,
                 null,
                 nameof(DataGridViewComboBoxItemWrapper<ForeshoreProfile>.This),
                 nameof(DataGridViewComboBoxItemWrapper<ForeshoreProfile>.DisplayName));
@@ -183,15 +183,15 @@
 
             dataGridViewControl.AddTextBoxColumn(
                 nameof(ClosingStructuresCalculationRow.MeanInsideWaterLevel),
-                RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName);
+                string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, " ", RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName));
 
             dataGridViewControl.AddTextBoxColumn(
                 nameof(ClosingStructuresCalculationRow.CriticalOvertoppingDischarge),
-                RiskeerCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName);
+                string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, " ", RiskeerCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName));
 
             dataGridViewControl.AddTextBoxColumn(
                 nameof(ClosingStructuresCalculationRow.AllowedLevelIncreaseStorage),
-                RiskeerCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName);
+                string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, " ", RiskeerCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName));
         }
 
         private void InitializeListBox()
@@ -443,7 +443,14 @@
         {
             List<HydraulicBoundaryLocation> hydraulicBoundaryLocations = assessmentSection.HydraulicBoundaryDatabase.Locations;
 
-            return hydraulicBoundaryLocations.Select(hbl => new SelectableHydraulicBoundaryLocation(hbl, hbl.Location)).ToList();
+            List<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations = hydraulicBoundaryLocations.Select(hbl => new SelectableHydraulicBoundaryLocation(hbl, null)).ToList();
+
+            foreach (ForeshoreProfile foreshoreProfile in failureMechanism.ForeshoreProfiles)
+            {
+                selectableHydraulicBoundaryLocations.AddRange(GetSelectableHydraulicBoundaryLocations(hydraulicBoundaryLocations, foreshoreProfile));
+            }
+
+            return selectableHydraulicBoundaryLocations;
         }
 
         #endregion
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs
===================================================================
diff -u -rbe9cffbc5ed8f0a3787298d5693574e49bf94981 -r13f17219d61663607e32c0ee25011a5271b393f3
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs	(.../ClosingStructuresCalculationsViewTest.cs)	(revision be9cffbc5ed8f0a3787298d5693574e49bf94981)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs	(.../ClosingStructuresCalculationsViewTest.cs)	(revision 13f17219d61663607e32c0ee25011a5271b393f3)
@@ -157,7 +157,7 @@
 
             AssertColumnMembers(dataGridView.Columns.OfType<DataGridViewComboBoxColumn>().ToArray());
 
-            //AssertDataGridViewControlColumnHeaders(dataGridView);
+            AssertDataGridViewControlColumnHeaders(dataGridView);
 
             mocks.VerifyAll();
         }
@@ -184,33 +184,33 @@
             mocks.VerifyAll();
         }
 
-        // [Test]
-        // public void AssessmentSection_HydraulicBoundaryDatabaseWithLocations_SelectableHydraulicBoundaryLocationsComboboxCorrectlyInitialized()
-        // {
-        //     // Setup
-        //     var mocks = new MockRepository();
-        //     var assessmentSection = mocks.Stub<IAssessmentSection>();
-        //     mocks.ReplayAll();
-        //
-        //     // Call
-        //     ShowFullyConfiguredCalculationsView(assessmentSection);
-        //
-        //     // Assert
-        //     var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-        //     var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex];
-        //     DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items;
-        //     Assert.AreEqual(7, hydraulicBoundaryLocationComboboxItems.Count);
-        //     Assert.AreEqual("<selecteer>", hydraulicBoundaryLocationComboboxItems[0].ToString());
-        //     Assert.AreEqual("Location 1", hydraulicBoundaryLocationComboboxItems[1].ToString());
-        //     Assert.AreEqual("Location 2", hydraulicBoundaryLocationComboboxItems[2].ToString());
-        //     Assert.AreEqual("Location 1 (2 m)", hydraulicBoundaryLocationComboboxItems[3].ToString());
-        //     Assert.AreEqual("Location 2 (6 m)", hydraulicBoundaryLocationComboboxItems[4].ToString());
-        //     Assert.AreEqual("Location 1 (4 m)", hydraulicBoundaryLocationComboboxItems[5].ToString());
-        //     Assert.AreEqual("Location 2 (5 m)", hydraulicBoundaryLocationComboboxItems[6].ToString());
-        //
-        //     mocks.VerifyAll();
-        // }
+        [Test]
+        public void AssessmentSection_HydraulicBoundaryDatabaseWithLocations_SelectableHydraulicBoundaryLocationsComboboxCorrectlyInitialized()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
 
+            // Call
+            ShowFullyConfiguredCalculationsView(assessmentSection);
+
+            // Assert
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex];
+            DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items;
+            Assert.AreEqual(7, hydraulicBoundaryLocationComboboxItems.Count);
+            Assert.AreEqual("<selecteer>", hydraulicBoundaryLocationComboboxItems[0].ToString());
+            Assert.AreEqual("Location 1", hydraulicBoundaryLocationComboboxItems[1].ToString());
+            Assert.AreEqual("Location 2", hydraulicBoundaryLocationComboboxItems[2].ToString());
+            Assert.AreEqual("Location 1 (2 m)", hydraulicBoundaryLocationComboboxItems[3].ToString());
+            Assert.AreEqual("Location 2 (6 m)", hydraulicBoundaryLocationComboboxItems[4].ToString());
+            Assert.AreEqual("Location 1 (2 m)", hydraulicBoundaryLocationComboboxItems[5].ToString());
+            Assert.AreEqual("Location 2 (6 m)", hydraulicBoundaryLocationComboboxItems[6].ToString());
+
+            mocks.VerifyAll();
+        }
+
         [Test]
         public void ButtonGenerateCalculations_ForeshoreProfilesPresent_ButtonEnabled()
         {
@@ -481,25 +481,25 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
-        
+
             ConfigureHydraulicBoundaryDatabase(assessmentSection);
             ClosingStructuresFailureMechanism failureMechanism = ConfigureFailureMechanism();
             CalculationGroup calculationGroup = ConfigureCalculationGroup(failureMechanism, assessmentSection);
-        
+
             var newRoundedValue = (RoundedDouble) newValue;
-        
+
             ShowCalculationsView(calculationGroup, failureMechanism, assessmentSection);
-        
+
             mocks.ReplayAll();
-        
+
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-        
+
             // Call
             dataGridView.Rows[0].Cells[cellIndex].Value = newRoundedValue;
-        
+
             // Assert
             Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-        
+
             mocks.VerifyAll();
         }
 
@@ -963,9 +963,10 @@
             Assert.AreEqual("Damtype", dataGridView.Columns[breakWaterTypeColumnIndex].HeaderText);
             Assert.AreEqual("Damhoogte [m+NAP]", dataGridView.Columns[breakWaterHeightColumnIndex].HeaderText);
             Assert.AreEqual("Gebruik voorlandgeometrie", dataGridView.Columns[useForeShoreGeometryColumnIndex].HeaderText);
-            Assert.AreEqual("Verwachtingswaarde binnenwaterstand [m+NAP]", dataGridView.Columns[inflowModelTypeColumnIndex].HeaderText);
-            Assert.AreEqual("Verwachtingswaarde kritiek instromend debiet [m3/m/s]", dataGridView.Columns[meanInsideWaterLevelColumnIndex].HeaderText);
-            Assert.AreEqual("Verwachtingswaarde toegestane peilverhoging komberging [m]", dataGridView.Columns[criticalOvertoppingDischargeColumnIndex].HeaderText);
+            Assert.AreEqual("Instroommodel", dataGridView.Columns[inflowModelTypeColumnIndex].HeaderText);
+            Assert.AreEqual("Verwachtingswaarde Binnenwaterstand [m+NAP]", dataGridView.Columns[meanInsideWaterLevelColumnIndex].HeaderText);
+            Assert.AreEqual("Verwachtingswaarde Kritiek instromend debiet [m³/s/m]", dataGridView.Columns[criticalOvertoppingDischargeColumnIndex].HeaderText);
+            Assert.AreEqual("Verwachtingswaarde Toegestane peilverhoging komberging [m]", dataGridView.Columns[allowedLevelIncreaseStorageColumnIndex].HeaderText);
         }
     }
 }
\ No newline at end of file