diff --git a/src/FactSystem/ParameterManager.cc b/src/FactSystem/ParameterManager.cc
index d269ff49f183f88d710a47b5fba247b4d63c5caa..d3684495a6c51354da3bfbc5f3511f3ed088dc4e 100644
--- a/src/FactSystem/ParameterManager.cc
+++ b/src/FactSystem/ParameterManager.cc
@@ -51,11 +51,11 @@ const QHash<int, QString> _mavlinkCompIdHash {
     { MAV_COMP_ID_ADSB,     "ADSB" },
     { MAV_COMP_ID_OSD,      "OSD" },
     { MAV_COMP_ID_FLARM,    "FLARM" },
-    { 171,  "Gimbal2" }, //{ MAV_COMP_ID_GIMBAL2,  "Gimbal2" }, //not yet in the used common.h !!
-    { 172,  "Gimbal3" }, //{ MAV_COMP_ID_GIMBAL3,  "Gimbal3" },
-    { 173,  "Gimbal4" }, //{ MAV_COMP_ID_GIMBAL4,  "Gimbal4" },
-    { 174,  "Gimbal5" }, //{ MAV_COMP_ID_GIMBAL5,  "Gimbal5" },
-    { 175,  "Gimbal6" }, //{ MAV_COMP_ID_GIMBAL6,  "Gimbal6" },
+    { MAV_COMP_ID_GIMBAL2,  "Gimbal2" },
+    { MAV_COMP_ID_GIMBAL3,  "Gimbal3" },
+    { MAV_COMP_ID_GIMBAL4,  "Gimbal4" },
+    { MAV_COMP_ID_GIMBAL5,  "Gimbal5" },
+    { MAV_COMP_ID_GIMBAL6,  "Gimbal6" },
     { MAV_COMP_ID_IMU,      "IMU1" },
     { MAV_COMP_ID_IMU_2,    "IMU2" },
     { MAV_COMP_ID_IMU_3,    "IMU3" },