diff --git a/STM32F4/boards.txt b/STM32F4/boards.txt
index 453d520..7577d19 100644
--- a/STM32F4/boards.txt
+++ b/STM32F4/boards.txt
@@ -3,7 +3,7 @@
 ##############################################################
 discovery_f407.name=STM32 Discovery F407
 
-discovery_f407.upload.tool=stlink
+discovery_f407.upload.tool=stlink_upload
 discovery_f407.upload.protocol=stlink
 
 #discovery_f407.upload.use_1200bps_touch=false
diff --git a/STM32F4/platform.txt b/STM32F4/platform.txt
index 7d53959..99ae555 100755
--- a/STM32F4/platform.txt
+++ b/STM32F4/platform.txt
@@ -117,28 +117,14 @@ tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altI
 # Generic STM32 upload via serial to Serial Port 1 (pins PA9 and PA10) - note. Boot0 line needs to high on board reset to enable upload via serial
 # at the end of the upload the program is automatically run, without the board being reset
 
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path={runtime.hardware.path}/tools/win
-tools.serial_upload.path.macosx={runtime.hardware.path}/tools/macosx
-tools.serial_upload.path.linux={runtime.hardware.path}/tools/linux
-tools.serial_upload.path.linux64={runtime.hardware.path}/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
-
-# STLINK/V2
-
-tools.stlink.cmd=stlink_upload
-tools.stlink.cmd.windows=stlink_upload.bat
+# stlink upload
+tools.stlink_upload.cmd=stlink_upload
+tools.stlink_upload.cmd.windows=stlink_upload.bat
 tools.stlink_upload.path.windows={runtime.hardware.path}/tools/win
 tools.stlink_upload.path.macosx={runtime.hardware.path}/tools/macosx
 tools.stlink_upload.path.linux={runtime.hardware.path}/tools/linux
 tools.stlink_upload.path.linux64={runtime.hardware.path}/tools/linux64
-tools.stlink.path.linux={runtime.hardware.path}/tools/linux/
-tools.stlink.path.macosx={runtime.hardware.path}/tools/macosx/
-tools.stlink.upload.params.verbose=-d
-tools.stlink.upload.params.quiet=
-tools.stlink.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
+tools.stlink_upload.upload.params.verbose=-d
+tools.stlink_upload.upload.params.quiet=
+tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"