diff --git a/tcl/target/rp2040.cfg b/tcl/target/rp2040.cfg
index 262de4418..e60892ebd 100644
--- a/tcl/target/rp2040.cfg
+++ b/tcl/target/rp2040.cfg
@@ -6,8 +6,6 @@
 # The device requires multidrop SWD for debug.
 transport select swd
 
-source [find target/swj-dp.tcl]
-
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
 } else {
@@ -50,7 +48,7 @@ if { [info exists USE_CORE] } {
 }
 set _BOTH_CORES [expr { $_USE_CORE != 0 && $_USE_CORE != 1 }]
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 # The rescue debug port uses the DP CTRL/STAT bit DBGPWRUPREQ to reset the
 # PSM (power on state machine) of the RP2040 with a flag set in the
diff --git a/tcl/target/rp2350.cfg b/tcl/target/rp2350.cfg
index be51931ec..afa16261c 100644
--- a/tcl/target/rp2350.cfg
+++ b/tcl/target/rp2350.cfg
@@ -5,8 +5,6 @@
 
 transport select swd
 
-source [find target/swj-dp.tcl]
-
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
 } else {
@@ -51,7 +49,7 @@ if { [info exists USE_CORE] } {
 	set _USE_CORE { cm0 cm1 }
 }
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 if { [info exists SWD_MULTIDROP] } {
 	dap create $_CHIPNAME.dap -adiv6 -chain-position $_CHIPNAME.cpu -dp-id 0x0040927 -instance-id 0