Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r6855 -r6873
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6855)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6873)
@@ -154,17 +154,11 @@
                 CreateSimpleLocationWithSoilProfile2DSegment(selectedLocationTwoName, selectedSegmentTwoName, profile2DName)
             });
 
-            // Create the project to serialize
-            var waterBoard = new WaterBoard
-            {
-                Dike = dike
-            };
-
             var projectData = new DamProjectData();
             FillAnalysisSpecification(projectData);
             FillStabilityParameters(projectData);
             DamProject.ProjectMap = ""; // Set the folder to be empty so that it runs in the current test directory
-            projectData.WaterBoard = waterBoard;
+            projectData.Dike = dike;
             foreach (LocationJob locationJob in projectData.LocationJobs)
             {
                 if (selectedLocations.Contains(locationJob.Name))
@@ -253,17 +247,11 @@
                 CreateSimpleLocationWithSoilProfile2DSegment(selectedLocationTwoName, selectedSegmentTwoName, segmentTwoSoilProfileName)
             });
 
-            // Create the project to serialize
-            var waterBoard = new WaterBoard
-            {
-                Dike = dike
-            };
-
             var projectData = new DamProjectData();
             FillAnalysisSpecification(projectData);
             FillStabilityParameters(projectData);
             DamProject.ProjectMap = ""; // Set the folder to be empty so that it runs in the current test directory
-            projectData.WaterBoard = waterBoard;
+            projectData.Dike = dike;
             foreach (LocationJob locationJob in projectData.LocationJobs)
             {
                 if (selectedLocations.Contains(locationJob.Name))
@@ -332,17 +320,11 @@
                 CreateSimpleLocationWithSoilProfile2DSegment(selectedLocationTwoName, selectedSegmentTwoName, soilProfileName)
             });
 
-            // Create the project to serialize
-            var waterBoard = new WaterBoard
-            {
-                Dike = dike
-            };
-
             var projectData = new DamProjectData();
             FillAnalysisSpecification(projectData);
             FillStabilityParameters(projectData);
             DamProject.ProjectMap = ""; // Set the folder to be empty so that it runs in the current test directory
-            projectData.WaterBoard = waterBoard;
+            projectData.Dike = dike;
             foreach (LocationJob locationJob in projectData.LocationJobs)
             {
                 locationJob.Run = true;
@@ -415,17 +397,11 @@
                 selectedLocationTwoName
             });
 
-            // Create the project to serialize
-            var waterBoard = new WaterBoard
-            {
-                Dike = dike
-            };
-
             var projectData = new DamProjectData();
             FillAnalysisSpecification(projectData);
             FillStabilityParameters(projectData);
             DamProject.ProjectMap = ""; // Set the folder to be empty so that it runs in the current test directory
-            projectData.WaterBoard = waterBoard;
+            projectData.Dike = dike;
             foreach (LocationJob locationJob in projectData.LocationJobs)
             {
                 if (selectedLocations.Contains(locationJob.Name))
@@ -514,17 +490,11 @@
                 invalidLocation
             });
 
-            // Create the project to serialize
-            var waterBoard = new WaterBoard
-            {
-                Dike = dike
-            };
-
             var projectData = new DamProjectData();
             FillAnalysisSpecification(projectData);
             FillStabilityParameters(projectData);
             DamProject.ProjectMap = ""; // Set the folder to be empty so that it runs in the current test directory
