diff --git a/cpu/cc2538/periph/hwrng.c b/cpu/cc2538/periph/hwrng.c
index bc606e19252dee6fa7bedcaee900740cca2692fc..6d0d9a850b7b0e059bc8ecc615e2370919672599 100644
--- a/cpu/cc2538/periph/hwrng.c
+++ b/cpu/cc2538/periph/hwrng.c
@@ -9,7 +9,7 @@
 
 /**
  * @ingroup     cpu_cc2538
- * @ingroup     drivers_periph_hwng
+ * @ingroup     drivers_periph_hwrng
  * @{
  *
  * @file
diff --git a/cpu/cc26x0/include/cc26x0_i2c.h b/cpu/cc26x0/include/cc26x0_i2c.h
index 2dc2e466d588fccb3f39838e23b372c6833e5a9f..60d84a0b24ceaf75cb0c66759b6b1a4643191d97 100644
--- a/cpu/cc26x0/include/cc26x0_i2c.h
+++ b/cpu/cc26x0/include/cc26x0_i2c.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup         cpu_cc26x0_i2c_definitions
+ * @ingroup         cpu_cc26x0_definitions
  * @{
  *
  * @file
diff --git a/cpu/cc26x0/include/cc26x0_ioc.h b/cpu/cc26x0/include/cc26x0_ioc.h
index e481a7b0233b3d0a8e0daad05ec2f1f4c4e1b29c..2a2e5dec6bdba83965f0dede6949d004cf5cc500 100644
--- a/cpu/cc26x0/include/cc26x0_ioc.h
+++ b/cpu/cc26x0/include/cc26x0_ioc.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup         cpu_cc26x0_ioc_definitions
+ * @ingroup         cpu_cc26x0_definitions
  * @{
  *
  * @file
diff --git a/cpu/cc430/cc430-adc.c b/cpu/cc430/cc430-adc.c
index f1a55a7f49da92e183b11db8dadee3de1aa8b697..3f2aa71c1e5b230fe9c6432baa740f622e7eaa9c 100644
--- a/cpu/cc430/cc430-adc.c
+++ b/cpu/cc430/cc430-adc.c
@@ -34,7 +34,7 @@
  * ************************************************************************************************/
 
 /**
- * @ingroup cc430
+ * @ingroup cpu_cc430
  * @{
  */
 
diff --git a/cpu/cc430/doc.txt b/cpu/cc430/doc.txt
index 42c7a50a1bb0bc4c747fcc31faa3dc75747b5d9c..dcce291c4ad8d78b57ee3038ab93fd35a50332d3 100644
--- a/cpu/cc430/doc.txt
+++ b/cpu/cc430/doc.txt
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup    cc430 TI CC430
+ * @defgroup    cpu_cc430 TI CC430
  * @brief       Texas Instruments CC430 specific code
  * @ingroup     cpu
  */
diff --git a/cpu/cc430/include/cc430-rtc.h b/cpu/cc430/include/cc430-rtc.h
index bbe715334634a5021fff1d949f24c861bca509ff..39fb5a58c6f44426a0a688b44254e2718c63e6a9 100644
--- a/cpu/cc430/include/cc430-rtc.h
+++ b/cpu/cc430/include/cc430-rtc.h
@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 /**
- * @ingroup     cc430
+ * @ingroup     cpu_cc430
  */
 
 /**
diff --git a/cpu/cc430/periph/rtc.c b/cpu/cc430/periph/rtc.c
index 5337c4bf53b2051c5959b6bdfc2b0522c24c9e82..f1efc891f37e8fa0620420168390b6b76a041dce 100644
--- a/cpu/cc430/periph/rtc.c
+++ b/cpu/cc430/periph/rtc.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     cc430
+ * @ingroup     cpu_cc430
  * @ingroup     drivers_periph_rtc
  * @{
  *
diff --git a/cpu/cc430/periph/timer.c b/cpu/cc430/periph/timer.c
index 58f79a8468ce1b300b63144c81579a471234bfa0..9c96c9faeed2d3e5872f2746ab9b991ea4800e3f 100644
--- a/cpu/cc430/periph/timer.c
+++ b/cpu/cc430/periph/timer.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     cc430
+ * @ingroup     cpu_cc430
  * @ingroup     drivers_periph_timer
  * @{
  *
diff --git a/cpu/cortexm_common/panic.c b/cpu/cortexm_common/panic.c
index af158b3de2a59950298e1963d87689560f5862db..f7aa9c6b193f78c36ba2fdccae97788d010ba110 100644
--- a/cpu/cortexm_common/panic.c
+++ b/cpu/cortexm_common/panic.c
@@ -9,7 +9,7 @@
  */
 
 /**
- * @ingroup     cortex-m_common
+ * @ingroup     cpu_cortexm_common
  * @{
  *
  * @file
diff --git a/cpu/efm32/doc.txt b/cpu/efm32/doc.txt
index 86b70aa47d0276f680b83ac61529e09f13a73bec..2983ba3fb97d7b35e76e20fe27ba235b6dda665f 100644
--- a/cpu/efm32/doc.txt
+++ b/cpu/efm32/doc.txt
@@ -1,7 +1,7 @@
 /**
  * @defgroup        cpu_efm32 Silicon Labs EFM32/EFR32/EZR32
  * @ingroup         cpu
- * @brief           Implementation of Silicon Labs's EFM32/EFR32/EZR32 MCUs
+ * @brief           Silicon Labs's EFM32/EFR32/EZR32 MCUs implementation
  *
  * This module contains all code and definitions for the Silicon Labs
  * EFM32/EFR32/EZR32 MCUs. It uses the Gecko SDK (vendor library) for the
@@ -64,3 +64,39 @@
  * The EFM32/EFR32/EZR32 MCUs have support for low-power peripherals. Support
  * is enabled by default, but can be disabled by setting LOW_POWER_ENABLED=0.
  */
