diff --git a/boards/samr21-xpro/board.c b/boards/samr21-xpro/board.c
index 6d79b2478d..1965454baf 100644
--- a/boards/samr21-xpro/board.c
+++ b/boards/samr21-xpro/board.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     board_samr21-xpro
+ * @ingroup     boards_samr21-xpro
  * @{
  *
  * @file        board.c
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index 8b5f3f604a..7f2c838000 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup    board_samr21-xpro Atmel SAM R21 Xplained Pro
+ * @defgroup    boards_samr21-xpro Atmel SAM R21 Xplained Pro
  * @ingroup     boards
  * @brief       Support for the Atmel SAM R21 Xplained Pro board.
  * @{
@@ -39,7 +39,7 @@ extern "C" {
 
 /**
 * @name AT86RF231 config
-* @{ 
+* @{
 */
 #define AT86RF231_SPI      SPI_0
 #define AT86RF231_CS       GPIO_4
diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h
index 467ec64739..0946adbbd8 100644
--- a/boards/samr21-xpro/include/periph_conf.h
+++ b/boards/samr21-xpro/include/periph_conf.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     board_samr21-xpro
+ * @ingroup     boards_samr21-xpro
  * @{
  *
  * @file