Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine1Creator.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine1Creator.cs	(.../SensorPlLine1Creator.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine1Creator.cs	(.../SensorPlLine1Creator.cs)	(revision 1602)
@@ -83,29 +83,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;
@@ -137,7 +137,7 @@
             {
                 double depth = lastZ;
                 double xLocation = XDikeToeAtPolder;
-                if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.Pl1PlLineOffsetBelowDikeToeAtPolder))
+                if (useLocationAsDataSource.IsSatisfiedBy(SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder))
                 {
                     depth = ZDikeToeAtPolder - SensorLocation.PlLineOffsetBelowDikeToeAtPolder;
                     
@@ -272,7 +272,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;
 
@@ -291,7 +291,7 @@
                 var sensor = PolderLevelSensor;
                 if (sensor != null)
                 {
-                    var value = SensorLocation.GetValue(x => x.Pl1WaterLevelAtPolder, SensorValues, sensor);
+                    var value = SensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, SensorValues, sensor);
                     if (value.HasValue)
                         return value.Value;
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine4Creator.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine4Creator.cs	(.../SensorPlLine4Creator.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine4Creator.cs	(.../SensorPlLine4Creator.cs)	(revision 1602)
@@ -45,7 +45,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: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r1558 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1558)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1602)
@@ -324,23 +324,23 @@
             }
             foreach (var location in dike.Locations)
             {
-                var sd = location.SensorData;
+                var sensorLocation = location.SensorLocation;
                 
-                foreach (var sensor in sd.Sensors )
+                foreach (var sensor in sensorLocation.Sensors )
                 {
                     if (sensorData.GetSensorById(sensor.ID) == null)
                     {
                         sensorData.Sensors.Add(sensor);
                     }
                 }
-                if (sensorData.GetGroupById(sd.Group.ID) == null && sd.Group.ID >= 0)
+                if (sensorData.GetGroupById(sensorLocation.Group.ID) == null && sensorLocation.Group.ID >= 0)
                 {
-                    sd.Group.PickSensors = sensorData.Sensors;
-                    sensorData.SensorGroups.Add(sd.Group);
+                    sensorLocation.Group.PickSensors = sensorData.Sensors;
+                    sensorData.SensorGroups.Add(sensorLocation.Group);
                 }
-                if (sensorData.GetSensorLocationByLocationName(sd.LocationName) == null)
+                if (sensorData.GetSensorLocationByLocationName(sensorLocation.LocationName) == null)
                 {
-                    sensorData.SensorLocations.Add(sd);
+                    sensorData.SensorLocations.Add(sensorLocation);
                 }
             }            
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r1591 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 1591)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 1602)
@@ -88,7 +88,7 @@
         private double rwBankProtectionBottomLevel;
         private double scenarioRiverLevel;
         private Segment segment;
-        private SensorLocation sensorData;
+        private SensorLocation sensorLocation;
         private double sheetPileLength;
         private string shoulderEmbankmentMaterial = "";
         private double slopeAdaptionEndCotangent = 6.0;
@@ -142,11 +142,11 @@
         /// <value>
         ///   <c>true</c> if this instance has sensor data; otherwise, <c>false</c>.
         /// </value>
-        public bool HasSensorData
+        public bool HasSensorLocation
         {
             get
             {
-                return sensorData != null;
+                return sensorLocation != null;
             }
         }
 
@@ -156,16 +156,16 @@
         /// <value>
         /// The sensor data.
         /// </value>
-        public virtual SensorLocation SensorData
+        public virtual SensorLocation SensorLocation
         {
             get
             {
-                return sensorData;
+                return sensorLocation;
             }
             set
             {
-                sensorData = value;
-                sensorData.Location = this;
+                sensorLocation = value;
+                sensorLocation.Location = this;
             }
         }
 
@@ -1601,7 +1601,7 @@
         public void AddNewSensorData()
         {
             var factory = new SensorFactory();
-            SensorData = factory.CreateSensorLocation(this);
+            SensorLocation = factory.CreateSensorLocation(this);
         }
         /// <summary>
         /// Creates an instance of model parameters for pl lines.
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1602)
@@ -67,10 +67,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);
@@ -86,10 +86,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);
@@ -104,10 +104,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);
@@ -122,10 +122,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);
@@ -141,10 +141,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);
@@ -159,10 +159,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);
@@ -177,10 +177,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);
@@ -196,10 +196,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);
@@ -214,10 +214,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);
@@ -232,10 +232,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);
@@ -251,10 +251,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);
@@ -269,10 +269,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);
@@ -287,10 +287,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.Pl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.Pl1WaterLevelAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -306,10 +306,10 @@
             var sensorLocation = CreateValidSensorLocation();
             location.PolderLevel = testValue;
 
