diff --git a/Platforms/platform-esp32/include/tactility/drivers/esp32_esp_hosted_ota.h b/Platforms/platform-esp32/include/tactility/drivers/esp32_esp_hosted_ota.h
index 1908d4dd4..69c16597b 100644
--- a/Platforms/platform-esp32/include/tactility/drivers/esp32_esp_hosted_ota.h
+++ b/Platforms/platform-esp32/include/tactility/drivers/esp32_esp_hosted_ota.h
@@ -3,5 +3,5 @@
 struct FirmwareOps;
 
 /** @return the esp_hosted co-processor FirmwareOps implementation. Only declared/linked when
- *  CONFIG_SLAVE_SOC_WIFI_SUPPORTED - callers (esp32_wifi.cpp) must guard with the same #if. */
+ *  CONFIG_ESP_HOSTED_ENABLED - callers (esp32_wifi.cpp) must guard with the same #if. */
 const FirmwareOps* esp32_esp_hosted_ota_get_ops();
diff --git a/Platforms/platform-esp32/source/drivers/esp32_esp_hosted_ota.cpp b/Platforms/platform-esp32/source/drivers/esp32_esp_hosted_ota.cpp
index 69fd6eceb..bc0aed392 100644
--- a/Platforms/platform-esp32/source/drivers/esp32_esp_hosted_ota.cpp
+++ b/Platforms/platform-esp32/source/drivers/esp32_esp_hosted_ota.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <tactility/drivers/esp32_esp_hosted_ota.h>
 #include <tactility/drivers/wifi.h>
@@ -251,4 +251,4 @@ const FirmwareOps* esp32_esp_hosted_ota_get_ops() {
     return &firmwareOps;
 }
 
-#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_ESP_HOSTED_ENABLED
diff --git a/Platforms/platform-esp32/source/drivers/esp32_wifi.cpp b/Platforms/platform-esp32/source/drivers/esp32_wifi.cpp
index 79d5c1b31..f647c961d 100644
--- a/Platforms/platform-esp32/source/drivers/esp32_wifi.cpp
+++ b/Platforms/platform-esp32/source/drivers/esp32_wifi.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <esp_event.h>
 #include <esp_netif.h>
@@ -20,7 +20,7 @@
 
 #include <TactilityCpp/Allocator.h>
 
-#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_ESP_HOSTED_ENABLED)
 #include <tactility/drivers/esp32_esp_hosted_ota.h>
 #endif
 
