diff --git a/os/hal/templates/hal_lld.h b/os/hal/templates/hal_lld.h
index 8cb098ab6..7f6a7d067 100644
--- a/os/hal/templates/hal_lld.h
+++ b/os/hal/templates/hal_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _HAL_LLD_H_
-#define _HAL_LLD_H_
+#ifndef HAL_LLD_H
+#define HAL_LLD_H
 
 /*===========================================================================*/
 /* Driver constants.                                                         */
@@ -110,6 +110,6 @@ extern "C" {
 }
 #endif
 
-#endif /* _HAL_LLD_H_ */
+#endif /* HAL_LLD_H */
 
 /** @} */
diff --git a/os/sb/host/sb.h b/os/sb/host/sb.h
index 259834e36..df8b82c3c 100644
--- a/os/sb/host/sb.h
+++ b/os/sb/host/sb.h
@@ -19,7 +19,7 @@
 
 /**
  * @file    sb/host/sb.h
- * @brief   ARM sandbox macros and structures.
+ * @brief   ARM SandBox macros and structures.
  *
  * @addtogroup ARM_SANDBOX
  * @{
diff --git a/os/sb/host/sbapi.c b/os/sb/host/sbapi.c
index b50a62b70..526d6918e 100644
--- a/os/sb/host/sbapi.c
+++ b/os/sb/host/sbapi.c
@@ -19,7 +19,7 @@
 
 /**
  * @file    sb/host/sbhost.c
- * @brief   ARM sandbox host API code.
+ * @brief   ARM SandBox host API code.
  *
  * @addtogroup ARM_SANDBOX_HOSTAPI
  * @{
diff --git a/os/sb/host/sbapi.h b/os/sb/host/sbapi.h
index 2d1525c37..db4768d50 100644
--- a/os/sb/host/sbapi.h
+++ b/os/sb/host/sbapi.h
@@ -19,7 +19,7 @@
 
 /**
  * @file    sb/host/sbapi.h
- * @brief   ARM sandbox host API macros and structures.
+ * @brief   ARM SandBox host API macros and structures.
  *
  * @addtogroup ARM_SANDBOX_HOSTAPI
  * @{
diff --git a/os/sb/host/sbhost.c b/os/sb/host/sbhost.c
index d5a29b754..6bd8d61ea 100644
--- a/os/sb/host/sbhost.c
+++ b/os/sb/host/sbhost.c
@@ -19,7 +19,7 @@
 
 /**
  * @file    sb/host/sbhost.c
- * @brief   ARM sandbox host code.
+ * @brief   ARM SandBox host code.
  *
  * @addtogroup ARM_SANDBOX
  * @{
diff --git a/os/sb/host/sbhost.h b/os/sb/host/sbhost.h
index b4239be2d..59fae8109 100644
--- a/os/sb/host/sbhost.h
+++ b/os/sb/host/sbhost.h
@@ -19,7 +19,7 @@
 
 /**
  * @file    sb/host/sbhost.h
- * @brief   ARM sandbox host macros and structures.
+ * @brief   ARM SandBox host macros and structures.
  *
  * @addtogroup ARM_SANDBOX
  * @{
diff --git a/os/sb/host/sbposix.c b/os/sb/host/sbposix.c
index 6a855d2e0..d66ee3ce3 100644
--- a/os/sb/host/sbposix.c
+++ b/os/sb/host/sbposix.c
@@ -19,7 +19,7 @@
 
 /**
  * @file    sb/host/sbposix.c
- * @brief   ARM sandbox host Posix API code.
+ * @brief   ARM SandBox host Posix API code.
  *
  * @addtogroup ARM_SANDBOX_HOSTAPI
  * @{
diff --git a/os/sb/host/sbposix.h b/os/sb/host/sbposix.h
index 1409d1da8..c28c72764 100644
--- a/os/sb/host/sbposix.h
+++ b/os/sb/host/sbposix.h
@@ -19,9 +19,9 @@
 
 /**
  * @file    sb/host/sbposix.h
- * @brief   ARM sandbox host Posix API macros and structures.
+ * @brief   ARM SandBox host Posix API macros and structures.
  *
- * @addtogroup ARM_SANDBOX_POSIX
+ * @addtogroup ARM_SANDBOX_HOSTAPI
  * @{
  */
 
diff --git a/os/sb/user/sbuser.c b/os/sb/user/sbuser.c
index a45ea4e44..09207c78e 100644
--- a/os/sb/user/sbuser.c
+++ b/os/sb/user/sbuser.c
@@ -19,9 +19,9 @@
 
 /**
  * @file    sb/user/sbuser.c
- * @brief   ARMv7-M sandbox user API code.
+ * @brief   ARM SandBox user API code.
  *
- * @addtogroup ARMV7M_SANDBOX_API
+ * @addtogroup ARM_SANDBOX_USER_API
  * @{
  */
 
diff --git a/os/sb/user/sbuser.h b/os/sb/user/sbuser.h
index 6ff282fc2..a0c87afe1 100644
--- a/os/sb/user/sbuser.h
+++ b/os/sb/user/sbuser.h
@@ -19,9 +19,9 @@
 
 /**
  * @file    sb/user/sbapi.h
- * @brief   ARMv7-M sandbox user API macros and structures.
+ * @brief   ARM SandBox user API macros and structures.
  *
- * @addtogroup ARMV7M_SANDBOX_USERAPI
+ * @addtogroup ARM_SANDBOX_USER_API
  * @{
  */