diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000000000000000000000000000000000000..432d41dd0eb6d0b5e8183fc817b44ddd0dec3023
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/home/alberton/Qt/5.15.2/gcc_64/include/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++17",
+            "intelliSenseMode": "linux-gcc-x64"
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index c067a4b2f2fac4b04bab233e7cf05ed1e13d6fce..0000000000000000000000000000000000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "cSpell.words": [
-        "mavlink"
-    ]
-}
\ No newline at end of file
diff --git a/Modules/Mavlink/mavlink_skyward_lib b/Modules/Mavlink/mavlink_skyward_lib
index 96329687cd3f44837978a91f94c84bf0a65e0d0b..4439d36371e8f39fb5a377774371b5ffa0a5fc11 160000
--- a/Modules/Mavlink/mavlink_skyward_lib
+++ b/Modules/Mavlink/mavlink_skyward_lib
@@ -1 +1 @@
-Subproject commit 96329687cd3f44837978a91f94c84bf0a65e0d0b
+Subproject commit 4439d36371e8f39fb5a377774371b5ffa0a5fc11
diff --git a/Modules/Mavlink/mavlinkcommandadapter.cpp b/Modules/Mavlink/mavlinkcommandadapter.cpp
index ba0e1c113d732cc900f248990d6e37c27c82f4da..55f885c557e4c440ca3f0e59d67677f8864c8d5a 100644
--- a/Modules/Mavlink/mavlinkcommandadapter.cpp
+++ b/Modules/Mavlink/mavlinkcommandadapter.cpp
@@ -23,10 +23,10 @@ bool MavlinkCommandAdapter::encodeCommand(const ModuleMessage& msg, mavlink_mess
         mavlink_msg_command_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("command_id").getUInteger(0));
         return true;
     } else if(messageName == "SYSTEM_TELEMETRY_REQUEST_TC") {
-        mavlink_msg_system_telemetry_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("tm_id").getUInteger(0));
+        mavlink_msg_system_tm_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("tm_id").getUInteger(0));
         return true;
     } else if(messageName == "SENSOR_TELEMETRY_REQUEST_TC") {
-        mavlink_msg_sensor_telemetry_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("sensor_id").getUInteger(0));
+        mavlink_msg_sensor_tm_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("sensor_id").getUInteger(0));
         return true;
     } else if(messageName == "SET_SERVO_ANGLE_TC") {
         mavlink_msg_set_servo_angle_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("servo_id").getUInteger(0), msg.getField("angle").getDouble(0.0));