Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine3Creator.cs
===================================================================
diff -u -r874 -r1603
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine3Creator.cs	(.../SensorPLLine3Creator.cs)	(revision 874)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine3Creator.cs	(.../SensorPLLine3Creator.cs)	(revision 1603)
@@ -29,7 +29,7 @@
         protected override double GetStartLevel()
         {
             double currentLevel;
-            bool useLocationAsDataSource = new UseLocationAsDataSource().IsSatisfiedBy(SensorLocation.PL3);
+            bool useLocationAsDataSource = new UseLocationAsDataSource().IsSatisfiedBy(SensorLocation.SourceTypePl3);
             if (useLocationAsDataSource)
             {
                 if (!SensorLocation.HeadPl3.HasValue)
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs
===================================================================
diff -u -r874 -r1603
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 874)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1603)
@@ -59,14 +59,14 @@
             {
                 Group = group,
                 Location = location,
-                PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
-                PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
-                PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
-                PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
-                PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
+                SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
                 PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
-                PL3 = DataSourceTypeSensors.LocationData,
-                PL4 = DataSourceTypeSensors.LocationData
+                SourceTypePl3 = DataSourceTypeSensors.LocationData,
+                SourceTypePl4 = DataSourceTypeSensors.LocationData
             };
         }
     }
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine4Creator.cs
===================================================================
diff -u -r874 -r1603
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine4Creator.cs	(.../SensorPLLine4Creator.cs)	(revision 874)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine4Creator.cs	(.../SensorPLLine4Creator.cs)	(revision 1603)
@@ -23,7 +23,7 @@
         protected override double GetStartLevel()
         {
             var locationAsDataSource = new UseLocationAsDataSource();
-            bool useLocationAsDataSource = locationAsDataSource.IsSatisfiedBy(SensorLocation.PL4);
+            bool useLocationAsDataSource = locationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl4);
             if (useLocationAsDataSource)
             {
                 if (!SensorLocation.HeadPl4.HasValue)
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs
===================================================================
diff -u -r1598 -r1603
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1603)
@@ -122,10 +122,10 @@
             using (var location = new Location("test") { RiverLevel = 1, PolderLevel = 1 })
             {
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
                 // create dike with ditch
 
@@ -226,10 +226,10 @@
             using (var location = new Location("test") { RiverLevel = 5, PolderLevel = polderLevel })
             {
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
                 // create dike with ditch
 
@@ -290,10 +290,10 @@
             using (var location = new Location("test") { RiverLevel = 5, PolderLevel = -1 })
             {
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor;
+                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);
                 surfaceLine.EnsurePointOfType(50.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
@@ -379,11 +379,11 @@
             using (var location = new Location("test") { RiverLevel = 1, PolderLevel = 1 })
             {
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
                 location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
@@ -477,11 +477,11 @@
                 #region Setup
                 
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
                 location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
@@ -571,12 +571,12 @@
                 #region Setup
 
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
-                location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
                 location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
@@ -658,8 +658,8 @@
             using (var location = new Location("test") { RiverLevel = waterLevel, PolderLevel = waterLevel })
             {
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL3 = DataSourceTypeSensors.Sensor;
-                location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
                 location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
@@ -728,8 +728,8 @@
             using (var location = new Location("test") { RiverLevel = 1.0, PolderLevel = 1.0 })
             {
                 location.AddNewSensorLocation();
-                location.SensorLocation.PL3 = DataSourceTypeSensors.Sensor;
-                location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
                 location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
                 Assert.IsTrue(location.SensorLocation.IsValid());
Index: DamClassic/trunk/src/Dam/DamLive/Tests/ModelRunnerTest.cs
===================================================================
diff -u -r874 -r1603
--- DamClassic/trunk/src/Dam/DamLive/Tests/ModelRunnerTest.cs	(.../ModelRunnerTest.cs)	(revision 874)
+++ DamClassic/trunk/src/Dam/DamLive/Tests/ModelRunnerTest.cs	(.../ModelRunnerTest.cs)	(revision 1603)
@@ -201,7 +201,7 @@
             runner.RunnerDelegate = new LegacyModelRunner();
 
             runner.Process();
-
+            runner.OutputTimeSeriesCollection.Save(outputFile);
             Assert.IsNotEmpty(runner.OutputTimeSeriesCollection.Series);            
         }
     }
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreator.cs
===================================================================
diff -u -r1598 -r1603
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreator.cs	(.../SensorPLLineCreator.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreator.cs	(.../SensorPLLineCreator.cs)	(revision 1603)
@@ -53,12 +53,12 @@
                 }
             }
 
-            if (!lineTypes.Contains(PLLineType.PL3) && sensorLocation.PL3 == DataSourceTypeSensors.LocationData)
+            if (!lineTypes.Contains(PLLineType.PL3) && sensorLocation.SourceTypePl3 == DataSourceTypeSensors.LocationData)
             {
                 tuples.Add(new Tuple<PLLineType, IPLLineCreator>(PLLineType.PL3, c3));
             }
 
-            if (!lineTypes.Contains(PLLineType.PL4) && sensorLocation.PL4 == DataSourceTypeSensors.LocationData)
+            if (!lineTypes.Contains(PLLineType.PL4) && sensorLocation.SourceTypePl4 == DataSourceTypeSensors.LocationData)
             {
                 tuples.Add(new Tuple<PLLineType, IPLLineCreator>(PLLineType.PL4, c4));
             }
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs
===================================================================
diff -u -r1598 -r1603
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1603)
@@ -284,14 +284,14 @@
                 var sensorLocation = location.SensorLocation;
                 sensorLocation.Group.ID = record.GroupID;
                 sensorLocation.Alias = record.Alias;
-                sensorLocation.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
-                sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
-                sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
-                sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
-                sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
+                sensorLocation.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
+                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
+                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
+                sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
                 sensorLocation.PL1WaterLevelAtPolder = record.InputPL1PolderLevel;
-                sensorLocation.PL3 = record.InputPL3;
-                sensorLocation.PL4 = record.InputPL4;
+                sensorLocation.SourceTypePl3 = record.InputPL3;
+                sensorLocation.SourceTypePl4 = record.InputPL4;
             }
             catch (Exception e)
             {
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs
===================================================================
diff -u -r874 -r1603
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 874)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1603)
@@ -69,7 +69,7 @@
         [Browsable(false)]
         public SensorLocation()
         {
-            PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+            SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
             PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
         }
 
