diff --git a/.gitmodules b/.gitmodules
index 14ebbcc7e259961aa9036a5ccfe3a5afecb0108f..8d94e67246c0107398855117b3e192edaed08c37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,24 @@
-[submodule "libs/miosix-kernel"]
-	path = libs/miosix-kernel
-	url = ../miosix-kernel.git
-[submodule "libs/tscpp"]
-	path = libs/tscpp
-	url = ../third-party/tscpp.git
-[submodule "libs/mavlink_skyward_lib"]
-	path = libs/mavlink_skyward_lib
-	url = ../mavlink_gs/mavlink_skyward_lib.git
-[submodule "libs/eigen"]
+[submodule "Catch2"]
+	path = libs/Catch2
+	url = ../third-party/Catch2.git
+[submodule "Eigen"]
 	path = libs/eigen
 	url = ../third-party/eigen.git
-[submodule "libs/mxgui"]
-	path = libs/mxgui
-	url = ../third-party/mxgui.git
-[submodule "libs/fmt"]
+[submodule "Modern formatting library"]
 	path = libs/fmt
 	url = ../third-party/fmt.git
-[submodule "libs/Catch2"]
-	path = libs/Catch2
-	url = ../third-party/Catch2.git
-[submodule "libs/miosix-host"]
-	path = libs/miosix-host
-	url = ../miosix-host.git
+[submodule "MAVLink Skyward library"]
+	path = libs/mavlink-skyward-lib
+	url = ../mavlink/mavlink-skyward-lib
+[submodule "Miosix Host"]
+	path = libs/miosix-host
+	url = ../miosix-host.git
+[submodule "Miosix Kernel"]
+	path = libs/miosix-kernel
+	url = ../miosix-kernel.git
+[submodule "Miosix GUI library"]
+	path = libs/mxgui
+	url = ../third-party/mxgui.git
+[submodule "Trivial serialization for C++"]
+	path = libs/tscpp
+	url = ../third-party/tscpp.git
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 5e77e8cd88ceb12f063df6c60b3f9abc5d7c9e4f..d77b06c6888e6b171328204c83a08c347729fc59 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -47,4 +47,4 @@ add_subdirectory(${SBS_BASE}/libs/Catch2 EXCLUDE_FROM_ALL)
 list(APPEND CMAKE_MODULE_PATH ${SBS_BASE}/libs/Catch2/contrib)
 include(Catch)
 
-add_subdirectory(${SBS_BASE}/libs/mavlink_skyward_lib EXCLUDE_FROM_ALL)
+add_subdirectory(${SBS_BASE}/libs/mavlink-skyward-lib EXCLUDE_FROM_ALL)
diff --git a/libs/mavlink-skyward-lib b/libs/mavlink-skyward-lib
new file mode 160000
index 0000000000000000000000000000000000000000..94b57a3b5d5c200e69817066d69bc2e37cf963af
--- /dev/null
+++ b/libs/mavlink-skyward-lib
@@ -0,0 +1 @@
+Subproject commit 94b57a3b5d5c200e69817066d69bc2e37cf963af
diff --git a/libs/mavlink_skyward_lib b/libs/mavlink_skyward_lib
deleted file mode 160000
index e81ebd93ca06167e672486b944334a7b5b34226b..0000000000000000000000000000000000000000
--- a/libs/mavlink_skyward_lib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e81ebd93ca06167e672486b944334a7b5b34226b
diff --git a/scripts/logdecoder/Makefile b/scripts/logdecoder/Makefile
index 2523965cd9ce3b7e20457d7d5c1f047d90386c7c..4f9857ad3fe80b1640b317a05abcedc6a3791dd7 100644
--- a/scripts/logdecoder/Makefile
+++ b/scripts/logdecoder/Makefile
@@ -4,7 +4,7 @@ all:
 	g++ -std=c++17 -O2 -o logdecoder logdecoder.cpp \
 					-DCOMPILE_FOR_X86 \
 					$(BOARDCORE)libs/tscpp/tscpp/stream.cpp \
-	 				-I$(BOARDCORE)libs/mavlink_skyward_lib \
+	 				-I$(BOARDCORE)libs/mavlink-skyward-lib \
 	 				-I$(BOARDCORE)libs/eigen \
 	 				-I$(BOARDCORE)libs/tscpp \
 	 				-I$(BOARDCORE)src/shared
diff --git a/src/entrypoints/imu-calibration.cpp b/src/entrypoints/imu-calibration.cpp
index fbb00378cb7c5c7e0d21d41616847012ce166ad4..6c681ea0eaf784188bceea4c47284471bf1e220d 100644
--- a/src/entrypoints/imu-calibration.cpp
+++ b/src/entrypoints/imu-calibration.cpp
@@ -1,5 +1,5 @@
 /* Copyright (c) 2022 Skyward Experimental Rocketry
- * Authors: Alberto Nidasio
+ * Author: Alberto Nidasio
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/shared/utils/collections/SyncPacketQueue.h b/src/shared/utils/collections/SyncPacketQueue.h
index 3d646d04da08bd600d663c951871e0960ee9b85d..974979585047db698365923d7077444ea6f0d9a5 100644
--- a/src/shared/utils/collections/SyncPacketQueue.h
+++ b/src/shared/utils/collections/SyncPacketQueue.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2019-2022 Skyward Experimental Rocketry
- * Author: Alvise de'Faveri Tron, Davide Mor, Alberto Nidasio
+ * Authors: Alvise de'Faveri Tron, Davide Mor, Alberto Nidasio
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal