diff --git a/interface/src/wifi/WiFiSettingsController.tsx b/interface/src/wifi/WiFiSettingsController.tsx
index b5ad0f85e..23fdd316b 100644
--- a/interface/src/wifi/WiFiSettingsController.tsx
+++ b/interface/src/wifi/WiFiSettingsController.tsx
@@ -19,7 +19,7 @@ class WiFiSettingsController extends Component<WiFiSettingsControllerProps> {
       const wifiSettings: WiFiSettings = {
         ssid: selectedNetwork.ssid,
         password: "",
-        hostname: "esp8266-react",
+        hostname: "ems-esp",
         static_ip_config: false,
       }
       this.props.setData(wifiSettings);
diff --git a/lib/framework/APSettingsService.h b/lib/framework/APSettingsService.h
index 910461536..01042d9d8 100644
--- a/lib/framework/APSettingsService.h
+++ b/lib/framework/APSettingsService.h
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef FACTORY_AP_SSID
-#define FACTORY_AP_SSID "ESP8266-React"
+#define FACTORY_AP_SSID "ems-esp"
 #endif
 
 #ifndef FACTORY_AP_PASSWORD