diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 2b5510f57..7788ada6f 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -2756,7 +2756,8 @@ static const struct command_registration cortex_a8_command_handlers[] = {
 };
 
 struct target_type cortexa8_target = {
-	.name = "cortex_a8",
+	.name = "cortex_a",
+	.deprecated_name = "cortex_a8",
 
 	.poll = cortex_a8_poll,
 	.arch_state = armv7a_arch_state,
diff --git a/tcl/target/imx6.cfg b/tcl/target/imx6.cfg
index 707bab84c..292b1148e 100644
--- a/tcl/target/imx6.cfg
+++ b/tcl/target/imx6.cfg
@@ -37,7 +37,7 @@ jtag newtap $_CHIPNAME sjc -irlen 5 -ircapture 0x01 -irmask 0x1f \
 # core 2  -  0x82154000
 # core 3  -  0x82156000
 set _TARGETNAME $_CHIPNAME.cpu.0
-target create $_TARGETNAME cortex_a8 -chain-position $_CHIPNAME.dap \
+target create $_TARGETNAME cortex_a -chain-position $_CHIPNAME.dap \
         -coreid 0 -dbgbase 0x82150000
 
 # some TCK cycles are required to activate the DEBUG power domain
@@ -45,7 +45,7 @@ jtag configure $_CHIPNAME.sjc -event post-reset "runtest 100"
 
 proc imx6_dbginit {target} {
         # General Cortex A8/A9 debug initialisation
-        cortex_a8 dbginit
+        cortex_a dbginit
 }
 
 # Slow speed to be sure it will work