@@ -202,7 +202,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 12)]
-        public DataSourceTypeSensors PL3 { get; set; }
+        public DataSourceTypeSensors SourceTypePl3 { get; set; }
 
         /// <summary>
         /// Gets or sets the PL4 data source type.
@@ -212,7 +212,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 13)]
-        public DataSourceTypeSensors PL4 { get; set; }
+        public DataSourceTypeSensors SourceTypePl4 { get; set; }
 
 
         /// <summary>
@@ -223,7 +223,7 @@
         /// </value>
         [Specification(typeof(SensorOrLocationData))]
         [PropertyOrder(1, 6)]
-        public DataSourceTypeSensors PL1WaterLevelAtRiver { get; set; }
+        public DataSourceTypeSensors SourceTypePl1WaterLevelAtRiver { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 PL line offset below dike top at river data source type.
@@ -233,7 +233,7 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 7)]
-        public DataSourceTypeSensors PL1PLLineOffsetBelowDikeTopAtRiver { get; set; }
+        public DataSourceTypeSensors SourceTypePl1PLLineOffsetBelowDikeTopAtRiver { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 PL line offset below dike top at polder data source type
@@ -243,7 +243,7 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 8)]
-        public DataSourceTypeSensors PL1PLLineOffsetBelowDikeTopAtPolder { get; set; }
+        public DataSourceTypeSensors SourceTypePl1PLLineOffsetBelowDikeTopAtPolder { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 PL line offset below shoulder base inside data source type
@@ -253,7 +253,7 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 9)]
-        public DataSourceTypeSensors PL1PLLineOffsetBelowShoulderBaseInside { get; set; }
+        public DataSourceTypeSensors SourceTypePl1PLLineOffsetBelowShoulderBaseInside { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 PL line offset below dike toe at polder data source type.
@@ -263,7 +263,7 @@
         /// </value>
         [Specification(typeof(IgnoreOrLocationData))]
         [PropertyOrder(1, 10)]
-        public DataSourceTypeSensors PL1PLLineOffsetBelowDikeToeAtPolder { get; set; }
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeToeAtPolder { get; set; }
 
         /// <summary>
         /// Gets or sets the PL1 polder level data source type.
@@ -391,14 +391,14 @@
 
         internal static class MemberNames
         {
-            internal static readonly string OffsetBelowDikeToeAtPolder = StaticReflection.GetMemberName<SensorLocation>(x => x.PL1PLLineOffsetBelowDikeToeAtPolder);
-            internal static readonly string OffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName<SensorLocation>(x => x.PL1PLLineOffsetBelowDikeTopAtPolder);
-            internal static readonly string OffsetBelowDikeTopAtRiver = StaticReflection.GetMemberName<SensorLocation>(x => x.PL1PLLineOffsetBelowDikeTopAtRiver);
-            internal static readonly string OffsetBelowShoulderBaseInside = StaticReflection.GetMemberName<SensorLocation>(x => x.PL1PLLineOffsetBelowShoulderBaseInside);
-            internal static readonly string WaterLevelAtRiver = StaticReflection.GetMemberName<SensorLocation>(x => x.PL1WaterLevelAtRiver);
+            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 WaterLevelAtRiver = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1WaterLevelAtRiver);
             internal static readonly string PolderLevel = StaticReflection.GetMemberName<SensorLocation>(x => x.PL1WaterLevelAtPolder);
-            internal static readonly string PL3 = StaticReflection.GetMemberName<SensorLocation>(x => x.PL3);
-            internal static readonly string PL4 = StaticReflection.GetMemberName<SensorLocation>(x => x.PL4);
+            internal static readonly string PL3 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl3);
+            internal static readonly string PL4 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl4);
         }
 
         public double? GetValue(Expression<Func<SensorLocation, object>> expression, IDictionary<Sensor,double> sensorValues, Sensor sensor)
@@ -413,34 +413,34 @@
 
             if (memberName == MemberNames.OffsetBelowDikeToeAtPolder)
             {
-                if (PL1PLLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1PlLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData)
                     return Location.PlLineOffsetBelowDikeToeAtPolder;
             }
 
             if (memberName == MemberNames.OffsetBelowDikeTopAtPolder)
             {
-                if (PL1PLLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1PLLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData)
                     return Location.PlLineOffsetBelowDikeTopAtPolder;
             }
 
             if (memberName == MemberNames.OffsetBelowDikeTopAtRiver)
             {
-                if (PL1PLLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1PLLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData)
                     return Location.PlLineOffsetBelowDikeTopAtRiver;
             }
 
             if (memberName == MemberNames.OffsetBelowShoulderBaseInside)
             {
-                if (PL1PLLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1PLLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData)
                     return Location.PlLineOffsetBelowShoulderBaseInside;
             }
 
             if (memberName == MemberNames.WaterLevelAtRiver)
             {
-                if (PL1WaterLevelAtRiver == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.LocationData)
                     return Location.RiverLevel;
 
-                if (PL1WaterLevelAtRiver == DataSourceTypeSensors.Sensor)
+                if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.Sensor)
                     return sensorValues[sensor];
             }
 
