Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1668)
@@ -61,9 +61,9 @@
                 Location = location,
                 SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
                 SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
-                SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
-                SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
-                SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
                 SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
                 SourceTypePl3 = DataSourceTypeSensors.LocationData,
                 SourceTypePl4 = DataSourceTypeSensors.LocationData
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1668)
@@ -285,9 +285,9 @@
                 sensorLocation.Group.ID = record.GroupID;
                 sensorLocation.Alias = record.Alias;
                 sensorLocation.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
-                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
-                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
-                sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
                 sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
                 sensorLocation.SourceTypePl1WaterLevelAtPolder = record.InputPL1PolderLevel;
                 sensorLocation.SourceTypePl3 = record.InputPL3;
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1668)
@@ -75,9 +75,9 @@
                 {
                     Assert.IsTrue(sensorIds.Contains(sensor.ID), String.Format("Sensor Id {0} not part of expected list", sensor.ID));
                 }
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder);
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver);
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside);
+                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
+                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver);
+                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside);
                 Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorLocation.SourceTypePl1WaterLevelAtRiver);
                 Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.SourceTypePl1WaterLevelAtPolder);
                 Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl3);
Index: DamClassic/trunk/src/Dam/Data/Location.cs
===================================================================
diff -u -r1598 -r1668
--- DamClassic/trunk/src/Dam/Data/Location.cs	(.../Location.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Data/Location.cs	(.../Location.cs)	(revision 1668)
@@ -286,6 +286,7 @@
         }
 
         [Browsable(false)]
+        [XmlOldName("SensorData")]
         public virtual SensorLocation SensorLocation
         {
             get
Index: DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs
===================================================================
diff -u -r1603 -r1668
--- DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1603)
+++ DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1668)
@@ -272,11 +272,11 @@
             repository.Add(new[] { sensor1, sensor2, sensor3, sensor4, sensor5, sensor6, sensor7 });
             var sensorLocation = location0.SensorLocation;
             sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
             sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
             sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
             sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location0.Name = "dwp 31,5";
@@ -286,11 +286,11 @@
             repository.Add(new[] { sensor1, sensor8, sensor9, sensor10 });
             sensorLocation = location1.SensorLocation;
             sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
             sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
             sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
             sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location1.Name = "dwp 34,0";
@@ -300,11 +300,11 @@
             repository.Add(new[] { sensor1, sensor11, sensor12, sensor13, sensor14, sensor15 });
             sensorLocation = location2.SensorLocation;
             sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
             sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
             sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
             sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location2.Name = "dwp 37,0";            
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1668)
@@ -267,7 +267,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -281,7 +281,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -295,7 +295,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -309,7 +309,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -323,7 +323,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -337,7 +337,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -351,7 +351,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -365,7 +365,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -379,7 +379,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -400,9 +400,9 @@
                     Location = location1,
                     SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
                     SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
-                    SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
-                    SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
-                    SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
                     SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
                     SourceTypePl3 = DataSourceTypeSensors.LocationData,
                     SourceTypePl4 = DataSourceTypeSensors.LocationData
@@ -537,10 +537,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -556,10 +556,10 @@
             var sensorLocation = CreateValidSensorLocation();
             location.PlLineOffsetBelowDikeTopAtPolder = testValue;
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -574,10 +574,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -592,10 +592,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -611,10 +611,10 @@
             var sensorLocation = CreateValidSensorLocation();
             location.PlLineOffsetBelowDikeTopAtRiver = testValue;
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -629,10 +629,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -647,10 +647,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -666,10 +666,10 @@
             var sensorLocation = CreateValidSensorLocation();
             location.PlLineOffsetBelowShoulderBaseInside = testValue;
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -684,10 +684,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1668)
@@ -123,9 +123,9 @@
             {
                 location.AddNewSensorLocation();
                 location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
                 // create dike with ditch
 
@@ -227,9 +227,9 @@
             {
                 location.AddNewSensorLocation();
                 location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
                 // create dike with ditch
 
@@ -290,9 +290,9 @@
             using (var location = new Location("test") { RiverLevel = 5, PolderLevel = -1 })
             {
                 location.AddNewSensorLocation();
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
                 location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor;
 
                 surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside);
@@ -380,9 +380,9 @@
             {
                 location.AddNewSensorLocation();
                 location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
                 location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
@@ -478,9 +478,9 @@
                 
                 location.AddNewSensorLocation();
                 location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
                 location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
@@ -572,9 +572,9 @@
 
                 location.AddNewSensorLocation();
                 location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
                 location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
                 location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1668)
@@ -202,6 +202,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 12)]
+        [XmlOldName("PL3")]
         public DataSourceTypeSensors SourceTypePl3 { get; set; }
 
         /// <summary>
