diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 4e7fb063..a5a2fb30 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -176,7 +176,7 @@ static void drawSleepScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int
 }
 #endif
 
-static void drawPluginFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+static void drawModuleFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
     uint8_t module_frame;
     // there's a little but in the UI transition code
@@ -976,7 +976,7 @@ void Screen::setFrames()
     DEBUG_MSG("showing standard frames\n");
     showingNormalScreen = true;
 
-    moduleFrames = MeshPlugin::GetMeshPluginsWithUIFrames();
+    moduleFrames = MeshPlugin::GetMeshModulesWithUIFrames();
     DEBUG_MSG("Showing %d module frames\n", moduleFrames.size());
     int totalFrameCount = MAX_NUM_NODES + NUM_EXTRA_FRAMES + moduleFrames.size();
     DEBUG_MSG("Total frame count: %d\n", totalFrameCount);
@@ -995,7 +995,7 @@ void Screen::setFrames()
     // is the same offset into the moduleFrames vector
     // so that we can invoke the module's callback
     for (auto i = moduleFrames.begin(); i != moduleFrames.end(); ++i) {
-        normalFrames[numframes++] = drawPluginFrame;
+        normalFrames[numframes++] = drawModuleFrame;
     }
 
     DEBUG_MSG("Added modules.  numframes: %d\n", numframes);
diff --git a/src/mesh/MeshPlugin.cpp b/src/mesh/MeshPlugin.cpp
index 77d64756..d3e0f584 100644
--- a/src/mesh/MeshPlugin.cpp
+++ b/src/mesh/MeshPlugin.cpp
@@ -222,7 +222,7 @@ void setReplyTo(MeshPacket *p, const MeshPacket &to)
     p->decoded.request_id = to.id;
 }
 
-std::vector<MeshPlugin *> MeshPlugin::GetMeshPluginsWithUIFrames()
+std::vector<MeshPlugin *> MeshPlugin::GetMeshModulesWithUIFrames()
 {
 
     std::vector<MeshPlugin *> modulesWithUIFrames;
diff --git a/src/mesh/MeshPlugin.h b/src/mesh/MeshPlugin.h
index 97f9e647..7abd56e1 100644
--- a/src/mesh/MeshPlugin.h
+++ b/src/mesh/MeshPlugin.h
@@ -68,7 +68,7 @@ class MeshPlugin
      */
     static void callPlugins(const MeshPacket &mp, RxSource src = RX_SRC_RADIO);
 
-    static std::vector<MeshPlugin *> GetMeshPluginsWithUIFrames();
+    static std::vector<MeshPlugin *> GetMeshModulesWithUIFrames();
     static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
     static AdminMessageHandleResult handleAdminMessageForAllPlugins(
         const MeshPacket &mp, AdminMessage *request, AdminMessage *response);