diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
index eb720d23..0534321f 100644
--- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
+++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
@@ -50,7 +50,7 @@ build_flags =
     -D STM32_SERIAL1                ; Set this option to use Serial1 as default sersial port, leave out if using Serial2
 
 ;region -- Hasp build options ----------------------------
-    -D HASP_USE_TASMOTA_SLAVE=0
+    -D HASP_USE_TASMOTA_CLIENT=0
     -D HASP_OUTPUT_PIN=PA1          ; User LED D2 on DevEBox board 
     -D HASP_INPUT_PIN=PA0           ; User Button K1 on DevEBox board
     -D HASP_USE_WIFI=0
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
index 57ed09f7..2b3d9388 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
@@ -32,7 +32,7 @@ build_flags =
 ;region -- Hasp build options ----------------------------
     -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board
     -D HASP_INPUT_PIN=PD15 ; User Button K1 on DevEBox board
-    -D HASP_USE_TASMOTA_SLAVE=1
+    -D HASP_USE_TASMOTA_CLIENT=1
     -D HASP_USE_OTA=0
     -D HASP_USE_ETHERNET=1
 ;endregion
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
index c855aebb..b019108b 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
@@ -44,7 +44,7 @@ build_flags =
     -D HASP_USE_SPIFFS=0
     -D HASP_USE_EEPROM=1
     -D HASP_USE_GPIO=0
-    -D HASP_USE_TASMOTA_SLAVE=0
+    -D HASP_USE_TASMOTA_CLIENT=0
     -D HASP_USE_OTA=0
     -D HASP_USE_ETHERNET=0
 ;endregion
diff --git a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
index 2a5e7950..4005c4a8 100644
--- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
@@ -52,7 +52,7 @@ build_flags =
     -D HASP_USE_SPIFFS=0
     -D HASP_USE_EEPROM=1
     -D HASP_USE_GPIO=1
-    -D HASP_USE_TASMOTA_SLAVE=0
+    -D HASP_USE_TASMOTA_CLIENT=0
     -D HASP_USE_OTA=0
     -D HASP_OUTPUT_PIN=PA1          ; User LED D2 on DevEBox board 
     -D HASP_INPUT_PIN=PA0           ; User Button K1 on DevEBox board
diff --git a/user_setups/win32/emulator_64bits.ini b/user_setups/win32/emulator_64bits.ini
index 43480cbd..0d86e0e2 100644
--- a/user_setups/win32/emulator_64bits.ini
+++ b/user_setups/win32/emulator_64bits.ini
@@ -100,8 +100,6 @@ src_filter =
   -<hal/>
   -<svc/>
   -<hasp_filesystem.cpp>
-  -<hasp_gui.cpp>
-  -<hasp_gui.h>
   +<font/>
   +<hasp/>
   +<lang/>