diff --git a/conf/airframes/CDW/DualBoardApFbw.xml b/conf/airframes/CDW/DualBoardApFbw.xml
index d04473b19e..8a6369ae3c 100644
--- a/conf/airframes/CDW/DualBoardApFbw.xml
+++ b/conf/airframes/CDW/DualBoardApFbw.xml
@@ -123,9 +123,9 @@
   </section>
 
   <section name="GLS_APPROACH" prefix="APP_" >
-    <define name="ANGLE" value="5" />
-    <define name="INTERCEPT_AF_TOD" value="10" />
-    <define name="TARGET_SPEED" value="13" />
+    <define name="ANGLE" value="5" unit="deg"/>
+    <define name="INTERCEPT_AF_SD" value="10" unit="m"/>
+    <define name="TARGET_SPEED" value="13" unit="m/s"/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/examples/MentorEnergy.xml b/conf/airframes/examples/MentorEnergy.xml
index be5c3f9f0c..39c98a1283 100644
--- a/conf/airframes/examples/MentorEnergy.xml
+++ b/conf/airframes/examples/MentorEnergy.xml
@@ -180,9 +180,9 @@
   </section>
 
   <section name="GLS_APPROACH" prefix="APP_">
-    <define name="ANGLE" value="5"/>
-    <define name="INTERCEPT_AF_TOD" value="10"/>
-    <define name="TARGET_SPEED" value="13"/>
+    <define name="ANGLE" value="5" unit="deg"/>
+    <define name="INTERCEPT_AF_SD" value="10" unit="m"/>
+    <define name="TARGET_SPEED" value="13" unit="m/s"/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/examples/Twinstar_energyadaptive.xml b/conf/airframes/examples/Twinstar_energyadaptive.xml
index ee7361ea6a..76c03fec76 100644
--- a/conf/airframes/examples/Twinstar_energyadaptive.xml
+++ b/conf/airframes/examples/Twinstar_energyadaptive.xml
@@ -170,8 +170,8 @@ twog_1.0 + aspirin + ETS baro + ETS speed
 
   <section name="GLS_APPROACH" prefix="APP_">
     <define name="ANGLE" value="10" unit="deg"/>
-    <define name="INTERCEPT_AF_TOD" value="100"/>
-    <define name="TARGET_SPEED" value="13"/>
+    <define name="INTERCEPT_AF_SD" value="100" unit="m"/>
+    <define name="TARGET_SPEED" value="13" unit="m/s"/>
   </section>
 
 <!-- ########################################################################################### -->
diff --git a/conf/airframes/examples/separate_fbw_ap.xml b/conf/airframes/examples/separate_fbw_ap.xml
index e4cf762944..be66561fd3 100644
--- a/conf/airframes/examples/separate_fbw_ap.xml
+++ b/conf/airframes/examples/separate_fbw_ap.xml
@@ -124,9 +124,9 @@
   </section>
 
   <section name="GLS_APPROACH" prefix="APP_" >
-    <define name="ANGLE" value="5" />
-    <define name="INTERCEPT_AF_TOD" value="10" />
-    <define name="TARGET_SPEED" value="13" />
+    <define name="ANGLE" value="5" unit="deg"/>
+    <define name="INTERCEPT_AF_SD" value="10" unit="m"/>
+    <define name="TARGET_SPEED" value="13" unit="m/s"/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">