-            sensorLocation.Pl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.Pl1WaterLevelAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -324,10 +324,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, expectedValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.Pl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.Pl1WaterLevelAtPolder, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(expectedValue, actualValue);
@@ -342,10 +342,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);
@@ -363,10 +363,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);
@@ -381,10 +381,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);
@@ -399,10 +399,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);
@@ -418,10 +418,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);
@@ -436,10 +436,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);
@@ -454,10 +454,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);
@@ -473,10 +473,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);
@@ -491,10 +491,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: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1602)
@@ -128,10 +128,10 @@
                 PolderLevel = 1
             };
             location.AddNewSensorData();
-            location.SensorData.Pl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            location.SensorData.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
 
@@ -176,7 +176,7 @@
                                                           {sensor7, 1},
                                                       };
 
-            var sensorLocation = location.SensorData;
+            var sensorLocation = location.SensorLocation;
 
             var creator = new SensorPlLine1Creator(sensorLocation, sensorValues);
 
@@ -237,10 +237,10 @@
                 PolderLevel = polderLevel
             };
             location.AddNewSensorData();
-            location.SensorData.Pl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData;
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            location.SensorData.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
 
@@ -275,7 +275,7 @@
                                                           {sensor4, 1},
                                                       };
 
-            var sensorLocation = location.SensorData;
+            var sensorLocation = location.SensorLocation;
 
             var creator = new SensorPlLine1Creator(sensorLocation, sensorValues);
 
@@ -303,10 +303,10 @@
                 PolderLevel = -1
             };
             location.AddNewSensorData();
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData;
-            location.SensorData.Pl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData;
-            location.SensorData.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);
@@ -339,7 +339,7 @@
                                                           {sensor4, 1},
                                                       };
 
-            var sensorLocation = location.SensorData;
+            var sensorLocation = location.SensorLocation;
 
             var creator = new SensorPlLine1Creator(sensorLocation, sensorValues);
 
@@ -374,7 +374,7 @@
             location.AddNewSensorData();
             location.SurfaceLine = surfaceLine;
 
-            var creator = new SensorPlLine1Creator(location.SensorData, new Dictionary<Sensor, double>());
+            var creator = new SensorPlLine1Creator(location.SensorLocation, new Dictionary<Sensor, double>());
             var actual = creator.GetDitchWaterLevelIntersectionAtXDikeSide(-2.5);
             const double expected = 12.5;
             Assert.AreEqual(expected, actual);
@@ -398,12 +398,12 @@
                 PolderLevel = 1
             };
             location.AddNewSensorData();
-            location.SensorData.Pl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-            location.SensorData.Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-            location.SensorData.Pl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-            location.SensorData.Pl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-            location.SensorData.Pl1WaterLevelAtPolder = 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.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
             // Assert.IsTrue(location.SensorData.IsValid());
 
@@ -446,7 +446,7 @@
                                                           {sensor7, 1},
                                                       };
 
-            var sensorLocation = location.SensorData;
+            var sensorLocation = location.SensorLocation;
             var creator = new SensorPlLine1Creator(sensorLocation, sensorValues);
 
             // call
@@ -500,12 +500,12 @@
                 #region Setup
 
                 location.AddNewSensorData();
-                location.SensorData.Pl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorData.Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorData.Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorData.Pl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
-                location.SensorData.Pl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorData.Pl1WaterLevelAtPolder = 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.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 // Assert.IsTrue(location.SensorData.IsValid());
 
@@ -542,7 +542,7 @@
                                                           {sensor4, 3},
                                                       };
 
-                var sensorLocation = location.SensorData;
+                var sensorLocation = location.SensorLocation;
                 var creator = new SensorPlLine1Creator(sensorLocation, sensorValues);
 
                 #endregion
@@ -598,13 +598,13 @@
                 #region Setup
 
                 location.AddNewSensorData();
-                location.SensorData.Pl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorData.Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
-                location.SensorData.Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
-                location.SensorData.Pl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+                location.SensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore;
 
-                location.SensorData.Pl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-                location.SensorData.Pl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
                 // Assert.IsTrue(location.SensorData.IsValid());
 
@@ -644,7 +644,7 @@
                                                           {sensor5, -1.5}
                                                       };
 
-                var sensorLocation = location.SensorData;
+                var sensorLocation = location.SensorLocation;
 
                 #endregion
 