@@ -212,6 +213,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 13)]
+        [XmlOldName("PL4")]
         public DataSourceTypeSensors SourceTypePl4 { get; set; }
 
 
@@ -223,6 +225,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 6)]
+        [XmlOldName("PL1WaterLevelAtRiver")]
         public DataSourceTypeSensors SourceTypePl1WaterLevelAtRiver { get; set; }
 
         /// <summary>
@@ -233,7 +236,8 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 7)]
-        public DataSourceTypeSensors SourceTypePl1PLLineOffsetBelowDikeTopAtRiver { get; set; }
+        [XmlOldName("PL1PLLineOffsetBelowDikeTopAtRiver")]
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtRiver { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 PL line offset below dike top at polder data source type
@@ -243,7 +247,8 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 8)]
-        public DataSourceTypeSensors SourceTypePl1PLLineOffsetBelowDikeTopAtPolder { get; set; }
+        [XmlOldName("PL1PLLineOffsetBelowDikeTopAtPolder")]
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtPolder { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 PL line offset below shoulder base inside data source type
@@ -253,7 +258,8 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 9)]
-        public DataSourceTypeSensors SourceTypePl1PLLineOffsetBelowShoulderBaseInside { get; set; }
+        [XmlOldName("PL1PLLineOffsetBelowShoulderBaseInside")]
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowShoulderBaseInside { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 PL line offset below dike toe at polder data source type.
@@ -263,6 +269,7 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 10)]
+        [XmlOldName("PL1PLLineOffsetBelowDikeToeAtPolder")]
         public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeToeAtPolder { get; set; }
 
         /// <summary>
@@ -273,6 +280,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 11)]
+        [XmlOldName("PL1WaterLevelAtPolder")]
         public DataSourceTypeSensors SourceTypePl1WaterLevelAtPolder { get; set; }
 
         /// <summary>
@@ -392,9 +400,9 @@
         internal static class MemberNames
         {
             internal static readonly string OffsetBelowDikeToeAtPolder = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
-            internal static readonly string OffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder);
-            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 OffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
+            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.SourceTypePl1WaterLevelAtPolder);
             internal static readonly string PL3 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl3);
@@ -419,19 +427,19 @@
 
             if (memberName == MemberNames.OffsetBelowDikeTopAtPolder)
             {
-                if (SourceTypePl1PLLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1PlLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData)
                     return Location.PlLineOffsetBelowDikeTopAtPolder;
             }
 
             if (memberName == MemberNames.OffsetBelowDikeTopAtRiver)
             {
-                if (SourceTypePl1PLLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1PlLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData)
                     return Location.PlLineOffsetBelowDikeTopAtRiver;
             }
 
             if (memberName == MemberNames.OffsetBelowShoulderBaseInside)
             {
-                if (SourceTypePl1PLLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1PlLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData)
                     return Location.PlLineOffsetBelowShoulderBaseInside;
             }
 
Index: DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1668)
@@ -468,9 +468,9 @@
                 sensorLocation.Group.ID = record.GroupID;
                 sensorLocation.Alias = record.Alias;
                 sensorLocation.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
-                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
-                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
-                sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
                 sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
                 sensorLocation.SourceTypePl1WaterLevelAtPolder = record.InputPL1PolderLevel;
                 sensorLocation.SourceTypePl3 = record.InputPL3;
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs
===================================================================
diff -u -r1667 -r1668
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs	(.../SensorPLLine1Creator.cs)	(revision 1667)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs	(.../SensorPLLine1Creator.cs)	(revision 1668)
@@ -60,22 +60,22 @@
 
             // insert offset below dike top at river point?
             var useLocationAsDataSource = new UseLocationAsDataSource();
-            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver))
+            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver))
             {
                 double offset = waterLevel - SensorLocation.PLLineOffsetBelowDikeTopAtRiver;
                 lineConstructor.Insert(new PLLinePoint(XDikeTopAtRiver, offset));
             }
 
             // insert offset below dike top at polder point?
-            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder))
+            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder))
             {
                 double offset = waterLevel - SensorLocation.PLLineOffsetBelowDikeTopAtPolder;
                 var x = XDikeTopAtPolder;
                 lineConstructor.Insert(new PLLinePoint(x, offset));
             }
 
             // insert offset below shoulder base inside?
-            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside))
+            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside))
             {
                 double offset = lastZ = ZShouldeBaseInside - SensorLocation.PLLineOffsetDryBelowShoulderBaseInside;
                 lineConstructor.Insert(new PLLinePoint(XShoulderBaseInside, offset));