diff --git a/Target/Demo/ARMCM3_STM32_Nucleo_STM32F103RB_GNU_ARM_GCC/Prog/prog.dox b/Target/Demo/ARMCM3_STM32_Nucleo_STM32F103RB_GNU_ARM_GCC/Prog/prog.dox
index c2b15901..3467a542 100644
--- a/Target/Demo/ARMCM3_STM32_Nucleo_STM32F103RB_GNU_ARM_GCC/Prog/prog.dox
+++ b/Target/Demo/ARMCM3_STM32_Nucleo_STM32F103RB_GNU_ARM_GCC/Prog/prog.dox
@@ -1,5 +1,5 @@
 /**
-\defgroup   Boot_ARMCM3_STM32_Nucleo_STM32F103RB_GNU_ARM_GCC User Program
+\defgroup   Prog_ARMCM3_STM32_Nucleo_STM32F103RB_GNU_ARM_GCC User Program
 \brief      User Program. 
 \ingroup    ARMCM3_STM32_Nucleo_STM32F103RB_GNU_ARM_GCC
 */
diff --git a/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.c b/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.c
index 8ff215b8..12055531 100644
--- a/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.c
+++ b/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.c
@@ -1,5 +1,5 @@
 /************************************************************************************//**
-* \file         Demo\HCS12_Evbplus_Dragon12p_CodeWarrior\Prog\timer.c
+* \file         Demo\HCS12_Evbplus_Dragon12p_CodeWarrior\Prog\time.c
 * \brief        Timer driver source file.
 * \ingroup      Prog_HCS12_Evbplus_Dragon12p_CodeWarrior
 * \internal
diff --git a/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.h b/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.h
index 40cea7f2..10f703be 100644
--- a/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.h
+++ b/Target/Demo/HCS12_Evbplus_Dragon12p_CodeWarrior/Prog/time.h
@@ -1,5 +1,5 @@
 /************************************************************************************//**
-* \file         Demo\HCS12_Evbplus_Dragon12p_CodeWarrior\Prog\timer.h
+* \file         Demo\HCS12_Evbplus_Dragon12p_CodeWarrior\Prog\time.h
 * \brief        Timer driver header file.
 * \ingroup      Prog_HCS12_Evbplus_Dragon12p_CodeWarrior
 * \internal
diff --git a/Target/Source/ARMCM0_STM32/flash.h b/Target/Source/ARMCM0_STM32/flash.h
index 4840d84b..90a1dae4 100644
--- a/Target/Source/ARMCM0_STM32/flash.h
+++ b/Target/Source/ARMCM0_STM32/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\ARMCM0_STM32\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\ARMCM0_STM32\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_ARMCM0_STM32
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/ARMCM3_EFM32/flash.h b/Target/Source/ARMCM3_EFM32/flash.h
index 5f3dc504..0072b7d9 100644
--- a/Target/Source/ARMCM3_EFM32/flash.h
+++ b/Target/Source/ARMCM3_EFM32/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\ARMCM3_EFM32\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\ARMCM3_EFM32\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_ARMCM3_EFM32
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/ARMCM3_LM3S/flash.h b/Target/Source/ARMCM3_LM3S/flash.h
index bfc95c3e..4d6a8c3e 100644
--- a/Target/Source/ARMCM3_LM3S/flash.h
+++ b/Target/Source/ARMCM3_LM3S/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\ARMCM3_LM3S\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\ARMCM3_LM3S\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_ARMCM3_LM3S
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/ARMCM3_STM32/flash.h b/Target/Source/ARMCM3_STM32/flash.h
index 62948c48..84568460 100644
--- a/Target/Source/ARMCM3_STM32/flash.h
+++ b/Target/Source/ARMCM3_STM32/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\ARMCM3_STM32\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\ARMCM3_STM32\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_ARMCM3_STM32
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/ARMCM3_STM32F2/flash.h b/Target/Source/ARMCM3_STM32F2/flash.h
index c19b123e..24a1348c 100644
--- a/Target/Source/ARMCM3_STM32F2/flash.h
+++ b/Target/Source/ARMCM3_STM32F2/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\ARMCM3_STM32F2\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\ARMCM3_STM32F2\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_ARMCM3_STM32F2
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/ARMCM4_STM32/flash.h b/Target/Source/ARMCM4_STM32/flash.h
index 1df853f5..174cfb02 100644
--- a/Target/Source/ARMCM4_STM32/flash.h
+++ b/Target/Source/ARMCM4_STM32/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\ARMCM4_STM32\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\ARMCM4_STM32\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_ARMCM4_STM32
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/ARMCM4_TM4C/flash.h b/Target/Source/ARMCM4_TM4C/flash.h
index 720db34b..58d8ce15 100644
--- a/Target/Source/ARMCM4_TM4C/flash.h
+++ b/Target/Source/ARMCM4_TM4C/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\ARMCM4_TM4C\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\ARMCM4_TM4C\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_ARMCM4_TM4C
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/HCS12/flash.h b/Target/Source/HCS12/flash.h
index 7ee73749..059c7ab5 100644
--- a/Target/Source/HCS12/flash.h
+++ b/Target/Source/HCS12/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
-* \file         Source\HCS12\flash.c
-* \brief        Bootloader flash driver source file.
+* \file         Source\HCS12\flash.h
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_HCS12
 * \internal
 *----------------------------------------------------------------------------------------
diff --git a/Target/Source/TRICORE_TC1798/flash.h b/Target/Source/TRICORE_TC1798/flash.h
index b35e1e2f..63d0bc55 100644
--- a/Target/Source/TRICORE_TC1798/flash.h
+++ b/Target/Source/TRICORE_TC1798/flash.h
@@ -1,6 +1,6 @@
 /************************************************************************************//**
 * \file         Source\TRICORE_TC1798\flash.h
-* \brief        Bootloader flash driver source file.
+* \brief        Bootloader flash driver header file.
 * \ingroup      Target_TRICORE_TC1798
 * \internal
 *----------------------------------------------------------------------------------------