diff --git a/tcl/target/am437x.cfg b/tcl/target/am437x.cfg
index 8b51f9967..1e3cbc52c 100644
--- a/tcl/target/am437x.cfg
+++ b/tcl/target/am437x.cfg
@@ -439,27 +439,36 @@ if { [info exists CHIPNAME] } {
    set _CHIPNAME am437x
 }
 
+set JRC_MODULE		icepick_d
+set DEBUGSS_MODULE	debugss
+set M3_MODULE		m3_wakeupss
+
+set JRC_NAME		$_CHIPNAME.$JRC_MODULE
+set DEBUGSS_NAME	$_CHIPNAME.$DEBUGSS_MODULE
+set M3_NAME		$_CHIPNAME.$M3_MODULE
+set _TARGETNAME		$_CHIPNAME.mpuss
+
 #
-# M3 DAP
+# M3 WakeupSS DAP
 #
 if { [info exists M3_DAP_TAPID] } {
 	set _M3_DAP_TAPID $M3_DAP_TAPID
 } else {
 	set _M3_DAP_TAPID 0x4b6b902f
 }
-jtag newtap $_CHIPNAME m3_dap -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_M3_DAP_TAPID -disable
-jtag configure $_CHIPNAME.m3_dap -event tap-enable "icepick_d_tapenable $_CHIPNAME.jrc 11"
+jtag newtap $_CHIPNAME $M3_MODULE -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_M3_DAP_TAPID -disable
+jtag configure $M3_NAME -event tap-enable "icepick_d_tapenable $JRC_NAME 11"
 
 #
-# Cortex A9 DAP
+# DebugSS DAP
 #
 if { [info exists DAP_TAPID] } {
    set _DAP_TAPID $DAP_TAPID
 } else {
    set _DAP_TAPID 0x46b6902f
 }
-jtag newtap $_CHIPNAME dap -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_DAP_TAPID -disable
-jtag configure $_CHIPNAME.dap -event tap-enable "icepick_d_tapenable $_CHIPNAME.jrc 12"
+jtag newtap $_CHIPNAME $DEBUGSS_MODULE -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_DAP_TAPID -disable
+jtag configure $DEBUGSS_NAME -event tap-enable "icepick_d_tapenable $JRC_NAME 12"
 
 #
 # ICEpick-D (JTAG route controller)
@@ -469,16 +478,16 @@ if { [info exists JRC_TAPID] } {
 } else {
    set _JRC_TAPID 0x0b98c02f
 }
-jtag newtap $_CHIPNAME jrc -irlen 6 -ircapture 0x1 -irmask 0x3f -expected-id $_JRC_TAPID -ignore-version
-jtag configure $_CHIPNAME.jrc -event setup "jtag tapenable $_CHIPNAME.dap"
-# some TCK tycles are required to activate the DEBUG power domain
-jtag configure $_CHIPNAME.jrc -event post-reset "runtest 100"
+jtag newtap $_CHIPNAME $JRC_MODULE -irlen 6 -ircapture 0x1 -irmask 0x3f -expected-id $_JRC_TAPID -ignore-version
+jtag configure $JRC_NAME -event setup "jtag tapenable $DEBUGSS_NAME"
+ # some TCK tycles are required to activate the DEBUG power domain
+jtag configure $JRC_NAME -event post-reset "runtest 100"
 
 #
 # Cortex A9 target
 #
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_a -chain-position $_CHIPNAME.dap -dbgbase 0x80000000
+target create $_TARGETNAME cortex_a -chain-position $DEBUGSS_NAME -dbgbase 0x80000000
+
 
 # SRAM: 256K at 0x4030.0000
 $_TARGETNAME configure -work-area-phys 0x40300000 -work-area-size 0x40000