Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r6858 -r6873
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6858)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6873)
@@ -179,7 +179,7 @@
         [Label("Options")]
         public void ShowCalculationOptions()
         {
-            DataEventPublisher.SelectionChanged(damProject.DamProjectData.WaterBoardJob);
+            DataEventPublisher.SelectionChanged(damProject.DamProjectData.DikeJob);
             FormsSupport.MakeTreeVisible(damProjectCalculationSpecificationPropertyControl);
         }
 
@@ -247,9 +247,9 @@
 
             BindSupport.Assign(damNavigator, projectData);
             BindSupport.Assign(projectPanel, projectData);
-            Dike sd = projectData.WaterBoard.Dike;
-            projectData.WaterBoard.Dike = sd;
-            BindSupport.Assign(materialPanel, projectData.WaterBoard.Dike);
+            Dike sd = projectData.Dike;
+            projectData.Dike = sd;
+            BindSupport.Assign(materialPanel, projectData.Dike);
             BindSupport.Assign(sensorPanel, projectData);
             BindSupport.Assign(calculationSpecificationPanel, projectData.DamProjectCalculationSpecification);
             BindSupport.Assign(locationJobPanel, currentLocationJob);
@@ -350,7 +350,7 @@
                 return;
             }
 
-            var wb = TreeViewControl.GetInnerDataObject(node.Tag) as WaterBoardJob;
+            var wb = TreeViewControl.GetInnerDataObject(node.Tag) as DikeJob;
             if (null != wb)
             {
                 node.SetValue(0, wb.Name);
@@ -639,7 +639,7 @@
 
             DataEventPublisher.InvokeWithoutPublishingEvents(() =>
             {
-                mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.Dike);
+                mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.Dike);
                 LogManager.Clear();
                 damProject.DamProjectData.ClearResults();
             });
@@ -790,7 +790,7 @@
             // update the data
             mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.LocationJobs.FirstOrDefault());
             mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), damProject.DamProjectData.LocationJobs, null);
-            mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.Locations.FirstOrDefault());
+            mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.Dike.Locations.FirstOrDefault());
             // For design, extra action is needed to get rid of the calculation property window
             if (damProject.DamProjectData.DamProjectType == DamProjectType.Design)
             {
@@ -810,10 +810,10 @@
 
         private void ConfigureNavigation()
         {
-            damNavigator = new WaterBoardTreeView();
-            mainForm.NavigatorControl.RegisterResource(typeof(WaterBoard), damNavigator, "Waterboard");
+            damNavigator = new DikeTreeView();
+            mainForm.NavigatorControl.RegisterResource(typeof(Dike), damNavigator, "Dike");
 
-            BindSupport.Bind(projectPanel, damNavigator, typeof(DamProjectData), "WaterBoardJob");
+            BindSupport.Bind(projectPanel, damNavigator, typeof(DamProjectData), "DikeJob");
             BindSupport.Bind(projectPanel, damNavigator.TreeList.Columns[1], typeof(DamProjectData), 
                              "RunColumVisible", BindingType.Visibility);
         }
@@ -839,14 +839,14 @@
             {
                 if (e.Property != null && e.Property.Equals("DamProjectType"))
                 {
-                    if (damProject.DamProjectData.WaterBoard != null)
+                    if (damProject.DamProjectData.Dike != null)
                     {
-                        DataEventPublisher.AfterChange(damProject.DamProjectData.WaterBoard);
+                        DataEventPublisher.AfterChange(damProject.DamProjectData.Dike);
                         DataEventPublisher.DataListModified(damProject.DamProjectData.Locations);
                     }
                 }
             }
-            else if (sender == damProject.DamProjectData.WaterBoard)
+            else if (sender == damProject.DamProjectData.Dike)
             {
                 try
                 {
@@ -902,7 +902,7 @@
             return selectedFilterValue;
         }
 
-        private void SelectWaterBoardJob(WaterBoardJob job)
+        private void SelectDikeJob(DikeJob job)
         {
             DataEventPublisher.SelectionChanged(damProject.DamProjectData);
         }
@@ -974,9 +974,9 @@
 
             if (((SelectionEventArgs) e).PropertyEditorReactionType != PropertyEditorReactionType.Ignore)
             {
-                if (sender is WaterBoardJob)
+                if (sender is DikeJob)
                 {
-                    SelectWaterBoardJob((WaterBoardJob) sender);
+                    SelectDikeJob((DikeJob) sender);
                 }
                 else if (sender is LocationJob)
                 {
@@ -1056,8 +1056,8 @@
         {
             LogManager.Clear();
 
-            damProject.DamProjectData.WaterBoard.Dike = new Dike();
-            mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.Dike);
+            damProject.DamProjectData.Dike = new Dike();
+            mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.Dike);
 
             progressDelegate(0);
 
@@ -1077,8 +1077,7 @@
                 // ATTENTION: Do not stop DataEventPublisher because it is needed to determine the source of the data with DataSourceManager
                 DataSourceManager.StartListening();
 
-                damProject.Import(damProjectFolder, dataSourceContainer, damNewProjectData.SelectedDikeRingIds[0],
-                                  damNewProjectData.DamProjectType, progressDelegate);
+                damProject.Import(damProjectFolder, dataSourceContainer, damNewProjectData.DamProjectType, progressDelegate);
 
                 // Importing data creates a new DamProjectData object so the values set in the dialog have to be reset.
                 damProject.DamProjectData.DamProjectType = projectType;
@@ -1093,15 +1092,15 @@
                 // If profiles are defined as relative profiles, new absolute profiles will be generated for each location
                 if (dataSourceContainer.IsImportAsRelativeProfiles)
                 {
-                    WaterBoardPostProcessRelativeProfiles.CreateAbsoluteProfiles(damProject.DamProjectData.WaterBoard, dataSourceContainer.SoilProfileCharacteristicPointReference);
+                    DikePostProcessRelativeProfiles.CreateAbsoluteProfiles(damProject.DamProjectData.Dike, dataSourceContainer.SoilProfileCharacteristicPointReference);
                 }
 
                 damProject.DamProjectData.DataSources = DataSourceManager.DataSources;
 
                 // Read sensor data if DamLive Configuration project
                 if (damNewProjectData.DamProjectType == DamProjectType.DamLiveConfiguration)
                 {
-                    Dike dike = damProject.DamProjectData.WaterBoard.Dike;
+                    Dike dike = damProject.DamProjectData.Dike;
 
                     string sensorConfigurationFilename = Path.GetFullPath(damNewProjectData.SensorConfigurationFileName);
                     if (File.Exists(sensorConfigurationFilename))