Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u -r2454 -r2464
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2454)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2464)
@@ -138,30 +138,24 @@
                         throw new CsvImporterSegmentsException(String.Format("{0} : {1}", fileName, csvHeaderError));                        
                     }
 
-                    const string fieldLocationId = "location_id";
+                    const string fieldLocationId = CsvColumnNames.LocationColumnName;
                     int colIndexLocationId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldLocationId);
                     CheckColumn(colIndexLocationId, fileName, fieldLocationId);
 
-                    const string fieldLocationScenarioId = "location_scenario_id";
+                    const string fieldLocationScenarioId = CsvColumnNames.LocationScenarioColumnName;
                     int colIndexLocationScenarioId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldLocationScenarioId);
                     CheckColumn(colIndexLocationScenarioId, fileName, fieldLocationScenarioId);
 
-                    const string fieldWaterHeight = "water_height";
-                    int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldWaterHeight);
+                    int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightColumnName);
+                    int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightLowColumnName);
 
-                    const string fieldWaterHeightLow = "water_height_low";
-                    int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldWaterHeightLow);
-
-                    const string fieldDikeTableHeight = "dike_table_height";
+                    const string fieldDikeTableHeight = CsvColumnNames.DikeTableHeightColumnName;
                     int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldDikeTableHeight);
                     CheckColumn(colIndexDikeTableHeight, fileName, fieldDikeTableHeight);
 
-                    const string fieldWaterHeightDecimeringsHoogte = "water_height_decimerings_hoogte";
-                    int colIndexWaterHeightDecimeringsHoogte = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldWaterHeightDecimeringsHoogte);
+                    int colIndexWaterHeightDecimeringsHoogte = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightDecimeringsHoogteColumnName);
+                    int colIndexMaxWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MaxWaterHeightColumnName);
 
-                    const string fieldMaxWaterHeight = "max_waterheight";
-                    int colIndexMaxWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldMaxWaterHeight);
-
                     int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorPiping);
                     int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityInnerslope);
                     int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityOuterslope);
@@ -171,26 +165,16 @@
                     int colIndexUpliftCriterionPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.UpliftCriterionPiping);
                     int colIndexUpliftCriterionStability = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.UpliftCriterionStability);
 
-                    const string fieldPlLineOffsetBelowDikeTopAtRiver = "PLLineOffsetBelowDikeTopAtRiver";
-                    int colIndexPlLineOffsetBelowDikeTopAtRiver = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldPlLineOffsetBelowDikeTopAtRiver);
-                    const string fieldPlLineOffsetBelowDikeTopAtPolder = "PLLineOffsetBelowDikeTopAtPolder";
-                    int colIndexPlLineOffsetBelowDikeTopAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldPlLineOffsetBelowDikeTopAtPolder);
-                    const string fieldPlLineOffsetBelowShoulderBaseInside = "PLLineOffsetBelowShoulderBaseInside";
-                    int colIndexPlLineOffsetBelowShoulderBaseInside = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldPlLineOffsetBelowShoulderBaseInside);
-                    const string fieldPlLineOffsetBelowDikeToeAtPolder = "PLLineOffsetBelowDikeToeAtPolder";
-                    int colIndexPlLineOffsetBelowDikeToeAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldPlLineOffsetBelowDikeToeAtPolder);
-                    const string fieldPlLineOffsetBelowDikeCrestMiddle = "PLLineOffsetBelowDikeCrestMiddle";
-                    int colIndexPlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldPlLineOffsetBelowDikeCrestMiddle);
-                    const string fieldPlLineOffsetFactorBelowShoulderCrest = "PLLineOffsetFactorBelowShoulderCrest";
-                    int colIndexPlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldPlLineOffsetFactorBelowShoulderCrest);
-                    const string fieldUsePlLineOffsetBelowDikeCrestMiddle = "UsePLLineOffsetBelowDikeCrestMiddle";
-                    int colIndexUsePlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldUsePlLineOffsetBelowDikeCrestMiddle);
-                    const string fieldUsePlLineOffsetFactorBelowShoulderCrest = "UsePLLineOffsetFactorBelowShoulderCrest";
-                    int colIndexUsePlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldUsePlLineOffsetFactorBelowShoulderCrest);
-                    const string fieldHeadPl3 = "HeadPL3";
-                    int colIndexHeadPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldHeadPl3);
-                    const string fieldHeadPl4 = "HeadPL4";
-                    int colIndexHeadPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldHeadPl4);
+                    int colIndexPlLineOffsetBelowDikeTopAtRiver = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeTopAtRiverColumnName);
+                    int colIndexPlLineOffsetBelowDikeTopAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName);
+                    int colIndexPlLineOffsetBelowShoulderBaseInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName);
+                    int colIndexPlLineOffsetBelowDikeToeAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName);
+                    int colIndexPlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexPlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexUsePlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexUsePlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexHeadPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl3ColumnName);
+                    int colIndexHeadPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl4ColumnName);
 
                     var index = 1;
                     while (csv.ReadNextRecord())
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r2459 -r2464
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 2459)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 2464)
@@ -185,11 +185,11 @@
                     int colIndexPLLineOffsetBelowDikeTopAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName);
                     int colIndexPLLineOffsetBelowShoulderBaseInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName);
                     int colIndexPLLineOffsetBelowDikeToeAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName);
-                    int colIndexPlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeCrestMiddle);
-                    int colIndexPlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetFactorBelowShoulderCrest);
-                    int colIndexUsePlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddle);
-                    int colIndexUsePlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrest);
-                    int colIndexIntrusionVerticalWaterPressure = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.IntrusionVerticalWaterPressure);
+                    int colIndexPlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexPlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexUsePlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexUsePlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexIntrusionVerticalWaterPressure = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.IntrusionVerticalWaterPressureColumnName);
                     int colIndexStabilityShoulderGrowSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityShoulderGrowSlopeColumnName);
                     int colIndexStabilityShoulderGrowDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityShoulderGrowDeltaXColumnName);
                     int colIndexStabilitySlopeAdaptionDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u -r2459 -r2464
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs	(.../LocationShapeFileAttributeMap.cs)	(revision 2459)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs	(.../LocationShapeFileAttributeMap.cs)	(revision 2464)
@@ -230,7 +230,7 @@
         /// PLBlDCM
         /// double
         /// </summary>
-        public const string PlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.PlLineOffsetBelowDikeCrestMiddle;
+        public const string PlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.PlLineOffsetBelowDikeCrestMiddleColumnName;
 
         /// <summary>
         /// PlLineOffsetFactorBelowShoulderCrest
@@ -239,7 +239,7 @@
         /// PLFBlSC
         /// double
         /// </summary>
-        public const string PlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.PlLineOffsetFactorBelowShoulderCrest;
+        public const string PlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.PlLineOffsetFactorBelowShoulderCrestColumnName;
 
         /// <summary>
         /// UsePlLineOffsetBelowDikeCrestMiddle
@@ -248,7 +248,7 @@
         /// UPLBlDCM
         /// double
         /// </summary>
-        public const string UsePlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddle;
+        public const string UsePlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddleColumnName;
 
         /// <summary>
         /// UsePlLineOffsetFactorBelowShoulderCrest
@@ -257,7 +257,7 @@
         /// UPLFBlSC
         /// double
         /// </summary>
-        public const string UsePlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrest;
+        public const string UsePlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrestColumnName;
 
         /// <summary>
         /// The intrusion vertical water pressure attribute identifier
@@ -266,7 +266,7 @@
         /// IVWP
         /// string
         /// </summary>
-        public const string IntrusionVerticalWaterPressureAttributeId = CsvColumnNames.IntrusionVerticalWaterPressure;
+        public const string IntrusionVerticalWaterPressureAttributeId = CsvColumnNames.IntrusionVerticalWaterPressureColumnName;
 
         /// <summary>
         /// StabilityShoulderGrowSlope
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
===================================================================
diff -u -r2459 -r2464
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs	(.../CsvColumnNames.cs)	(revision 2459)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs	(.../CsvColumnNames.cs)	(revision 2464)
@@ -36,8 +36,13 @@
         public const string LocationColumnName = "location_id";
 
         /// <summary>
