Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs
===================================================================
diff -u -r1616 -r1617
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1616)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 1617)
@@ -44,7 +44,7 @@
             // TODO: see of these calls can be combined for performance reason
             var id = sensors.GetUniqueID(x => x.ID);
 
-            Sensor sensor = new Sensor { ID = id, Type = SensorType.PiezometricHead };
+            Sensor sensor = new Sensor { ID = id, SensorType = SensorType.PiezometricHead };
             UniqueNameProvider.ProvideUniqueName(new List<Sensor>(sensors), sensor);
 
             return sensor;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs
===================================================================
diff -u -r1122 -r1617
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs	(.../Sensor.cs)	(revision 1122)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs	(.../Sensor.cs)	(revision 1617)
@@ -176,18 +176,18 @@
         /// </value>
         public bool RelativeLocationSpecified { get; private set; } 
 
-        private SensorType type;
+        private SensorType sensorType;
 
         /// <summary>
         /// Gets or sets the type of this sensor.
         /// </summary>
         /// <value>
         /// The type. Default value is PiezoMetricHead.
         /// </value>
-        public SensorType Type
+        public SensorType SensorType
         {
-            get { return type; }
-            set { type = value; }
+            get { return sensorType; }
+            set { sensorType = value; }
         }
 
         /// <summary>
