Index: src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs
===================================================================
diff -u -r408 -r501
--- src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 408)
+++ src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 501)
@@ -31,9 +31,9 @@
 
             PropertyControl.SelectedObject = cpt;
 
-            TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "X [m]");
+            TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "X (RD) [m]");
             TestSpinEditVisibleEnabledValue(PropertyControl, "XEdit", true, true, cpt, c => c.X, 66.6);
-            TestLabelControlVisibleValue(PropertyControl, "ZLabel", true, "Y [m]");
+            TestLabelControlVisibleValue(PropertyControl, "ZLabel", true, "Y (RD) [m]");
             TestSpinEditVisibleEnabledValue(PropertyControl, "ZEdit", true, true, cpt, c => c.Y, 77.7);
             TestLabelControlVisibleValue(PropertyControl, "NameLabel", true, "Naam");
             TestTextEditVisibleEnabledValue(PropertyControl, "NameEdit", true, false, cpt, c => c.Name, "NameTest");
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs
===================================================================
diff -u -r335 -r501
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 335)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 501)
@@ -40,16 +40,16 @@
             TestLabelControlVisibleValue(PropertyControl, "ProbabilityLabel", true, "Kans [-]");
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "XEdit", true, true, profile, p => p.X, 1.0);
-            TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "X [m]");
+            TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "X (RD) [m]");
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "ZEdit", true, true, profile, p => p.Y, 1.0);
-            TestLabelControlVisibleValue(PropertyControl, "ZLabel", true, "Y [m]");
+            TestLabelControlVisibleValue(PropertyControl, "ZLabel", true, "Y (RD) [m]");
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "TopEdit", true, true, profile, p => p.TopLevel, 1.0);
-            TestLabelControlVisibleValue(PropertyControl, "TopLabel", true, "Bovenkant [m]");
+            TestLabelControlVisibleValue(PropertyControl, "TopLabel", true, "Bovenkant [m NAP]");
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "BottomEdit", true, true, profile, p => p.BottomLevel, 1.0);
-            TestLabelControlVisibleValue(PropertyControl, "BottomLabel", true, "Onderkant [m]");
+            TestLabelControlVisibleValue(PropertyControl, "BottomLabel", true, "Onderkant [m NAP]");
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "HeightEdit", true, false, profile, p => p.Height);
             TestLabelControlVisibleValue(PropertyControl, "HeightLabel", true, "Hoogte [m]");
Index: src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs
===================================================================
diff -u -r380 -r501
--- src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 380)
+++ src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 501)
@@ -29,10 +29,10 @@
 
             TestLabelControlVisibleValue(PropertyControl, "XcoordinateLabel", true, "X coordinaat");
             TestSpinEditVisibleEnabledValue(PropertyControl, "XcoordinateEdit", true, true, m, c => c.XCoordinate, 5.5);
-            TestLabelControlVisibleValue(PropertyControl, "MechanismLabel", true, "Mechanisme");
+            TestLabelControlVisibleValue(PropertyControl, "MechanismLabel", true, "Faalmechanisme");
             TestComboBoxVisibleEnabledValue(PropertyControl, "MechanismEdit", true, true, m, c => c.Mechanism, Mechanism.Piping);
 
-            TestLabelControlVisibleValue(PropertyControl, "SoilProfileLabel", true, "Grondprofiel 2D");
+            TestLabelControlVisibleValue(PropertyControl, "SoilProfileLabel", true, "Ondergrondprofiel 2D");
             TestTextEditVisibleEnabledValue(PropertyControl, "SoilProfileEdit", true, false, m, c => c.SoilProfile2D);
         }
 
Index: src/Deltares.DSoilModel.Forms/CPTControl.cs
===================================================================
diff -u -r6 -r501
--- src/Deltares.DSoilModel.Forms/CPTControl.cs	(.../CPTControl.cs)	(revision 6)
+++ src/Deltares.DSoilModel.Forms/CPTControl.cs	(.../CPTControl.cs)	(revision 501)
@@ -24,8 +24,8 @@
             BindSupport.BindTextValueAndUnit(this, ZLabel, ZEdit, typeof(Geotechnics.ConePenetrationTest.ConePenetrationTestData), "Y");
             BindSupport.BindTextAndValue(this, NameLabel, NameEdit, typeof(Geotechnics.ConePenetrationTest.ConePenetrationTestData), "Name");
             BindSupport.BindTextAndValue(this, DescriptionLabel, DescriptionEdit, typeof(Geotechnics.ConePenetrationTest.ConePenetrationTestData), "Description");
-            BindSupport.BindTextAndValue(this, GroundLevelLabel, GroundLevelEdit, typeof(Geotechnics.ConePenetrationTest.ConePenetrationTestData), "GroundLevel");
-            BindSupport.BindTextAndValue(this, PreExcavationLabel, PreExcavationEdit, typeof(Geotechnics.ConePenetrationTest.ConePenetrationTestData), "PreExcavation");
+            BindSupport.BindTextValueAndUnit(this, GroundLevelLabel, GroundLevelEdit, typeof(Geotechnics.ConePenetrationTest.ConePenetrationTestData), "GroundLevel");
+            BindSupport.BindTextValueAndUnit(this, PreExcavationLabel, PreExcavationEdit, typeof(Geotechnics.ConePenetrationTest.ConePenetrationTestData), "PreExcavation");
             BindSupport.Bind<Geotechnics.ConePenetrationTest.ConePenetrationTestData>(this, CptValuesGridControl, p => p.CPTDatarows);
             CptValuesGridControl.ShowToolbar = false;
             IdentificationGroupControl.Text = "IdentificationGroupControl";
Index: src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs
===================================================================
diff -u -r366 -r501
--- src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.cs)	(revision 366)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.cs)	(revision 501)
@@ -32,9 +32,9 @@
 
             PropertyControl.SelectedObject = boring;
 
-            TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "X [m]");
+            TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "X (RD) [m]");
             TestSpinEditVisibleEnabledValue(PropertyControl, "XEdit", true, true, boring, b => b.X, 9.1);
-            TestLabelControlVisibleValue(PropertyControl, "ZLabel", true, "Y [m]");
+            TestLabelControlVisibleValue(PropertyControl, "ZLabel", true, "Y (RD) [m]");
             TestSpinEditVisibleEnabledValue(PropertyControl, "ZEdit", true, true, boring, b => b.Y, 9.2);
             TestLabelControlVisibleValue(PropertyControl, "NameLabel", true, "Naam");
             TestTextEditVisibleEnabledValue(PropertyControl, "NameEdit", true, true, boring, b => b.Name, "NewName");