diff --git a/build-targets.mk b/build-targets.mk
index 57f0d96..90ec22e 100644
--- a/build-targets.mk
+++ b/build-targets.mk
@@ -223,6 +223,6 @@ bootloader:
 version:
 	@echo "$(name) $(notdir $(runtime.platform.path))"
 
-.PHONY: clean all path term version build-summary prebuild build-variables upload program erase bootloader
+.PHONY: clean all path term version build-summary prebuild build-variables upload program erase bootloader $(PREBUILD_HOOKS) $(PRELINK_HOOKS)
 
 -include $(DEPS)
diff --git a/docs/esp.md b/docs/esp.md
index 4b04433..317a215 100644
--- a/docs/esp.md
+++ b/docs/esp.md
@@ -68,7 +68,7 @@ other variables:
 
 targets:
 - ota
-- upload-fs: builds and uploads spiffs image
+- upload-spiffs: builds and uploads spiffs image
 
 ### examples
 
diff --git a/esp32.mk b/esp32.mk
index 339c38e..3104713 100644
--- a/esp32.mk
+++ b/esp32.mk
@@ -52,8 +52,8 @@ SPIFFS_BLOCKSIZE := 4096
 $(SPIFFS_IMAGE): $(wildcard $(SPIFFS_DIR)/*)
 	$(runtime.tools.mkspiffs.path)/$(runtime.tools.mkspiffs.cmd) -c $(FS_DIR) -b $(SPIFFS_BLOCKSIZE) -p $(SPIFFS_PAGESIZE) -s $(SPIFFS_SIZE) $@
 
-upload-fs: cmd = $(tools.$(upload.tool).cmd)
-upload-fs: $(SPIFFS_IMAGE)
+upload-spiffs: cmd = $(tools.$(upload.tool).cmd)
+upload-spiffs: $(SPIFFS_IMAGE)
 	$(runtime.tools.$(upload.tool).path)/$(cmd) --chip esp32 --port $(serial.port) --before default_reset --after hard_reset write_flash -z --flash_mode $(build.flash_mode) --flash_freq $(build.flash_freq) --flash_size detect $(SPIFFS_START) $(SPIFFS_IMAGE)
 
-.PHONY: upload upload-fs ota
+.PHONY: upload upload-spiffs ota
diff --git a/esp8266.mk b/esp8266.mk
index 2de02b7..b1a3396 100644
--- a/esp8266.mk
+++ b/esp8266.mk
@@ -65,4 +65,4 @@ fs: $(LITTLEFS_IMAGE)
 upload-fs: $(LITTLEFS_IMAGE)
 	$(tools.esptool.cmd) $(runtime.platform.path)/tools/upload.py --chip esp8266 --port $(serial.port) --baud $(upload.speed) $(upload.verbose) write_flash $(build.spiffs_start) $<
 
-.PHONY: upload ota spiffs upload-spiffs fs upload-fs
+.PHONY: ota spiffs upload-spiffs fs upload-fs