diff --git a/doc/sphinx/bsp.md b/doc/sphinx/bsp.md
index ee718788e..74d619e85 100644
--- a/doc/sphinx/bsp.md
+++ b/doc/sphinx/bsp.md
@@ -16,14 +16,12 @@ _api/bsp_gpio
 _api/bsp_i2c
 _api/bsp_ipc
 _api/bsp_lh2
-_api/bsp_motors
 _api/bsp_nvmc
 _api/bsp_partition
 _api/bsp_pwm
 _api/bsp_qdec
 _api/bsp_qspi
 _api/bsp_radio
-_api/bsp_rgbled
 _api/bsp_rng
 _api/bsp_rpm
 _api/bsp_saadc
diff --git a/doc/sphinx/drv.md b/doc/sphinx/drv.md
index 323275360..090bc6017 100644
--- a/doc/sphinx/drv.md
+++ b/doc/sphinx/drv.md
@@ -18,11 +18,13 @@ _api/drv_lis3mdl
 _api/drv_log_flash
 _api/drv_lsm6ds
 _api/drv_lz4
+_api/drv_motors
 _api/drv_move
 _api/drv_n25q128
 _api/drv_ota
 _api/drv_pid
 _api/drv_protocol
+_api/drv_rgbled
 _api/drv_rgbled_pwm
 _api/drv_upgate
 _api/drv_uzlib
diff --git a/doc/sphinx/examples.md b/doc/sphinx/examples.md
index 73a555a1e..5dc1e5561 100644
--- a/doc/sphinx/examples.md
+++ b/doc/sphinx/examples.md
@@ -19,13 +19,11 @@ _examples/01bsp_device
 _examples/01bsp_gpio
 _examples/01bsp_i2c
 _examples/01bsp_lighthouse
-_examples/01bsp_motors
 _examples/01bsp_nvmc
 _examples/01bsp_qdec
 _examples/01bsp_qspi
 _examples/01bsp_radio_txrx_lr
 _examples/01bsp_radio_txrx
-_examples/01bsp_rgbled
 _examples/01bsp_rng
 _examples/01bsp_rpm
 _examples/01bsp_saadc
@@ -52,9 +50,11 @@ _examples/01drv_lis2mdl
 _examples/01drv_lis3mdl
 _examples/01drv_lsm6ds
 _examples/01drv_lz4
+_examples/01drv_motors
 _examples/01drv_move
 _examples/01drv_n25q128
 _examples/01drv_pid
+_examples/01drv_rgbled
 _examples/01drv_rgbled_pwm
 _examples/01drv_uzlib
 ```
diff --git a/drv/motors.h b/drv/motors.h
index d0b81e09b..e17d29e93 100644
--- a/drv/motors.h
+++ b/drv/motors.h
@@ -2,8 +2,8 @@
 #define __MOTORS_H
 
 /**
- * @defgroup    bsp_motors  Motors driver
- * @ingroup     bsp
+ * @defgroup    drv_motors  Motors driver
+ * @ingroup     drv
  * @brief       Control the DC motors
  *
  * @{
diff --git a/drv/rgbled.h b/drv/rgbled.h
index 30931ccac..6a71330ca 100644
--- a/drv/rgbled.h
+++ b/drv/rgbled.h
@@ -2,8 +2,8 @@
 #define __RGBLED_H
 
 /**
- * @defgroup    bsp_rgbled      RGB LED driver
- * @ingroup     bsp
+ * @defgroup    drv_rgbled      RGB LED driver
+ * @ingroup     drv
  * @brief       Control the rgbled driver (through SPI)
  *
  * @{