Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs
===================================================================
diff -u -r1604 -r1609
--- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1604)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs	(.../SensorImportFromExcelSheetTest.cs)	(revision 1609)
@@ -97,7 +97,7 @@
                     Assert.IsTrue(sensorIds.Contains(sensor.ID), String.Format("Sensor Id {0} not part of expected list", sensor.ID));
                 }
                 Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
-                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver);
+                Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver);
                 Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside);
                 Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorData.SourceTypePl1WaterLevelAtRiver);
                 Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.SourceTypePl1WaterLevelAtPolder);
Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r1604 -r1609
--- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1604)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 1609)
@@ -320,7 +320,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -334,7 +334,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -348,7 +348,7 @@
         {
             // setup
             var sensorLocation = CreateValidSensorLocation();
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
             var actual = sensorLocation.IsValid();
@@ -412,7 +412,7 @@
                     SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
                     SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
                     SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
-                    SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
+                    SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
                     SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
                     SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
                     SourceTypePl3 = DataSourceTypeSensors.LocationData,
@@ -603,10 +603,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
@@ -622,10 +622,10 @@
             var sensorLocation = CreateValidSensorLocation();
             location.PlLineOffsetBelowDikeTopAtRiver = testValue;
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.AreEqual(testValue, actualValue);
@@ -640,10 +640,10 @@
             var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
             var sensorLocation = CreateValidSensorLocation();
 
-            sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
+            sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor;
 
             // call
-            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
+            var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor);
 
             // assert            
             Assert.IsNull(actualValue);
Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs
===================================================================
diff -u -r1604 -r1609
--- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1604)
+++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 1609)
@@ -489,7 +489,7 @@
                 sensorData.Group.ID = record.GroupID;
                 sensorData.Alias = record.Alias;
                 sensorData.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
-                sensorData.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
+                sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
                 sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
                 sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
                 sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r1594 -r1609
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 1594)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 1609)
@@ -326,7 +326,7 @@
             BindSupport.Bind<DamProjectData>(this.projectPanel,
                                              designCalculationsControl.Parent, p => p.DesignCalculations);
 
-            this.mainForm.DynamicTableControl.RegisterTable(typeof(Sensor), sensorControl, "Sensor Configuration");
+            this.mainForm.DynamicTableControl.RegisterTable(typeof(Data.Sensors.Sensor), sensorControl, "Sensor Configuration");
             BindSupport.Bind<SensorData>(this.sensorControl, sensorControl, p => p.Sensors);
             BindSupport.Bind<DamProjectData>(this.sensorPanel, sensorControl, p => p.SensorData, BindingType.Assign);
             BindSupport.Bind<DamProjectData>(this.sensorPanel, sensorControl.Parent, p => p.SensorData, BindingType.Visibility);
@@ -336,7 +336,7 @@
             BindSupport.Bind<DamProjectData>(this.sensorPanel, sensorGroupControl, p => p.SensorData, BindingType.Assign);
             BindSupport.Bind<DamProjectData>(this.sensorPanel, sensorGroupControl.Parent, p => p.SensorData, BindingType.Visibility);
 
-            this.mainForm.DynamicTableControl.RegisterTable(typeof(SensorLocation), sensorProfileControl, "Sensor Location Data");
+            this.mainForm.DynamicTableControl.RegisterTable(typeof(Data.Sensors.SensorLocation), sensorProfileControl, "Sensor Location Data");
             BindSupport.Bind<SensorData>(this.sensorProfileControl, sensorProfileControl, p => p.SensorLocations);
             BindSupport.Bind<DamProjectData>(this.sensorPanel, sensorProfileControl, p => p.SensorData, BindingType.Assign);
             BindSupport.Bind<DamProjectData>(this.sensorPanel, sensorProfileControl.Parent, p => p.SensorData, BindingType.Visibility);
@@ -437,7 +437,7 @@
             BindSupport.Assign(this.locationJobPanel, currentLocationJob);
             if (projectData.SensorData != null)
             {
-                SensorLocation.GetGroups = projectData.SensorData.GetGroups;
+                Data.Sensors.SensorLocation.GetGroups = projectData.SensorData.GetGroups;
             }
             // TODO This seems awkward: what is the purpose of assigning DamProjectData to locationJobSymbol, all it uses projectdata for is to fire events...
             this.locationJobSymbol.DamProjectData = projectData;
@@ -1082,9 +1082,9 @@
                 {
                     SelectLocation((Location)sender);
                 }
-                else if (sender is SensorLocation)
+                else if (sender is Data.Sensors.SensorLocation)
                 {
-                    var senderLocation = (SensorLocation)sender;
+                    var senderLocation = (Data.Sensors.SensorLocation)sender;
                     SelectLocation(senderLocation.Location);
                     // Activate any custom property editor for SensorLocation here.
                 }