Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs
===================================================================
diff -u -r578 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs	(.../CalculationHelper.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs	(.../CalculationHelper.cs)	(revision 588)
@@ -161,11 +161,11 @@
                                    {
                                        SafetyFactorZone1A = location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope.Value,
                                        SafetyFactorZone1B = location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope.Value,
-                                       DikeTableHeight = location.SurfaceLine2.GetDefaultDikeTableHeight().Value,
+                                       DikeTableHeight = location.LocalXZSurfaceLine2.GetDefaultDikeTableHeight().Value,
                                        DikeTableWidth = location.ZoneAreaRestSlopeCrestWidth,
-                                       XCoordinateDikeTopAtPolder = location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X,
-                                       XCoordinateDikeTopAtRiver = location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X,
-                                       XCoordinateStartRestProfile = location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X
+                                       XCoordinateDikeTopAtPolder = location.LocalXZSurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X,
+                                       XCoordinateDikeTopAtRiver = location.LocalXZSurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X,
+                                       XCoordinateStartRestProfile = location.LocalXZSurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X
                                    };
 
             // Slip circle definition for Uplift Van; TODO: Combine with code in StabilityCalculation
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
===================================================================
diff -u -r587 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 587)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 588)
@@ -195,7 +195,7 @@
             var plLineCreator = new PLLinesCreator
             {
                 WaterLevelRiverHigh = waterLevel,
-                SurfaceLine = location.SurfaceLine2,
+                SurfaceLine = location.LocalXZSurfaceLine2,
                 WaterLevelPolder = location.PolderLevel,
                 HeadInPLLine2 = location.HeadPl2,
                 HeadInPLLine3 = location.HeadPl3,
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r580 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 580)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 588)
@@ -204,7 +204,7 @@
                 location.PlLineOffsetBelowDikeToeAtPolder = waternetOptions.Pl1BelowToeDikePolderside;
 
                 SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName));
-                location.SurfaceLine2 = surfaceLine;
+                location.LocalXZSurfaceLine2 = surfaceLine;
 
                 if (inputLocation.DesignScenarios != null)
                 {
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r578 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 588)
@@ -175,7 +175,7 @@
                 location.HeadPl2 = 1.0 * i + 0.24;
                 location.HeadPl3 = 1.0 * i + 0.25;
                 location.HeadPl4 = 1.0 * i + 0.21;
-                location.SurfaceLine2 = dike.SurfaceLines2[i];
+                location.LocalXZSurfaceLine2 = dike.SurfaceLines2[i];
                 for (int j = 0; j < 3; j++)
                 {
                     var designScenario = FillDesignScenario((i +1) * (j + 1)); // The parameter factor is used to create unique data for the design scenarios
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r578 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 588)
@@ -73,7 +73,6 @@
         private double levelReductionOutside = 0;
         private PL1Line localXZPL1Line;
         private GeometryPoint localXZSheetPilePoint;
-        private SurfaceLine2 localXzSurfaceLine;
         private string mapForSoilGeometries2D = "";
         private double minimalCircleDepth = 0;
         private ModelFactors modelFactors = new ModelFactors();
@@ -458,21 +457,6 @@
         }
 
         /// <summary>
-        /// Gets or sets the surface line 
-        /// </summary>
-        public virtual SurfaceLine2 SurfaceLine2
-        {
-            get
-            {
-                return surfaceLine2;
-            }
-            set
-            {
-                surfaceLine2 = value;
-            }
-        }
-
-        /// <summary>
         /// 
         /// </summary>
         public virtual double MinimalCircleDepth
@@ -1978,7 +1962,7 @@
                 SoilProfile1D soilProfile1D;
                 if (originalProfile == null)
                 {
-                    soilProfile1D = new SoilProfile1D(SurfaceLine2.Geometry.GetMaxZ(), -10, dikeSoil);
+                    soilProfile1D = new SoilProfile1D(LocalXZSurfaceLine2.Geometry.GetMaxZ(), -10, dikeSoil);
                 }
                 else
                 {
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs
===================================================================
diff -u -r452 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 588)
@@ -266,7 +266,7 @@
 
         public SurfaceLine2 SurfaceLine
         {
-            get { return Location.SurfaceLine2; }
+            get { return Location.LocalXZSurfaceLine2; }
         }
 
         public double RiverLevel
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs
===================================================================
diff -u -r578 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 578)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 588)
@@ -393,11 +393,11 @@
 
             //Add all locations with valid surfaceline
             var newLocations = new List<Location>();
-            newLocations.AddRange(this.Locations.Where(loc => loc.SurfaceLine2 != null));
+            newLocations.AddRange(this.Locations.Where(loc => loc.LocalXZSurfaceLine2 != null));
 
             // Report which locations are not added because no valid surfaceline is found
             var deletedLocations = new List<Location>();
-            deletedLocations.AddRange(this.Locations.Where(loc => loc.SurfaceLine2 == null));
+            deletedLocations.AddRange(this.Locations.Where(loc => loc.LocalXZSurfaceLine2 == null));
             foreach (var deletedLocation in deletedLocations)
             {
                 var locationHasNoSurfaceLine = LocalizationManager.GetTranslatedText(this.GetType(), "LocationHasNoSurfaceLine");
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs
===================================================================
diff -u -r586 -r588
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 586)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 588)
@@ -114,7 +114,7 @@
                 var dikeLengths = new List<double?>();
                 if (Scenario != null && Scenario.Location != null)
                 {
-                    SurfaceLine2 surfaceLine = Scenario.Location.SurfaceLine2;
+                    SurfaceLine2 surfaceLine = Scenario.Location.LocalXZSurfaceLine2;
                     if (surfaceLine != null)
                         dikeLengths.Add(surfaceLine.GetDikeLength());
                 }