diff --git a/cpu/arm7_common/arm_cpu.c b/cpu/arm7_common/arm_cpu.c
index c95852680f333c1048c89c7020b65237a1974bf7..ec60c8660b8bf4336e88fb59f2ccb2a3c9f6983f 100644
--- a/cpu/arm7_common/arm_cpu.c
+++ b/cpu/arm7_common/arm_cpu.c
@@ -8,7 +8,7 @@
  * General Public License v2.1. See the file LICENSE in the top level
  * directory for more details.
  *
- * @ingroup arm7_common
+ * @ingroup cpu_arm7_common
  * @{
  * @file
  * @author Kaspar Schleiser <kaspar@schleiser.de>
diff --git a/cpu/arm7_common/bootloader.c b/cpu/arm7_common/bootloader.c
index 700b38df4c429c15251b0b9fc3846d8a0676fbd4..0ecf5d59df3d451b63ad5ca1e5f4a90010fede87 100644
--- a/cpu/arm7_common/bootloader.c
+++ b/cpu/arm7_common/bootloader.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     arm7_common
+ * @ingroup     cpu_arm7_common
  * @{
  */
 
diff --git a/cpu/arm7_common/include/VIC.h b/cpu/arm7_common/include/VIC.h
index f293f7d4f2a287de13924dcef1f1fda62e4bafd8..3c0601dc39f0da1ba809ad1604fb44e27dd065ee 100644
--- a/cpu/arm7_common/include/VIC.h
+++ b/cpu/arm7_common/include/VIC.h
@@ -13,7 +13,7 @@ extern "C" {
 #endif
 
 /**
- * @ingroup         arm7_common
+ * @ingroup         cpu_arm7_common
  * @{
  */
 
diff --git a/cpu/arm7_common/include/arm7_common.h b/cpu/arm7_common/include/arm7_common.h
index 6f2379d545b8463c331ed4da74759c216d34a463..8377c079db70975f510b326b2bacabb5392bad92 100644
--- a/cpu/arm7_common/include/arm7_common.h
+++ b/cpu/arm7_common/include/arm7_common.h
@@ -6,11 +6,11 @@
  * more details.
  */
 
-#ifndef __ARM_COMMON_H
-#define __ARM_COMMON_H
+#ifndef ARM7_COMMON_H_
+#define ARM7_COMMON_H_
 
 /**
- * @defgroup    arm7_common ARM CPU common
+ * @defgroup    cpu_arm7_common ARM7 CPU common
  * @brief       Common implementations and headers for ARM based micro-controllers
  * @ingroup     cpu
  * @{
@@ -18,7 +18,7 @@
 
 /**
  * @file
- * @brief       ARM CPU common declarations
+ * @brief       ARM7 CPU common declarations
  *
  * @author      Freie Universität Berlin, Computer Systems & Telematics
  *
@@ -100,4 +100,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif // __ARM_COMMON_H
+#endif /* ARM7_COMMON_H_ */
diff --git a/cpu/arm7_common/panic.c b/cpu/arm7_common/panic.c
index 3f99c50f4c6929809d6b4fb4b8ad1d94488e39bb..93da793dfc9acee24bef93cab1e801d1c59118b8 100644
--- a/cpu/arm7_common/panic.c
+++ b/cpu/arm7_common/panic.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup arm7_common
+ * @ingroup cpu_arm7_common
  * @{
  *
  * @file
diff --git a/cpu/arm7_common/syscalls.c b/cpu/arm7_common/syscalls.c
index 193a68df52b6c28b944f32c0067d59d85a99daf5..bb057712c79531b9a2ee2e37f431dfec300592ec 100644
--- a/cpu/arm7_common/syscalls.c
+++ b/cpu/arm7_common/syscalls.c
@@ -9,7 +9,7 @@
 
 /**
  * @file
- * @ingroup     arm7_common
+ * @ingroup     cpu_arm7_common
  * @brief       LPC2387 NewLib system calls implementation
  *
  * @author      Michael Baar <michael.baar@fu-berlin.de>
diff --git a/cpu/lpc2387/doc/lpc2387.doc b/cpu/lpc2387/doc/lpc2387.doc
index 192bb7d8437eaffb7fcfcda585d53d1a7bf81d82..7a7a7de59ecf00219b0c58d382f795bf1347cb7a 100644
--- a/cpu/lpc2387/doc/lpc2387.doc
+++ b/cpu/lpc2387/doc/lpc2387.doc
@@ -7,7 +7,7 @@
 \li <a href="http://www.nxp.com/pip/LPC2387_2.html">Documentation</a>
 
 <h2>Components</h2>
-\li \ref arm7_common
+\li \ref cpu_arm7_common
 \li \ref lpc2387_rtc
 
 <h2>Memory layout</h2>