Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs
===================================================================
diff -u -r1630 -r1646
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1630)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 1646)
@@ -279,7 +279,7 @@
             var location0 = locations[0];                     
             var repository = new SensorRepository(location0);
             repository.Add(new[] { sensor1, sensor2, sensor3, sensor4, sensor5, sensor6, sensor7 });
-            var sensorData = location0.SensorData;
+            var sensorData = location0.SensorLocation;
             sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
             sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
             sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
@@ -293,7 +293,7 @@
             var location1 = locations[1];
             repository = new SensorRepository(location1);
             repository.Add(new[] { sensor1, sensor8, sensor9, sensor10 });
-            sensorData = location1.SensorData;
+            sensorData = location1.SensorLocation;
             sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
             sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
             sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
@@ -307,7 +307,7 @@
             var location2 = locations[2];
             repository = new SensorRepository(location2);
             repository.Add(new[] { sensor1, sensor11, sensor12, sensor13, sensor14, sensor15 });
-            sensorData = location2.SensorData;
+            sensorData = location2.SensorLocation;
             sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
             sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
             sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r1634 -r1646
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 1634)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 1646)
@@ -123,7 +123,7 @@
             {
                 var sensorLocation = new Data.Sensors.SensorLocation();
                 sensorLocation.Location = locations.First(l => l.Name.Equals(inputSensorLocation.LocationId));
-                sensorLocation.Location.SensorData = sensorLocation;
+                sensorLocation.Location.SensorLocation = sensorLocation;
                 sensorLocation.Group = sensorData.SensorGroups.First(sg => sg.ID.Equals(inputSensorLocation.GroupId));
                 sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
                 sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r1545 -r1646
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 1545)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 1646)
@@ -232,7 +232,7 @@
         private double scenarioRiverLevel = 0;
         private double? scenarioRiverLevelLow = null;
         private Segment segment;
-        private SensorLocation sensorData;
+        private SensorLocation sensorLocation;
         private double sheetPileLength = 0;
         private GeometryPoint sheetPilePoint = new GeometryPoint();
         private string shoulderEmbankmentMaterial = "";
@@ -291,21 +291,21 @@
         {
             get
             {
-                return sensorData != null;
+                return sensorLocation != null;
             }
         }
 
         [Browsable(false)]
-        public virtual SensorLocation SensorData
+        public virtual SensorLocation SensorLocation
         {
             get
             {
-                return sensorData;
+                return sensorLocation;
             }
             set
             {
-                sensorData = value;
-                sensorData.Location = this;
+                sensorLocation = value;
+                sensorLocation.Location = this;
             }
         }
 
@@ -2982,7 +2982,7 @@
         public void AddNewSensorData()
         {
             var factory = new SensorFactory();
-            SensorData = factory.CreateSensorLocation(this);
+            SensorLocation = factory.CreateSensorLocation(this);
         }
 
         [Validate]
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs
===================================================================
diff -u -r1607 -r1646
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1607)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 1646)
@@ -300,7 +300,7 @@
 
                 id = record.GroupID;
 
-                var sensorData = location.SensorData;
+                var sensorData = location.SensorLocation;
                 sensorData.Group.ID = record.GroupID;
                 sensorData.Alias = record.Alias;
                 sensorData.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorRepository.cs
===================================================================
diff -u -r1545 -r1646
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 1545)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 1646)
@@ -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();
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u -r1571 -r1646
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1571)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1646)
@@ -789,7 +789,7 @@
             }
             foreach (var location in Locations)
             {
-                var sd = location.SensorData;
+                var sd = location.SensorLocation;
                 
                 foreach (var sensor in sd.Sensors )
                 {