@@ -455,19 +455,19 @@
 
             if (memberName == MemberNames.PL3)
             {
-                if (PL3 == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl3 == DataSourceTypeSensors.LocationData)
                     return Location.HeadPl3;
 
-                if (PL3 == DataSourceTypeSensors.Sensor)
+                if (SourceTypePl3 == DataSourceTypeSensors.Sensor)
                     return sensorValues[sensor];
             }
 
             if (memberName == MemberNames.PL4)
             {
-                if (PL4 == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl4 == DataSourceTypeSensors.LocationData)
                     return Location.HeadPl4;
 
-                if (PL4 == DataSourceTypeSensors.Sensor)
+                if (SourceTypePl4 == DataSourceTypeSensors.Sensor)
                     return sensorValues[sensor];
             }
 
Index: DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs
===================================================================
diff -u -r1598 -r1603
--- DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1603)
@@ -467,14 +467,14 @@
                 var sensorLocation = location.SensorLocation;
                 sensorLocation.Group.ID = record.GroupID;
                 sensorLocation.Alias = record.Alias;
-                sensorLocation.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
-                sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
-                sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
-                sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
-                sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
+                sensorLocation.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
+                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
+                sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
+                sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
                 sensorLocation.PL1WaterLevelAtPolder = record.InputPL1PolderLevel;
-                sensorLocation.PL3 = record.InputPL3;
-                sensorLocation.PL4 = record.InputPL4;
+                sensorLocation.SourceTypePl3 = record.InputPL3;
+                sensorLocation.SourceTypePl4 = record.InputPL4;
             }
             catch (Exception e)
             {
Index: DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs
===================================================================
diff -u -r1598 -r1603
--- DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1603)
@@ -271,42 +271,42 @@
             var repository = new SensorRepository(location0);
             repository.Add(new[] { sensor1, sensor2, sensor3, sensor4, sensor5, sensor6, sensor7 });
             var sensorLocation = location0.SensorLocation;
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
             sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
-            sensorLocation.PL3 = DataSourceTypeSensors.Sensor;
-            sensorLocation.PL4 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location0.Name = "dwp 31,5";
 
             var location1 = locations[1];
             repository = new SensorRepository(location1);
             repository.Add(new[] { sensor1, sensor8, sensor9, sensor10 });
             sensorLocation = location1.SensorLocation;
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
             sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
-            sensorLocation.PL3 = DataSourceTypeSensors.Sensor;
-            sensorLocation.PL4 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location1.Name = "dwp 34,0";
 
             var location2 = locations[2];
             repository = new SensorRepository(location2);
             repository.Add(new[] { sensor1, sensor11, sensor12, sensor13, sensor14, sensor15 });
             sensorLocation = location2.SensorLocation;
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
             sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
-            sensorLocation.PL3 = DataSourceTypeSensors.Sensor;
-            sensorLocation.PL4 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
             //location2.Name = "dwp 37,0";            
 
             #endregion
Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs
===================================================================
diff -u -r874 -r1603
--- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs	(.../SensorPLLine1Creator.cs)	(revision 874)
+++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs	(.../SensorPLLine1Creator.cs)	(revision 1603)
@@ -60,29 +60,29 @@
 
             // insert offset below dike top at river point?
             var useLocationAsDataSource = new UseLocationAsDataSource();
-            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver))
+            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.PL1PLLineOffsetBelowDikeTopAtPolder))
+            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.PL1PLLineOffsetBelowShoulderBaseInside))
+            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside))
             {
                 double offset = lastZ = ZShouldeBaseInside - SensorLocation.PLLineOffsetDryBelowShoulderBaseInside;
                 lineConstructor.Insert(new PLLinePoint(XShoulderBaseInside, offset));
             }
 
             // insert offset below dike toe at river?
-            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder))
+            if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder))
             {
                 double offset = lastZ = ZDikeToeAtPolder - SensorLocation.PLLineOffsetBelowDikeToeAtPolder;
                 var x = XDikeToeAtPolder;
@@ -114,7 +114,7 @@
             {
                 double depth = lastZ;
                 double xLocation = XDikeToeAtPolder;
-                if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder))
+                if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder))
                 {
                     depth = ZDikeToeAtPolder - SensorLocation.PLLineOffsetBelowDikeToeAtPolder;
                     
@@ -249,7 +249,7 @@
                     throw new PLLinesCreatorException("There are multiple or no water level sensors defined.", e);
                 }
 
