Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs
===================================================================
diff -u -re46d30b3ce0dd6ac1b44bfb979f75a20712dbd4a -r76f30488c80811c5e489f9e86fd701fd5417f31e
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs	(.../HydraulicBoundaryCalculationsViewTest.cs)	(revision e46d30b3ce0dd6ac1b44bfb979f75a20712dbd4a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs	(.../HydraulicBoundaryCalculationsViewTest.cs)	(revision 76f30488c80811c5e489f9e86fd701fd5417f31e)
@@ -49,7 +49,7 @@
         private const int includeIllustrationPointsColumnIndex = 1;
         private const int locationNameColumnIndex = 2;
         private const int locationIdColumnIndex = 3;
-        private const int hydraulicBoundaryDatabaseFileName = 4;
+        private const int hydraulicBoundaryDatabaseFileNameColumnIndex = 4;
 
         private Form testForm;
 
@@ -145,7 +145,7 @@
             Assert.AreEqual("ID", locationIdColumn.HeaderText);
             Assert.IsTrue(locationIdColumn.Visible);
 
-            var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[hydraulicBoundaryDatabaseFileName];
+            var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[hydraulicBoundaryDatabaseFileNameColumnIndex];
             Assert.AreEqual("HRD bestand", hydraulicBoundaryDatabaseFileNameColumn.HeaderText);
             Assert.IsFalse(hydraulicBoundaryDatabaseFileNameColumn.Visible);
         }
@@ -190,23 +190,23 @@
             Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
-            Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileName].FormattedValue);
+            Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue);
 
             cells = rows[1].Cells;
             Assert.AreEqual(5, cells.Count);
             Assert.AreEqual(false, cells[calculateColumnIndex].FormattedValue);
             Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
-            Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileName].FormattedValue);
+            Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue);
 
             cells = rows[2].Cells;
             Assert.AreEqual(5, cells.Count);
             Assert.AreEqual(false, cells[calculateColumnIndex].FormattedValue);
             Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
-            Assert.AreEqual("database2", cells[hydraulicBoundaryDatabaseFileName].FormattedValue);
+            Assert.AreEqual("database2", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -422,7 +422,7 @@
             DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView");
 
             // Precondition
-            var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[hydraulicBoundaryDatabaseFileName];
+            var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[hydraulicBoundaryDatabaseFileNameColumnIndex];
             Assert.IsFalse(hydraulicBoundaryDatabaseFileNameColumn.Visible);
 
             // When