@@ -318,7 +318,7 @@
             var name = string.IsNullOrWhiteSpace(Name) ? "name_not_set" : Name;
 
             return string.Format("[ID: {0}, Name: {1}, Depth: {2}, Type: {3}, RelativeLocation: {4}]", 
-                ID, name, Depth, Type, RelativeLocation);
+                ID, name, Depth, SensorType, RelativeLocation);
         }
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/WaterLevelSensorSpecification.cs
===================================================================
diff -u -r1581 -r1617
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/WaterLevelSensorSpecification.cs	(.../WaterLevelSensorSpecification.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/WaterLevelSensorSpecification.cs	(.../WaterLevelSensorSpecification.cs)	(revision 1617)
@@ -26,7 +26,7 @@
     public class WaterLevelSensorSpecification : PredicateSpecification<Sensor>
     {
         public WaterLevelSensorSpecification() :
-            base(s => s.Type == SensorType.WaterLevel)
+            base(s => s.SensorType == SensorType.WaterLevel)
         {
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/DitchWaterLevelSensorSpecification.cs
===================================================================
diff -u -r1581 -r1617
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/DitchWaterLevelSensorSpecification.cs	(.../DitchWaterLevelSensorSpecification.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/DitchWaterLevelSensorSpecification.cs	(.../DitchWaterLevelSensorSpecification.cs)	(revision 1617)
@@ -29,7 +29,7 @@
         private readonly double xDitchPolderSide;
 
         public DitchWaterLevelSensorSpecification(double xDitchDikeSide, double xDitchPolderSide) :
-            base(s => s.Type == SensorType.PolderLevel)
+            base(s => s.SensorType == SensorType.PolderLevel)
         {
             this.xDitchDikeSide = xDitchDikeSide;
             this.xDitchPolderSide = xDitchPolderSide;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/PiezometricHeadSensorSpecification.cs
===================================================================
diff -u -r1581 -r1617
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/PiezometricHeadSensorSpecification.cs	(.../PiezometricHeadSensorSpecification.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/PiezometricHeadSensorSpecification.cs	(.../PiezometricHeadSensorSpecification.cs)	(revision 1617)
@@ -26,7 +26,7 @@
     internal class  PiezometricHeadSensorSpecification : PredicateSpecification<Sensor>
     {
         public PiezometricHeadSensorSpecification() :
-            base(s => s.Type == SensorType.PiezometricHead)
+            base(s => s.SensorType == SensorType.PiezometricHead)
         {
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/PolderLevelSensorSpecification.cs
===================================================================
diff -u -r1581 -r1617
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/PolderLevelSensorSpecification.cs	(.../PolderLevelSensorSpecification.cs)	(revision 1581)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Specifications/PolderLevelSensorSpecification.cs	(.../PolderLevelSensorSpecification.cs)	(revision 1617)
@@ -26,7 +26,7 @@
     public class PolderLevelSensorSpecification : PredicateSpecification<Sensor>
     {
         public PolderLevelSensorSpecification() :
-            base(s => s.Type == SensorType.PolderLevel)
+            base(s => s.SensorType == SensorType.PolderLevel)
         {
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs
===================================================================
diff -u -r1614 -r1617
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1614)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 1617)
@@ -147,7 +147,7 @@
 
             location.SurfaceLine = surfaceLine;
 
-            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
             var sensor2 = new Sensor { ID = 2, Name = "Test2", Depth = 2, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor3 = new Sensor { ID = 3, Name = "Test3", Depth = 2, RelativeLocation = 104, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor4 = new Sensor { ID = 4, Name = "Test4", Depth = 2, RelativeLocation = 123.3, PlLineMappings = new[] { PlLineType.Pl1 } };
@@ -255,7 +255,7 @@
 
             location.SurfaceLine = surfaceLine;
 
-            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
             var sensor2 = new Sensor { ID = 2, Name = "Test2", Depth = 2, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor3 = new Sensor { ID = 3, Name = "Test3", Depth = 2, RelativeLocation = 104, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor4 = new Sensor { ID = 4, Name = "Test4", Depth = 2, RelativeLocation = 123.3, PlLineMappings = new[] { PlLineType.Pl1 } };
@@ -319,7 +319,7 @@
 
             location.SurfaceLine = surfaceLine;
 
-            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
             var sensor2 = new Sensor { ID = 2, Name = "Test2", Depth = 2, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor3 = new Sensor { ID = 3, Name = "Test3", Depth = 2, RelativeLocation = 104, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor4 = new Sensor { ID = 4, Name = "Test4", Depth = 2, RelativeLocation = 123.3, PlLineMappings = new[] { PlLineType.Pl1 } };
@@ -417,7 +417,7 @@
 
             location.SurfaceLine = surfaceLine;
 
-            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+            var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
             var sensor2 = new Sensor { ID = 2, Name = "Test2", Depth = 2, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor3 = new Sensor { ID = 3, Name = "Test3", Depth = 2, RelativeLocation = 104, PlLineMappings = new[] { PlLineType.Pl1 } };
             var sensor4 = new Sensor { ID = 4, Name = "Test4", Depth = 2, RelativeLocation = 123.3, PlLineMappings = new[] { PlLineType.Pl1 } };
@@ -522,7 +522,7 @@
 
                 location.SurfaceLine = surfaceLine;
 
-                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
                 var sensor2 = new Sensor { ID = 2, Name = "Test2", Depth = 2, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl1 } };
                 var sensor3 = new Sensor { ID = 3, Name = "Test3", Depth = 2, RelativeLocation = 104, PlLineMappings = new[] { PlLineType.Pl1 } };
                 var sensor4 = new Sensor { ID = 4, Name = "Test4", Depth = 2, RelativeLocation = 128, PlLineMappings = new[] { PlLineType.Pl1 } };
@@ -621,11 +621,11 @@
 
                 location.SurfaceLine = surfaceLine;
 
-                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = 2, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
                 var sensor2 = new Sensor { ID = 2, Name = "Test2", Depth = 2, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl1 } };
                 var sensor3 = new Sensor { ID = 3, Name = "Test3", Depth = 2, RelativeLocation = 104, PlLineMappings = new[] { PlLineType.Pl1 } };
                 var sensor4 = new Sensor { ID = 4, Name = "Test4", Depth = 2, RelativeLocation = 128, PlLineMappings = new[] { PlLineType.Pl1 } };
-                var sensor5 = new Sensor { ID = 5, Name = "Test5", Depth = 2, RelativeLocation = 152, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.PolderLevel };
+                var sensor5 = new Sensor { ID = 5, Name = "Test5", Depth = 2, RelativeLocation = 152, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.PolderLevel };
 
                 var repository = new SensorRepository(location);
 
@@ -707,7 +707,7 @@
                 location.SurfaceLine = surfaceLine;
 
 
-                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = waterLevel, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = waterLevel, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
                 var sensor5 = new Sensor { ID = 5, Name = "Test5", Depth = -8, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl3 } };
                 var sensor6 = new Sensor { ID = 6, Name = "Test6", Depth = -8, RelativeLocation = 123.3, PlLineMappings = new[] { PlLineType.Pl3 } };
                 var sensor7 = new Sensor { ID = 7, Name = "Test7", Depth = -8, RelativeLocation = 180, PlLineMappings = new[] { PlLineType.Pl3 } };
@@ -783,7 +783,7 @@
                 location.SurfaceLine = surfaceLine;
 
 
-                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = -0.25, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, Type = SensorType.WaterLevel };
+                var sensor1 = new Sensor { ID = 1, Name = "Test1", Depth = -0.25, RelativeLocation = 50, PlLineMappings = new[] { PlLineType.Pl1 }, SensorType = SensorType.WaterLevel };
                 var sensor5 = new Sensor { ID = 5, Name = "Test5", Depth = -8, RelativeLocation = 90, PlLineMappings = new[] { PlLineType.Pl3 } };
                 var sensor6 = new Sensor { ID = 6, Name = "Test6", Depth = -8, RelativeLocation = 123.3, PlLineMappings = new[] { PlLineType.Pl3 } };
                 var sensor7 = new Sensor { ID = 7, Name = "Test7", Depth = -8, RelativeLocation = 180, PlLineMappings = new[] { PlLineType.Pl3 } };