-                var value = SensorLocation.GetValue(x => x.PL1WaterLevelAtRiver, SensorValues, sensor);
+                var value = SensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, SensorValues, sensor);
                 if (value.HasValue)
                     return value.Value;
 
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r1598 -r1603
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1603)
@@ -56,7 +56,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();            
@@ -70,7 +70,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -84,7 +84,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -140,7 +140,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL3 = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -154,7 +154,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL3 = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -183,7 +183,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL4 = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -197,7 +197,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL4 = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -211,7 +211,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL4 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -225,7 +225,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -239,7 +239,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -253,7 +253,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -267,7 +267,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -281,7 +281,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -295,7 +295,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -309,7 +309,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -323,7 +323,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -337,7 +337,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -351,7 +351,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -365,7 +365,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -379,7 +379,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -398,14 +398,14 @@
                 {
                     Group = null,
                     Location = location1,
-                    PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
-                    PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
-                    PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
-                    PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
-                    PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
                     PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
-                    PL3 = DataSourceTypeSensors.LocationData,
-                    PL4 = DataSourceTypeSensors.LocationData
+                    SourceTypePl3 = DataSourceTypeSensors.LocationData,
+                    SourceTypePl4 = DataSourceTypeSensors.LocationData
                 };
 
                 // call
@@ -482,10 +482,10 @@
             var sensorValues = new Dictionary<Sensor, double> { {sensor, sensorValue}};
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeToeAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -501,10 +501,10 @@
             var sensorLocation = CreateValidSensorLocation();
             location.PlLineOffsetBelowDikeToeAtPolder = testValue;
 
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeToeAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -519,10 +519,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeToeAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -537,10 +537,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtPolder, 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.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtPolder, 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.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtPolder, 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.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtRiver, 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.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtRiver, 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.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtRiver, 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.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowShoulderBaseInside, 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.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowShoulderBaseInside, 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.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -757,10 +757,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -778,10 +778,10 @@
             location.RiverLevel = testValue;
             Assert.AreEqual(testValue, location.RiverLevel);
 
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -796,10 +796,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, expectedValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(expectedValue, actualValue);
@@ -814,10 +814,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL3 = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL3, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -833,10 +833,10 @@
             var sensorLocation = CreateValidSensorLocation();
 
             location.HeadPl3 = testValue;
-            sensorLocation.PL3 = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL3, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -851,10 +851,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, expectedValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL3 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL3, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(expectedValue, actualValue);
@@ -869,10 +869,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL4 = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL4, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -888,10 +888,10 @@
             var sensorLocation = CreateValidSensorLocation();
 
             location.HeadPl4 = testValue;
-            sensorLocation.PL4 = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL4, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -906,10 +906,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, expectedValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.PL4 = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.PL4, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(expectedValue, actualValue);
Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs
===================================================================
diff -u -r1598 -r1603
--- DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1598)
+++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1603)
@@ -75,13 +75,13 @@
                 {
                     Assert.IsTrue(sensorIds.Contains(sensor.ID), String.Format("Sensor Id {0} not part of expected list", sensor.ID));
                 }
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder);
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver);
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside);
-                Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorLocation.PL1WaterLevelAtRiver);
+                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.PL1WaterLevelAtPolder);
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL3);
-                Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.PL4);
+                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.SourceTypePl3);
+                Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.SourceTypePl4);
                 Assert.AreEqual(-1.33, sensorLocation.PolderLevel, cTolerance);
                 Assert.AreEqual(0.8, sensorLocation.HeadPl3, cTolerance);
                 Assert.AreEqual(0.8, sensorLocation.HeadPl4, cTolerance);