diff --git a/src/target/target/at91r40008.cfg b/src/target/target/at91r40008.cfg
index 48317c868..f8f5d4106 100644
--- a/src/target/target/at91r40008.cfg
+++ b/src/target/target/at91r40008.cfg
@@ -29,7 +29,7 @@ reset_config srst_only srst_pulls_trst
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGENAME -variant arm7tdmi
+target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi
 
 
 $_TARGETNAME configure -event gdb-flash-erase-start {
diff --git a/src/target/target/at91sam9260.cfg b/src/target/target/at91sam9260.cfg
index d7c8833ce..05500ab5a 100644
--- a/src/target/target/at91sam9260.cfg
+++ b/src/target/target/at91sam9260.cfg
@@ -9,7 +9,7 @@ source [find target/at91sam9260minimal.cfg]
 # Target configuration
 ######################
 
-$_TARGET_NAME configure -event reset-init {
+$_TARGETNAME configure -event reset-init {
 	# at reset chip runs at 32khz
 	jtag_khz 8
 	mww 0xfffffd08 0xa5000501         # RSTC_MR : enable user reset
diff --git a/src/target/target/at91sam9260minimal.cfg b/src/target/target/at91sam9260minimal.cfg
index 93114d802..4d51831da 100644
--- a/src/target/target/at91sam9260minimal.cfg
+++ b/src/target/target/at91sam9260minimal.cfg
@@ -18,7 +18,7 @@ if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
 } else {
   # force an error till we get a good number
-   set _CPUTAPID 0xffffffff
+   set _CPUTAPID 0x0792603f
 }
 
 reset_config trst_and_srst
@@ -37,6 +37,6 @@ set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 
 # Internal sram1 memory
-$_TARGET_NAME configure -work-area-virt 0 -work-area-phys 0x00300000 -work-area-size 0x1000 -work-area-backup 1
+$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x00300000 -work-area-size 0x1000 -work-area-backup 1