-        /// location_id
+        /// location_scenario_id
         /// </summary>
+        public const string LocationScenarioColumnName = "location_scenario_id";
+
+        /// <summary>
+        /// dikering_id
+        /// </summary>
         public const string DikeRingColumnName = "dikering_id";
 
         /// <summary>
@@ -96,12 +101,12 @@
         public const string XSoilGeometry2DOriginColumnName = "x_soilgeometry2D_origin";
             
         /// <summary>
-        /// Defines the column name: ophoogmateriaaldijk
+        /// ophoogmateriaaldijk
         /// </summary>
         public const string DikeEmbankmentMaterialColumnName = "ophoogmateriaaldijk";
 
         /// <summary>
-        /// Defines the column name: ophoogmateriaalberm
+        /// ophoogmateriaalberm
         /// </summary>
         public const string ShoulderEmbankmentMaterialColumnName = "ophoogmateriaalberm";
 
@@ -136,7 +141,7 @@
         public const string TrafficLoadColumnName = "TrafficLoad";
 
         /// <summary>
-        /// TrafficLoad
+        /// TL_DegreeOfConsolidation
         /// </summary>
         public const string TL_DegreeOfConsolidationColumnName = "TL_DegreeOfConsolidation";
 
@@ -168,27 +173,27 @@
         /// <summary>
         /// The pl line offset below dike crest middle
         /// </summary>
-        public const string PlLineOffsetBelowDikeCrestMiddle = "PLLineOffsetBelowDikeCrestMiddle";
+        public const string PlLineOffsetBelowDikeCrestMiddleColumnName = "PLLineOffsetBelowDikeCrestMiddle";
 
         /// <summary>
         /// The pl line offset factor below shoulder crest
         /// </summary>
-        public const string PlLineOffsetFactorBelowShoulderCrest = "PLLineOffsetFactorBelowShoulderCrest";
+        public const string PlLineOffsetFactorBelowShoulderCrestColumnName = "PLLineOffsetFactorBelowShoulderCrest";
 
         /// <summary>
         /// Use the pl line offset below dike crest middle
         /// </summary>
-        public const string UsePlLineOffsetBelowDikeCrestMiddle = "UsePLLineOffsetBelowDikeCrestMiddle";
+        public const string UsePlLineOffsetBelowDikeCrestMiddleColumnName = "UsePLLineOffsetBelowDikeCrestMiddle";
 
         /// <summary>
         /// Use the pl line offset factor below shoulder crest
         /// </summary>
-        public const string UsePlLineOffsetFactorBelowShoulderCrest = "UsePLLineOffsetFactorBelowShoulderCrest";
+        public const string UsePlLineOffsetFactorBelowShoulderCrestColumnName = "UsePLLineOffsetFactorBelowShoulderCrest";
 
         /// <summary>
         /// The intrusion vertical water pressure
         /// </summary>
-        public const string IntrusionVerticalWaterPressure = "IntrusionVerticalWaterPressure";
+        public const string IntrusionVerticalWaterPressureColumnName = "IntrusionVerticalWaterPressure";
 
         /// <summary>
         /// StabilityShoulderGrowSlope
@@ -307,12 +312,12 @@
         public const string ZoneTypeColumnName = "ZoneType";
 
         /// <summary>
-        /// Zone type 
+        /// ForbiddenZoneFactor 
         /// </summary>
         public const string ForbiddenZoneFactorColumnName = "ForbiddenZoneFactor";
 
         /// <summary>
-        /// Zone type 
+        /// ZoneAreaRestSlopeCrestWidth 
         /// </summary>
         public const string ZoneAreaRestSlopeCrestWidthColumnName = "ZoneAreaRestSlopeCrestWidth";
 
@@ -409,7 +414,7 @@
         /// <summary>
         /// DikeTableHeight
         /// </summary>
-        public const string DikeTableHeightColumnName = "DikeTableHeight";
+        public const string DikeTableHeightColumnName = "dike_table_height";
 
         /// <summary>
         /// water_height