Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r6823 -r6873
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 6823)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 6873)
@@ -95,12 +95,12 @@
         public void ThrowsExceptionWhenRequestingDataWhenDataSourcesNotDefined()
         {
             var dataPluginImporter = new DataPluginImporter();
-            Assert.That(() => dataPluginImporter.WaterBoardInfo, Throws.InstanceOf<DataPluginImporterException>());
+            Assert.That(() => dataPluginImporter.DikeInfo, Throws.InstanceOf<DataPluginImporterException>());
         }
 
         [Test]
         [Category("Slow")]
-        public void CanRetrieveWaterboardInfo()
+        public void CanRetrieveDikeInfo()
         {
             var srcDataSources = new List<DataSource>
             {
@@ -112,19 +112,19 @@
             };
             var dataPluginImporter = new DataPluginImporter();
             dataPluginImporter.SetDataSources("", srcDataSources);
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
 
-            Info info = dataPluginImporter.WaterBoardInfo;
+            Info info = dataPluginImporter.DikeInfo;
             if (LocalizationManager.CurrentLanguage == LanguageType.Dutch)
             {
-                Assert.That(info.Name, Is.EqualTo("Waterschap"));
+                Assert.That(info.Description, Is.EqualTo("Dijkring"));
             }
             else
             {
-                Assert.That(info.Name, Is.EqualTo("WaterBoard"));
+                Assert.That(info.Description, Is.EqualTo("Dike ring"));
             }
 
-            Assert.That(info.Description, Is.EqualTo("Waterschap"));
+            Assert.That(info.Name, Is.EqualTo("dijkring10"));
         }
 
         /// <summary>
@@ -139,7 +139,7 @@
         public void ValuesFromShapeFileOverwriteValuesFromLocationsCsv()
         {
             SetupInvoer1WithShapeFiles();
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
 
             string scenarioIdOne = dataPluginImporter.GetScenarioList(Location1Id).FirstOrDefault();
             NameValueParameter[] scenarioDetailsOne = dataPluginImporter.GetScenarioDetails(Location1Id, scenarioIdOne).ToArray();
@@ -167,7 +167,7 @@
         public void ValuesFromLocationsCsvAreCopiedToScenarioIfNotDefinedInScenariosCsvOrShapeFile()
         {
             SetupInvoer1WithoutShapeFiles();
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
 
             string scenarioId = dataPluginImporter.GetScenarioList(Location1Id).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(Location1Id, scenarioId);
@@ -192,7 +192,7 @@
         public void ValuesFromShapeFileAreCopiedToScenarioIfNotDefinedInScenariosCsv()
         {
             SetupInvoer1WithShapeFiles();
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
 
             string scenarioId = dataPluginImporter.GetScenarioList(Location1Id).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(Location1Id, scenarioId);
@@ -237,7 +237,7 @@
 
             dataPluginImporter = new DataPluginImporter();
             dataPluginImporter.SetDataSources("", srcDataSources);
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
 
             // Expected: The values of location are used for scenario, because it was not specified in scenarios.csv
             string scenarioId = dataPluginImporter.GetScenarioList("RK210-560").FirstOrDefault();
@@ -285,7 +285,7 @@
 
             dataPluginImporter = new DataPluginImporter();
             dataPluginImporter.SetDataSources("", srcDataSources);
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
 
             // Expected: The values of scenarios are used for scenario
             string scenarioId = dataPluginImporter.GetScenarioList("RK210-560").FirstOrDefault();
@@ -333,7 +333,7 @@
 
             dataPluginImporter = new DataPluginImporter();
             dataPluginImporter.SetDataSources("", srcDataSources);
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
 
             // Expected: The values are null
             string scenarioId = dataPluginImporter.GetScenarioList("RK210-560").FirstOrDefault();
@@ -380,7 +380,7 @@
             File.Copy(Path.Combine(testDataFolderCsv, "scenarios_basic.csv"), Path.Combine(importFolder, "scenarios.csv"));
             // create importer
             SetupInvoerHemPolderWithoutShapeFiles(importFolder);
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
             // check values for location 1
             string scenarioId = dataPluginImporter.GetScenarioList(HemPolderLocationId1).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(HemPolderLocationId1, scenarioId);
@@ -459,7 +459,7 @@
             File.Copy(Path.Combine(testDataFolderCsv, "scenarios_basic.csv"), Path.Combine(importFolder, "scenarios.csv"));
             // create importer
             SetupInvoerHemPolderWithoutShapeFiles(importFolder);
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
             // check values for location 1
             string scenarioId = dataPluginImporter.GetScenarioList(HemPolderLocationId1).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(HemPolderLocationId1, scenarioId);
@@ -546,7 +546,7 @@
 
             // create importer
             SetupInvoerHemPolderWithShapeFiles(importFolder, "LijnScenario.shp");
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
             // check values for location 1
             string scenarioId = dataPluginImporter.GetScenarioList(HemPolderLocationId1).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(HemPolderLocationId1, scenarioId);
@@ -633,7 +633,7 @@
 
             // create importer
             SetupInvoerHemPolderWithShapeFiles(importFolder, "VlakScenario.shp");
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
             // check values for location 1
             string scenarioId = dataPluginImporter.GetScenarioList(HemPolderLocationId1).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(HemPolderLocationId1, scenarioId);
@@ -720,7 +720,7 @@
 
             // create importer
             SetupInvoerHemPolderWithShapeFiles(importFolder, "LijnScenario.shp");
-            dataPluginImporter.ImportDataForDikeRings(null);
+            dataPluginImporter.ImportDataForDike(null);
             // check values for location 1
             string scenarioId = dataPluginImporter.GetScenarioList(HemPolderLocationId1).FirstOrDefault();
             IEnumerable<NameValueParameter> scenarioDetails = dataPluginImporter.GetScenarioDetails(HemPolderLocationId1, scenarioId);