diff --git a/boards/mbed_lpc1768/include/board.h b/boards/mbed_lpc1768/include/board.h
index 2ef6cfb25d658721c633b19178f23fe629cb4e12..4c766b13e7ac54e2d1dc89e5533bc8d44dffb703 100644
--- a/boards/mbed_lpc1768/include/board.h
+++ b/boards/mbed_lpc1768/include/board.h
@@ -33,12 +33,12 @@ extern "C" {
 #endif
 
 /**
- * @name The nominal CPU core clock in this board
+ * @brief The nominal CPU core clock in this board
  */
 #define F_CPU               (96000000)
 
 /**
- * @name Assign the peripheral timer to be used as hardware timer
+ * @brief Assign the peripheral timer to be used as hardware timer
  */
 #define HW_TIMER            TIMER_0
 
@@ -89,7 +89,7 @@ extern "C" {
 /** @} */
 
 /**
- * @name define radio packet length
+ * @brief define radio packet length
  */
 typedef uint8_t radio_packet_length_t;
 
diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h
index 8a8cda4e89baaaa413fb9f74e401ea0b3c9da4ae..5b370c8e1d17cccc93af2e205957d6de080c72b6 100644
--- a/boards/pca10000/include/board.h
+++ b/boards/pca10000/include/board.h
@@ -34,7 +34,7 @@ extern "C" {
 #define F_CPU               (16000000UL)
 
 /**
- * @name Assign the hardware timer
+ * @brief Assign the hardware timer
  */
 #define HW_TIMER            TIMER_0
 
diff --git a/cpu/stm32f1/include/cpu-conf.h b/cpu/stm32f1/include/cpu-conf.h
index d60bafe135bce29f7c17ca45c663c9c9fe9f8b4b..6cbf818b0ca23fb1a293b6c9501ff4cdcd7c3ccb 100644
--- a/cpu/stm32f1/include/cpu-conf.h
+++ b/cpu/stm32f1/include/cpu-conf.h
@@ -20,8 +20,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef __CPU_CONF_H
+#define __CPU_CONF_H
 
 #include "stm32f10x.h"
 
@@ -56,12 +56,12 @@ extern "C" {
 /** @} */
 
 /**
- * @name Length for reading CPU_ID
+ * @brief Length for reading CPU_ID
  */
 #define CPUID_ID_LEN                    (12)
 
 /**
- * @name Definition of different panic modes
+ * @brief Definition of different panic modes
  */
 typedef enum {
     HARD_FAULT,
diff --git a/drivers/include/lps331ap.h b/drivers/include/lps331ap.h
index 9ab54f09cb69c44edd9e0dadb0dcffc8566b3c92..b732fd4ca57521b5b193b1022c71d6b00c5c0903 100644
--- a/drivers/include/lps331ap.h
+++ b/drivers/include/lps331ap.h
@@ -31,7 +31,7 @@ extern "C" {
 #include "periph/i2c.h"
 
  /**
-  * @name The sensors default I2C address
+  * @brief The sensors default I2C address
   */
 #define LPS331AP_DEFAULT_ADDRESS        0x5c
 
diff --git a/drivers/include/rgbled.h b/drivers/include/rgbled.h
index 431a17da4e721a0a104f92c63cff0973a9f40301..f3ea0b3740655e7e578e343311da95448e6a1a60 100644
--- a/drivers/include/rgbled.h
+++ b/drivers/include/rgbled.h
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 /**
- * @name Descriptor struct for rgbleds
+ * @brief Descriptor struct for rgbleds
  */
 typedef struct {
     pwm_t device;
diff --git a/drivers/include/servo.h b/drivers/include/servo.h
index 830b9cdae515c844acf215eb57f47f0bb61a0241..6d0a9d03ccae0e52037b1ec9de02ad81e6fd1ef4 100644
--- a/drivers/include/servo.h
+++ b/drivers/include/servo.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 /**
- * @name Descriptor struct for a servo
+ * @brief Descriptor struct for a servo
  */
 typedef struct {
     pwm_t device;       /**< the PWM device driving the servo */