diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index 374d7affabeb11459416ebd9f25e4fd706067e0b..067b367e8550186f57195e1dcdadd48e66ec25e7 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -7,7 +7,7 @@
  * General Public License v2.1. See the file LICENSE in the top level
  * directory for more details.
  *
- * @ingroup sys_autoinit
+ * @ingroup sys_auto_init
  * @{
  * @file
  * @brief   initializes any used module that has a trivial init function
diff --git a/sys/auto_init/can/auto_init_can.c b/sys/auto_init/can/auto_init_can.c
index 3005371f861516ac41647bab26c073903a1b668e..3b1844e9816084f9318454a2b6878eefdf270f69 100644
--- a/sys/auto_init/can/auto_init_can.c
+++ b/sys/auto_init/can/auto_init_can.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     sys_autoinit
+ * @ingroup     sys_auto_init
  * @{
  * @file
  * @brief       initializes can device init function
diff --git a/sys/auto_init/can/auto_init_can_native.c b/sys/auto_init/can/auto_init_can_native.c
index 43cd60762826fd77727b2f017e3b3156ab3e1731..320ed576be12f76b26182974646e4afc9a44d1a4 100644
--- a/sys/auto_init/can/auto_init_can_native.c
+++ b/sys/auto_init/can/auto_init_can_native.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     sys_autoinit
+ * @ingroup     sys_auto_init
  * @{
  * @file
  * @brief       initializes native can device
diff --git a/sys/auto_init/netif/auto_init_at86rf2xx.c b/sys/auto_init/netif/auto_init_at86rf2xx.c
index 6f66879aa5314833255d8ab26236bfd7bf5a190b..256733b9e72e27fab3d94be9fc1f1b9f285801ab 100644
--- a/sys/auto_init/netif/auto_init_at86rf2xx.c
+++ b/sys/auto_init/netif/auto_init_at86rf2xx.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_cc110x.c b/sys/auto_init/netif/auto_init_cc110x.c
index 471f6a91c591c0ccf12729827d9a2012018890cb..3378600474399a80504b779b19802c6efb017ce4 100644
--- a/sys/auto_init/netif/auto_init_cc110x.c
+++ b/sys/auto_init/netif/auto_init_cc110x.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_cc2420.c b/sys/auto_init/netif/auto_init_cc2420.c
index d06c66e1787162cfa67c4d1c9a0226b13428e14c..b37f687172585583b8cff3b3c6fdde75c068f947 100644
--- a/sys/auto_init/netif/auto_init_cc2420.c
+++ b/sys/auto_init/netif/auto_init_cc2420.c
@@ -9,7 +9,7 @@
  */
 
 /*
- * @ingroup     auto_init_gnrc_netif
+ * @ingroup     sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_cc2538_rf.c b/sys/auto_init/netif/auto_init_cc2538_rf.c
index 9371b5fbac588e14166851c3f011ef683ce366ce..62b2b0b11e93a67884e6e4b1ac6f282b6fe53405 100644
--- a/sys/auto_init/netif/auto_init_cc2538_rf.c
+++ b/sys/auto_init/netif/auto_init_cc2538_rf.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_enc28j60.c b/sys/auto_init/netif/auto_init_enc28j60.c
index 3d4b9c0beeecbd3bec5129316c337d79480e1c68..0e8c00d28028d4c66bb49aa92bcc4a407afe90e7 100644
--- a/sys/auto_init/netif/auto_init_enc28j60.c
+++ b/sys/auto_init/netif/auto_init_enc28j60.c
@@ -9,7 +9,7 @@
  */
 
 /**
- * @ingroup     auto_init_gnrc_netif
+ * @ingroup     sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_encx24j600.c b/sys/auto_init/netif/auto_init_encx24j600.c
index 83796e800b9b670565414a09056b9a69d90add83..860f2bbcf75c255915ae3eeaed6458b3a480351b 100644
--- a/sys/auto_init/netif/auto_init_encx24j600.c
+++ b/sys/auto_init/netif/auto_init_encx24j600.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_ethos.c b/sys/auto_init/netif/auto_init_ethos.c
index f1d9a317cc581f6711f0141c2c1460ce96a6c70b..65bcd92a414cc34da100959aea9d4277f4bcc982 100644
--- a/sys/auto_init/netif/auto_init_ethos.c
+++ b/sys/auto_init/netif/auto_init_ethos.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_kw2xrf.c b/sys/auto_init/netif/auto_init_kw2xrf.c
index 0c687db3e01a54d82989fcfc95ecfe81607d9fca..adbbc5f23e8c404f6baa918f7d238364ced12418 100644
--- a/sys/auto_init/netif/auto_init_kw2xrf.c
+++ b/sys/auto_init/netif/auto_init_kw2xrf.c
@@ -9,7 +9,7 @@
  */
 
 /*
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_mrf24j40.c b/sys/auto_init/netif/auto_init_mrf24j40.c
index 9b514e4b0a8f7ab4f936a9888ef80dd98a1e244c..32d22fd01efd0b042153a911ddd20f7ea60e130a 100644
--- a/sys/auto_init/netif/auto_init_mrf24j40.c
+++ b/sys/auto_init/netif/auto_init_mrf24j40.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_netdev_tap.c b/sys/auto_init/netif/auto_init_netdev_tap.c
index 1854dc666adbe6cdac098a109eab0fe315f405da..4e4494cad1f90ffa3d8a3eb7e860d2b53ae6ddb8 100644
--- a/sys/auto_init/netif/auto_init_netdev_tap.c
+++ b/sys/auto_init/netif/auto_init_netdev_tap.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_slipdev.c b/sys/auto_init/netif/auto_init_slipdev.c
index 9f6c1b0fc955b6bc80dc1970f534bb87c3de3fef..4d743d832cf6669cd6996c895a889fef358d2621 100644
--- a/sys/auto_init/netif/auto_init_slipdev.c
+++ b/sys/auto_init/netif/auto_init_slipdev.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_socket_zep.c b/sys/auto_init/netif/auto_init_socket_zep.c
index b80457798cda422d6fc9d1effdb6a72ae46b5a66..e086b9e3d90be6f8188f57b746cfdf12cbd40c12 100644
--- a/sys/auto_init/netif/auto_init_socket_zep.c
+++ b/sys/auto_init/netif/auto_init_socket_zep.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup auto_init_gnrc_netif
+ * @ingroup sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_sx127x.c b/sys/auto_init/netif/auto_init_sx127x.c
index 7abf9961a47e0dcd63b123a142d0771ae22f8fe7..f3c97a39c59f63d48fc55487a938be7a2fcbc114 100644
--- a/sys/auto_init/netif/auto_init_sx127x.c
+++ b/sys/auto_init/netif/auto_init_sx127x.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_gnrc_netif
+ * @ingroup     sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_w5100.c b/sys/auto_init/netif/auto_init_w5100.c
index f0ab09f651dacc55626dbb62dc7f0d77123e29ba..efb550b6c012c1491b7e6bcef10b34d17e4375e4 100644
--- a/sys/auto_init/netif/auto_init_w5100.c
+++ b/sys/auto_init/netif/auto_init_w5100.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_gnrc_netif
+ * @ingroup     sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/netif/auto_init_xbee.c b/sys/auto_init/netif/auto_init_xbee.c
index cac098929b8bf1c745851df3778ec078e49c39e4..3c64e2654a2e1442942ba2bca22d0f7ae0ffa6b9 100644
--- a/sys/auto_init/netif/auto_init_xbee.c
+++ b/sys/auto_init/netif/auto_init_xbee.c
@@ -9,7 +9,7 @@
  */
 
 /**
- * @ingroup     auto_init_gnrc_netif
+ * @ingroup     sys_auto_init_gnrc_netif
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_adc.c b/sys/auto_init/saul/auto_init_adc.c
index 5668e3adffcc597d80976cd2894098d999a2013e..9bdfcf784c496f960fca36e62f38a6617b0b3653 100644
--- a/sys/auto_init/saul/auto_init_adc.c
+++ b/sys/auto_init/saul/auto_init_adc.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_adcxx1c.c b/sys/auto_init/saul/auto_init_adcxx1c.c
index a5c1216defdd284fdbd08757c358abe874f8e3b3..fafd3e274f11e417c36013fda46c5f4fe48d87dd 100644
--- a/sys/auto_init/saul/auto_init_adcxx1c.c
+++ b/sys/auto_init/saul/auto_init_adcxx1c.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_ads101x.c b/sys/auto_init/saul/auto_init_ads101x.c
index 46c8cfe772b9c39c729b130551b1ec76c1004240..1178af196e40a150d7a5c6b0f015bfac6018801b 100644
--- a/sys/auto_init/saul/auto_init_ads101x.c
+++ b/sys/auto_init/saul/auto_init_ads101x.c
@@ -9,7 +9,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_adxl345.c b/sys/auto_init/saul/auto_init_adxl345.c
index 7bb9e0d10791c0dd9dcc07acd0afcb957d2ce7e1..705ebfbdf8a400291438a1127e7ea9bf4bb95541 100644
--- a/sys/auto_init/saul/auto_init_adxl345.c
+++ b/sys/auto_init/saul/auto_init_adxl345.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_bmp180.c b/sys/auto_init/saul/auto_init_bmp180.c
index 113110d461cd64e10ad15a7a2f11a6866a3567a0..6f50027b3cb1e84a504e075d387348519fad3232 100644
--- a/sys/auto_init/saul/auto_init_bmp180.c
+++ b/sys/auto_init/saul/auto_init_bmp180.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_bmx055.c b/sys/auto_init/saul/auto_init_bmx055.c
index 62edfa9ebd573c0a4eed20aac3de08fb4561b90c..02c4f65f681d938c77fcbe65e5a38506060fbd02 100644
--- a/sys/auto_init/saul/auto_init_bmx055.c
+++ b/sys/auto_init/saul/auto_init_bmx055.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_bmx280.c b/sys/auto_init/saul/auto_init_bmx280.c
index 3bd0672486aad2aee93a2218a271f863c4f112ac..32d29661d3a4caf6a99ddb95c7be20130449eee3 100644
--- a/sys/auto_init/saul/auto_init_bmx280.c
+++ b/sys/auto_init/saul/auto_init_bmx280.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_dht.c b/sys/auto_init/saul/auto_init_dht.c
index 08175ac71a772465b4172d0964295fdf7bc8c3a8..69577c8cea203e3ff0e92f43ec126337b9f6ca3b 100644
--- a/sys/auto_init/saul/auto_init_dht.c
+++ b/sys/auto_init/saul/auto_init_dht.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_fxos8700.c b/sys/auto_init/saul/auto_init_fxos8700.c
index 3c78b4cb1add99799f8bb615197b16f47919198b..bbcaa1bc3c782815191e35a5f936048e4ee1966c 100644
--- a/sys/auto_init/saul/auto_init_fxos8700.c
+++ b/sys/auto_init/saul/auto_init_fxos8700.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_gpio.c b/sys/auto_init/saul/auto_init_gpio.c
index ed98acf46466a3f01ceec8907e28feb13bb7f6fa..0047986462e287beac1bd370d7e07b9e6060bae2 100644
--- a/sys/auto_init/saul/auto_init_gpio.c
+++ b/sys/auto_init/saul/auto_init_gpio.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_grove_ledbar.c b/sys/auto_init/saul/auto_init_grove_ledbar.c
index 0afa7b4fcfa5c79456a33489b3335a0ccdf8d081..8222b613c0dc0acdf80d8abfe68aac2ba9634ee9 100644
--- a/sys/auto_init/saul/auto_init_grove_ledbar.c
+++ b/sys/auto_init/saul/auto_init_grove_ledbar.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_hdc1000.c b/sys/auto_init/saul/auto_init_hdc1000.c
index 628133365091253489a74b7af4f06f22946bb593..e7aaa853dd620bbfd6679a0adb401069a263a294 100644
--- a/sys/auto_init/saul/auto_init_hdc1000.c
+++ b/sys/auto_init/saul/auto_init_hdc1000.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_hts221.c b/sys/auto_init/saul/auto_init_hts221.c
index 32480a8e4b0066f178f36d5a2103881214666e51..63cc8d3b3189433587b7ad83dc2fba552e5cb347 100644
--- a/sys/auto_init/saul/auto_init_hts221.c
+++ b/sys/auto_init/saul/auto_init_hts221.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_io1_xplained.c b/sys/auto_init/saul/auto_init_io1_xplained.c
index 312804939e6908a2e0675fbd4949b7223ee325d8..296f3b2ef9dd226911c1d2bb1a31f721d27899f8 100644
--- a/sys/auto_init/saul/auto_init_io1_xplained.c
+++ b/sys/auto_init/saul/auto_init_io1_xplained.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_isl29020.c b/sys/auto_init/saul/auto_init_isl29020.c
index 2f0493f873fbc7e227b68f82d0ecb66bb8d84cc1..369be28d741680bfb06d8a1695253a343aedc639 100644
--- a/sys/auto_init/saul/auto_init_isl29020.c
+++ b/sys/auto_init/saul/auto_init_isl29020.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_jc42.c b/sys/auto_init/saul/auto_init_jc42.c
index 0a61afcd50746ee03513457080f43cde099484ce..28c89a94b127a59d8ab6188427801d169293306b 100644
--- a/sys/auto_init/saul/auto_init_jc42.c
+++ b/sys/auto_init/saul/auto_init_jc42.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_l3g4200d.c b/sys/auto_init/saul/auto_init_l3g4200d.c
index ecd3d14656b46876e6e316f37fb3eaa14c2c4099..d23fce657930ef17ee3ccf288a324486f1a7cf16 100644
--- a/sys/auto_init/saul/auto_init_l3g4200d.c
+++ b/sys/auto_init/saul/auto_init_l3g4200d.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_lis2dh12.c b/sys/auto_init/saul/auto_init_lis2dh12.c
index 76113d4c4dff6dafd53e52fa0adae287e8bffb25..789e54075a0a49c5d066904b2f41d5aeae3faea1 100644
--- a/sys/auto_init/saul/auto_init_lis2dh12.c
+++ b/sys/auto_init/saul/auto_init_lis2dh12.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_lis3dh.c b/sys/auto_init/saul/auto_init_lis3dh.c
index a5c796736b702ed3815f5c9dfe59a5f8008f356e..86ff10a61966f7b7602a4f4463dfe5f1249a6759 100644
--- a/sys/auto_init/saul/auto_init_lis3dh.c
+++ b/sys/auto_init/saul/auto_init_lis3dh.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_lis3mdl.c b/sys/auto_init/saul/auto_init_lis3mdl.c
index 9febe34aef209bb95be46d7e194baa54899da244..5c9676d07651b273c72de3cea9ca43bc4f9c4e29 100644
--- a/sys/auto_init/saul/auto_init_lis3mdl.c
+++ b/sys/auto_init/saul/auto_init_lis3mdl.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_lps331ap.c b/sys/auto_init/saul/auto_init_lps331ap.c
index a22d36684e3270da8ee05887e899d5fbe5398415..5d064448882b2f98eef8ea05906f6bc80c1f5a8b 100644
--- a/sys/auto_init/saul/auto_init_lps331ap.c
+++ b/sys/auto_init/saul/auto_init_lps331ap.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_lsm303dlhc.c b/sys/auto_init/saul/auto_init_lsm303dlhc.c
index 8c2bf88b1b52c36cad28b45520d37bbc3b8e60cc..6cf3a30fabb381def3871aa3e78188a748e9df92 100644
--- a/sys/auto_init/saul/auto_init_lsm303dlhc.c
+++ b/sys/auto_init/saul/auto_init_lsm303dlhc.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_lsm6dsl.c b/sys/auto_init/saul/auto_init_lsm6dsl.c
index a8cec21e9194fe78866ffbfef1a3310fc7a3e5ad..170bfe29ea816dc3d9b7c2fca3b32475b2eba7e3 100644
--- a/sys/auto_init/saul/auto_init_lsm6dsl.c
+++ b/sys/auto_init/saul/auto_init_lsm6dsl.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_mag3110.c b/sys/auto_init/saul/auto_init_mag3110.c
index ac08bae1ae752ac12f2aa087d7d15dbb1a0f61a0..b8292c70c5e0eaef863cdf056794db1b7a2883eb 100644
--- a/sys/auto_init/saul/auto_init_mag3110.c
+++ b/sys/auto_init/saul/auto_init_mag3110.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_mma8x5x.c b/sys/auto_init/saul/auto_init_mma8x5x.c
index f5b1b4fa8c6301efa2746d73693680e21735c685..3c39398193648bb2192bac0155a2e8831a4ced3a 100644
--- a/sys/auto_init/saul/auto_init_mma8x5x.c
+++ b/sys/auto_init/saul/auto_init_mma8x5x.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_mpl3115a2.c b/sys/auto_init/saul/auto_init_mpl3115a2.c
index 431c4570e8de87776b904bf19a0bb917830d059d..66830d5c5f11d6df0ca2d662250498b7857af650 100644
--- a/sys/auto_init/saul/auto_init_mpl3115a2.c
+++ b/sys/auto_init/saul/auto_init_mpl3115a2.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_mpu9150.c b/sys/auto_init/saul/auto_init_mpu9150.c
index d3dda29b2b0e748f242eca2f77a0a36a8248e76e..2b62bc1a7810865bb7fcac121402f7aae322bf4a 100644
--- a/sys/auto_init/saul/auto_init_mpu9150.c
+++ b/sys/auto_init/saul/auto_init_mpu9150.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_pulse_counter.c b/sys/auto_init/saul/auto_init_pulse_counter.c
index 897f240f334790bc4a6220951c5caebc1796d7b4..32c52761a4ee63c19aa0334cfd5661369b7bb810 100644
--- a/sys/auto_init/saul/auto_init_pulse_counter.c
+++ b/sys/auto_init/saul/auto_init_pulse_counter.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_si114x.c b/sys/auto_init/saul/auto_init_si114x.c
index f905d33a21207eac1ef9261da9f0a518d71ba4f8..9869b9b3766bef8fc1794d424fab4e37c560963e 100644
--- a/sys/auto_init/saul/auto_init_si114x.c
+++ b/sys/auto_init/saul/auto_init_si114x.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_si70xx.c b/sys/auto_init/saul/auto_init_si70xx.c
index 11783e6c7ad82ea2ce3c01de98056fc2a85ffc69..e433a11e2828667438301b5f8b2f5aeb6641bef9 100644
--- a/sys/auto_init/saul/auto_init_si70xx.c
+++ b/sys/auto_init/saul/auto_init_si70xx.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_tcs37727.c b/sys/auto_init/saul/auto_init_tcs37727.c
index d21417dc32987d8b9011c3fb46f50f41adb14d0b..4d7069027a0d8278376db7be6397df0feb904566 100644
--- a/sys/auto_init/saul/auto_init_tcs37727.c
+++ b/sys/auto_init/saul/auto_init_tcs37727.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_tmp006.c b/sys/auto_init/saul/auto_init_tmp006.c
index fbe75512ae417af617bee768091492d125d64b59..302450199e224f25b1403ea33201926630ad5c31 100644
--- a/sys/auto_init/saul/auto_init_tmp006.c
+++ b/sys/auto_init/saul/auto_init_tmp006.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_tsl2561.c b/sys/auto_init/saul/auto_init_tsl2561.c
index 6a5735c06557f03dfe55ea167f27df6a7271f60f..39809e159b520c86030bcb00c14d46bcb89b8451 100644
--- a/sys/auto_init/saul/auto_init_tsl2561.c
+++ b/sys/auto_init/saul/auto_init_tsl2561.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/saul/auto_init_veml6070.c b/sys/auto_init/saul/auto_init_veml6070.c
index 5e774c93f6cab316e4f9b58aa7c579ccf1b5e0c8..db872c70e64aaaae7349ca3d0beaf5e5f3e84659 100644
--- a/sys/auto_init/saul/auto_init_veml6070.c
+++ b/sys/auto_init/saul/auto_init_veml6070.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_saul
+ * @ingroup     sys_auto_init_saul
  * @{
  *
  * @file
diff --git a/sys/auto_init/storage/auto_init_sdcard_spi.c b/sys/auto_init/storage/auto_init_sdcard_spi.c
index 5c8fd1a86c62e6cd2fadda908d161047bd2b1982..1e57be14e70f46a13c7bea8719d74124a4adbb14 100644
--- a/sys/auto_init/storage/auto_init_sdcard_spi.c
+++ b/sys/auto_init/storage/auto_init_sdcard_spi.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     auto_init_sdcard_spi
+ * @ingroup     sys_auto_init
  * @{
  *
  * @file
diff --git a/sys/fs/devfs/auto_init_devfs.c b/sys/fs/devfs/auto_init_devfs.c
index 011af83d40477d32cb312d5117790c1506c4af2c..5754a2b190834619d2efd768a569a3e7de2e4a11 100644
--- a/sys/fs/devfs/auto_init_devfs.c
+++ b/sys/fs/devfs/auto_init_devfs.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     sys_autoinit
+ * @ingroup     sys_auto_init
  * @{
  *
  * @file
diff --git a/sys/include/auto_init.h b/sys/include/auto_init.h
index c8342ca0cfa41937c04176e3942d92da0e9fac5c..67500bd8e9d091ee6fce3ece5469604c04ebc996 100644
--- a/sys/include/auto_init.h
+++ b/sys/include/auto_init.h
@@ -8,9 +8,8 @@
  * directory for more details.
  */
 
-
 /**
- * @defgroup    sys_autoinit Auto-init
+ * @defgroup    sys_auto_init Auto-init
  * @ingroup     sys
  * @brief       Auto initialize modules
  * @note        This feature can be used by any application by adding auto_init to
@@ -23,7 +22,26 @@
  *              gets called. Be aware that most modules expect to be
  *              initialized only once, so do not call a module's init function
  *              when using auto_init unless you know what you're doing.
+ */
+
+/**
+ * @defgroup    sys_auto_init_saul SAUL drivers auto-initialization
+ * @ingroup     sys_auto_init
+ * @brief       Provides auto-initialization of SAUL drivers
  *
+ * @see @ref drivers_saul
+ */
+
+/**
+ * @defgroup    sys_auto_init_gnrc_netif GNRC netif drivers auto-initialization
+ * @ingroup     sys_auto_init
+ * @brief       Provides auto-initialization of
+ * [network device drivers](@ref drivers_netdev) via GNRC
+ *
+ * @see @ref net_gnrc_netif
+ */
+
+/**
  * @{
  *
  * @file