diff --git a/src/Afterburner.cpp b/src/Afterburner.cpp
index 7a15f64..4b0cf7d 100644
--- a/src/Afterburner.cpp
+++ b/src/Afterburner.cpp
@@ -85,7 +85,7 @@
   This example code is in the public domain.
 */
 
-#include "WiFi/ABMqtt.h"
+#include "WiFi/ABMQTT.h"
 #include "cfg/BTCConfig.h"
 #include "cfg/pins.h"
 #include "RTC/Timers.h"
diff --git a/src/OLED/MQTTScreen.cpp b/src/OLED/MQTTScreen.cpp
index f08f96e..16790e5 100644
--- a/src/OLED/MQTTScreen.cpp
+++ b/src/OLED/MQTTScreen.cpp
@@ -22,7 +22,7 @@
 #include "MQTTScreen.h"
 #include "KeyPad.h"
 #include "../Utility/helpers.h"
-#include "../WiFi/ABMqtt.h"
+#include "../WiFi/ABMQTT.h"
 #include "../WiFi/BTCWifi.h"
 #include "../Utility/NVStorage.h"
 #include "fonts/Arial.h"
diff --git a/src/Utility/BTC_JSON.cpp b/src/Utility/BTC_JSON.cpp
index da29284..2e88d79 100644
--- a/src/Utility/BTC_JSON.cpp
+++ b/src/Utility/BTC_JSON.cpp
@@ -30,7 +30,7 @@
 #include "../Bluetooth/BluetoothAbstract.h"
 #include "../WiFi/BTCWebServer.h"
 #include "../WiFi/BTCWifi.h"
-#include "../WiFi/ABmqtt.h"
+#include "../WiFi/ABMQTT.h"
 #include "../cfg/BTCConfig.h"
 #include "macros.h"
 #include "../Protocol/Protocol.h"
diff --git a/src/WiFi/ABMqtt.cpp b/src/WiFi/ABMqtt.cpp
index 7e58906..fcdac19 100644
--- a/src/WiFi/ABMqtt.cpp
+++ b/src/WiFi/ABMqtt.cpp
@@ -28,7 +28,7 @@
 
 
 #include <Arduino.h>
-#include "ABMqtt.h"
+#include "ABMQTT.h"
 #include "../../lib/async-mqtt-client/src/AsyncMqttClient.h"
 #include "BTCWifi.h"
 #include "BTCWebServer.h"
diff --git a/src/WiFi/ABmqtt.h b/src/WiFi/ABmqtt.h
index 6384a19..8990800 100644
--- a/src/WiFi/ABmqtt.h
+++ b/src/WiFi/ABmqtt.h
@@ -1,4 +1,4 @@
-// ABMqtt.h
+// ABMQTT.h
 /*
  * This file is part of the "bluetoothheater" distribution 
  * (https://gitlab.com/mrjones.id.au/bluetoothheater) 
diff --git a/src/WiFi/BTCWifi.cpp b/src/WiFi/BTCWifi.cpp
index 6ae73e7..aaa89d0 100644
--- a/src/WiFi/BTCWifi.cpp
+++ b/src/WiFi/BTCWifi.cpp
@@ -52,6 +52,8 @@ extern CScreenManager ScreenManager;
 bool initWifi(const char *failedssid, const char *failedpassword) 
 {
   
+  WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
+
   // report the MAC addresses - note individual values for STA and AP modes
   uint8_t MAC[6];
   esp_read_mac(MAC, ESP_MAC_WIFI_STA);