diff --git a/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java b/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
index 7c04fa4e31..2594fbb7c2 100644
--- a/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
+++ b/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
@@ -715,8 +715,8 @@ public void sendMavlinkMessage(MavlinkMessageWrapper messageWrapper) {
         if (drone == null)
             return;
 
-        message.compid = drone.getCompid();
-        message.sysid = drone.getSysid();
+        message.target_system = drone.getCompid();
+        message.target_component = drone.getSysid();
         drone.getMavClient().sendMavPacket(message.pack());
     }