@@ -690,9 +690,9 @@
             };
             {
                 location.AddNewSensorData();
-                location.SensorData.Pl3 = DataSourceTypeSensors.Sensor;
-                location.SensorData.Pl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-                location.SensorData.Pl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
                 // Assert.IsTrue(location.SensorData.IsValid());
 
@@ -727,7 +727,7 @@
                                                           {sensor7, waterLevel},
                                                       };
 
-                var sensorLocation = location.SensorData;
+                var sensorLocation = location.SensorLocation;
                 var creator = new SensorPlLine3Creator(sensorLocation, sensorValues);
 
                 // call
@@ -766,9 +766,9 @@
             };
             {
                 location.AddNewSensorData();
-                location.SensorData.Pl3 = DataSourceTypeSensors.Sensor;
-                location.SensorData.Pl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
-                location.SensorData.Pl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
+                location.SensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
 
                 // Assert.IsTrue(location.SensorData.IsValid());
 
@@ -803,7 +803,7 @@
                                                           {sensor7, 1},
                                                       };
 
-                var sensorLocation = location.SensorData;
+                var sensorLocation = location.SensorLocation;
                 var creator = new SensorPlLine3Creator(sensorLocation, sensorValues);
 
                 // call
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1602)
@@ -70,8 +70,8 @@
         
         public SensorLocation()
         {
-            Pl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
-            Pl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+            SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+            SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
         }
 
         private Group sensorGroup;
@@ -189,7 +189,7 @@
         /// The Pl3.
         /// </value>
      //   [Specification(typeof(SensorOrLocationData))]
-        public DataSourceTypeSensors Pl3 { get; set; }
+        public DataSourceTypeSensors SourceTypePl3 { get; set; }
 
         /// <summary>
         /// Gets or sets the Pl4 data source type.
@@ -198,7 +198,7 @@
         /// The Pl4.
         /// </value>
      //   [Specification(typeof(SensorOrLocationData))]
-        public DataSourceTypeSensors Pl4 { get; set; }
+        public DataSourceTypeSensors SourceTypePl4 { get; set; }
 
 
         /// <summary>
@@ -208,7 +208,7 @@
         /// The outer water level.
         /// </value>
      //   [Specification(typeof(SensorOrLocationData))]
-        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.
@@ -217,7 +217,7 @@
         /// Data source type for Pl1 PLLine offset below dike top at river.
         /// </value>
  //       [Specification(typeof(IgnoreOrLocationData))]
-        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
@@ -226,7 +226,7 @@
         /// The Pl1 PL line offset below dike top at polder.
         /// </value>
    //     [Specification(typeof(IgnoreOrLocationData))]
-        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
@@ -235,7 +235,7 @@
         /// The Pl1 PL line offset below shoulder base inside.
         /// </value>
      //   [Specification(typeof(IgnoreOrLocationData))]
-        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.
@@ -244,7 +244,7 @@
         /// The Pl1 PL line offset below dike toe at polder.
         /// </value>
         //[Specification(typeof(IgnoreOrLocationData))]
-        public DataSourceTypeSensors Pl1PlLineOffsetBelowDikeToeAtPolder { get; set; }
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeToeAtPolder { get; set; }
 
         /// <summary>
         /// Gets or sets the Pl1 polder level data source type.
@@ -253,7 +253,7 @@
         /// The Pl1 polder level.
         /// </value>
         //[Specification(typeof(SensorOrLocationData))]
-        public DataSourceTypeSensors Pl1WaterLevelAtPolder { get; set; }
+        public DataSourceTypeSensors SourceTypePl1WaterLevelAtPolder { get; set; }
 
         /// <summary>
         /// Gets the sensor count.
@@ -362,14 +362,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 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 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.SourceTypePl1WaterLevelAtPolder);
+            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)
@@ -384,61 +384,61 @@
 
             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];
             }
 
             if (memberName == MemberNames.PolderLevel)
             {
-                if (Pl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData)
+                if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData)
                     return Location.PolderLevel;
 
