diff --git a/arch/arm/fsl_frdm_k64f/board.h b/arch/arm/fsl_frdm_k64f/board.h
index b3012cd47df..84946957c2f 100644
--- a/arch/arm/fsl_frdm_k64f/board.h
+++ b/arch/arm/fsl_frdm_k64f/board.h
@@ -168,7 +168,7 @@ This header file is used to specify and describe board-level aspects for the
  * UART configuration settings
  */
 
-#include <drivers/k20Pcr.h>
+#include <drivers/k20_pcr.h>
 
 #define CONFIG_UART_NUM_SYSTEM_PORTS 1
 #define CONFIG_UART_NUM_EXTRA_PORTS 0
diff --git a/arch/arm/fsl_frdm_k64f/system.c b/arch/arm/fsl_frdm_k64f/system.c
index 7118cacde18..70c9d3db2d6 100644
--- a/arch/arm/fsl_frdm_k64f/system.c
+++ b/arch/arm/fsl_frdm_k64f/system.c
@@ -40,12 +40,12 @@ for the fsl_frdm_k64f BSP.
 #include <nanokernel/cpu.h>
 #include <cputype.h>
 #include <board.h>
-#include <drivers/k20Mcg.h>
+#include <drivers/k20_mcg.h>
 #include <drivers/uart.h>
-#include <drivers/k20Pcr.h>
-#include <drivers/k20Sim.h>
-#include <drivers/k6xMpu.h>
-#include <drivers/k6xPmc.h>
+#include <drivers/k20_pcr.h>
+#include <drivers/k20_sim.h>
+#include <drivers/k6x_mpu.h>
+#include <drivers/k6x_pmc.h>
 #include <sections.h>
 
 #if defined(CONFIG_PRINTK) || defined(CONFIG_STDOUT_CONSOLE)
diff --git a/drivers/serial/k20UartDrv.c b/drivers/serial/k20UartDrv.c
index 7977d98b21b..c4b5d21d61a 100644
--- a/drivers/serial/k20UartDrv.c
+++ b/drivers/serial/k20UartDrv.c
@@ -37,7 +37,7 @@ An _K20_UART_t structure is used to describe the UART.
 The BSP's _InitHardware() routine initializes all the
 values in the uart_init_info structure before calling uart_init().
 
-INCLUDE FILES: drivers/serial/k20Uart.h
+INCLUDE FILES: drivers/serial/k20_uart.h
 */
 
 /* includes */
@@ -48,8 +48,8 @@ INCLUDE FILES: drivers/serial/k20Uart.h
 
 #include <board.h>
 #include <drivers/uart.h>
-#include <drivers/k20Uart.h>
-#include <drivers/k20Sim.h>
+#include <drivers/k20_uart.h>
+#include <drivers/k20_sim.h>
 #include <toolchain.h>
 #include <sections.h>
 
diff --git a/include/drivers/k20Mcg.h b/include/drivers/k20_mcg.h
similarity index 99%
rename from include/drivers/k20Mcg.h
rename to include/drivers/k20_mcg.h
index ca22470e32f..df33d6d80dc 100644
--- a/include/drivers/k20Mcg.h
+++ b/include/drivers/k20_mcg.h
@@ -1,4 +1,4 @@
-/* k20Mcg.h - K20 Microprocessor MCG register definitions */
+/* K20 Microprocessor MCG register definitions */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/include/drivers/k20Pcr.h b/include/drivers/k20_pcr.h
similarity index 97%
rename from include/drivers/k20Pcr.h
rename to include/drivers/k20_pcr.h
index 8cf9930ef3a..ea831770350 100644
--- a/include/drivers/k20Pcr.h
+++ b/include/drivers/k20_pcr.h
@@ -1,4 +1,4 @@
-/* k20Pcr.h - Freescale K20 microprocessor Pin Control register definitions */
+/* Freescale K20 microprocessor Pin Control register definitions */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/include/drivers/k20Sim.h b/include/drivers/k20_sim.h
similarity index 99%
rename from include/drivers/k20Sim.h
rename to include/drivers/k20_sim.h
index ad2be52195d..c4714c5141b 100644
--- a/include/drivers/k20Sim.h
+++ b/include/drivers/k20_sim.h
@@ -1,4 +1,4 @@
-/* k20Sim.h - Freescale K20 microprocessor SIM Module register definitions */
+/* Freescale K20 microprocessor SIM Module register definitions */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/include/drivers/k20Uart.h b/include/drivers/k20_uart.h
similarity index 99%
rename from include/drivers/k20Uart.h
rename to include/drivers/k20_uart.h
index 2261d735df0..b5e3c2ef974 100644
--- a/include/drivers/k20Uart.h
+++ b/include/drivers/k20_uart.h
@@ -1,4 +1,4 @@
-/* k20Uart.h - Freescale K20 microprocessor UART register definitions */
+/* Freescale K20 microprocessor UART register definitions */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/include/drivers/k20Wdog.h b/include/drivers/k20_watchdog.h
similarity index 98%
rename from include/drivers/k20Wdog.h
rename to include/drivers/k20_watchdog.h
index 04009ce81f2..96bc37c0c47 100644
--- a/include/drivers/k20Wdog.h
+++ b/include/drivers/k20_watchdog.h
@@ -1,4 +1,4 @@
-/* k20Wdog.h - Freescale K20 microprocessor Watch Dog register definitions */
+/* Freescale K20 microprocessor Watch Dog registers */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/include/drivers/k6xMpu.h b/include/drivers/k6x_mpu.h
similarity index 97%
rename from include/drivers/k6xMpu.h
rename to include/drivers/k6x_mpu.h
index 0c1e6ba3757..4dd46113fa7 100644
--- a/include/drivers/k6xMpu.h
+++ b/include/drivers/k6x_mpu.h
@@ -1,4 +1,4 @@
-/* k6xMpu.h - Freescale K6x microprocessor MPU register definitions */
+/* Freescale K6x microprocessor MPU register definitions */
 
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
diff --git a/include/drivers/k6xPmc.h b/include/drivers/k6x_pmc.h
similarity index 97%
rename from include/drivers/k6xPmc.h
rename to include/drivers/k6x_pmc.h
index 432267e3278..0a04c079dcf 100644
--- a/include/drivers/k6xPmc.h
+++ b/include/drivers/k6x_pmc.h
@@ -1,4 +1,4 @@
-/* k6xMpu.h - Freescale K6x microprocessor PMC register definitions */
+/* Freescale K6x microprocessor PMC register definitions */
 
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.