Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2512 -r2529
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2512)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2529)
@@ -683,31 +683,31 @@
             Assert.AreEqual("106", locationRecords[1].SegmentId);
             Assert.AreEqual(66586.0, locationRecords[1].GeoX, tolerance);
             Assert.AreEqual(424173.0, locationRecords[1].GeoY, tolerance);
-            Assert.AreEqual(2.0, locationRecords[1].XSoilgeometry2DOrigin, tolerance);
-            Assert.AreEqual(-0.25, locationRecords[1].Polderlevel, tolerance);
+            Assert.AreEqual(2.0, locationRecords[1].XSoilGeometry2DOrigin, tolerance);
+            Assert.AreEqual(-0.25, locationRecords[1].PolderLevel, tolerance);
             Assert.AreEqual(0.8727, locationRecords[1].HeadPl2.Value, tolerance);
             Assert.AreEqual(0.9, locationRecords[0].HeadPl3.Value, tolerance);
             Assert.AreEqual(0.8, locationRecords[0].HeadPl4.Value, tolerance);
-            Assert.AreEqual("klei", locationRecords[1].Ophoogmateriaaldijk);
-            Assert.AreEqual("klei2", locationRecords[1].Ophoogmateriaalberm);
+            Assert.AreEqual("klei", locationRecords[1].DikeEmbankmentMaterial);
+            Assert.AreEqual("klei2", locationRecords[1].ShoulderEmbankmentMaterial);
             Assert.AreEqual(1.3, locationRecords[1].PenetrationLength, tolerance);
             Assert.AreEqual(10, locationRecords[1].TrafficLoad, tolerance);
             Assert.AreEqual(10.1, locationRecords[0].TL_DegreeOfConsolidation, tolerance);
             Assert.AreEqual(55.5, locationRecords[1].TL_DegreeOfConsolidation, tolerance);
             Assert.AreEqual(1.5, locationRecords[1].MinimalCircleDepth, tolerance);
-            Assert.AreEqual(30.0, locationRecords[1].DempingsfactorPl3, tolerance);
-            Assert.AreEqual(40.0, locationRecords[1].DempingsfactorPl4, tolerance);
+            Assert.AreEqual(30.0, locationRecords[1].DampingFactorPl3, tolerance);
+            Assert.AreEqual(40.0, locationRecords[1].DampingFactorPl4, tolerance);
             Assert.AreEqual(PLLineCreationMethod.ExpertKnowledgeRRD, locationRecords[1].PLLineCreationMethod);
-            Assert.AreEqual(1.2, locationRecords[1].SafetyFactorPiping, tolerance);
-            Assert.AreEqual(1.3, locationRecords[1].SafetyFactorStabilityInnerSlope, tolerance);
-            Assert.AreEqual(1.4, locationRecords[1].SafetyFactorStabilityOuterSlope, tolerance);
+            Assert.AreEqual(1.2, locationRecords[1].RequiredSafetyFactorPiping, tolerance);
+            Assert.AreEqual(1.3, locationRecords[1].RequiredSafetyFactorStabilityInnerSlope, tolerance);
+            Assert.AreEqual(1.4, locationRecords[1].RequiredSafetyFactorStabilityOuterSlope, tolerance);
             Assert.AreEqual(1.1, locationRecords[1].UpliftCriterionPiping, tolerance);
             Assert.AreEqual(1.2, locationRecords[1].UpliftCriterionStability, tolerance);
             Assert.AreEqual(2.1, locationRecords[1].DistanceToEntryPoint, tolerance);
-            Assert.AreEqual(0.5, locationRecords[1].PLLineOffsetBelowDikeTopAtRiver, tolerance);
-            Assert.AreEqual(0.6, locationRecords[1].PLLineOffsetBelowDikeTopAtPolder, tolerance);
-            Assert.AreEqual(0.1, locationRecords[1].PLLineOffsetBelowShoulderBaseInside, tolerance);
-            Assert.AreEqual(0.2, locationRecords[1].PLLineOffsetBelowDikeToeAtPolder, tolerance);
+            Assert.AreEqual(0.5, locationRecords[1].PlLineOffsetBelowDikeTopAtRiver, tolerance);
+            Assert.AreEqual(0.6, locationRecords[1].PlLineOffsetBelowDikeTopAtPolder, tolerance);
+            Assert.AreEqual(0.1, locationRecords[1].PlLineOffsetBelowShoulderBaseInside, tolerance);
+            Assert.AreEqual(0.2, locationRecords[1].PlLineOffsetBelowDikeToeAtPolder, tolerance);
             Assert.AreEqual(2.0, locationRecords[1].StabilityShoulderGrowSlope, tolerance);
             Assert.AreEqual(0.2, locationRecords[1].StabilityShoulderGrowDeltaX, tolerance);
             Assert.AreEqual(0.5, locationRecords[1].StabilitySlopeAdaptionDeltaX, tolerance);