+
+/**
+ * @defgroup        cpu_efm32gg Silicon Labs EFM32GG family
+ * @ingroup         cpu_efm32
+ * @brief           Silicon Labs's EFM32GG MCUs family implementation
+ */
+
+/**
+ * @defgroup        cpu_efm32lg Silicon Labs EFM32LG family
+ * @ingroup         cpu_efm32
+ * @brief           Silicon Labs's EFM32LG MCUs family implementation
+ */
+
+/**
+ * @defgroup        cpu_efm32pg1b Silicon Labs EFM32PG1B family
+ * @ingroup         cpu_efm32
+ * @brief           Silicon Labs's EFM32PG1B MCUs family implementation
+ */
+
+/**
+ * @defgroup        cpu_efm32pg12b Silicon Labs EFM32PG12B family
+ * @ingroup         cpu_efm32
+ * @brief           Silicon Labs's EFM32PG12B MCUs family implementation
+ */
+
+/**
+ * @defgroup        cpu_efr32mg1p Silicon Labs EFR32MG1P family
+ * @ingroup         cpu_efm32
+ * @brief           Silicon Labs's EFR32MG1P MCUs family implementation
+ */
+
+/**
+ * @defgroup        cpu_efr32mg12p Silicon Labs EFR32MG12P family
+ * @ingroup         cpu_efm32
+ * @brief           Silicon Labs's EFR32MG12P MCUs family implementation
+ */
\ No newline at end of file
diff --git a/cpu/kinetis/include/vectors_kinetis.h b/cpu/kinetis/include/vectors_kinetis.h
index e546372cbeee25a88a19439850ca9454e09621ac..c14ca73356a45a71a524cfde40c0cd22d490bf2f 100644
--- a/cpu/kinetis/include/vectors_kinetis.h
+++ b/cpu/kinetis/include/vectors_kinetis.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     cpu_k22f
+ * @ingroup     cpu_kinetis
  * @{
  *
  * @file
diff --git a/cpu/kinetis/periph/hwrng.c b/cpu/kinetis/periph/hwrng.c
index 3e409e040eddb180b7ae1162b2121975c3042882..573a80b92c588ae46ec98ebc197b1caa0ef19673 100644
--- a/cpu/kinetis/periph/hwrng.c
+++ b/cpu/kinetis/periph/hwrng.c
@@ -9,7 +9,7 @@
 
 /**
  * @ingroup     cpu_kinetis
- * @ingroup     drivers_periph_hwng
+ * @ingroup     drivers_periph_hwrng
  *
  * @{
  *
diff --git a/cpu/kinetis/periph/i2c.c b/cpu/kinetis/periph/i2c.c
index 4afc994f5858644406e00f3816ead6fad8e43c9b..4470d228f34c7c56cf91b20a2258966af972d044 100644
--- a/cpu/kinetis/periph/i2c.c
+++ b/cpu/kinetis/periph/i2c.c
@@ -9,7 +9,7 @@
  */
 
 /**
- * @ingroup     cpu_kinetis_commo
+ * @ingroup     cpu_kinetis
  * @ingroup     drivers_periph_i2c
  *
  * @note        This driver only implements the 7-bit addressing master mode.
diff --git a/cpu/kinetis/periph/mcg.c b/cpu/kinetis/periph/mcg.c
index 89544fdccaa81d1ab1ed9e89ff8fd38ae6ccdcf5..e8c66f434396bf6040748c1004836f95cf42000b 100644
--- a/cpu/kinetis/periph/mcg.c
+++ b/cpu/kinetis/periph/mcg.c
@@ -9,7 +9,7 @@
 
 /**
  * @ingroup     cpu_kinetis
- * @ingroup     drivers_periph_mcg
+ * @ingroup     cpu_kinetis_mcg
  * @{
  *
  * @file
diff --git a/cpu/kinetis/periph/wdog.c b/cpu/kinetis/periph/wdog.c
index e0c995678a893eb16bac30543f6f9c01330f619a..816b5bd7669cda93000ee2cff3affce41afc50e2 100644
--- a/cpu/kinetis/periph/wdog.c
+++ b/cpu/kinetis/periph/wdog.c
@@ -9,7 +9,7 @@
 
 /**
  * @ingroup     cpu_kinetis
- * @ingroup     drivers_periph_watchdog
+ * @ingroup     cpu_kinetis_wdog
  *
  * @{
  *
diff --git a/cpu/lpc2387/cpu.c b/cpu/lpc2387/cpu.c
index 930fbe03904ae0b0cf9731072fc371bf51a19a98..91e61e58b48bf4cfc2b75f2120d6eb00e106c748 100644
--- a/cpu/lpc2387/cpu.c
+++ b/cpu/lpc2387/cpu.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     lpc2387
+ * @ingroup     cpu_lpc2387
  * @{
  */
 
diff --git a/cpu/lpc2387/doc/lpc2387.doc b/cpu/lpc2387/doc/lpc2387.doc
index 7a7a7de59ecf00219b0c58d382f795bf1347cb7a..0fc952868f7688eb45a34ce18a3e7775708f1fbf 100644
--- a/cpu/lpc2387/doc/lpc2387.doc
+++ b/cpu/lpc2387/doc/lpc2387.doc
@@ -1,6 +1,6 @@
 /**
  * @defgroup lpc2387_intro LPC2387 Introduction
- * @ingroup lpc2387
+ * @ingroup cpu_lpc2387
 
 <h2>First steps</h2>
 \li See the manual for toolchain and ide setup
diff --git a/cpu/lpc2387/include/cpu.h b/cpu/lpc2387/include/cpu.h
index 289dc14b139b79228be11044c439d501bc767858..7a063cfb4b822e089c150c079af0f9fc69237135 100644
--- a/cpu/lpc2387/include/cpu.h
+++ b/cpu/lpc2387/include/cpu.h
@@ -10,7 +10,7 @@
 #define CPU_H
 
 /**
- * @defgroup    lpc2387     NXP LPC2387
+ * @defgroup    cpu_lpc2387     NXP LPC2387
  * @ingroup     cpu
  * @brief       NXP LPC2387 specific code
  * @{
diff --git a/cpu/lpc2387/include/cpu_conf.h b/cpu/lpc2387/include/cpu_conf.h
index 15696ef3a2ce3f2217972921107b1d9425136505..02b22435cf942e3f089df76f2d45efde6a44963f 100644
--- a/cpu/lpc2387/include/cpu_conf.h
+++ b/cpu/lpc2387/include/cpu_conf.h
@@ -15,8 +15,7 @@ extern "C" {
 #endif
 
 /**
- * @ingroup     conf
- * @ingroup     lpc2387
+ * @ingroup     cpu_lpc2387
  *
  * @{
  */
diff --git a/cpu/lpc2387/lpc23xx-iap.c b/cpu/lpc2387/lpc23xx-iap.c
index 6bd41dce6a222adc91896859254b7517369028ed..7f7a8921433ea9d9894783dfd679e2252bea89b7 100644
--- a/cpu/lpc2387/lpc23xx-iap.c
+++ b/cpu/lpc2387/lpc23xx-iap.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup lpc2387
+ * @ingroup cpu_lpc2387
  * @{
  */
 
diff --git a/cpu/mips32r2_common/include/eic_irq.h b/cpu/mips32r2_common/include/eic_irq.h
index dfb5b6e4944e6819d444261909dde03b25ccdb02..27c606def435feec8c37d74b84c5bab24df6540a 100644
--- a/cpu/mips32r2_common/include/eic_irq.h
+++ b/cpu/mips32r2_common/include/eic_irq.h
@@ -7,7 +7,9 @@
  */
 
 /**
- * @ingroup     cpu_mips32r2_commom
+ * @defgroup        cpu_mips32r2_common Imagination Technologies MIPS32R2 Common
+ * @ingroup         cpu
+ * @brief           Imagination Technologies MIPS32R2 Common implementation
  * @{
  *
  * @file
diff --git a/cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c b/cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c
index 4e724bb92b7fea6e770d2816caf1c8c04ca947a1..3f0d7e49a6b0670e628223a0d3975039581fe5e2 100644
--- a/cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c
+++ b/cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c
@@ -7,7 +7,7 @@
  */
 
 /**
-  * @ingroup sys_newlib
+  * @ingroup    sys_newlib
   * @{
   *
   * @file
diff --git a/cpu/mips32r2_generic/include/cpu.h b/cpu/mips32r2_generic/include/cpu.h
index 6c039938ff2c88d896fd74f477d11bd7c40bc224..8b910ba5850c41486d3d08bcf10aa11df4b965f0 100644
--- a/cpu/mips32r2_generic/include/cpu.h
+++ b/cpu/mips32r2_generic/include/cpu.h
@@ -7,9 +7,9 @@
  */
 
 /**
- * @defgroup    cpu_mips32r2_generic Imagination Technologies MIPS32R2 Common
+ * @defgroup    cpu_mips32r2_generic Imagination Technologies MIPS32R2 generic
  * @ingroup     cpu
- * @brief       Imagination Technologies MIPS32R2 common
+ * @brief       Imagination Technologies MIPS32R2 generic
  * @{
  *
  * @file
diff --git a/cpu/msp430fxyz/include/periph_cpu.h b/cpu/msp430fxyz/include/periph_cpu.h
index 9d1e3319f45d6603508bd6328049adfc2a9fa874..36bf7e9e3f598e3959348417672e6042011b6d08 100644
--- a/cpu/msp430fxyz/include/periph_cpu.h
+++ b/cpu/msp430fxyz/include/periph_cpu.h
@@ -7,7 +7,9 @@
  */
 
 /**
- * @ingroup         cpu_msp430fxyz
+ * @defgroup    cpu_msp430fxyz TI MSP430F
+ * @ingroup     cpu
+ * @brief       Texas Instruments MSP430F family specific code
  * @{
  *
  * @file
diff --git a/cpu/nrf51/cpu.c b/cpu/nrf51/cpu.c
index 76316c845df0d86badb10a61deeba03621a1838c..5413305854979659fa4b9e8474f64f2b574a2bc3 100644
--- a/cpu/nrf51/cpu.c
+++ b/cpu/nrf51/cpu.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     cpu_nrf51822
+ * @ingroup     cpu_nrf51
  * @{
  *
  * @file
diff --git a/cpu/nrf51/include/cpu_conf.h b/cpu/nrf51/include/cpu_conf.h
index b5948685a1ab098120773ad288187dd226450da1..1f49e12ef41b1de9237754fe34957590b2ba3c0f 100644
--- a/cpu/nrf51/include/cpu_conf.h
+++ b/cpu/nrf51/include/cpu_conf.h
@@ -7,7 +7,9 @@
  */
 
 /**
- * @ingroup         cpu_nrf51822
+ * @defgroup        cpu_nrf51 Nordic nRF51 MCU
+ * @ingroup         cpu
+ * @brief           Nordic nRF51 family of CPUs
  * @{
  *
  * @file
diff --git a/cpu/nrf51/vectors.c b/cpu/nrf51/vectors.c
index 57eeb18c45c1f922cc19d43b521d8c312536eeb9..a20debc3d3cf2c41599e04dd412e89221a7d8bae 100644
--- a/cpu/nrf51/vectors.c
+++ b/cpu/nrf51/vectors.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     cpu_nrf51822
+ * @ingroup     cpu_nrf51
  * @{
  *
  * @file
diff --git a/cpu/nrf52/include/cpu_conf.h b/cpu/nrf52/include/cpu_conf.h
index 32d9b9da65270e3aae7ffb48da775712c8c1d689..b882321cebc5b05bedde95ea58b5bafd9abd158d 100644
--- a/cpu/nrf52/include/cpu_conf.h
+++ b/cpu/nrf52/include/cpu_conf.h
@@ -7,7 +7,9 @@
  */
 
 /**
- * @ingroup     cpu_nrf52
+ * @defgroup        cpu_nrf52 Nordic nRF52 MCU
+ * @ingroup         cpu
+ * @brief           Nordic nRF52 family of CPUs
  * @{
  *
  * @file
diff --git a/cpu/sam3/vectors.c b/cpu/sam3/vectors.c
index c9dd3c1bb34f384fff29b8720f15281e5ef30019..6c38e400cc64d6f0e6c257bc5b9b8f4fd624a5fd 100644
--- a/cpu/sam3/vectors.c
+++ b/cpu/sam3/vectors.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     cpu_sam3x8e
+ * @ingroup     cpu_sam3
  * @{
  *
  * @file
diff --git a/cpu/sam_common/ldscripts/sam3x8e.ld b/cpu/sam_common/ldscripts/sam3x8e.ld
index 6d3d137c417d31328fbdb118f2aa6ba89fc89280..0a9d6ddc8bf0d52b79544c30f5eac58f9f8bc1f6 100644
--- a/cpu/sam_common/ldscripts/sam3x8e.ld
+++ b/cpu/sam_common/ldscripts/sam3x8e.ld
@@ -7,7 +7,7 @@
  */
 
 /**
- * @addtogroup      cpu_sam3x8e
+ * @addtogroup      cpu_sam3
  * @{
  *
  * @file