diff --git a/os/hal/templates/hal_adc_lld.c b/os/hal/templates/hal_adc_lld.c
index 7490487ee..116654072 100644
--- a/os/hal/templates/hal_adc_lld.c
+++ b/os/hal/templates/hal_adc_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    adc_lld.c
+ * @file    hal_adc_lld.c
  * @brief   PLATFORM ADC subsystem low level driver source.
  *
  * @addtogroup ADC
diff --git a/os/hal/templates/hal_adc_lld.h b/os/hal/templates/hal_adc_lld.h
index 90a6cd56b..5701e143b 100644
--- a/os/hal/templates/hal_adc_lld.h
+++ b/os/hal/templates/hal_adc_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    adc_lld.h
+ * @file    hal_adc_lld.h
  * @brief   PLATFORM ADC subsystem low level driver header.
  *
  * @addtogroup ADC
  * @{
  */
 
-#ifndef _ADC_LLD_H_
-#define _ADC_LLD_H_
+#ifndef HAL_ADC_LLD_H
+#define HAL_ADC_LLD_H
 
 #if (HAL_USE_ADC == TRUE) || defined(__DOXYGEN__)
 
@@ -206,6 +206,6 @@ extern "C" {
 
 #endif /* HAL_USE_ADC == TRUE */
 
-#endif /* _ADC_LLD_H_ */
+#endif /* HAL_ADC_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_can_lld.c b/os/hal/templates/hal_can_lld.c
index f8d0ada4e..fedce5bdf 100644
--- a/os/hal/templates/hal_can_lld.c
+++ b/os/hal/templates/hal_can_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    can_lld.c
+ * @file    hal_can_lld.c
  * @brief   PLATFORM CAN subsystem low level driver source.
  *
  * @addtogroup CAN
diff --git a/os/hal/templates/hal_can_lld.h b/os/hal/templates/hal_can_lld.h
index 0bd4d95b2..14e631a1b 100644
--- a/os/hal/templates/hal_can_lld.h
+++ b/os/hal/templates/hal_can_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    can_lld.h
+ * @file    hal_can_lld.h
  * @brief   PLATFORM CAN subsystem low level driver header.
  *
  * @addtogroup CAN
  * @{
  */
 
-#ifndef _CAN_LLD_H_
-#define _CAN_LLD_H_
+#ifndef HAL_CAN_LLD_H
+#define HAL_CAN_LLD_H
 
 #if (HAL_USE_CAN == TRUE) || defined(__DOXYGEN__)
 
@@ -223,6 +223,6 @@ extern "C" {
 
 #endif /* HAL_USE_CAN == TRUE */
 
-#endif /* _CAN_LLD_H_ */
+#endif /* HAL_CAN_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_dac_lld.c b/os/hal/templates/hal_dac_lld.c
index 33a39e673..b952f5b2d 100644
--- a/os/hal/templates/hal_dac_lld.c
+++ b/os/hal/templates/hal_dac_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    dac_lld.c
+ * @file    hal_dac_lld.c
  * @brief   PLATFORM DAC subsystem low level driver source.
  *
  * @addtogroup DAC
diff --git a/os/hal/templates/hal_dac_lld.h b/os/hal/templates/hal_dac_lld.h
index 47c3d1a6b..d35d321d9 100644
--- a/os/hal/templates/hal_dac_lld.h
+++ b/os/hal/templates/hal_dac_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    dac_lld.h
+ * @file    hal_dac_lld.h
  * @brief   PLATFORM DAC subsystem low level driver header.
  *
  * @addtogroup DAC
  * @{
  */
 
-#ifndef _DAC_LLD_H_
-#define _DAC_LLD_H_
+#ifndef HAL_DAC_LLD_H
+#define HAL_DAC_LLD_H
 
 #if HAL_USE_DAC || defined(__DOXYGEN__)
 
@@ -206,6 +206,6 @@ extern "C" {
 
 #endif /* HAL_USE_DAC */
 
-#endif /* _DAC_LLD_H_ */
+#endif /* HAL_DAC_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_ext_lld.c b/os/hal/templates/hal_ext_lld.c
index de58827db..6902eecb1 100644
--- a/os/hal/templates/hal_ext_lld.c
+++ b/os/hal/templates/hal_ext_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    ext_lld.c
+ * @file    hal_ext_lld.c
  * @brief   PLATFORM EXT subsystem low level driver source.
  *
  * @addtogroup EXT
diff --git a/os/hal/templates/hal_ext_lld.h b/os/hal/templates/hal_ext_lld.h
index ddbcbd5e2..44709aff2 100644
--- a/os/hal/templates/hal_ext_lld.h
+++ b/os/hal/templates/hal_ext_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    ext_lld.h
+ * @file    hal_ext_lld.h
  * @brief   PLATFORM EXT subsystem low level driver header.
  *
  * @addtogroup EXT
  * @{
  */
 
-#ifndef _EXT_LLD_H_
-#define _EXT_LLD_H_
+#ifndef HAL_EXT_LLD_H
+#define HAL_EXT_LLD_H
 
 #if (HAL_USE_EXT == TRUE) || defined(__DOXYGEN__)
 
@@ -145,6 +145,6 @@ extern "C" {
 
 #endif /* HAL_USE_EXT == TRUE */
 
-#endif /* _EXT_LLD_H_ */
+#endif /* HAL_EXT_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_gpt_lld.c b/os/hal/templates/hal_gpt_lld.c
index 75b92ec68..b82416d9e 100644
--- a/os/hal/templates/hal_gpt_lld.c
+++ b/os/hal/templates/hal_gpt_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    gpt_lld.c
+ * @file    hal_gpt_lld.c
  * @brief   PLATFORM GPT subsystem low level driver source.
  *
  * @addtogroup GPT
diff --git a/os/hal/templates/hal_gpt_lld.h b/os/hal/templates/hal_gpt_lld.h
index 9677c26e2..d2ab7da02 100644
--- a/os/hal/templates/hal_gpt_lld.h
+++ b/os/hal/templates/hal_gpt_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    gpt_lld.h
+ * @file    hal_gpt_lld.h
  * @brief   PLATFORM GPT subsystem low level driver header.
  *
  * @addtogroup GPT
  * @{
  */
 
-#ifndef _GPT_LLD_H_
-#define _GPT_LLD_H_
+#ifndef HAL_GPT_LLD_H
+#define HAL_GPT_LLD_H
 
 #if (HAL_USE_GPT == TRUE) || defined(__DOXYGEN__)
 
@@ -149,6 +149,6 @@ extern "C" {
 
 #endif /* HAL_USE_GPT == TRUE */
 
-#endif /* _GPT_LLD_H_ */
+#endif /* HAL_GPT_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_i2c_lld.c b/os/hal/templates/hal_i2c_lld.c
index f3a50c395..5d94a284b 100644
--- a/os/hal/templates/hal_i2c_lld.c
+++ b/os/hal/templates/hal_i2c_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    i2c_lld.c
+ * @file    hal_i2c_lld.c
  * @brief   PLATFORM I2C subsystem low level driver source.
  *
  * @addtogroup I2C
diff --git a/os/hal/templates/hal_i2c_lld.h b/os/hal/templates/hal_i2c_lld.h
index 0585cc9b1..304bd219f 100644
--- a/os/hal/templates/hal_i2c_lld.h
+++ b/os/hal/templates/hal_i2c_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    i2c_lld.h
+ * @file    hal_i2c_lld.h
  * @brief   PLATFORM I2C subsystem low level driver header.
  *
  * @addtogroup I2C
  * @{
  */
 
-#ifndef _I2C_LLD_H_
-#define _I2C_LLD_H_
+#ifndef HAL_I2C_LLD_H
+#define HAL_I2C_LLD_H
 
 #if (HAL_USE_I2C == TRUE) || defined(__DOXYGEN__)
 
@@ -147,6 +147,6 @@ extern "C" {
 
 #endif /* HAL_USE_I2C == TRUE */
 
-#endif /* _I2C_LLD_H_ */
+#endif /* HAL_I2C_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_i2s_lld.c b/os/hal/templates/hal_i2s_lld.c
index d4677fe8d..3a77b2636 100644
--- a/os/hal/templates/hal_i2s_lld.c
+++ b/os/hal/templates/hal_i2s_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    i2s_lld.c
+ * @file    hal_i2s_lld.c
  * @brief   PLATFORM I2S subsystem low level driver source.
  *
  * @addtogroup I2S
diff --git a/os/hal/templates/hal_i2s_lld.h b/os/hal/templates/hal_i2s_lld.h
index 35cc94109..d665a19db 100644
--- a/os/hal/templates/hal_i2s_lld.h
+++ b/os/hal/templates/hal_i2s_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    i2s_lld.h
+ * @file    hal_i2s_lld.h
  * @brief   PLATFORM I2S subsystem low level driver header.
  *
  * @addtogroup I2S
  * @{
  */
 
-#ifndef _I2S_LLD_H_
-#define _I2S_LLD_H_
+#ifndef HAL_I2S_LLD_H
+#define HAL_I2S_LLD_H
 
 #if (HAL_USE_I2S == TRUE) || defined(__DOXYGEN__)
 
@@ -138,6 +138,6 @@ extern "C" {
 
 #endif /* HAL_USE_I2S == TRUE */
 
-#endif /* _I2S_LLD_H_ */
+#endif /* HAL_I2S_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_icu_lld.c b/os/hal/templates/hal_icu_lld.c
index 9c0f28c52..9db5b5f52 100644
--- a/os/hal/templates/hal_icu_lld.c
+++ b/os/hal/templates/hal_icu_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    icu_lld.c
+ * @file    hal_icu_lld.c
  * @brief   PLATFORM ADC subsystem low level driver source.
  *
  * @addtogroup ICU
diff --git a/os/hal/templates/hal_icu_lld.h b/os/hal/templates/hal_icu_lld.h
index 431d8ea88..e88a1702a 100644
--- a/os/hal/templates/hal_icu_lld.h
+++ b/os/hal/templates/hal_icu_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    icu_lld.h
+ * @file    hal_icu_lld.h
  * @brief   PLATFORM ICU subsystem low level driver header.
  *
  * @addtogroup ICU
  * @{
  */
 
-#ifndef _ICU_LLD_H_
-#define _ICU_LLD_H_
+#ifndef HAL_ICU_LLD_H
+#define HAL_ICU_LLD_H
 
 #if (HAL_USE_ICU == TRUE) || defined(__DOXYGEN__)
 
@@ -188,6 +188,6 @@ extern "C" {
 
 #endif /* HAL_USE_ICU == TRUE */
 
-#endif /* _ICU_LLD_H_ */
+#endif /* HAL_ICU_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_mac_lld.c b/os/hal/templates/hal_mac_lld.c
index c7c9fc6a3..83d15a9d7 100644
--- a/os/hal/templates/hal_mac_lld.c
+++ b/os/hal/templates/hal_mac_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    mac_lld.c
+ * @file    hal_mac_lld.c
  * @brief   PLATFORM MAC subsystem low level driver source.
  *
  * @addtogroup MAC
diff --git a/os/hal/templates/hal_mac_lld.h b/os/hal/templates/hal_mac_lld.h
index 8e438eccb..16b307763 100644
--- a/os/hal/templates/hal_mac_lld.h
+++ b/os/hal/templates/hal_mac_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    mac_lld.h
+ * @file    hal_mac_lld.h
  * @brief   PLATFORM MAC subsystem low level driver header.
  *
  * @addtogroup MAC
  * @{
  */
 
-#ifndef _MAC_LLD_H_
-#define _MAC_LLD_H_
+#ifndef HAL_MAC_LLD_H
+#define HAL_MAC_LLD_H
 
 #if (HAL_USE_MAC == TRUE) || defined(__DOXYGEN__)
 
@@ -176,6 +176,6 @@ extern "C" {
 
 #endif /* HAL_USE_MAC == TRUE */
 
-#endif /* _MAC_LLD_H_ */
+#endif /* HAL_MAC_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_pal_lld.c b/os/hal/templates/hal_pal_lld.c
index 3b1d0d9b6..95b188a58 100644
--- a/os/hal/templates/hal_pal_lld.c
+++ b/os/hal/templates/hal_pal_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    pal_lld.c
+ * @file    hal_pal_lld.c
  * @brief   PLATFORM PAL subsystem low level driver source.
  *
  * @addtogroup PAL
diff --git a/os/hal/templates/hal_pal_lld.h b/os/hal/templates/hal_pal_lld.h
index 49f45043c..814b76741 100644
--- a/os/hal/templates/hal_pal_lld.h
+++ b/os/hal/templates/hal_pal_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    pal_lld.h
+ * @file    hal_pal_lld.h
  * @brief   PLATFORM PAL subsystem low level driver header.
  *
  * @addtogroup PAL
  * @{
  */
 
-#ifndef _PAL_LLD_H_
-#define _PAL_LLD_H_
+#ifndef HAL_PAL_LLD_H
+#define HAL_PAL_LLD_H
 
 #if (HAL_USE_PAL == TRUE) || defined(__DOXYGEN__)
 
@@ -417,6 +417,6 @@ extern "C" {
 
 #endif /* HAL_USE_PAL == TRUE */
 
-#endif /* _PAL_LLD_H_ */
+#endif /* HAL_PAL_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_pwm_lld.c b/os/hal/templates/hal_pwm_lld.c
index 59d8c2d85..0d13a59f0 100644
--- a/os/hal/templates/hal_pwm_lld.c
+++ b/os/hal/templates/hal_pwm_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    pwm_lld.c
+ * @file    hal_pwm_lld.c
  * @brief   PLATFORM PWM subsystem low level driver source.
  *
  * @addtogroup PWM
diff --git a/os/hal/templates/hal_pwm_lld.h b/os/hal/templates/hal_pwm_lld.h
index 79ace7fb6..418e8d5c8 100644
--- a/os/hal/templates/hal_pwm_lld.h
+++ b/os/hal/templates/hal_pwm_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    pwm_lld.h
+ * @file    hal_pwm_lld.h
  * @brief   PLATFORM PWM subsystem low level driver header.
  *
  * @addtogroup PWM
  * @{
  */
 
-#ifndef _PWM_LLD_H_
-#define _PWM_LLD_H_
+#ifndef HAL_PWM_LLD_H
+#define HAL_PWM_LLD_H
 
 #if (HAL_USE_PWM == TRUE) || defined(__DOXYGEN__)
 
@@ -210,6 +210,6 @@ extern "C" {
 
 #endif /* HAL_USE_PWM == TRUE */
 
-#endif /* _PWM_LLD_H_ */
+#endif /* HAL_PWM_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_rtc_lld.c b/os/hal/templates/hal_rtc_lld.c
index a84c2ca3b..d32ac5df4 100644
--- a/os/hal/templates/hal_rtc_lld.c
+++ b/os/hal/templates/hal_rtc_lld.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file    rtc_lld.c
+ * @file    hal_rtc_lld.c
  * @brief   PLATFORM RTC subsystem low level driver source.
  *
  * @addtogroup RTC
diff --git a/os/hal/templates/hal_rtc_lld.h b/os/hal/templates/hal_rtc_lld.h
index 4075cdea3..c04805018 100644
--- a/os/hal/templates/hal_rtc_lld.h
+++ b/os/hal/templates/hal_rtc_lld.h
@@ -19,15 +19,15 @@
  */
 
 /**
- * @file    rtc_lld.h
+ * @file    hal_rtc_lld.h
  * @brief   PLATFORM RTC subsystem low level driver header.
  *
  * @addtogroup RTC
  * @{
  */
 
-#ifndef _RTC_LLD_H_
-#define _RTC_LLD_H_
+#ifndef HAL_RTC_LLD_H
+#define HAL_RTC_LLD_H
 
 #if (HAL_USE_RTC == TRUE) || defined(__DOXYGEN__)
 
@@ -177,6 +177,6 @@ extern "C" {
 
 #endif /* HAL_USE_RTC == TRUE */
 
-#endif /* _RTC_LLD_H_ */
+#endif /* HAL_RTC_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_sdc_lld.c b/os/hal/templates/hal_sdc_lld.c
index 091b6c3f8..c7134aab5 100644
--- a/os/hal/templates/hal_sdc_lld.c
+++ b/os/hal/templates/hal_sdc_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    sdc_lld.c
+ * @file    hal_sdc_lld.c
  * @brief   PLATFORM SDC subsystem low level driver source.
  *
  * @addtogroup SDC
diff --git a/os/hal/templates/hal_sdc_lld.h b/os/hal/templates/hal_sdc_lld.h
index d9f8741bd..56f89d909 100644
--- a/os/hal/templates/hal_sdc_lld.h
+++ b/os/hal/templates/hal_sdc_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    sdc_lld.h
+ * @file    hal_sdc_lld.h
  * @brief   PLATFORM SDC subsystem low level driver header.
  *
  * @addtogroup SDC
  * @{
  */
 
-#ifndef _SDC_LLD_H_
-#define _SDC_LLD_H_
+#ifndef HAL_SDC_LLD_H
+#define HAL_SDC_LLD_H
 
 #if (HAL_USE_SDC == TRUE) || defined(__DOXYGEN__)
 
@@ -179,6 +179,6 @@ extern "C" {
 
 #endif /* HAL_USE_SDC == TRUE */
 
-#endif /* _SDC_LLD_H_ */
+#endif /* HAL_SDC_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_serial_lld.c b/os/hal/templates/hal_serial_lld.c
index 4234e97c2..f5fe50916 100644
--- a/os/hal/templates/hal_serial_lld.c
+++ b/os/hal/templates/hal_serial_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    serial_lld.c
+ * @file    hal_serial_lld.c
  * @brief   PLATFORM serial subsystem low level driver source.
  *
  * @addtogroup SERIAL
diff --git a/os/hal/templates/hal_serial_lld.h b/os/hal/templates/hal_serial_lld.h
index 04c1b66fd..d50bb715e 100644
--- a/os/hal/templates/hal_serial_lld.h
+++ b/os/hal/templates/hal_serial_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    serial_lld.h
+ * @file    hal_serial_lld.h
  * @brief   PLATFORM serial subsystem low level driver header.
  *
  * @addtogroup SERIAL
  * @{
  */
 
-#ifndef _SERIAL_LLD_H_
-#define _SERIAL_LLD_H_
+#ifndef HAL_SERIAL_LLD_H
+#define HAL_SERIAL_LLD_H
 
 #if (HAL_USE_SERIAL == TRUE) || defined(__DOXYGEN__)
 
@@ -114,6 +114,6 @@ extern "C" {
 
 #endif /* HAL_USE_SERIAL == TRUE */
 
-#endif /* _SERIAL_LLD_H_ */
+#endif /* HAL_SERIAL_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_spi_lld.c b/os/hal/templates/hal_spi_lld.c
index 9e1299c1e..6dd582677 100644
--- a/os/hal/templates/hal_spi_lld.c
+++ b/os/hal/templates/hal_spi_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    spi_lld.c
+ * @file    hal_spi_lld.c
  * @brief   PLATFORM SPI subsystem low level driver source.
  *
  * @addtogroup SPI
diff --git a/os/hal/templates/hal_spi_lld.h b/os/hal/templates/hal_spi_lld.h
index 38d717966..f6dd9d579 100644
--- a/os/hal/templates/hal_spi_lld.h
+++ b/os/hal/templates/hal_spi_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    spi_lld.h
+ * @file    hal_spi_lld.h
  * @brief   PLATFORM SPI subsystem low level driver header.
  *
  * @addtogroup SPI
  * @{
  */
 
-#ifndef _SPI_LLD_H_
-#define _SPI_LLD_H_
+#ifndef HAL_SPI_LLD_H
+#define HAL_SPI_LLD_H
 
 #if (HAL_USE_SPI == TRUE) || defined(__DOXYGEN__)
 
@@ -147,6 +147,6 @@ extern "C" {
 
 #endif /* HAL_USE_SPI == TRUE */
 
-#endif /* _SPI_LLD_H_ */
+#endif /* HAL_SPI_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_st_lld.c b/os/hal/templates/hal_st_lld.c
index 10e26da50..a58c74a36 100644
--- a/os/hal/templates/hal_st_lld.c
+++ b/os/hal/templates/hal_st_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    st_lld.c
+ * @file    hal_st_lld.c
  * @brief   PLATFORM ST subsystem low level driver source.
  *
  * @addtogroup ST
diff --git a/os/hal/templates/hal_st_lld.h b/os/hal/templates/hal_st_lld.h
index ceb36cc60..c59542778 100644
--- a/os/hal/templates/hal_st_lld.h
+++ b/os/hal/templates/hal_st_lld.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    st_lld.h
+ * @file    hal_st_lld.h
  * @brief   PLATFORM ST subsystem low level driver header.
  * @details This header is designed to be include-able without having to
  *          include other files from the HAL.
@@ -24,8 +24,8 @@
  * @{
  */
 
-#ifndef _ST_LLD_H_
-#define _ST_LLD_H_
+#ifndef HAL_ST_LLD_H
+#define HAL_ST_LLD_H
 
 /*===========================================================================*/
 /* Driver constants.                                                         */
@@ -136,6 +136,6 @@ static inline bool st_lld_is_alarm_active(void) {
   return false;
 }
 
-#endif /* _ST_LLD_H_ */
+#endif /* HAL_ST_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_uart_lld.c b/os/hal/templates/hal_uart_lld.c
index d37d155be..67afd165f 100644
--- a/os/hal/templates/hal_uart_lld.c
+++ b/os/hal/templates/hal_uart_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    uart_lld.c
+ * @file    hal_uart_lld.c
  * @brief   PLATFORM UART subsystem low level driver source.
  *
  * @addtogroup UART
diff --git a/os/hal/templates/hal_uart_lld.h b/os/hal/templates/hal_uart_lld.h
index 275a174b3..e070c2f4f 100644
--- a/os/hal/templates/hal_uart_lld.h
+++ b/os/hal/templates/hal_uart_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    uart_lld.h
+ * @file    hal_uart_lld.h
  * @brief   PLATFORM UART subsystem low level driver header.
  *
  * @addtogroup UART
  * @{
  */
 
-#ifndef _UART_LLD_H_
-#define _UART_LLD_H_
+#ifndef HAL_UART_LLD_H
+#define HAL_UART_LLD_H
 
 #if (HAL_USE_UART == TRUE) || defined(__DOXYGEN__)
 
@@ -197,6 +197,6 @@ extern "C" {
 
 #endif /* HAL_USE_UART == TRUE */
 
-#endif /* _UART_LLD_H_ */
+#endif /* HAL_UART_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_usb_lld.c b/os/hal/templates/hal_usb_lld.c
index c0c870fba..e06d93950 100644
--- a/os/hal/templates/hal_usb_lld.c
+++ b/os/hal/templates/hal_usb_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    usb_lld.c
+ * @file    hal_usb_lld.c
  * @brief   PLATFORM USB subsystem low level driver source.
  *
  * @addtogroup USB
diff --git a/os/hal/templates/hal_usb_lld.h b/os/hal/templates/hal_usb_lld.h
index 8ae4eeb76..2bb1bc494 100644
--- a/os/hal/templates/hal_usb_lld.h
+++ b/os/hal/templates/hal_usb_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    usb_lld.h
+ * @file    hal_usb_lld.h
  * @brief   PLATFORM USB subsystem low level driver header.
  *
  * @addtogroup USB
  * @{
  */
 
-#ifndef _USB_LLD_H_
-#define _USB_LLD_H_
+#ifndef HAL_USB_LLD_H
+#define HAL_USB_LLD_H
 
 #if (HAL_USE_USB == TRUE) || defined(__DOXYGEN__)
 
@@ -367,6 +367,6 @@ extern "C" {
 
 #endif /* HAL_USE_USB == TRUE */
 
-#endif /* _USB_LLD_H_ */
+#endif /* HAL_USB_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_wdg_lld.c b/os/hal/templates/hal_wdg_lld.c
index 4127a5e51..04e012cdd 100644
--- a/os/hal/templates/hal_wdg_lld.c
+++ b/os/hal/templates/hal_wdg_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/wdg_lld.c
+ * @file    hal_templates/wdg_lld.c
  * @brief   WDG Driver subsystem low level driver source template.
  *
  * @addtogroup WDG
diff --git a/os/hal/templates/hal_wdg_lld.h b/os/hal/templates/hal_wdg_lld.h
index 2cacc32e4..6fe501e24 100644
--- a/os/hal/templates/hal_wdg_lld.h
+++ b/os/hal/templates/hal_wdg_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    templates/wdg_lld.h
+ * @file    hal_templates/wdg_lld.h
  * @brief   WDG Driver subsystem low level driver header template.
  *
  * @addtogroup WDG
  * @{
  */
 
-#ifndef _WDG_LLD_H_
-#define _WDG_LLD_H_
+#ifndef HAL_WDG_LLD_H
+#define HAL_WDG_LLD_H
 
 #if (HAL_USE_WDG == TRUE) || defined(__DOXYGEN__)
 
@@ -108,6 +108,6 @@ extern "C" {
 
 #endif /* HAL_USE_WDG == TRUE */
 
-#endif /* _WDG_LLD_H_ */
+#endif /* HAL_WDG_LLD_H */
 
 /** @} */
diff --git a/os/hal/templates/osal/osal.h b/os/hal/templates/osal/osal.h
index 18d286f47..166cc3983 100644
--- a/os/hal/templates/osal/osal.h
+++ b/os/hal/templates/osal/osal.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _OSAL_H_
-#define _OSAL_H_
+#ifndef OSAL_H
+#define OSAL_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -643,6 +643,6 @@ static inline void osalMutexObjectInit(mutex_t *mp) {
   *mp = 0;
 }
 
-#endif /* _OSAL_H_ */
+#endif /* OSAL_H */
 
 /** @} */