diff --git a/scripts/esp32.mk b/scripts/esp32.mk
index 566ca3d72..92db7e1b9 100644
--- a/scripts/esp32.mk
+++ b/scripts/esp32.mk
@@ -24,7 +24,6 @@ ifeq ($(FAC),)
 	FAC=0
 endif
 export FAC
-DIRNAME:=$(shell basename $$(pwd) | tr -d '\n')
 
 $(LWS_BUILD_PATH)/pack.img: $(APP_BIN)
 	if [ -z "$(GENROMFS)" ]; then \
@@ -37,22 +36,21 @@ $(LWS_BUILD_PATH)/pack.img: $(APP_BIN)
 	fi; \
 	GNUSTAT=stat ;\
 	if [ `which gstat 2>/dev/null` ] ; then GNUSTAT=gstat ; fi ;\
-	DIRNAME=$$(basename $$(pwd) | tr -d '\n') ;\
 	genromfs -f $(LWS_BUILD_PATH)/romfs.img -d $(PROJECT_PATH)/romfs-files ; \
         RLEN=$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/romfs.img) ;\
-        LEN=$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$$DIRNAME.bin) ;\
+        LEN=$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin) ;\
         printf "             Original length: 0x%06x (%8d)\n" $$LEN $$LEN ; \
-        printf %02x $$(( $$RLEN % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-        printf %02x $$(( ( $$RLEN / 256 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-        printf %02x $$(( ( $$RLEN / 65536 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-        printf %02x $$(( ( $$RLEN / 16777216 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-        cat $(LWS_BUILD_PATH)/romfs.img >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ; \
-        LEN=$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$$DIRNAME.bin) ;\
+        printf %02x $$(( $$RLEN % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+        printf %02x $$(( ( $$RLEN / 256 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+        printf %02x $$(( ( $$RLEN / 65536 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+        printf %02x $$(( ( $$RLEN / 16777216 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+        cat $(LWS_BUILD_PATH)/romfs.img >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ; \
+        LEN=$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin) ;\
 	UNIXTIME=$$(date +%s | tr -d '\n') ; \
 	echo -n -e "{\r\n \"schema\": \"lws1\",\r\n \"model\": \"$(CONFIG_LWS_MODEL_NAME)\",\r\n \"builder\": \"" > $(jbi) ;\
 	hostname | tr -d '\n' >> $(jbi) ;\
 	echo -n -e "\",\r\n \"app\": \"" >> $(jbi) ;\
-	echo -n $$DIRNAME >> $(jbi) ;\
+	echo -n $(PROJECT_NAME) >> $(jbi) ;\
 	echo -n -e "\",\r\n \"user\": \"" >> $(jbi) ;\
 	whoami | tr -d '\n' >>$(jbi) ;\
 	echo -n -e  "\",\r\n \"git\": \"" >> $(jbi) ;\
@@ -61,18 +59,18 @@ $(LWS_BUILD_PATH)/pack.img: $(APP_BIN)
 	date | tr -d '\n' >> $(jbi) ;\
 	echo -n -e "\",\r\n \"unixtime\": \"" >> $(jbi) ;\
 	echo -n $$UNIXTIME >> $(jbi) ;\
-	echo -n -e "\",\r\n \"file\": \""$$DIRNAME-$$UNIXTIME.bin >> $(jbi) ;\
+	echo -n -e "\",\r\n \"file\": \""$(PROJECT_NAME)-$$UNIXTIME.bin >> $(jbi) ;\
 	echo -n -e "\",\r\n \"factory\": \"$(FAC)" >> $(jbi) ;\
 	echo -n -e "\"\r\n}"  >> $(jbi) ;\
 	JLEN=$$($$GNUSTAT -c %s $(jbi)) ;\
-	printf %02x $$(( $$JLEN % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-	printf %02x $$(( ( $$JLEN / 256 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-	printf %02x $$(( ( $$JLEN / 65536 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-	printf %02x $$(( ( $$JLEN / 16777216 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-	cat $(jbi) >> $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\
-	cp $(LWS_BUILD_PATH)/$$DIRNAME.bin $(LWS_BUILD_PATH)/pack.img ;\
-        LEN=$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$$DIRNAME.bin) ;\
-	cp $(LWS_BUILD_PATH)/$$DIRNAME.bin $(LWS_BUILD_PATH)/$$DIRNAME-$$UNIXTIME.bin ;\
+	printf %02x $$(( $$JLEN % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+	printf %02x $$(( ( $$JLEN / 256 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+	printf %02x $$(( ( $$JLEN / 65536 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+	printf %02x $$(( ( $$JLEN / 16777216 ) % 256 )) | xxd -r -p >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+	cat $(jbi) >> $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\
+	cp $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin $(LWS_BUILD_PATH)/pack.img ;\
+        LEN=$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin) ;\
+	cp $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin $(LWS_BUILD_PATH)/$(PROJECT_NAME)-$$UNIXTIME.bin ;\
 	printf "    After ROMFS + Build info: 0x%06x (%8d)\n" $$LEN $$LEN
 
 .PHONY: manifest
@@ -96,12 +94,11 @@ all: $(LWS_BUILD_PATH)/pack.img
 flash: $(LWS_BUILD_PATH)/pack.img
 
 flash_ota: $(LWS_BUILD_PATH)/pack.img
-	DIRNAME=$$(basename $$(pwd) | tr -d '\n') ;\
 	$(IDF_PATH)/components/esptool_py/esptool/esptool.py \
 		--chip esp32 \
 		--port $(ESPPORT) \
 		--baud $(CONFIG_ESPTOOLPY_BAUD) \
-		write_flash 0x110000 $(LWS_BUILD_PATH)/$$DIRNAME.bin
+		write_flash 0x110000 $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin
 
 erase_ota:
 	$(IDF_PATH)/components/esptool_py/esptool/esptool.py \