@@ -583,7 +583,7 @@ error_t api_get_firmware_ops(Device* /*device*/, const FirmwareOps** ops, void**
     if (ops == nullptr || ctx == nullptr) {
         return ERROR_INVALID_ARGUMENT;
     }
-#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_ESP_HOSTED_ENABLED)
     // Only meaningful on a hosted board (P4+C6/C5 etc.) - this wifi device is backed by a real
     // co-processor with its own updatable firmware there. On a native (non-hosted) chip, this
     // device's "radio" is the chip's own built-in WiFi, nothing to update via this interface.
@@ -682,4 +682,4 @@ Driver esp32_wifi_driver = {
 
 } // extern "C"
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_ESP_HOSTED_ENABLED
diff --git a/Platforms/platform-esp32/source/drivers/esp32_wifi_pinned.cpp b/Platforms/platform-esp32/source/drivers/esp32_wifi_pinned.cpp
index 340c55910..8fb3c0046 100644
--- a/Platforms/platform-esp32/source/drivers/esp32_wifi_pinned.cpp
+++ b/Platforms/platform-esp32/source/drivers/esp32_wifi_pinned.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <esp_wifi.h> // for WIFI_TASK_CORE_ID
 
@@ -365,4 +365,4 @@ Driver esp32_wifi_pinned_driver = {
 
 } // extern "C"
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_ESP_HOSTED_ENABLED
diff --git a/Platforms/platform-esp32/source/module.cpp b/Platforms/platform-esp32/source/module.cpp
index a0a490c24..e3a38e334 100644
--- a/Platforms/platform-esp32/source/module.cpp
+++ b/Platforms/platform-esp32/source/module.cpp
@@ -337,7 +337,7 @@ extern Driver esp32_sdspi_driver;
 extern Driver esp32_spi_driver;
 extern Driver esp32_uart_driver;
 extern Driver esp32_grove_driver;
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 extern Driver esp32_wifi_driver;
 extern Driver esp32_wifi_pinned_driver;
 #endif
@@ -387,7 +387,7 @@ static Driver* const platform_esp32_drivers[] = {
     &esp32_spi_driver,
     &esp32_uart_driver,
     &esp32_grove_driver,
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
     &esp32_wifi_driver,
     &esp32_wifi_pinned_driver,
 #endif
diff --git a/Tactility/Include/Tactility/service/espnow/EspNow.h b/Tactility/Include/Tactility/service/espnow/EspNow.h
index 42c2e43f8..c79c86d01 100644
--- a/Tactility/Include/Tactility/service/espnow/EspNow.h
+++ b/Tactility/Include/Tactility/service/espnow/EspNow.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <cstdint>
 #include <cstring>
@@ -66,4 +66,4 @@ size_t getMaxDataLength();
 
 }
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
\ No newline at end of file
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
\ No newline at end of file
diff --git a/Tactility/Private/Tactility/app/chat/ChatAppPrivate.h b/Tactility/Private/Tactility/app/chat/ChatAppPrivate.h
index d5eece322..101a90361 100644
--- a/Tactility/Private/Tactility/app/chat/ChatAppPrivate.h
+++ b/Tactility/Private/Tactility/app/chat/ChatAppPrivate.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include "ChatState.h"
 #include "ChatView.h"
@@ -37,4 +37,4 @@ void switchChannel(Context* ctx, const std::string& chatChannel);
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Private/Tactility/app/chat/ChatProtocol.h b/Tactility/Private/Tactility/app/chat/ChatProtocol.h
index dd8d397d1..6d5cf822d 100644
--- a/Tactility/Private/Tactility/app/chat/ChatProtocol.h
+++ b/Tactility/Private/Tactility/app/chat/ChatProtocol.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <cstddef>
 #include <cstdint>
@@ -94,4 +94,4 @@ size_t getMaxMessageLength(size_t nicknameLen, size_t targetLen);
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Private/Tactility/app/chat/ChatSettings.h b/Tactility/Private/Tactility/app/chat/ChatSettings.h
index 950841f41..2b052ab22 100644
--- a/Tactility/Private/Tactility/app/chat/ChatSettings.h
+++ b/Tactility/Private/Tactility/app/chat/ChatSettings.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <array>
 #include <cstdint>
@@ -28,4 +28,4 @@ bool settingsFileExists();
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Private/Tactility/app/chat/ChatState.h b/Tactility/Private/Tactility/app/chat/ChatState.h
index cf66c208c..30eb195cd 100644
--- a/Tactility/Private/Tactility/app/chat/ChatState.h
+++ b/Tactility/Private/Tactility/app/chat/ChatState.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/RecursiveMutex.h>
 
@@ -56,4 +56,4 @@ public:
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Private/Tactility/app/chat/ChatView.h b/Tactility/Private/Tactility/app/chat/ChatView.h
index b53b3b98f..a2588e980 100644
--- a/Tactility/Private/Tactility/app/chat/ChatView.h
+++ b/Tactility/Private/Tactility/app/chat/ChatView.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include "ChatState.h"
 #include "ChatSettings.h"
@@ -75,4 +75,4 @@ public:
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Private/Tactility/service/espnow/EspNowBackend.h b/Tactility/Private/Tactility/service/espnow/EspNowBackend.h
index a30b10490..76c1be363 100644
--- a/Tactility/Private/Tactility/service/espnow/EspNowBackend.h
+++ b/Tactility/Private/Tactility/service/espnow/EspNowBackend.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/service/espnow/EspNow.h>
 
@@ -29,4 +29,4 @@ uint32_t getVersion();
 
 }
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Private/Tactility/service/espnow/EspNowHostedTransport.h b/Tactility/Private/Tactility/service/espnow/EspNowHostedTransport.h
index dc0d190e0..91f90feac 100644
--- a/Tactility/Private/Tactility/service/espnow/EspNowHostedTransport.h
+++ b/Tactility/Private/Tactility/service/espnow/EspNowHostedTransport.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <cstdint>
 
