diff --git a/conf/flight_plans/OpenUAS/include_obc2014_mission.xml b/conf/flight_plans/OpenUAS/include_obc2014_mission.xml
index ddb7b9ccfdf..60e14eb6796 100644
--- a/conf/flight_plans/OpenUAS/include_obc2014_mission.xml
+++ b/conf/flight_plans/OpenUAS/include_obc2014_mission.xml
@@ -182,7 +182,7 @@ TST-3 = -26° 35' 23.2" * 151° 50' 45.9"
   <blocks>
     <block name="WaitForGPS" pre_call="NavKillThrottle()" >
       <!-- Do Not Kill -->
-      <handler fun="Fly()"/>
+      <call fun="Fly()"/>
       <!-- IDEA Close the hatch so not able to insert payload before there is a 3D fix , however maybe not so handy anyhow since we need to wat be fre we can insert-->
       <!--  <set value="NavDropCloseHatch" var="unit"/> -->
       <!-- if no valid fix or gps accuracy> 15m or no AHRS , it a no-go wait-->
@@ -201,7 +201,7 @@ TST-3 = -26° 35' 23.2" * 151° 50' 45.9"
 -->
       <!--  TODO Set QNH here based on GPS height if allowed from commitee -->
       <call fun="NavSetAltitudeReferenceHere()" />
-      <handler fun="compute_qnh()"/>
+      <call fun="compute_qnh()"/>
     </block>
 
     <!-- *********** Set the ground reference height and the home position *********** -->
@@ -519,7 +519,7 @@ extern bool_t compute_alignment(uint8_t w1, uint8_t w2, uint8_t start, uint8_t e
     </block>
 
     <block name="Flare">
-      <handler fun="NavKillThrottle()" />
+      <call fun="NavKillThrottle()" />
       <set value="set_airspeed_glide*0.8" var="v_ctl_auto_airspeed_setpoint"/>
       <go approaching_time="0" from="TD" hmode="route" wp="FLARE"/>
       <attitude roll="0.0" pitch="DegOfRad(set_flare_pitch)" throttle="0.0" until="FALSE" vmode="throttle"/>
diff --git a/conf/flight_plans/OpenUAS/include_obc2014_safety.xml b/conf/flight_plans/OpenUAS/include_obc2014_safety.xml
index 8147ad77f18..7e98de8079f 100644
--- a/conf/flight_plans/OpenUAS/include_obc2014_safety.xml
+++ b/conf/flight_plans/OpenUAS/include_obc2014_safety.xml
@@ -87,27 +87,27 @@
     <!-- ******* Activate the irreversible Forced Crash Command to the Flight Termination Device ******** -->
 
     <block name="GeoFence">
-      <handler fun="ForceCrash()"/>
+      <call fun="ForceCrash()"/>
       <circle radius="nav_radius" wp="STDBY"/> <!-- todo add a dynamic TDFORCEDCRASH point so to notify and have it in the log  -->
     </block>
 
     <block name="AlmostHeightViolation">
-      <handler fun="NavKillThrottle()"/>
+      <call fun="NavKillThrottle()"/>
       <circle radius="nav_radius" wp="STDBY"/> <!-- todo add a dynamic TDFORCEDCRASH point so to notify and have it in the log  -->
     </block>
 
     <block name="HeightViolation">
-      <handler fun="ForceCrash()"/>
+      <call fun="ForceCrash()"/>
       <circle radius="nav_radius" wp="STDBY"/> <!-- todo add a dynamic TDFORCEDCRASH point so to notify and have it in the log  -->
     </block>
 
     <block name="DatalinkAndGpsFailure">
-      <handler fun="ForceCrash()"/>
+      <call fun="ForceCrash()"/>
       <circle radius="nav_radius" wp="STDBY"/> <!-- todo add a dynamic TDFORCEDCRASH point so to notify and have it in the log  -->
     </block>
 
     <block name="ManualTerminateRequest" strip_button="FlightTermination" strip_icon="downdownend.png">
-      <handler fun="ForceCrash()"/>
+      <call fun="ForceCrash()"/>
       <circle radius="nav_radius" wp="STDBY"/> <!-- todo add a dynamic TDFORCEDCRASH point so to notify and have it in the log  -->
     </block>
 
diff --git a/conf/flight_plans/OpenUAS/include_obc2014_testing.xml b/conf/flight_plans/OpenUAS/include_obc2014_testing.xml
index 1a832cd20e9..c654c723204 100644
--- a/conf/flight_plans/OpenUAS/include_obc2014_testing.xml
+++ b/conf/flight_plans/OpenUAS/include_obc2014_testing.xml
@@ -9,7 +9,7 @@
 
   <blocks>
     <block name="Standby" strip_button="Standby" strip_icon="home.png">
-      <handler fun="Fly()"/>
+      <call fun="Fly()"/>
         <!--   <set value="0" var="ap_state->commands[COMMAND_BRAKE]"/> -->
       <circle alt="WaypointAlt(WP_STDBY)" radius="nav_radius" wp="STDBY"/>
     </block>