Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs	(.../SensorPLLine1Creator.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs	(.../SensorPLLine1Creator.cs)	(revision 1667)
@@ -268,7 +268,7 @@
                 var sensor = PolderLevelSensor;
                 if (sensor != null)
                 {
-                    var value = SensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, SensorValues, sensor);
+                    var value = SensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, SensorValues, sensor);
                     if (value.HasValue)
                         return value.Value;
 
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1667)
@@ -79,7 +79,7 @@
                 Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver);
                 Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside);
                 Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorLocation.SourceTypePl1WaterLevelAtRiver);
-                Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.PL1WaterLevelAtPolder);
+                Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.SourceTypePl1WaterLevelAtPolder);
                 Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl3);
                 Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.SourceTypePl4);
                 Assert.AreEqual(-1.33, sensorLocation.PolderLevel, cTolerance);
Index: DamClassic/trunk/src/Dam/Data/Translations.xml
===================================================================
diff -u -r874 -r1667
--- DamClassic/trunk/src/Dam/Data/Translations.xml	(.../Translations.xml)	(revision 874)
+++ DamClassic/trunk/src/Dam/Data/Translations.xml	(.../Translations.xml)	(revision 1667)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Translations>
   <Translation ID="Name" en-US="Name" nl-NL="Naam" />
   <Translation ID="NameDescription" en-US="Name" nl-NL="Naam" />
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1667)
@@ -64,7 +64,7 @@
                 SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
                 SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
                 SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
-                PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
                 SourceTypePl3 = DataSourceTypeSensors.LocationData,
                 SourceTypePl4 = DataSourceTypeSensors.LocationData
             };
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreatorBase.cs
===================================================================
diff -u -r874 -r1667
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreatorBase.cs	(.../SensorPLLineCreatorBase.cs)	(revision 874)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreatorBase.cs	(.../SensorPLLineCreatorBase.cs)	(revision 1667)
@@ -186,7 +186,7 @@
             get
             {
                 var sensor = SensorLocation.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType).Last().Value;
-                var value = SensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, SensorValues, sensor);
+                var value = SensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, SensorValues, sensor);
                 if (value.HasValue)
                     return value.Value;
 
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1667)
@@ -98,7 +98,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -112,7 +112,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -126,7 +126,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -168,7 +168,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -403,7 +403,7 @@
                     SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
                     SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
                     SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
-                    PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
                     SourceTypePl3 = DataSourceTypeSensors.LocationData,
                     SourceTypePl4 = DataSourceTypeSensors.LocationData
                 };
@@ -702,10 +702,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -721,10 +721,10 @@
             var sensorLocation = CreateValidSensorLocation();
             location.PolderLevel = testValue;
 
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -739,10 +739,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, expectedValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(expectedValue, actualValue);
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1667)
@@ -289,7 +289,7 @@
                 sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
                 sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
                 sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
-                sensorLocation.PL1WaterLevelAtPolder = record.InputPL1PolderLevel;
+                sensorLocation.SourceTypePl1WaterLevelAtPolder = record.InputPL1PolderLevel;
                 sensorLocation.SourceTypePl3 = record.InputPL3;
                 sensorLocation.SourceTypePl4 = record.InputPL4;
             }
Index: DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1667)
@@ -472,7 +472,7 @@
                 sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
                 sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
                 sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
-                sensorLocation.PL1WaterLevelAtPolder = record.InputPL1PolderLevel;
+                sensorLocation.SourceTypePl1WaterLevelAtPolder = record.InputPL1PolderLevel;
                 sensorLocation.SourceTypePl3 = record.InputPL3;
                 sensorLocation.SourceTypePl4 = record.InputPL4;
             }
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1667)
@@ -70,7 +70,7 @@
         public SensorLocation()
         {
             SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-            PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
         }
 
         private Group sensorGroup;
@@ -273,7 +273,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 11)]
-        public DataSourceTypeSensors PL1WaterLevelAtPolder { get; set; }
+        public DataSourceTypeSensors SourceTypePl1WaterLevelAtPolder { get; set; }
 
         /// <summary>
         /// Gets the sensor count.
@@ -396,7 +396,7 @@
             internal static readonly string OffsetBelowDikeTopAtRiver = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver);
             internal static readonly string OffsetBelowShoulderBaseInside = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PLLineOffsetBelowShoulderBaseInside);
             internal static readonly string WaterLevelAtRiver = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1WaterLevelAtRiver);
-            internal static readonly string PolderLevel = StaticReflection.GetMemberName<SensorLocation>(x => x.PL1WaterLevelAtPolder);
+            internal static readonly string PolderLevel = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1WaterLevelAtPolder);
             internal static readonly string PL3 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl3);
             internal static readonly string PL4 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl4);
         }
@@ -446,10 +446,10 @@
 
             if (memberName == MemberNames.PolderLevel)
             {
-                if (PL1WaterLevelAtPolder == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData)
                     return Location.PolderLevel;
 
-                if (PL1WaterLevelAtPolder == DataSourceTypeSensors.Sensor)
+                if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.Sensor)
                     return sensorValues[sensor];
             }
 
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs
===================================================================
diff -u -r1603 -r1667
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1667)
@@ -384,7 +384,7 @@
                 location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
                 location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
 
@@ -482,7 +482,7 @@
                 location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
                 location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
 
@@ -577,7 +577,7 @@
                 location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-                location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
 
@@ -660,7 +660,7 @@
                 location.AddNewSensorLocation();
                 location.SensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
 
@@ -730,7 +730,7 @@
                 location.AddNewSensorLocation();
                 location.SensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-                location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());