-                if (Pl1WaterLevelAtPolder == DataSourceTypeSensors.Sensor)
+                if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.Sensor)
                     return sensorValues[sensor];
             }
 
             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: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreator.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreator.cs	(.../SensorPlLineCreator.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreator.cs	(.../SensorPlLineCreator.cs)	(revision 1602)
@@ -76,12 +76,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: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine3Creator.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine3Creator.cs	(.../SensorPlLine3Creator.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLine3Creator.cs	(.../SensorPlLine3Creator.cs)	(revision 1602)
@@ -50,7 +50,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: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1602)
@@ -61,14 +61,14 @@
             {
                 Group = group,
                 Location = location,
-                Pl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
-                Pl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
-                Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
-                Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
-                Pl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
-                Pl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
-                Pl3 = DataSourceTypeSensors.LocationData,
-                Pl4 = DataSourceTypeSensors.LocationData
+                SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
+                SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl3 = DataSourceTypeSensors.LocationData,
+                SourceTypePl4 = DataSourceTypeSensors.LocationData
             };
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/SensorTimeSeriesProcessor.cs
===================================================================
diff -u -r1591 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/SensorTimeSeriesProcessor.cs	(.../SensorTimeSeriesProcessor.cs)	(revision 1591)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/SensorTimeSeriesProcessor.cs	(.../SensorTimeSeriesProcessor.cs)	(revision 1602)
@@ -51,7 +51,7 @@
         private class LocationsWithSensorData : PredicateSpecification<Location>
         {
             public LocationsWithSensorData()
-                : base(l => l.HasSensorData && l.SensorData.SensorCount > 0)
+                : base(l => l.HasSensorLocation && l.SensorLocation.SensorCount > 0)
             {
             }
         }
@@ -405,8 +405,8 @@
             bool isCombined = stabilityParams.IsCombinedBishopUpliftVanCalculation;
 
             var soilGeometry = CalculationHelper.GetSoilGeometryType(location, Path.GetDirectoryName(CalculationParameters.WorkingPath));
-            var sensorSetup = location.SensorData;
-            var lineTypes = location.SensorData.Sensors.SelectMany(s => s.PlLineMappings).Distinct().ToList();
+            var sensorSetup = location.SensorLocation;
+            var lineTypes = location.SensorLocation.Sensors.SelectMany(s => s.PlLineMappings).Distinct().ToList();
             //double waterLevel = sensorSetup.GetWaterLevelAtRiver(sensorValues);
 
             PlLines = CreateAllPlLines(sensorValues, sensorSetup, lineTypes);
@@ -437,15 +437,15 @@
         /// Creates all the PL lines from the specified sensor values.
         /// </summary>
         /// <param name="sensorValues">The sensor values.</param>
-        /// <param name="sensorSetup">The sensor setup.</param>
+        /// <param name="sensorLocation">The sensor setup.</param>
         /// <param name="lineTypes">The line types.</param>
         /// <param name="PlLines">The pl lines.</param>
         /// <returns></returns>
         /// <exception cref="Deltares.Dam.Data.Sensors.SensorPLLineCreatorException"></exception>
-        private static PlLines CreateAllPlLines(IDictionary<Sensor, double> sensorValues, SensorLocation sensorSetup, IEnumerable<PlLineType> lineTypes)
+        private static PlLines CreateAllPlLines(IDictionary<Sensor, double> sensorValues, SensorLocation sensorLocation, IEnumerable<PlLineType> lineTypes)
         {
             PlLines PlLines;
-            var creator = SensorPlLineCreator.CreateInstance(sensorSetup, sensorValues, lineTypes);
+            var creator = SensorPlLineCreator.CreateInstance(sensorLocation, sensorValues, lineTypes);
             try
             {
                 PlLines = creator.CreateAllPlLines();
@@ -469,7 +469,7 @@
             var firstSeriesEntries = new HashSet<DateTime>();
             bool hasFirstSeriesEntries = false;
 
-            foreach (var sensor in location.SensorData.Sensors)
+            foreach (var sensor in location.SensorLocation.Sensors)
             {
                 IEnumerable<TimeSerie> series = InputTimeSeriesCollection.GetSeriesByLocationId(sensor.Name);
                 ThrowIfSensorNotExists(sensor, series.Any());
@@ -592,7 +592,7 @@
         private void ThrowIfSensorsAreMissingInInputFile(Location location)
         {
             var sensorsNotFound = (
-                                      from sensor in location.SensorData.Sensors
+                                      from sensor in location.SensorLocation.Sensors
                                       let series = InputTimeSeriesCollection.GetSeriesByLocationId(sensor.Name)
                                       where !series.Any()
                                       select sensor.Name).ToList();
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs
===================================================================
diff -u -r1581 -r1602
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 1602)
@@ -39,12 +39,12 @@
 
         public SensorRepository(Location location) : this()
         {            
-            if (location.SensorData == null)
+            if (location.SensorLocation == null)
             {
                 location.AddNewSensorData();
             }
 
-            sensorLocation = location.SensorData;
+            sensorLocation = location.SensorLocation;
 
             if (sensorLocation.Group == null)
                 sensorLocation.Group = new Group();