6 files changed, 15 insertions, 15 deletions
diff --git a/os/hal/lib/complex/mfs/mfs.c b/os/hal/lib/complex/mfs/hal_mfs.c
index 32ae2432a..d37326134 100644
--- a/os/hal/lib/complex/mfs/mfs.c
+++ b/os/hal/lib/complex/mfs/hal_mfs.c
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file    mfs.c
+ * @file    hal_mfs.c
  * @brief   Managed Flash Storage module code.
  * @details This module manages a flash partition as a generic storage where
  *          arbitrary data records can be created, updated, deleted and
@@ -30,7 +30,7 @@
  *          banks (where possible) caused by power loss during operations.
  *          Both operations are transparent to the user.
  *
- * @addtogroup MFS
+ * @addtogroup HAL_MFS
  * @{
  */
 
@@ -38,7 +38,7 @@
 
 #include "hal.h"
 
-#include "mfs.h"
+#include "hal_mfs.h"
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/os/hal/lib/complex/mfs/mfs.h b/os/hal/lib/complex/mfs/hal_mfs.h
index d41dcf9bf..19c9b195f 100644
--- a/os/hal/lib/complex/mfs/mfs.h
+++ b/os/hal/lib/complex/mfs/hal_mfs.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    mfs.h
+ * @file    hal_mfs.h
  * @brief   Managed Flash Storage module header.
  *
- * @addtogroup MFS
+ * @addtogroup HAL_MFS
  * @{
  */
 
-#ifndef MFS_H
-#define MFS_H
+#ifndef HAL_MFS_H
+#define HAL_MFS_H
 
 #include "hal_flash.h"
 
@@ -364,7 +364,7 @@ extern "C" {
 }
 #endif
 
-#endif /* MFS_H */
+#endif /* HAL_MFS_H */
 
 /** @} */
 
diff --git a/os/hal/lib/complex/mfs/mfs.mk b/os/hal/lib/complex/mfs/hal_mfs.mk
index b1b67bb61..6448737b8 100644
--- a/os/hal/lib/complex/mfs/mfs.mk
+++ b/os/hal/lib/complex/mfs/hal_mfs.mk
@@ -1,5 +1,5 @@
 # List of all the MFS subsystem files.
-MFSSRC := $(CHIBIOS)/os/hal/lib/complex/mfs/mfs.c
+MFSSRC := $(CHIBIOS)/os/hal/lib/complex/mfs/hal_mfs.c
 
 # Required include directories
 MFSINC := $(CHIBIOS)/os/hal/lib/complex/mfs
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
index 1bba8f99a..e82af004d 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    flash_device.c
+ * @file    hal_flash_device.c
  * @brief   Micron N25Q serial flash driver code.
  *
  * @addtogroup MICRON_N25Q
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h
index 22b024b95..1f13f0c82 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    flash_device.h
+ * @file    hal_flash_device.h
  * @brief   Micron N25Q serial flash driver header.
  *
  * @addtogroup MICRON_N25Q
diff --git a/os/hal/lib/complex/serial_nor/hal_serial_nor.c b/os/hal/lib/complex/serial_nor/hal_serial_nor.c
index b21d09694..95d4ac267 100644
--- a/os/hal/lib/complex/serial_nor/hal_serial_nor.c
+++ b/os/hal/lib/complex/serial_nor/hal_serial_nor.c
@@ -15,11 +15,11 @@
 */
 
 /**
- * @file    m25q.c
- * @brief   M25Q serial flash driver code.
+ * @file    hal_serial_nor.c
+ * @brief   Serial NOR serial flash driver code.
  *
- * @addtogroup M25Q
- * @ingroup M25Q
+ * @addtogroup HAL_SERIAL_NOR
+ * @ingroup HAL_SERIAL_NOR
  * @{
  */