@@ -30,4 +30,4 @@ bool waitForHostedTransport(uint32_t timeoutMs);
 
 }
 
-#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Private/Tactility/service/espnow/EspNowService.h b/Tactility/Private/Tactility/service/espnow/EspNowService.h
index 24008c86c..2f69c242e 100644
--- a/Tactility/Private/Tactility/service/espnow/EspNowService.h
+++ b/Tactility/Private/Tactility/service/espnow/EspNowService.h
@@ -4,7 +4,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/service/Service.h>
 #include <Tactility/service/espnow/EspNow.h>
@@ -75,4 +75,4 @@ std::shared_ptr<EspNowService> findService();
 
 }
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/Tactility.cpp b/Tactility/Source/Tactility.cpp
index d5d132ef5..87f7c4eb8 100644
--- a/Tactility/Source/Tactility.cpp
+++ b/Tactility/Source/Tactility.cpp
@@ -121,7 +121,7 @@ namespace service {
     namespace audio { extern const ServiceManifest manifest; }
     namespace wifi { extern const ServiceManifest manifest; }
     namespace development { extern const ServiceManifest manifest; }
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
     namespace espnow { extern const ServiceManifest manifest; }
 #endif
     // Secondary (UI)
@@ -200,7 +200,7 @@ namespace app {
     namespace screenshot { extern const ::AppManifest manifest; }
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
     namespace chat { extern const ::AppManifest manifest; }
 #endif
 }
@@ -269,7 +269,7 @@ static void registerInternalApps() {
     app_manager_add(&app::screenshot::manifest);
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
     app_manager_add(&app::chat::manifest);
 #endif
 
@@ -319,7 +319,7 @@ static void registerAndStartServices() {
     addService(service::development::manifest);
     addService(service::webserver::manifest);
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
     addService(service::espnow::manifest);
 #endif
 #if defined(ESP_PLATFORM)
diff --git a/Tactility/Source/app/chat/ChatApp.cpp b/Tactility/Source/app/chat/ChatApp.cpp
index 3556abc47..1bb0c57c3 100644
--- a/Tactility/Source/app/chat/ChatApp.cpp
+++ b/Tactility/Source/app/chat/ChatApp.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/app/chat/ChatAppPrivate.h>
 #include <Tactility/app/chat/ChatProtocol.h>
@@ -233,4 +233,4 @@ extern const ::AppManifest manifest = {
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/app/chat/ChatProtocol.cpp b/Tactility/Source/app/chat/ChatProtocol.cpp
index e9b5742bb..8f5f16026 100644
--- a/Tactility/Source/app/chat/ChatProtocol.cpp
+++ b/Tactility/Source/app/chat/ChatProtocol.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/app/chat/ChatProtocol.h>
 #include <Tactility/service/espnow/EspNow.h>
@@ -171,4 +171,4 @@ size_t getMaxMessageLength(size_t nicknameLen, size_t targetLen) {
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/app/chat/ChatSettings.cpp b/Tactility/Source/app/chat/ChatSettings.cpp
index 0ea685fb2..a0fd345a0 100644
--- a/Tactility/Source/app/chat/ChatSettings.cpp
+++ b/Tactility/Source/app/chat/ChatSettings.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/app/chat/ChatSettings.h>
 #include <Tactility/app/chat/ChatProtocol.h>
@@ -205,4 +205,4 @@ bool settingsFileExists() {
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/app/chat/ChatState.cpp b/Tactility/Source/app/chat/ChatState.cpp
index 4c8174099..8a14e47d4 100644
--- a/Tactility/Source/app/chat/ChatState.cpp
+++ b/Tactility/Source/app/chat/ChatState.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/app/chat/ChatState.h>
 
@@ -57,4 +57,4 @@ std::vector<StoredMessage> ChatState::getFilteredMessages() const {
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/app/chat/ChatView.cpp b/Tactility/Source/app/chat/ChatView.cpp
index 2fbca38f6..5fc778a75 100644
--- a/Tactility/Source/app/chat/ChatView.cpp
+++ b/Tactility/Source/app/chat/ChatView.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/app/chat/ChatView.h>
 #include <Tactility/app/chat/ChatAppPrivate.h>
@@ -306,4 +306,4 @@ void ChatView::onChannelCancel(lv_event_t* e) {
 
 } // namespace tt::app::chat
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/service/espnow/EspNow.cpp b/Tactility/Source/service/espnow/EspNow.cpp
index d0797ec67..61156b83e 100644
--- a/Tactility/Source/service/espnow/EspNow.cpp
+++ b/Tactility/Source/service/espnow/EspNow.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/service/espnow/EspNow.h>
 #include <Tactility/service/espnow/EspNowService.h>
@@ -97,4 +97,4 @@ size_t getMaxDataLength() {
 
 }
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/service/espnow/EspNowBackendHosted.cpp b/Tactility/Source/service/espnow/EspNowBackendHosted.cpp
index b6966795e..ca48054b2 100644
--- a/Tactility/Source/service/espnow/EspNowBackendHosted.cpp
+++ b/Tactility/Source/service/espnow/EspNowBackendHosted.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/service/espnow/EspNowBackend.h>
 #include <Tactility/service/espnow/EspNowHostedTransport.h>
@@ -310,4 +310,4 @@ uint32_t getVersion() {
 
 }
 
-#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/service/espnow/EspNowBackendNative.cpp b/Tactility/Source/service/espnow/EspNowBackendNative.cpp
index 93b8bc65f..10597cdf7 100644
--- a/Tactility/Source/service/espnow/EspNowBackendNative.cpp
+++ b/Tactility/Source/service/espnow/EspNowBackendNative.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) && !defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) && !defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/service/espnow/EspNowBackend.h>
 #include <Tactility/service/wifi/Wifi.h>
@@ -205,4 +205,4 @@ uint32_t getVersion() {
 
 }
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED && !CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED && !CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/service/espnow/EspNowHostedTransport.cpp b/Tactility/Source/service/espnow/EspNowHostedTransport.cpp
index 751ffe11e..718e53da6 100644
--- a/Tactility/Source/service/espnow/EspNowHostedTransport.cpp
+++ b/Tactility/Source/service/espnow/EspNowHostedTransport.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/service/espnow/EspNowHostedTransport.h>
 
@@ -34,4 +34,4 @@ bool waitForHostedTransport(uint32_t timeoutMs) {
 
 }
 
-#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_ESP_HOSTED_ENABLED
diff --git a/Tactility/Source/service/espnow/EspNowService.cpp b/Tactility/Source/service/espnow/EspNowService.cpp
index f9ec858b6..eadf2a22e 100644
--- a/Tactility/Source/service/espnow/EspNowService.cpp
+++ b/Tactility/Source/service/espnow/EspNowService.cpp
@@ -2,7 +2,7 @@
 #include <sdkconfig.h>
 #endif
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED)
+#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
 
 #include <Tactility/Tactility.h>
 #include <Tactility/service/espnow/EspNowService.h>
@@ -199,4 +199,4 @@ extern const ServiceManifest manifest = {
 
 }
 
-#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED
+#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED