Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs
===================================================================
diff -u -r2422 -r2459
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs	(.../LocationCsvColumnNames.cs)	(revision 2422)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs	(.../CsvColumnNames.cs)	(revision 2459)
@@ -28,7 +28,7 @@
     /// Some of the definitions are used (referenced) in the LocationPropertyImporter. 
     /// Changing the definitions will affect the location importers using shapefiles as well!!
     /// </remarks>
-    public static class LocationCsvColumnNames
+    public static class CsvColumnNames
     {
         /// <summary>
         /// location_id
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u -r2422 -r2459
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs	(.../LocationShapeFileAttributeMap.cs)	(revision 2422)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs	(.../LocationShapeFileAttributeMap.cs)	(revision 2459)
@@ -34,12 +34,12 @@
         /// <summary>
         /// location_id 
         /// </summary>
-        public const string LocationAttributeId = LocationCsvColumnNames.LocationColumnName;
+        public const string LocationAttributeId = CsvColumnNames.LocationColumnName;
 
         /// <summary>
         /// DikeringId
         /// </summary>
-        public const string DikeRingAttributeId = LocationCsvColumnNames.DikeRingColumnName;
+        public const string DikeRingAttributeId = CsvColumnNames.DikeRingColumnName;
 
         /// <summary>
         /// crosssection 	
@@ -56,30 +56,30 @@
         /// segmentid 	
         /// string
         /// </summary>
-        public const string SegmentAttributeId = LocationCsvColumnNames.SegmentColumnName;
+        public const string SegmentAttributeId = CsvColumnNames.SegmentColumnName;
 
         /// <summary>
         /// PolderLevel 
         /// PolderLevel.shp 
         /// PLHigh 
         /// double
         /// </summary>
-        public const string PolderLevelAttributeId = LocationCsvColumnNames.PolderLevelColumnName;
+        public const string PolderLevelAttributeId = CsvColumnNames.PolderLevelColumnName;
 
         /// <summary>
         /// head_pl2 HeadPL2.shp 	HeadPL2 	double
         /// </summary>
-        public const string HeadPl2AttributeId = LocationCsvColumnNames.HeadPl2ColumnName;
+        public const string HeadPl2AttributeId = CsvColumnNames.HeadPl2ColumnName;
 
         /// <summary>
         /// head_pl3 	CustomShape 	HeadPL3.shp 	HeadPL3 	double
         /// </summary>
-        public const string HeadPl3AttributeId = LocationCsvColumnNames.HeadPl3ColumnName;
+        public const string HeadPl3AttributeId = CsvColumnNames.HeadPl3ColumnName;
 
         /// <summary>
         /// head_pl4 	CustomShape 	HeadPL4.shp 	HeadPL4 	double
         /// </summary>
-        public const string HeadPl4AttributeId = LocationCsvColumnNames.HeadPl4ColumnName;
+        public const string HeadPl4AttributeId = CsvColumnNames.HeadPl4ColumnName;
 
         /// <summary>
         /// grass_quality 	
@@ -88,7 +88,7 @@
         /// GrassQlty 	
         /// double
         /// </summary>
-        public const string GrassQualityAttributeId = LocationCsvColumnNames.GrassQualityColumnName;
+        public const string GrassQualityAttributeId = CsvColumnNames.GrassQualityColumnName;
 
         /// <summary>
         /// direction 	
@@ -97,7 +97,7 @@
         /// Direction 	
         /// double
         /// </summary>
-        public const string DirectionAttributeId = LocationCsvColumnNames.DirectionColumnName;
+        public const string DirectionAttributeId = CsvColumnNames.DirectionColumnName;
 
         /// <summary>
         /// x_soilgeometry2D_origin 	
@@ -106,7 +106,7 @@
         /// XG2DOrg 	
         /// double
         /// </summary>
-        public const string XSoilGeometry2DOriginAttributeId = LocationCsvColumnNames.XSoilGeometry2DOriginColumnName;
+        public const string XSoilGeometry2DOriginAttributeId = CsvColumnNames.XSoilGeometry2DOriginColumnName;
 
         /// <summary>
         /// ophoogmateriaaldijk 	
@@ -115,7 +115,7 @@
         /// DikeMtrl 	
         /// string
         /// </summary>
-        public const string DikeEmbankmentMaterialAttributeId = LocationCsvColumnNames.DikeEmbankmentMaterialColumnName;
+        public const string DikeEmbankmentMaterialAttributeId = CsvColumnNames.DikeEmbankmentMaterialColumnName;
 
         /// <summary>
         /// ophoogmateriaalberm 	
@@ -124,15 +124,15 @@
         /// ShlderMtrl 	
         /// string
         /// </summary>
-        public const string ShoulderEmbankmentMaterialAttributeId = LocationCsvColumnNames.ShoulderEmbankmentMaterialColumnName;
+        public const string ShoulderEmbankmentMaterialAttributeId = CsvColumnNames.ShoulderEmbankmentMaterialColumnName;
 
         /// <summary>
         /// dempingsfactor_pl3 	
         /// CustomShape 	
         /// DampingFactorPL3.shp 	
         /// DampingPL3 	double
         /// </summary>
-        public const string DampingFactorPl3AttributeId = LocationCsvColumnNames.DampingFactorPl3ColumnName;
+        public const string DampingFactorPl3AttributeId = CsvColumnNames.DampingFactorPl3ColumnName;
 
         /// <summary>
         /// dempingsfactor_pl4 	
@@ -141,12 +141,12 @@
         /// DampingPL4 	
         /// double
         /// </summary>
-        public const string DampingFactorPl4AttributeId = LocationCsvColumnNames.DampingFactorPl4ColumnName;
+        public const string DampingFactorPl4AttributeId = CsvColumnNames.DampingFactorPl4ColumnName;
 
         /// <summary>
         /// use_original_plline_assignments 	CustomShape 	use_original_plline_assignments.shp 	IsOrgPLs 	bool
         /// </summary>
-        public const string UseOriginalPlLineAssignmentsAttributeId = LocationCsvColumnNames.UseOriginalPlLineAssignmentsColumnName;
+        public const string UseOriginalPlLineAssignmentsAttributeId = CsvColumnNames.UseOriginalPlLineAssignmentsColumnName;
 
         /// <summary>
         /// PenetrationLength
@@ -155,7 +155,7 @@
         /// PenLength 	
         /// double
         /// </summary>
-        public const string PenetrationLengthAttributeId = LocationCsvColumnNames.PenetrationLengthColumnName;
+        public const string PenetrationLengthAttributeId = CsvColumnNames.PenetrationLengthColumnName;
 
         /// <summary>
         /// TrafficLoad 
@@ -164,7 +164,7 @@
         /// TrafLoad 	
         /// double
         /// </summary>
-        public const string TrafficLoadAttributeId = LocationCsvColumnNames.TrafficLoadColumnName;
+        public const string TrafficLoadAttributeId = CsvColumnNames.TrafficLoadColumnName;
 
 
         /// <summary>
@@ -174,7 +174,7 @@
         /// TL_DegOfCo 	
         /// double
         /// </summary>
-        public const string TL_DegreeOfConsolidationAttributeId = LocationCsvColumnNames.TL_DegreeOfConsolidationColumnName;
+        public const string TL_DegreeOfConsolidationAttributeId = CsvColumnNames.TL_DegreeOfConsolidationColumnName;
 
 
         /// <summary>
@@ -184,7 +184,7 @@
         /// PLCrtMthd 	
         /// string
         /// </summary>
-        public const string PlLineCreationMethodAttributeId = LocationCsvColumnNames.PlLineCreationMethodColumnName;
+        public const string PlLineCreationMethodAttributeId = CsvColumnNames.PlLineCreationMethodColumnName;
 
  
         /// <summary>
@@ -194,7 +194,7 @@
         /// PLBlwTDRvr 	
         /// double
         /// </summary>
-        public const string PlLineOffsetBelowDikeTopAtRiverAttributeId = LocationCsvColumnNames.PlLineOffsetBelowDikeTopAtRiverColumnName;
+        public const string PlLineOffsetBelowDikeTopAtRiverAttributeId = CsvColumnNames.PlLineOffsetBelowDikeTopAtRiverColumnName;
 
         /// <summary>
         /// PLLineOffsetBelowDikeTopAtPolder
@@ -203,7 +203,7 @@
         /// PLBlwTDPld 	
         /// double
         /// </summary>
-        public const string PlLineOffsetBelowDikeTopAtPolderAttributeId = LocationCsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName;
+        public const string PlLineOffsetBelowDikeTopAtPolderAttributeId = CsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName;
 
         /// <summary>
         /// PlLineOffsetBelowShoulderBaseInside
@@ -212,7 +212,7 @@
         /// PLBlwTDSh 	
         /// double
         /// </summary>
-        public const string PlLineOffsetBelowShoulderBaseInsideAttributeId = LocationCsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName;
+        public const string PlLineOffsetBelowShoulderBaseInsideAttributeId = CsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName;
 
         /// <summary>
         /// PlLineOffsetBelowDikeToeAtPolder
@@ -221,7 +221,7 @@
         /// PLBlwDTPld
         /// double
         /// </summary>
-        public const string PlLineOffsetBelowDikeToeAtPolderAttributeId = LocationCsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName;
+        public const string PlLineOffsetBelowDikeToeAtPolderAttributeId = CsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName;
 
         /// <summary>
         /// PlLineOffsetBelowDikeCrestMiddle
@@ -230,7 +230,7 @@
         /// PLBlDCM
         /// double
         /// </summary>
-        public const string PlLineOffsetBelowDikeCrestMiddleAttributeId = LocationCsvColumnNames.PlLineOffsetBelowDikeCrestMiddle;
+        public const string PlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.PlLineOffsetBelowDikeCrestMiddle;
 
         /// <summary>
         /// PlLineOffsetFactorBelowShoulderCrest
@@ -239,7 +239,7 @@
         /// PLFBlSC
         /// double
         /// </summary>
-        public const string PlLineOffsetFactorBelowShoulderCrestAttributeId = LocationCsvColumnNames.PlLineOffsetFactorBelowShoulderCrest;
+        public const string PlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.PlLineOffsetFactorBelowShoulderCrest;
 
         /// <summary>
         /// UsePlLineOffsetBelowDikeCrestMiddle
@@ -248,7 +248,7 @@
         /// UPLBlDCM
         /// double
         /// </summary>
-        public const string UsePlLineOffsetBelowDikeCrestMiddleAttributeId = LocationCsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddle;
+        public const string UsePlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddle;
 
         /// <summary>
         /// UsePlLineOffsetFactorBelowShoulderCrest
@@ -257,7 +257,7 @@
         /// UPLFBlSC
         /// double
         /// </summary>
-        public const string UsePlLineOffsetFactorBelowShoulderCrestAttributeId = LocationCsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrest;
+        public const string UsePlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrest;
 
         /// <summary>
         /// The intrusion vertical water pressure attribute identifier
@@ -266,7 +266,7 @@
         /// IVWP
         /// string
         /// </summary>
-        public const string IntrusionVerticalWaterPressureAttributeId = LocationCsvColumnNames.IntrusionVerticalWaterPressure;
+        public const string IntrusionVerticalWaterPressureAttributeId = CsvColumnNames.IntrusionVerticalWaterPressure;
 
         /// <summary>
         /// StabilityShoulderGrowSlope
@@ -275,7 +275,7 @@
         /// StShSlpGr 	
         /// double
         /// </summary>
-        public const string StabilityShoulderGrowSlopeAttributeId = LocationCsvColumnNames.StabilityShoulderGrowSlopeColumnName;
+        public const string StabilityShoulderGrowSlopeAttributeId = CsvColumnNames.StabilityShoulderGrowSlopeColumnName;
 
         /// <summary>
         /// StabilityShoulderGrowDeltaX
@@ -284,7 +284,7 @@
         /// StShDXGr 	
         /// double
         /// </summary>
-        public const string StabilityShoulderGrowDeltaXAttributeId = LocationCsvColumnNames.StabilityShoulderGrowDeltaXColumnName;
+        public const string StabilityShoulderGrowDeltaXAttributeId = CsvColumnNames.StabilityShoulderGrowDeltaXColumnName;
 
         /// <summary>
         /// StabilitySlopeAdaptionDeltaX
@@ -293,7 +293,7 @@
         /// StSlAdaptDX 	
         /// double
         /// </summary>
-        public const string StabilitySlopeAdaptionDeltaXAttributeId = LocationCsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName;
+        public const string StabilitySlopeAdaptionDeltaXAttributeId = CsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName;
 
         /// <summary>
         /// minimal_circle_depth 	
@@ -302,7 +302,7 @@
         /// mincrcldepth 	
         /// double
         /// </summary>
-        public const string MinimalCircleDepthAtrributeId = LocationCsvColumnNames.MinimalCircleDepthColumnName;
+        public const string MinimalCircleDepthAtrributeId = CsvColumnNames.MinimalCircleDepthColumnName;
 
         /// <summary>
         /// level_reduction_inside 	
@@ -311,7 +311,7 @@
         /// lvlrinside 	
         /// double
         /// </summary>
-        public const string LevelReductionInsideAttributeId = LocationCsvColumnNames.LevelReductionInsideColumnName;
+        public const string LevelReductionInsideAttributeId = CsvColumnNames.LevelReductionInsideColumnName;
 
         /// <summary>
         /// level_reduction_outside 	
@@ -320,7 +320,7 @@
         /// lvlroutside 	
         /// double
         /// </summary>
-        public const string LevelReductionOutsideAttributeId = LocationCsvColumnNames.LevelReductionOutsideColumnName;
+        public const string LevelReductionOutsideAttributeId = CsvColumnNames.LevelReductionOutsideColumnName;
 
         /// <summary>
         /// layer_height_distribution 	
@@ -329,7 +329,7 @@
         /// layerhdist 	
         /// double
         /// </summary>
-        public const string LayerHeightDistributionAttributeId = LocationCsvColumnNames.LayerHeightDistributionColumnName;
+        public const string LayerHeightDistributionAttributeId = CsvColumnNames.LayerHeightDistributionColumnName;
 
         /// <summary>
         /// layer_height_deviation 	
@@ -338,7 +338,7 @@
         /// layerhdev 	
         /// double
         /// </summary>
-        public const string LayerHeightDeviationAttributeId = LocationCsvColumnNames.LayerHeightDeviationColumnName;
+        public const string LayerHeightDeviationAttributeId = CsvColumnNames.LayerHeightDeviationColumnName;
 
 
         /// <summary>
@@ -348,7 +348,7 @@
         /// fpiping 	
         /// double
         /// </summary>
-        public const string SafetyFactorPipingAttributeId = LocationCsvColumnNames.RequiredSafetyFactorPipingColumnName;
+        public const string SafetyFactorPipingAttributeId = CsvColumnNames.RequiredSafetyFactorPipingColumnName;
 
         /// <summary>
         /// safety_factor_stability_inner_slope 	
@@ -357,7 +357,7 @@
         /// fstabinner 	
         /// double
         /// </summary>
-        public const string SafetyFactorStabilityInnerSlopeAttributeId = LocationCsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName;
+        public const string SafetyFactorStabilityInnerSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName;
 
         /// <summary>
         /// safety_factor_stability_outer_slope 	
@@ -366,7 +366,7 @@
         /// fstabouter 	
         /// double
         /// </summary>
-        public const string SafetyFactorStabilityOuterSlopeAttributeId = LocationCsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName;
+        public const string SafetyFactorStabilityOuterSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName;
 
         /// <summary>
         /// probability_of_failure_stability_innerslope 	
@@ -375,7 +375,7 @@
         /// probstabi 	
         /// double
         /// </summary>
-        public const string ProbabilityOfFailureStabilityInnerSlopeAttributeId = LocationCsvColumnNames.ProbabilityOfFailureStabilityInnerslopeColumnName;
+        public const string ProbabilityOfFailureStabilityInnerSlopeAttributeId = CsvColumnNames.ProbabilityOfFailureStabilityInnerslopeColumnName;
 
         /// <summary>
         /// probability_of_failure_stability_outerslope 	
@@ -384,7 +384,7 @@
         /// probstabo 	
         /// double
         /// </summary>
-        public const string ProbabilityOfFailureStabilityOuterSlopeAttributeId = LocationCsvColumnNames.ProbabilityOfFailureStabilityOuterslopeColumnName;
+        public const string ProbabilityOfFailureStabilityOuterSlopeAttributeId = CsvColumnNames.ProbabilityOfFailureStabilityOuterslopeColumnName;
 
         /// <summary>
         /// probability_of_failure_piping 	
@@ -393,7 +393,7 @@
         /// probpiping 	
         /// double
         /// </summary>
-        public const string ProbabilityOfFailurePipingAttributeId = LocationCsvColumnNames.ProbabilityOfFailurePipingColumnName;
+        public const string ProbabilityOfFailurePipingAttributeId = CsvColumnNames.ProbabilityOfFailurePipingColumnName;
 
         /// <summary>
         /// uplift_criterion_piping 	
@@ -402,7 +402,7 @@
         /// uplpiping 	
         /// double
         /// </summary>
-        public const string UpliftCriterionPipingAttributeId = LocationCsvColumnNames.UpliftCriterionPipingColumnName;
+        public const string UpliftCriterionPipingAttributeId = CsvColumnNames.UpliftCriterionPipingColumnName;
 
         /// <summary>
         /// uplift_criterion_stability
@@ -411,7 +411,7 @@
         /// uplstab 	
         /// double
         /// </summary>
-        public const string UpliftCriterionStabilityAttributeId = LocationCsvColumnNames.UpliftCriterionStabilityColumnName;
+        public const string UpliftCriterionStabilityAttributeId = CsvColumnNames.UpliftCriterionStabilityColumnName;
 
         /// <summary>
         /// distance_to_entry_point
@@ -420,7 +420,7 @@
         /// distentry 	
         /// double 
         /// </summary>
-        public const string DistanceToEntryPointAttributeId = LocationCsvColumnNames.DistanceToEntryPointColumnName;
+        public const string DistanceToEntryPointAttributeId = CsvColumnNames.DistanceToEntryPointColumnName;
 
         /// <summary>
         /// SlopeDampingPiezometricHeightPolderSideAttributeId 
@@ -429,7 +429,7 @@
         /// DTH 	
         /// double
         /// </summary>
-        public const string SlopeDampingPiezometricHeightPolderSideAttributeId = LocationCsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName;
+        public const string SlopeDampingPiezometricHeightPolderSideAttributeId = CsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName;
 
         /// <summary>
         /// ZoneType
@@ -438,7 +438,7 @@
         /// zonetype 	
         /// string
         /// </summary>
-        public const string ZoneTypeAttributeId = LocationCsvColumnNames.ZoneTypeColumnName;
+        public const string ZoneTypeAttributeId = CsvColumnNames.ZoneTypeColumnName;
 
         /// <summary>
         /// ForbiddenZoneFactor
@@ -447,7 +447,7 @@
         /// ForbiddenZoneFactor 	
         /// double
         /// </summary>
-        public const string ForbiddenZoneFactorAttributeId = LocationCsvColumnNames.ForbiddenZoneFactorColumnName; 
+        public const string ForbiddenZoneFactorAttributeId = CsvColumnNames.ForbiddenZoneFactorColumnName; 
 
         /// <summary>
         /// ZoneAreaRestSlopeCrestWidth
@@ -456,7 +456,7 @@
         /// ZoneAreaRestSlopeCrestWidth 	
         /// double
         /// </summary>
-        public const string ZoneAreaRestSlopeCrestWidthAttributeId = LocationCsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName;
+        public const string ZoneAreaRestSlopeCrestWidthAttributeId = CsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName;
 
         /// <summary>
         /// StabilityDesignMethodColumnName
@@ -465,7 +465,7 @@
         /// StabilityDesignMethodColumnName 	
         /// string
         /// </summary>
-        public const string StabilityDesignMethodAttributeId = LocationCsvColumnNames.StabilityDesignMethodColumnName;
+        public const string StabilityDesignMethodAttributeId = CsvColumnNames.StabilityDesignMethodColumnName;
 
         /// <summary>
         /// SlopeAdaptionStartCotangentColumnName
@@ -474,7 +474,7 @@
         /// SlopeAdaptionStartCotangentColumnName 	
         /// double
         /// </summary>
-        public const string SlopeAdaptionStartCotangentAttributeId = LocationCsvColumnNames.SlopeAdaptionStartCotangentColumnName;
+        public const string SlopeAdaptionStartCotangentAttributeId = CsvColumnNames.SlopeAdaptionStartCotangentColumnName;
 
         /// <summary>
         /// SlopeAdaptionEndCotangentColumnName
@@ -483,7 +483,7 @@
         /// SlopeAdaptionEndCotangentColumnName 	
         /// double
         /// </summary>
-        public const string SlopeAdaptionEndCotangentAttributeId = LocationCsvColumnNames.SlopeAdaptionEndCotangentColumnName; 
+        public const string SlopeAdaptionEndCotangentAttributeId = CsvColumnNames.SlopeAdaptionEndCotangentColumnName; 
         
         /// <summary>
         /// SlopeAdaptionStepCotangentColumnName
@@ -492,7 +492,7 @@
         /// SlopeAdaptionStepCotangentColumnName 	
         /// double
         /// </summary>
-        public const string SlopeAdaptionStepCotangentAttributeId = LocationCsvColumnNames.SlopeAdaptionStepCotangentColumnName; 
+        public const string SlopeAdaptionStepCotangentAttributeId = CsvColumnNames.SlopeAdaptionStepCotangentColumnName; 
 
         /// <summary>
         /// UseNewDikeTopWidth
@@ -501,7 +501,7 @@
         /// UseNewDikeTopWidth 	
         /// double
         /// </summary>
-        public const string UseNewDikeTopWidthAttributeId = LocationCsvColumnNames.UseNewDikeTopWidthColumnName; 
+        public const string UseNewDikeTopWidthAttributeId = CsvColumnNames.UseNewDikeTopWidthColumnName; 
 
         /// <summary>
         /// NewDikeTopWidth
@@ -510,7 +510,7 @@
         /// NewDikeTopWidth 	
         /// double
         /// </summary>
-        public const string NewDikeTopWidthAttributeId = LocationCsvColumnNames.NewDikeTopWidthColumnName; 
+        public const string NewDikeTopWidthAttributeId = CsvColumnNames.NewDikeTopWidthColumnName; 
 
         /// <summary>
         /// UseNewDikeSlopeInside
@@ -519,7 +519,7 @@
         /// UseNewDikeSlopeInside 	
         /// double
         /// </summary>
-        public const string UseNewDikeSlopeInsideAttributeId = LocationCsvColumnNames.UseNewDikeSlopeInsideColumnName; 
+        public const string UseNewDikeSlopeInsideAttributeId = CsvColumnNames.UseNewDikeSlopeInsideColumnName; 
 
         /// <summary>
         /// NewDikeSlopeInside
@@ -528,7 +528,7 @@
         /// NewDikeSlopeInside 	
         /// double
         /// </summary>
-        public const string NewDikeSlopeInsideAttributeId = LocationCsvColumnNames.NewDikeSlopeInsideColumnName; 
+        public const string NewDikeSlopeInsideAttributeId = CsvColumnNames.NewDikeSlopeInsideColumnName; 
 
         /// <summary>
         /// UseNewDikeSlopeOutside
@@ -537,7 +537,7 @@
         /// UseNewDikeSlopeOutside 	
         /// double
         /// </summary>
-        public const string UseNewDikeSlopeOutsideAttributeId = LocationCsvColumnNames.UseNewDikeSlopeOutsideColumnName; 
+        public const string UseNewDikeSlopeOutsideAttributeId = CsvColumnNames.UseNewDikeSlopeOutsideColumnName; 
 
         /// <summary>
         /// NewDikeSlopeOutside
@@ -546,7 +546,7 @@
         /// NewDikeSlopeOutside 	
         /// double
         /// </summary>
-        public const string NewDikeSlopeOutsideAttributeId = LocationCsvColumnNames.NewDikeSlopeOutsideColumnName; 
+        public const string NewDikeSlopeOutsideAttributeId = CsvColumnNames.NewDikeSlopeOutsideColumnName; 
 
         /// <summary>
         /// UseNewShoulderTopSlope
@@ -555,7 +555,7 @@
         /// UseNewShoulderTopSlope 	
         /// double
         /// </summary>
-        public const string UseNewShoulderTopSlopeAttributeId = LocationCsvColumnNames.UseNewShoulderTopSlopeColumnName; 
+        public const string UseNewShoulderTopSlopeAttributeId = CsvColumnNames.UseNewShoulderTopSlopeColumnName; 
 
         /// <summary>
         /// NewShoulderTopSlope
@@ -564,7 +564,7 @@
         /// NewShoulderTopSlope 	
         /// double
         /// </summary>
-        public const string NewShoulderTopSlopeAttributeId = LocationCsvColumnNames.NewShoulderTopSlopeColumnName; 
+        public const string NewShoulderTopSlopeAttributeId = CsvColumnNames.NewShoulderTopSlopeColumnName; 
 
         /// <summary>
         /// UseNewShoulderBaseSlope
@@ -573,7 +573,7 @@
         /// UseNewShoulderBaseSlope 	
         /// double
         /// </summary>
-        public const string UseNewShoulderBaseSlopeAttributeId = LocationCsvColumnNames.UseNewShoulderBaseSlopeColumnName; 
+        public const string UseNewShoulderBaseSlopeAttributeId = CsvColumnNames.UseNewShoulderBaseSlopeColumnName; 
 
         /// <summary>
         /// NewShoulderBaseSlope
@@ -582,7 +582,7 @@
         /// NewShoulderBaseSlope 	
         /// double
         /// </summary>
-        public const string NewShoulderBaseSlopeAttributeId = LocationCsvColumnNames.NewShoulderBaseSlopeColumnName; 
+        public const string NewShoulderBaseSlopeAttributeId = CsvColumnNames.NewShoulderBaseSlopeColumnName; 
 
         /// <summary>
         /// UseNewMaxHeightShoulderAsFraction
@@ -591,7 +591,7 @@
         /// UseNewMaxHeightShoulderAsFraction 	
         /// double
         /// </summary>
-        public const string UseNewMaxHeightShoulderAsFractionAttributeId = LocationCsvColumnNames.UseNewMaxHeightShoulderAsFractionColumnName; 
+        public const string UseNewMaxHeightShoulderAsFractionAttributeId = CsvColumnNames.UseNewMaxHeightShoulderAsFractionColumnName; 
 
         /// <summary>
         /// NewMaxHeightShoulderAsFraction
@@ -600,7 +600,7 @@
         /// NewMaxHeightShoulderAsFraction 	
         /// double
         /// </summary>
-        public const string NewMaxHeightShoulderAsFractionAttributeId = LocationCsvColumnNames.NewMaxHeightShoulderAsFractionColumnName; 
+        public const string NewMaxHeightShoulderAsFractionAttributeId = CsvColumnNames.NewMaxHeightShoulderAsFractionColumnName; 
 
         /// <summary>
         /// UseNewMinDistanceDikeToeStartDitch
@@ -609,7 +609,7 @@
         /// UseNewMinDistanceDikeToeStartDitch 	
         /// double
         /// </summary>
-        public const string UseNewMinDistanceDikeToeStartDitchAttributeId = LocationCsvColumnNames.UseNewMinDistanceDikeToeStartDitchColumnName; 
+        public const string UseNewMinDistanceDikeToeStartDitchAttributeId = CsvColumnNames.UseNewMinDistanceDikeToeStartDitchColumnName; 
 
         /// <summary>
         /// NewMinDistanceDikeToeStartDitch
@@ -618,7 +618,7 @@
         /// NewMinDistanceDikeToeStartDitch 	
         /// double
         /// </summary>
-        public const string NewMinDistanceDikeToeStartDitchAttributeId = LocationCsvColumnNames.NewMinDistanceDikeToeStartDitchColumnName; 
+        public const string NewMinDistanceDikeToeStartDitchAttributeId = CsvColumnNames.NewMinDistanceDikeToeStartDitchColumnName; 
 
         /// <summary>
         /// UseNewDitchDefinition
@@ -627,7 +627,7 @@
         /// UseNewDitchDefinition 	
         /// double
         /// </summary>
-        public const string UseNewDitchDefinitionAttributeId = LocationCsvColumnNames.UseNewDitchDefinitionColumnName; 
+        public const string UseNewDitchDefinitionAttributeId = CsvColumnNames.UseNewDitchDefinitionColumnName; 
 
         /// <summary>
         /// NewWidthDitchBottom
@@ -636,7 +636,7 @@
         /// NewWidthDitchBottom 	
         /// double
         /// </summary>
-        public const string NewWidthDitchBottomAttributeId = LocationCsvColumnNames.NewWidthDitchBottomColumnName; 
+        public const string NewWidthDitchBottomAttributeId = CsvColumnNames.NewWidthDitchBottomColumnName; 
 
         /// <summary>
         /// NewDepthDitch
@@ -645,7 +645,7 @@
         /// NewDepthDitch 	
         /// double
         /// </summary>
-        public const string NewDepthDitchAttributeId = LocationCsvColumnNames.NewDepthDitchColumnName; 
+        public const string NewDepthDitchAttributeId = CsvColumnNames.NewDepthDitchColumnName; 
 
         /// <summary>
         /// NewSlopeAngleDitch
@@ -654,7 +654,7 @@
         /// NewSlopeAngleDitch 	
         /// double
         /// </summary>
-        public const string NewSlopeAngleDitchAttributeId = LocationCsvColumnNames.NewSlopeAngleDitchColumnName;
+        public const string NewSlopeAngleDitchAttributeId = CsvColumnNames.NewSlopeAngleDitchColumnName;
 
         /// <summary>
         /// DikeTableHeight
@@ -663,7 +663,7 @@
         /// DikeTableHeight
         /// double
         /// </summary>
-        public const string DikeTableHeightAttributeId = LocationCsvColumnNames.DikeTableHeightColumnName;
+        public const string DikeTableHeightAttributeId = CsvColumnNames.DikeTableHeightColumnName;
 
         /// <summary>
         /// water_height
@@ -672,7 +672,7 @@
         /// WaterHeight
         /// double
         /// </summary>
-        public const string WaterHeightAttributeId = LocationCsvColumnNames.WaterHeightColumnName;
+        public const string WaterHeightAttributeId = CsvColumnNames.WaterHeightColumnName;
 
         /// <summary>
         /// water_height_low
@@ -681,7 +681,7 @@
         /// WaterHeightLow
         /// double
         /// </summary>
-        public const string WaterHeightLowAttributeId = LocationCsvColumnNames.WaterHeightLowColumnName;
+        public const string WaterHeightLowAttributeId = CsvColumnNames.WaterHeightLowColumnName;
 
         /// <summary>
         /// water_height_decimerings_hoogte
@@ -690,7 +690,7 @@
         /// WaterHeightDecimeringsHoogte
         /// double
         /// </summary>
-        public const string WaterHeightDecimeringsHoogteAttributeId = LocationCsvColumnNames.WaterHeightDecimeringsHoogteColumnName;
+        public const string WaterHeightDecimeringsHoogteAttributeId = CsvColumnNames.WaterHeightDecimeringsHoogteColumnName;
 
         /// <summary>
         /// max_waterheight
@@ -699,7 +699,7 @@
         /// MaxWaterHeight
         /// double
         /// </summary>
-        public const string MaxWaterHeightAttributeId = LocationCsvColumnNames.MaxWaterHeightColumnName;
+        public const string MaxWaterHeightAttributeId = CsvColumnNames.MaxWaterHeightColumnName;
 
         #endregion
 
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs
===================================================================
diff -u -r2168 -r2459
--- DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs	(.../DamNewProjectDialog.cs)	(revision 2168)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs	(.../DamNewProjectDialog.cs)	(revision 2459)
@@ -268,7 +268,7 @@
                         if (damProjectFolder != null && shapeFileDataSource != null)
                         {
                             string shapeFileFolder = Path.Combine(damProjectFolder, shapeFileDataSource.DataLocation);
-                            var shapeAttribute = dataSourceContainer.DataAttributes.FirstOrDefault( s => s.AttributeId.ToLower() == LocationCsvColumnNames.LocationColumnName);
+                            var shapeAttribute = dataSourceContainer.DataAttributes.FirstOrDefault( s => s.AttributeId.ToLower() == CsvColumnNames.LocationColumnName);
                             if (shapeAttribute != null)
                             {
                                 string shapeFilePath = Path.Combine(shapeFileFolder, shapeAttribute.DataSource);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r2234 -r2459
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 2234)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 2459)
@@ -225,7 +225,7 @@
     <Compile Include="Importers\LocationShapeFileImporter.cs" />
     <Compile Include="Importers\LineAttributeImporter.cs" />
     <Compile Include="Importers\LocationAttributeMapping.cs" />
-    <Compile Include="Importers\LocationCsvColumnNames.cs" />
+    <Compile Include="Importers\CsvColumnNames.cs" />
     <Compile Include="Importers\LocationImportHelper.cs" />
     <Compile Include="Importers\LocationShapeFileAttributeMap.cs" />
     <Compile Include="Importers\LocationShapeFileImporterDotSpatial.cs" />
Fisheye: Tag 2459 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r2422 -r2459
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 2422)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 2459)
@@ -144,86 +144,86 @@
                         throw new CsvImporterSegmentsException(String.Format("{0} : {1}", fileName, csvHeaderError));
                     }
 
-                    int colIndexLocationId = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.LocationColumnName);
-                    int colIndexSurfacelineId = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.SurfaceLineColumnName);
-                    int colIndexSegmentId = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.SegmentColumnName);
-                    int colIndexDikeRingId = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DikeRingColumnName);
-                    int colIndexGeoX = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.XValueColumnName);
-                    int colIndexGeoY = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.YValueColumnName);
-                    int colIndexXSoilgeometry2DOrigin = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.XSoilGeometry2DOriginColumnName);
-                    int colIndexPl1Id = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.Pl1ColumnName);
-                    int colIndexPolderlevel = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PolderLevelColumnName);
-                    int colIndexHeadPl2 = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.HeadPl2ColumnName);
-                    int colIndexHeadPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.HeadPl3ColumnName);
-                    int colIndexHeadPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.HeadPl4ColumnName);
-                    int colIndexGrassQuality = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.GrassQualityColumnName);
-                    int colIndexDirection = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DirectionColumnName);
-                    int colIndexOphoogmateriaaldijk = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DikeEmbankmentMaterialColumnName);
-                    int colIndexOphoogmateriaalberm = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ShoulderEmbankmentMaterialColumnName);
-                    int colIndexUseOriginalPllineAssignments = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseOriginalPlLineAssignmentsColumnName);
-                    int colIndexPenetrationLength = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PenetrationLengthColumnName);
-                    int colIndexTrafficLoad = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.TrafficLoadColumnName);
-                    int colIndexTL_DegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.TL_DegreeOfConsolidationColumnName);
-                    int colIndexMinimalCircleDepth = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.MinimalCircleDepthColumnName);
-                    int colIndexDempingsfactorPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DampingFactorPl3ColumnName);
-                    int colIndexDempingsfactorPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DampingFactorPl4ColumnName);
-                    int colIndexPLLineCreationMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PlLineCreationMethodColumnName);
-                    int colIndexLevelReductionInside = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.LevelReductionInsideColumnName);
-                    int colIndexLevelReductionOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.LevelReductionOutsideColumnName);
-                    int colIndexLayerHeightDistribution = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.LayerHeightDistributionColumnName);
-                    int colIndexLayerHeightDeviation = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.LayerHeightDeviationColumnName);
-                    int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.RequiredSafetyFactorPipingColumnName);
-                    int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName);
-                    int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName);
-                    int colIndexcolIndexProbabilityOfFailureStabilityInnerslope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ProbabilityOfFailureStabilityInnerslopeColumnName);
-                    int colIndexcolIndexProbabilityOfFailureStabilityOuterslope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ProbabilityOfFailureStabilityOuterslopeColumnName);
-                    int colIndexProbabilityOfFailurePiping = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ProbabilityOfFailurePipingColumnName);
-                    int colIndexUpliftCriterionPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UpliftCriterionPipingColumnName);
-                    int colIndexUpliftCriterionStability = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UpliftCriterionStabilityColumnName);
-                    int colIndexDistanceToEntryPoint = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DistanceToEntryPointColumnName);
-                    int colIndexPLLineOffsetBelowDikeTopAtRiver = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PlLineOffsetBelowDikeTopAtRiverColumnName);
-                    int colIndexPLLineOffsetBelowDikeTopAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName);
-                    int colIndexPLLineOffsetBelowShoulderBaseInside = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName);
-                    int colIndexPLLineOffsetBelowDikeToeAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName);
-                    int colIndexPlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PlLineOffsetBelowDikeCrestMiddle);
-                    int colIndexPlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PlLineOffsetFactorBelowShoulderCrest);
-                    int colIndexUsePlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddle);
-                    int colIndexUsePlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrest);
-                    int colIndexIntrusionVerticalWaterPressure = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.IntrusionVerticalWaterPressure);
-                    int colIndexStabilityShoulderGrowSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilityShoulderGrowSlopeColumnName);
-                    int colIndexStabilityShoulderGrowDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilityShoulderGrowDeltaXColumnName);
-                    int colIndexStabilitySlopeAdaptionDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName);
-                    int colIndexSlopeDampingPiezometricHeightPolderSide = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName);
-                    int colIndexStabilityDesignMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilityDesignMethodColumnName);
-                    int colIndexStabilityZoneType = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ZoneTypeColumnName);
-                    int colIndexForbiddenZoneFactor = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ForbiddenZoneFactorColumnName);
-                    int colIndexZoneAreaRestSlopeCrestWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName);
-                    int colIndexSlopeAdaptionStartCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.SlopeAdaptionStartCotangentColumnName);
-                    int colIndexSlopeAdaptionEndCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.SlopeAdaptionEndCotangentColumnName);
-                    int colIndexSlopeAdaptionStepCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.SlopeAdaptionStepCotangentColumnName);
-                    int colIndexNewDikeTopWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewDikeTopWidthColumnName);
-                    int colIndexUseNewDikeTopWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewDikeTopWidthColumnName);
-                    int colIndexNewDikeSlopeInside = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewDikeSlopeInsideColumnName);
-                    int colIndexUseNewDikeSlopeInside = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewDikeSlopeInsideColumnName);
-                    int colIndexNewDikeSlopeOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewDikeSlopeOutsideColumnName);
-                    int colIndexUseNewDikeSlopeOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewDikeSlopeOutsideColumnName);
-                    int colIndexNewShoulderTopSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewShoulderTopSlopeColumnName);
-                    int colIndexUseNewShoulderTopSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewShoulderTopSlopeColumnName);
-                    int colIndexNewShoulderBaseSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewShoulderBaseSlopeColumnName);
-                    int colIndexUseNewShoulderBaseSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewShoulderBaseSlopeColumnName);
-                    int colIndexNewMaxHeightShoulderAsFraction = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewMaxHeightShoulderAsFractionColumnName);
-                    int colIndexUseNewMaxHeightShoulderAsFraction = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewMaxHeightShoulderAsFractionColumnName);
-                    int colIndexNewMinDistanceDikeToeStartDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewMinDistanceDikeToeStartDitchColumnName);
-                    int colIndexUseNewMinDistanceDikeToeStartDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewMinDistanceDikeToeStartDitchColumnName);
-                    int colIndexUseNewDitchDefinition = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseNewDitchDefinitionColumnName);
-                    int colIndexNewWidthDitchBottom = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewWidthDitchBottomColumnName);
-                    int colIndexNewSlopeAngleDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewSlopeAngleDitchColumnName);
-                    int colIndexNewDepthDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.NewDepthDitchColumnName);
-                    int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DikeTableHeightColumnName);
-                    int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.WaterHeightColumnName);
-                    int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.WaterHeightLowColumnName);
-                    int colIndexWaterHeightDecimeringsHoogte = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.WaterHeightDecimeringsHoogteColumnName);
-                    int colIndexMaxWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.MaxWaterHeightColumnName);
+                    int colIndexLocationId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LocationColumnName);
+                    int colIndexSurfacelineId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SurfaceLineColumnName);
+                    int colIndexSegmentId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SegmentColumnName);
+                    int colIndexDikeRingId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeRingColumnName);
+                    int colIndexGeoX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XValueColumnName);
+                    int colIndexGeoY = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.YValueColumnName);
+                    int colIndexXSoilgeometry2DOrigin = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XSoilGeometry2DOriginColumnName);
+                    int colIndexPl1Id = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.Pl1ColumnName);
+                    int colIndexPolderlevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PolderLevelColumnName);
+                    int colIndexHeadPl2 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl2ColumnName);
+                    int colIndexHeadPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl3ColumnName);
+                    int colIndexHeadPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl4ColumnName);
+                    int colIndexGrassQuality = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.GrassQualityColumnName);
+                    int colIndexDirection = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DirectionColumnName);
+                    int colIndexOphoogmateriaaldijk = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeEmbankmentMaterialColumnName);
+                    int colIndexOphoogmateriaalberm = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ShoulderEmbankmentMaterialColumnName);
+                    int colIndexUseOriginalPllineAssignments = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseOriginalPlLineAssignmentsColumnName);
+                    int colIndexPenetrationLength = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PenetrationLengthColumnName);
+                    int colIndexTrafficLoad = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TrafficLoadColumnName);
+                    int colIndexTL_DegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TL_DegreeOfConsolidationColumnName);
+                    int colIndexMinimalCircleDepth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MinimalCircleDepthColumnName);
+                    int colIndexDempingsfactorPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl3ColumnName);
+                    int colIndexDempingsfactorPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl4ColumnName);
+                    int colIndexPLLineCreationMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineCreationMethodColumnName);
+                    int colIndexLevelReductionInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LevelReductionInsideColumnName);
+                    int colIndexLevelReductionOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LevelReductionOutsideColumnName);
+                    int colIndexLayerHeightDistribution = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LayerHeightDistributionColumnName);
+                    int colIndexLayerHeightDeviation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LayerHeightDeviationColumnName);
+                    int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorPipingColumnName);
+                    int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName);
+                    int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName);
+                    int colIndexcolIndexProbabilityOfFailureStabilityInnerslope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ProbabilityOfFailureStabilityInnerslopeColumnName);
+                    int colIndexcolIndexProbabilityOfFailureStabilityOuterslope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ProbabilityOfFailureStabilityOuterslopeColumnName);
+                    int colIndexProbabilityOfFailurePiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ProbabilityOfFailurePipingColumnName);
+                    int colIndexUpliftCriterionPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UpliftCriterionPipingColumnName);
+                    int colIndexUpliftCriterionStability = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UpliftCriterionStabilityColumnName);
+                    int colIndexDistanceToEntryPoint = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DistanceToEntryPointColumnName);
+                    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.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 colIndexStabilityShoulderGrowSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityShoulderGrowSlopeColumnName);
+                    int colIndexStabilityShoulderGrowDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityShoulderGrowDeltaXColumnName);
+                    int colIndexStabilitySlopeAdaptionDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName);
+                    int colIndexSlopeDampingPiezometricHeightPolderSide = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName);
+                    int colIndexStabilityDesignMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityDesignMethodColumnName);
+                    int colIndexStabilityZoneType = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ZoneTypeColumnName);
+                    int colIndexForbiddenZoneFactor = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ForbiddenZoneFactorColumnName);
+                    int colIndexZoneAreaRestSlopeCrestWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName);
+                    int colIndexSlopeAdaptionStartCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionStartCotangentColumnName);
+                    int colIndexSlopeAdaptionEndCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionEndCotangentColumnName);
+                    int colIndexSlopeAdaptionStepCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionStepCotangentColumnName);
+                    int colIndexNewDikeTopWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDikeTopWidthColumnName);
+                    int colIndexUseNewDikeTopWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDikeTopWidthColumnName);
+                    int colIndexNewDikeSlopeInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDikeSlopeInsideColumnName);
+                    int colIndexUseNewDikeSlopeInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDikeSlopeInsideColumnName);
+                    int colIndexNewDikeSlopeOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDikeSlopeOutsideColumnName);
+                    int colIndexUseNewDikeSlopeOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDikeSlopeOutsideColumnName);
+                    int colIndexNewShoulderTopSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewShoulderTopSlopeColumnName);
+                    int colIndexUseNewShoulderTopSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewShoulderTopSlopeColumnName);
+                    int colIndexNewShoulderBaseSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewShoulderBaseSlopeColumnName);
+                    int colIndexUseNewShoulderBaseSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewShoulderBaseSlopeColumnName);
+                    int colIndexNewMaxHeightShoulderAsFraction = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewMaxHeightShoulderAsFractionColumnName);
+                    int colIndexUseNewMaxHeightShoulderAsFraction = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewMaxHeightShoulderAsFractionColumnName);
+                    int colIndexNewMinDistanceDikeToeStartDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewMinDistanceDikeToeStartDitchColumnName);
+                    int colIndexUseNewMinDistanceDikeToeStartDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewMinDistanceDikeToeStartDitchColumnName);
+                    int colIndexUseNewDitchDefinition = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDitchDefinitionColumnName);
+                    int colIndexNewWidthDitchBottom = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewWidthDitchBottomColumnName);
+                    int colIndexNewSlopeAngleDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewSlopeAngleDitchColumnName);
+                    int colIndexNewDepthDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDepthDitchColumnName);
+                    int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeTableHeightColumnName);
+                    int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightColumnName);
+                    int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightLowColumnName);
+                    int colIndexWaterHeightDecimeringsHoogte = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightDecimeringsHoogteColumnName);
+                    int colIndexMaxWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MaxWaterHeightColumnName);
 
                     var index = 1;
                     while (csv.ReadNextRecord())