diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/MK64F12.h b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/MK64F12.h
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/MK64F12.h
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/MK64F12.h
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/MK64F12_features.h b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/MK64F12_features.h
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/MK64F12_features.h
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/MK64F12_features.h
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/startup_MK64F12.S b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/startup_MK64F12.S
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/startup_MK64F12.S
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/startup_MK64F12.S
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/sys.cpp b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/sys.cpp
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/sys.cpp
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_IAR/MK64FN1M0xxx12.icf b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_IAR/MK64FN1M0xxx12.icf
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_IAR/MK64FN1M0xxx12.icf
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_IAR/MK64FN1M0xxx12.icf
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_IAR/startup_MK64F12.S b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_IAR/startup_MK64F12.S
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_IAR/startup_MK64F12.S
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_IAR/startup_MK64F12.S
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis.h b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/cmsis.h
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis.h
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/cmsis.h
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.c b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/cmsis_nvic.c
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.c
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/cmsis_nvic.c
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.h b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/cmsis_nvic.h
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.h
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/cmsis_nvic.h
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/fsl_device_registers.h b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/fsl_device_registers.h
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/fsl_device_registers.h
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/fsl_device_registers.h
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/system_MK64F12.c b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/system_MK64F12.c
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/system_MK64F12.c
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/system_MK64F12.c
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/system_MK64F12.h b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/system_MK64F12.h
similarity index 100%
rename from hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/system_MK64F12.h
rename to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/system_MK64F12.h