diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 370bc9a54..ede88e41c 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
-#include "modules/TextMessagePlugin.h"
+#include "modules/TextMessageModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"
diff --git a/src/main.cpp b/src/main.cpp
index 813309de2..68c21c502 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 #include "concurrency/Periodic.h"
 #include "graphics/Screen.h"
 #include "main.h"
-#include "modules/Plugins.h"
+#include "modules/Modules.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include <OneButton.h>
diff --git a/src/mesh/MeshPlugin.cpp b/src/mesh/MeshPlugin.cpp
index b2261a471..323f56363 100644
--- a/src/mesh/MeshPlugin.cpp
+++ b/src/mesh/MeshPlugin.cpp
@@ -3,7 +3,7 @@
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "modules/RoutingPlugin.h"
+#include "modules/RoutingModule.h"
 #include <assert.h>
 
 std::vector<MeshPlugin *> *MeshPlugin::plugins;
diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index 151c4e2de..d9de5f52d 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -12,8 +12,8 @@
 #include "RTC.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
-#include "modules/NodeInfoPlugin.h"
-#include "modules/PositionPlugin.h"
+#include "modules/NodeInfoModule.h"
+#include "modules/PositionModule.h"
 #include "power.h"
 
 /*
diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 0917ec65f..6fac3739f 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -6,7 +6,7 @@
 #include "RTC.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
-#include "modules/RoutingPlugin.h"
+#include "modules/RoutingModule.h"
 
 #if defined(HAS_WIFI) || defined(PORTDUINO)
 #include "mqtt/MQTT.h"
diff --git a/src/modules/AdminPlugin.cpp b/src/modules/AdminModule.cpp
similarity index 99%
rename from src/modules/AdminPlugin.cpp
rename to src/modules/AdminModule.cpp
index 2f1893a87..5123a93c8 100644
--- a/src/modules/AdminPlugin.cpp
+++ b/src/modules/AdminModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "AdminPlugin.h"
+#include "AdminModule.h"
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
diff --git a/src/modules/AdminPlugin.h b/src/modules/AdminModule.h
similarity index 100%
rename from src/modules/AdminPlugin.h
rename to src/modules/AdminModule.h
diff --git a/src/modules/CannedMessagePlugin.cpp b/src/modules/CannedMessageModule.cpp
similarity index 99%
rename from src/modules/CannedMessagePlugin.cpp
rename to src/modules/CannedMessageModule.cpp
index a6b9a23f4..0d2a15715 100644
--- a/src/modules/CannedMessagePlugin.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "CannedMessagePlugin.h"
+#include "CannedMessageModule.h"
 #include "MeshService.h"
 #include "FSCommon.h"
 #include "mesh/generated/cannedmessages.pb.h"
diff --git a/src/modules/CannedMessagePlugin.h b/src/modules/CannedMessageModule.h
similarity index 100%
rename from src/modules/CannedMessagePlugin.h
rename to src/modules/CannedMessageModule.h
diff --git a/src/modules/ExternalNotificationPlugin.cpp b/src/modules/ExternalNotificationModule.cpp
similarity index 98%
rename from src/modules/ExternalNotificationPlugin.cpp
rename to src/modules/ExternalNotificationModule.cpp
index bea9a7e06..59827e6f8 100644
--- a/src/modules/ExternalNotificationPlugin.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "ExternalNotificationPlugin.h"
+#include "ExternalNotificationModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
@@ -11,7 +11,7 @@
 /*
 
     Documentation:
-        https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/modules/ExternalNotificationPlugin.md
+        https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/modules/ExternalNotificationModule.md
 
     This plugin supports:
         https://github.com/meshtastic/Meshtastic-device/issues/654
diff --git a/src/modules/ExternalNotificationPlugin.h b/src/modules/ExternalNotificationModule.h
similarity index 100%
rename from src/modules/ExternalNotificationPlugin.h
rename to src/modules/ExternalNotificationModule.h
diff --git a/src/modules/PluginDev.h b/src/modules/ModuleDev.h
similarity index 100%
rename from src/modules/PluginDev.h
rename to src/modules/ModuleDev.h
diff --git a/src/modules/Plugins.cpp b/src/modules/Modules.cpp
similarity index 82%
rename from src/modules/Plugins.cpp
rename to src/modules/Modules.cpp
index 8b543265d..915ac0d4f 100644
--- a/src/modules/Plugins.cpp
+++ b/src/modules/Modules.cpp
@@ -1,15 +1,15 @@
 #include "configuration.h"
 #include "input/InputBroker.h"
 #include "input/RotaryEncoderInterruptImpl1.h"
-#include "modules/AdminPlugin.h"
-#include "modules/CannedMessagePlugin.h"
-#include "modules/ExternalNotificationPlugin.h"
-#include "modules/NodeInfoPlugin.h"
-#include "modules/PositionPlugin.h"
-#include "modules/RemoteHardwarePlugin.h"
-#include "modules/ReplyPlugin.h"
-#include "modules/RoutingPlugin.h"
-#include "modules/TextMessagePlugin.h"
+#include "modules/AdminModule.h"
+#include "modules/CannedMessageModule.h"
+#include "modules/ExternalNotificationModule.h"
+#include "modules/NodeInfoModule.h"
+#include "modules/PositionModule.h"
+#include "modules/RemoteHardwareModule.h"
+#include "modules/ReplyModule.h"
+#include "modules/RoutingModule.h"
+#include "modules/TextMessageModule.h"
 #ifndef PORTDUINO
 #include "modules/Telemetry/Telemetry.h"
 #endif
diff --git a/src/modules/Plugins.h b/src/modules/Modules.h
similarity index 100%
rename from src/modules/Plugins.h
rename to src/modules/Modules.h
diff --git a/src/modules/NodeInfoPlugin.cpp b/src/modules/NodeInfoModule.cpp
similarity index 98%
rename from src/modules/NodeInfoPlugin.cpp
rename to src/modules/NodeInfoModule.cpp
index 51303ac57..83056d268 100644
--- a/src/modules/NodeInfoPlugin.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "NodeInfoPlugin.h"
+#include "NodeInfoModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
diff --git a/src/modules/NodeInfoPlugin.h b/src/modules/NodeInfoModule.h
similarity index 100%
rename from src/modules/NodeInfoPlugin.h
rename to src/modules/NodeInfoModule.h
diff --git a/src/modules/PositionPlugin.cpp b/src/modules/PositionModule.cpp
similarity index 99%
rename from src/modules/PositionPlugin.cpp
rename to src/modules/PositionModule.cpp
index 3f1355cbe..0f52d1865 100644
--- a/src/modules/PositionPlugin.cpp
+++ b/src/modules/PositionModule.cpp
@@ -1,4 +1,4 @@
-#include "PositionPlugin.h"
+#include "PositionModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
diff --git a/src/modules/PositionPlugin.h b/src/modules/PositionModule.h
similarity index 100%
rename from src/modules/PositionPlugin.h
rename to src/modules/PositionModule.h
diff --git a/src/modules/RemoteHardwarePlugin.cpp b/src/modules/RemoteHardwareModule.cpp
similarity index 99%
rename from src/modules/RemoteHardwarePlugin.cpp
rename to src/modules/RemoteHardwareModule.cpp
index 9da7ae218..1068e9cca 100644
--- a/src/modules/RemoteHardwarePlugin.cpp
+++ b/src/modules/RemoteHardwareModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "RemoteHardwarePlugin.h"
+#include "RemoteHardwareModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
diff --git a/src/modules/RemoteHardwarePlugin.h b/src/modules/RemoteHardwareModule.h
similarity index 100%
rename from src/modules/RemoteHardwarePlugin.h
rename to src/modules/RemoteHardwareModule.h
diff --git a/src/modules/ReplyPlugin.cpp b/src/modules/ReplyModule.cpp
similarity index 96%
rename from src/modules/ReplyPlugin.cpp
rename to src/modules/ReplyModule.cpp
index b0aa08673..d6f5dd10d 100644
--- a/src/modules/ReplyPlugin.cpp
+++ b/src/modules/ReplyModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "ReplyPlugin.h"
+#include "ReplyModule.h"
 #include "MeshService.h"
 #include "main.h"
 
diff --git a/src/modules/ReplyPlugin.h b/src/modules/ReplyModule.h
similarity index 100%
rename from src/modules/ReplyPlugin.h
rename to src/modules/ReplyModule.h
diff --git a/src/modules/RoutingPlugin.cpp b/src/modules/RoutingModule.cpp
similarity index 98%
rename from src/modules/RoutingPlugin.cpp
rename to src/modules/RoutingModule.cpp
index 82b0403fe..e762a8a03 100644
--- a/src/modules/RoutingPlugin.cpp
+++ b/src/modules/RoutingModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "RoutingPlugin.h"
+#include "RoutingModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Router.h"
diff --git a/src/modules/RoutingPlugin.h b/src/modules/RoutingModule.h
similarity index 100%
rename from src/modules/RoutingPlugin.h
rename to src/modules/RoutingModule.h
diff --git a/src/modules/TextMessagePlugin.cpp b/src/modules/TextMessageModule.cpp
similarity index 95%
rename from src/modules/TextMessagePlugin.cpp
rename to src/modules/TextMessageModule.cpp
index c2b1f08b2..bd6aea770 100644
--- a/src/modules/TextMessagePlugin.cpp
+++ b/src/modules/TextMessageModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "TextMessagePlugin.h"
+#include "TextMessageModule.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
 
diff --git a/src/modules/TextMessagePlugin.h b/src/modules/TextMessageModule.h
similarity index 100%
rename from src/modules/TextMessagePlugin.h
rename to src/modules/TextMessageModule.h
diff --git a/src/modules/esp32/StoreForwardPlugin.cpp b/src/modules/esp32/StoreForwardPlugin.cpp
index 7a05b9ab1..f789d5948 100644
--- a/src/modules/esp32/StoreForwardPlugin.cpp
+++ b/src/modules/esp32/StoreForwardPlugin.cpp
@@ -7,7 +7,7 @@
 #include "configuration.h"
 #include "mesh-pb-constants.h"
 #include "mesh/generated/storeforward.pb.h"
-#include "modules/PluginDev.h"
+#include "modules/ModuleDev.h"
 #include <Arduino.h>
 #include <iterator>
 #include <map>