diff --git a/tcl/board/altera_sockit.cfg b/tcl/board/altera_sockit.cfg
index b7c7993fe..4d10aef7b 100644
--- a/tcl/board/altera_sockit.cfg
+++ b/tcl/board/altera_sockit.cfg
@@ -12,7 +12,7 @@ adapter driver usb_blaster
 source [find target/altera_fpgasoc.cfg]
 
 # If the USB Blaster II were supported, these settings would be needed
-#usb_blaster_vid_pid 0x09fb 0x6810
-#usb_blaster_device_desc "USB-Blaster II"
+#usb_blaster vid_pid 0x09fb 0x6810
+#usb_blaster device_desc "USB-Blaster II"
 
 adapter speed 100
diff --git a/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg b/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
index a6e80650e..c9f8d3695 100644
--- a/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
+++ b/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
@@ -6,7 +6,7 @@ if { [info exists USE_EXTERNAL_DEBUGGER] } {
 	echo "Using external debugger"
 } else {
 	source [find interface/altera-usb-blaster2.cfg]
-	usb_blaster_device_desc "Arria10 IDK"
+	usb_blaster device_desc "Arria10 IDK"
 }
 
 source [find fpga/altera-10m50.cfg]
diff --git a/tcl/interface/altera-usb-blaster.cfg b/tcl/interface/altera-usb-blaster.cfg
index 84e77b13c..cb4ca9a78 100644
--- a/tcl/interface/altera-usb-blaster.cfg
+++ b/tcl/interface/altera-usb-blaster.cfg
@@ -5,7 +5,7 @@
 #
 
 adapter driver usb_blaster
-usb_blaster_lowlevel_driver ftdi
+usb_blaster lowlevel_driver ftdi
 # These are already the defaults.
-# usb_blaster_vid_pid 0x09FB 0x6001
-# usb_blaster_device_desc "USB-Blaster"
+# usb_blaster vid_pid 0x09FB 0x6001
+# usb_blaster device_desc "USB-Blaster"
diff --git a/tcl/interface/altera-usb-blaster2.cfg b/tcl/interface/altera-usb-blaster2.cfg
index 4642b1dcf..05b0519b8 100644
--- a/tcl/interface/altera-usb-blaster2.cfg
+++ b/tcl/interface/altera-usb-blaster2.cfg
@@ -3,6 +3,6 @@
 #
 
 adapter driver usb_blaster
-usb_blaster_vid_pid 0x09fb 0x6010 0x09fb 0x6810
-usb_blaster_lowlevel_driver ublast2
-usb_blaster_firmware /path/to/quartus/blaster_6810.hex
+usb_blaster vid_pid 0x09fb 0x6010 0x09fb 0x6810
+usb_blaster lowlevel_driver ublast2
+usb_blaster firmware /path/to/quartus/blaster_6810.hex
diff --git a/tcl/interface/usb-jtag.cfg b/tcl/interface/usb-jtag.cfg
index 8617c78c3..bbfb076d1 100644
--- a/tcl/interface/usb-jtag.cfg
+++ b/tcl/interface/usb-jtag.cfg
@@ -30,8 +30,8 @@
 # driver but ixo-usb-jtag requires the ftdi driver.
 
 adapter driver usb_blaster
-usb_blaster_vid_pid 0x16C0 0x06AD
-usb_blaster_device_desc "Van Ooijen Technische Informatica"
+usb_blaster vid_pid 0x16C0 0x06AD
+usb_blaster device_desc "Van Ooijen Technische Informatica"
 # ixo-usb-jtag is only compatible with the ublast1 protocol implemented via the
 # ftdi modes, using ublast2 will cause openocd to hang.
-usb_blaster_lowlevel_driver ftdi
+usb_blaster lowlevel_driver ftdi