diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index fd7203f7..13e3812a 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -19,7 +19,7 @@
 
 #ifndef NO_ESP32
 #include "mesh/http/WiFiAPClient.h"
-#include "modules/esp32/StoreForwardPlugin.h"
+#include "modules/esp32/StoreForwardModule.h"
 #include <Preferences.h>
 #include <nvs_flash.h>
 #endif
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index 48e94d0c..52528e35 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -14,9 +14,9 @@
 #include "modules/Telemetry/Telemetry.h"
 #endif
 #ifndef NO_ESP32
-#include "modules/esp32/RangeTestPlugin.h"
-#include "modules/esp32/SerialPlugin.h"
-#include "modules/esp32/StoreForwardPlugin.h"
+#include "modules/esp32/RangeTestModule.h"
+#include "modules/esp32/SerialModule.h"
+#include "modules/esp32/StoreForwardModule.h"
 #endif
 
 /**
diff --git a/src/modules/esp32/RangeTestPlugin.cpp b/src/modules/esp32/RangeTestModule.cpp
similarity index 99%
rename from src/modules/esp32/RangeTestPlugin.cpp
rename to src/modules/esp32/RangeTestModule.cpp
index 59ab4876..cf2a38e3 100644
--- a/src/modules/esp32/RangeTestPlugin.cpp
+++ b/src/modules/esp32/RangeTestModule.cpp
@@ -1,4 +1,4 @@
-#include "RangeTestPlugin.h"
+#include "RangeTestModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
diff --git a/src/modules/esp32/RangeTestPlugin.h b/src/modules/esp32/RangeTestModule.h
similarity index 100%
rename from src/modules/esp32/RangeTestPlugin.h
rename to src/modules/esp32/RangeTestModule.h
diff --git a/src/modules/esp32/SerialPlugin.cpp b/src/modules/esp32/SerialModule.cpp
similarity index 98%
rename from src/modules/esp32/SerialPlugin.cpp
rename to src/modules/esp32/SerialModule.cpp
index 2687eff2..849d1cd7 100644
--- a/src/modules/esp32/SerialPlugin.cpp
+++ b/src/modules/esp32/SerialModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "SerialPlugin.h"
+#include "SerialModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
@@ -27,7 +27,7 @@
                 TXD 15
         3) Set serialmodule_timeout to the amount of time to wait before we consider
            your packet as "done".
-        4) (Optional) In SerialPlugin.h set the port to PortNum_TEXT_MESSAGE_APP if you want to
+        4) (Optional) In SerialModule.h set the port to PortNum_TEXT_MESSAGE_APP if you want to
            send messages to/from the general text message channel.
         5) Connect to your device over the serial interface at 38400 8N1.
         6) Send a packet up to 240 bytes in length. This will get relayed over the mesh network.
diff --git a/src/modules/esp32/SerialPlugin.h b/src/modules/esp32/SerialModule.h
similarity index 100%
rename from src/modules/esp32/SerialPlugin.h
rename to src/modules/esp32/SerialModule.h
diff --git a/src/modules/esp32/StoreForwardPlugin.cpp b/src/modules/esp32/StoreForwardModule.cpp
similarity index 99%
rename from src/modules/esp32/StoreForwardPlugin.cpp
rename to src/modules/esp32/StoreForwardModule.cpp
index b061c3bf..3aedcdf3 100644
--- a/src/modules/esp32/StoreForwardPlugin.cpp
+++ b/src/modules/esp32/StoreForwardModule.cpp
@@ -1,4 +1,4 @@
-#include "StoreForwardPlugin.h"
+#include "StoreForwardModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
diff --git a/src/modules/esp32/StoreForwardPlugin.h b/src/modules/esp32/StoreForwardModule.h
similarity index 100%
rename from src/modules/esp32/StoreForwardPlugin.h
rename to src/modules/esp32/StoreForwardModule.h