-            projectData.WaterBoard = waterBoard;
+            projectData.Dike = dike;
             foreach (LocationJob locationJob in projectData.LocationJobs)
             {
                 locationJob.Run = true;
@@ -570,7 +540,7 @@
         {
             // Given DataSet Containing Illegal Characters
             DamProjectData expectedDamProjectData = CreateExampleDamProjectData();
-            Location location = expectedDamProjectData.WaterBoard.Dike.Locations[0];
+            Location location = expectedDamProjectData.Dike.Locations[0];
             location.Name = id;
 
             // When Writing Xml
@@ -601,7 +571,7 @@
         {
             // Given DataSet Containing Illegal Characters
             DamProjectData expectedDamProjectData = CreateExampleDamProjectData();
-            Location location = expectedDamProjectData.WaterBoard.Dike.Locations[0];
+            Location location = expectedDamProjectData.Dike.Locations[0];
             location.Name = id;
 
             // When Writing Xml
@@ -619,7 +589,7 @@
         {
             // Given DataSet with undefined RiverLevel
             DamProjectData damProjectData = CreateExampleDamProjectData();
-            Scenario scenario = damProjectData.WaterBoard.Dike.Locations[0].Scenarios[0];
+            Scenario scenario = damProjectData.Dike.Locations[0].Scenarios[0];
             scenario.RiverLevel = null;
 
             // When Writing Xml, Then Raise Exception With Clear Message
@@ -635,7 +605,7 @@
         {
             // Given DataSet with undefined RiverLevelLow
             DamProjectData damProjectData = CreateExampleDamProjectData();
-            Scenario scenario = damProjectData.WaterBoard.Dike.Locations[0].Scenarios[0];
+            Scenario scenario = damProjectData.Dike.Locations[0].Scenarios[0];
             scenario.RiverLevelLow = null;
             DamFailureMechanismeCalculationSpecification currentSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
             currentSpecification.FailureMechanismSystemType = failureMechanismSystemType;
@@ -652,15 +622,16 @@
         }
 
         [Test]
-        public void RaiseExceptionWhenWaterBoardIsNotDefined()
+        public void RaiseExceptionWhenDikeIsNotDefined()
         {
-            // Given DataSet with undefined waterboard
+            // Given DataSet with undefined dike
             var damProjectData = new DamProjectData();
-            damProjectData.WaterBoard = null;
+            damProjectData.Dike = null;
 
             // When Writing Xml, Then Raise Exception With Clear Message in case of Stability Outside
-            var expectedMessage = "No dike defined in this project (Parameter 'WaterBoard')";
-            Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
+            var expectedMessage = "No dike defined in this project (Parameter 'Dike')";
+            Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), 
+                        Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
         }
 
         private static void CompareSoilProfiles2D(SoilProfile2D[] actual, SoilProfile2D[] expected)
@@ -696,7 +667,7 @@
                         "SheetPilePointY",
                         "SheetPilePointZ",
                         "LocalXZSheetPilePoint",
-                        "WaterBoardJob",
+                        "DikeJob",
                         "LocationJobs",
                         "SelectedLocationJobs",
                         "PickSensors",
@@ -782,18 +753,17 @@
             DamProject.ProjectMap = ""; // Keep project map empty so that it runs in its current assembly group
             FillAnalysisSpecification(damProjectData);
             FillStabilityParameters(damProjectData);
-            damProjectData.WaterBoard = new WaterBoard();
-            damProjectData.WaterBoard.Dike = new Dike
+            damProjectData.Dike = new Dike
             {
                 MapForSoilGeometries2D = @"TestData\FillXMLInputFromDamUI"
             };
             damProjectData.MaxCalculationCores = 3;
-            Dike dike = damProjectData.WaterBoard.Dike;
+            Dike dike = damProjectData.Dike;
             List<SurfaceLine2> surfaceLines = CreateSurfaceLines();
             FillSoils(dike);
             FillSoilProfiles1D(dike);
             FillSegments(damProjectData);
-            AddLocations(dike, surfaceLines, damProjectData.WaterBoard.Segments);
+            AddLocations(dike, surfaceLines, damProjectData.Dike.Segments);
             foreach (LocationJob locationJob in damProjectData.LocationJobs)
             {
                 locationJob.Run = true;
@@ -845,7 +815,7 @@
             sensorData.SensorGroups.Add(sensorGroup1);
             var sensorLocation1 = new SensorLocation
             {
-                Location = damProjectData.WaterBoard.Dike.Locations[0],
+                Location = damProjectData.Dike.Locations[0],
                 Group = sensorGroup1,
                 SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
                 SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
@@ -856,7 +826,7 @@
                 SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
                 SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData
             };
-            damProjectData.WaterBoard.Dike.Locations[0].SensorLocation = sensorLocation1;
+            damProjectData.Dike.Locations[0].SensorLocation = sensorLocation1;
             sensorData.SensorLocations.Add(sensorLocation1);
 
             var sensor3 = new Sensor
@@ -883,7 +853,7 @@
             sensorData.SensorGroups.Add(sensorGroup2);
             var sensorLocation2 = new SensorLocation
             {
-                Location = damProjectData.WaterBoard.Dike.Locations[0],
+                Location = damProjectData.Dike.Locations[0],
                 Group = sensorGroup1,
                 SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
                 SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
@@ -894,7 +864,7 @@
                 SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
                 SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData
             };
-            damProjectData.WaterBoard.Dike.Locations[2].SensorLocation = sensorLocation2;
+            damProjectData.Dike.Locations[2].SensorLocation = sensorLocation2;
             sensorData.SensorLocations.Add(sensorLocation2);
         }
 
@@ -1217,7 +1187,7 @@
         private static void FillSegments(DamProjectData damProjectData)
         {
             const int segmentCount = 2;
-            Dike dike = damProjectData.WaterBoard.Dike;
+            Dike dike = damProjectData.Dike;
             for (var i = 0; i < segmentCount; i++)
             {
                 var segment = new Segment
@@ -1240,7 +1210,7 @@
 
                 soilProfileProbability.Probability = 0.003 * (i + 1);
                 segment.SoilProfileProbabilities.Add(soilProfileProbability);
-                damProjectData.WaterBoard.Segments.Add(segment);
+                damProjectData.Dike.Segments.Add(segment);
             }
         }