diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index bdaae240f1..f414186d15 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -44,7 +44,7 @@ MODULES		+= modules/sensors
 MODULES		+= drivers/mkblctrl
 MODULES		+= drivers/px4flow
 MODULES		+= drivers/oreoled
-MODULES		+= drivers/servo_gimbal
+MODULES		+= drivers/gimbal
 
 #
 # System commands
diff --git a/src/drivers/servo_gimbal/gimbal.cpp b/src/drivers/gimbal/gimbal.cpp
similarity index 100%
rename from src/drivers/servo_gimbal/gimbal.cpp
rename to src/drivers/gimbal/gimbal.cpp
diff --git a/src/drivers/servo_gimbal/module.mk b/src/drivers/gimbal/module.mk
similarity index 98%
rename from src/drivers/servo_gimbal/module.mk
rename to src/drivers/gimbal/module.mk
index 5699b702ac..cc0a10c6e3 100644
--- a/src/drivers/servo_gimbal/module.mk
+++ b/src/drivers/gimbal/module.mk
@@ -35,7 +35,7 @@
 # Makefile to build the gimbal high-level controller
 #
 
-MODULE_COMMAND	= servo_gimbal
+MODULE_COMMAND	= gimbal
 
 SRCS		= gimbal.cpp