diff --git a/boards/frdm-k64f/board.c b/boards/frdm-k64f/board.c
index c02590bff..5f83cfb68 100644
--- a/boards/frdm-k64f/board.c
+++ b/boards/frdm-k64f/board.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_frdm-k64f
+ * @ingroup     boards_frdm-k64f
  * @{
  *
  * @file
diff --git a/boards/frdm-k64f/include/board.h b/boards/frdm-k64f/include/board.h
index 08e5a5e22..ffff7a2be 100644
--- a/boards/frdm-k64f/include/board.h
+++ b/boards/frdm-k64f/include/board.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @defgroup    board_frdm-k64f Freescale FRDM-K64F Board
+ * @defgroup    boards_frdm-k64f Freescale FRDM-K64F Board
  * @ingroup     boards
  * @brief       Board specific implementations for the FRDM-K64F
  * @{
diff --git a/boards/frdm-k64f/include/periph_conf.h b/boards/frdm-k64f/include/periph_conf.h
index 7c28ebf55..2b5e4f2cb 100644
--- a/boards/frdm-k64f/include/periph_conf.h
+++ b/boards/frdm-k64f/include/periph_conf.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_frdm-k64f
+ * @ingroup     boards_frdm-k64f
  * @{
  *
  * @file
diff --git a/boards/mulle/board.c b/boards/mulle/board.c
index b47f1c2af..4d032d758 100644
--- a/boards/mulle/board.c
+++ b/boards/mulle/board.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     board_mulle
+ * @ingroup     boards_mulle
  * @{
  *
  * @file
diff --git a/boards/mulle/include/board.h b/boards/mulle/include/board.h
index 70f6efb4a..318d3e6e3 100644
--- a/boards/mulle/include/board.h
+++ b/boards/mulle/include/board.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup    board_mulle Eistec Mulle
+ * @defgroup    boards_mulle Eistec Mulle
  * @ingroup     boards
  * @brief       Board specific files for Eistec Mulle IoT boards
  * @{
diff --git a/boards/mulle/include/mulle-nvram.h b/boards/mulle/include/mulle-nvram.h
index ea63d8586..8455473c7 100644
--- a/boards/mulle/include/mulle-nvram.h
+++ b/boards/mulle/include/mulle-nvram.h
@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 /**
- * @ingroup     board_mulle
+ * @ingroup     boards_mulle
  * @{
  *
  * @file
diff --git a/boards/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h
index dfcb4c42a..dfe87833c 100644
--- a/boards/mulle/include/periph_conf.h
+++ b/boards/mulle/include/periph_conf.h
@@ -9,7 +9,7 @@
 
 
 /**
- * @ingroup     board_mulle
+ * @ingroup     boards_mulle
  * @{
  *
  * @file
diff --git a/boards/nrf6310/board.c b/boards/nrf6310/board.c
index 1f6725bba..48347ce5b 100644
--- a/boards/nrf6310/board.c
+++ b/boards/nrf6310/board.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     board_nrf6310
+ * @ingroup     boards_nrf6310
  * @{
  *
  * @file        board.c
diff --git a/boards/nrf6310/include/board.h b/boards/nrf6310/include/board.h
index 5c3b9b163..10ca769c1 100644
--- a/boards/nrf6310/include/board.h
+++ b/boards/nrf6310/include/board.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup    board_nrf6310 NRF6310 (Nordic NRF Hardware Development Kit)
+ * @defgroup    boards_nrf6310 NRF6310 (Nordic NRF Hardware Development Kit)
  * @ingroup     boards
  * @brief       Board specific files for the nRF51 boards nrf6310 or MOMMOSOFT BLE DEVKIT.N
  * @{
diff --git a/boards/nrf6310/include/periph_conf.h b/boards/nrf6310/include/periph_conf.h
index 3e804fbd7..f2cfa01ff 100644
--- a/boards/nrf6310/include/periph_conf.h
+++ b/boards/nrf6310/include/periph_conf.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     board_nrf6310
+ * @ingroup     boards_nrf6310
  * @{
  *
  * @file
diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h
index 3b0ec59b0..2ea9c9655 100644
--- a/boards/pba-d-01-kw2x/include/board.h
+++ b/boards/pba-d-01-kw2x/include/board.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @defgroup    board_phywave_eval phyWAVE-KW22 Board
+ * @defgroup    boards_pba-d-01-kw2x phyWAVE-KW22 Board
  * @ingroup     boards
  * @brief       Board specific implementations for the phyWAVE evaluation board
  * @{
diff --git a/boards/pba-d-01-kw2x/include/periph_conf.h b/boards/pba-d-01-kw2x/include/periph_conf.h
index 5d5b111a8..ce8721edb 100644
--- a/boards/pba-d-01-kw2x/include/periph_conf.h
+++ b/boards/pba-d-01-kw2x/include/periph_conf.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_pba-d-01-kw2x
+ * @ingroup     boards_pba-d-01-kw2x
  * @{
  *
  * @file