diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index 7364650b..57f14241 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -4891,7 +4891,7 @@ egg/core/eggThread.cpp:
 	.sbss       start:0x80576770 end:0x80576778
 	.bss        start:0x80673B10 end:0x80673B20
 
-egg/core/eggThreadMonitor.cpp:
+egg/core/eggThreadMgr.cpp:
 	.text       start:0x80496DE0 end:0x8049716C align:16
 	.sbss       start:0x80576778 end:0x80576780
 
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index e8d15920..3df76444 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -26254,10 +26254,10 @@ switchThreadCallback__Q23EGG6ThreadFP8OSThreadP8OSThread = .text:0x80496C70; //
 setCommonMesgQueue__Q23EGG6ThreadFiPQ23EGG4Heap = .text:0x80496D60; // type:function size:0x5C
 start__Q23EGG6ThreadFPv = .text:0x80496DC0; // type:function size:0x10
 run__Q23EGG6ThreadFv = .text:0x80496DD0; // type:function size:0x8 scope:weak
-getThreadIndex__Q23EGG13ThreadMonitorFP8OSThread = .text:0x80496DE0; // type:function size:0x44
-doRegisterThread__Q23EGG13ThreadMonitorFP8OSThread = .text:0x80496E30; // type:function size:0xD8
-sortByPriority__Q23EGG13ThreadMonitorFv = .text:0x80496F10; // type:function size:0x1CC
-registerThread__Q23EGG13ThreadMonitorFP8OSThreadQ23EGG13UnknownStruct = .text:0x804970E0; // type:function size:0x8C
+getThreadIndex__Q23EGG13ThreadMgrFP8OSThread = .text:0x80496DE0; // type:function size:0x44
+doRegisterThread__Q23EGG13ThreadMgrFP8OSThread = .text:0x80496E30; // type:function size:0xD8
+sortByPriority__Q23EGG13ThreadMgrFv = .text:0x80496F10; // type:function size:0x1CC
+registerThread__Q23EGG13ThreadMgrFP8OSThreadQ23EGG13UnknownStruct = .text:0x804970E0; // type:function size:0x8C
 initMemory__Q23EGG17ConfigurationDataFv = .text:0x80497170; // type:function size:0x174
 run__Q23EGG17ConfigurationDataFv = .text:0x804972F0; // type:function size:0x23C
 PreRetraceCallback = .text:0x80497530; // type:function size:0x40
@@ -43334,7 +43334,7 @@ sFreeCallbackArg__Q23EGG4Heap = .sbss:0x80576760; // type:object size:0x4 data:4
 sCreateCallback__Q23EGG4Heap = .sbss:0x80576764; // type:object size:0x4 data:4byte
 sDestroyCallback__Q23EGG4Heap = .sbss:0x80576768; // type:object size:0x4 data:4byte
 sOldSwitchThreadCallback__Q23EGG6Thread = .sbss:0x80576770; // type:object size:0x4 data:4byte
-sInstance__Q23EGG13ThreadMonitor = .sbss:0x80576778; // type:object size:0x4 data:4byte
+sInstance__Q23EGG13ThreadMgr = .sbss:0x80576778; // type:object size:0x4 data:4byte
 mConfigData__Q23EGG10BaseSystem = .sbss:0x80576780; // type:object size:0x4 data:4byte
 sTickPeriod__Q23EGG7Display = .sbss:0x80576788; // type:object size:0x4 data:4byte
 spSelector = .sbss:0x80576790; // type:object size:0x4 scope:local data:4byte
diff --git a/configure.py b/configure.py
index 0fb8c381..1e647092 100644
--- a/configure.py
+++ b/configure.py
@@ -1232,7 +1232,7 @@ config.libs = [
             Object(Matching, "egg/core/eggAssertHeap.cpp"),
             Object(Matching, "egg/core/eggDisposer.cpp"),
             Object(Matching, "egg/core/eggThread.cpp"),
-            Object(Matching, "egg/core/eggThreadMonitor.cpp"),
+            Object(Matching, "egg/core/eggThreadMgr.cpp"),
             Object(Matching, "egg/core/eggSystem.cpp"),
             Object(Matching, "egg/core/eggDisplay.cpp"),
             Object(Matching, "egg/core/eggColorFader.cpp"),
diff --git a/include/egg/core/eggThreadMonitor.h b/include/egg/core/eggThreadMgr.h
similarity index 93%
rename from include/egg/core/eggThreadMonitor.h
rename to include/egg/core/eggThreadMgr.h
index 4d2eaaa4..9d292692 100644
--- a/include/egg/core/eggThreadMonitor.h
+++ b/include/egg/core/eggThreadMgr.h
@@ -30,11 +30,11 @@ struct ThreadInfo {
 };
 
 // This is a complete guess
-class ThreadMonitor {
+class ThreadMgr {
 public:
     void registerThread(OSThread *thread, UnknownStruct);
 
-    static ThreadMonitor *getInstance() {
+    static ThreadMgr *getInstance() {
         return sInstance;
     }
 
@@ -57,7 +57,7 @@ private:
     /* 0xF8 */ bool mSortEnabled;
     // size unsure, but this is the limit seen
 
-    static ThreadMonitor *sInstance;
+    static ThreadMgr *sInstance;
 };
 
 } // namespace EGG
diff --git a/src/egg/core/eggThreadMonitor.cpp b/src/egg/core/eggThreadMgr.cpp
similarity index 81%
rename from src/egg/core/eggThreadMonitor.cpp
rename to src/egg/core/eggThreadMgr.cpp
index c7b2a5c6..e5fcd44a 100644
--- a/src/egg/core/eggThreadMonitor.cpp
+++ b/src/egg/core/eggThreadMgr.cpp
@@ -1,12 +1,12 @@
-#include "egg/core/eggThreadMonitor.h"
+#include "egg/core/eggThreadMgr.h"
 
 #include "rvl/OS.h"
 
 namespace EGG {
 
-ThreadMonitor *ThreadMonitor::sInstance; // Never initialized
+ThreadMgr *ThreadMgr::sInstance; // Never initialized
 
-s32 ThreadMonitor::getThreadIndex(OSThread *thread) {
+s32 ThreadMgr::getThreadIndex(OSThread *thread) {
     for (s32 i = 0; i < mThreadCount; i++) {
         if (mThreadList[i].mThread == thread) {
             return i;
@@ -15,7 +15,7 @@ s32 ThreadMonitor::getThreadIndex(OSThread *thread) {
     return -1;
 }
 
-s32 ThreadMonitor::doRegisterThread(OSThread *thread) {
+s32 ThreadMgr::doRegisterThread(OSThread *thread) {
     if (mThreadCount != mMaxThreads) {
         s32 i = mThreadCount;
 
@@ -37,7 +37,7 @@ s32 ThreadMonitor::doRegisterThread(OSThread *thread) {
     return -1;
 }
 
-void ThreadMonitor::sortByPriority() {
+void ThreadMgr::sortByPriority() {
     // Selection sort on thread priority
     for (s32 i = 0; i < mThreadCount - 1; i++) {
         OSPriority minPrio = 31;
@@ -59,7 +59,7 @@ void ThreadMonitor::sortByPriority() {
     }
 }
 
-void ThreadMonitor::registerThread(OSThread *thread, UnknownStruct arg) {
+void ThreadMgr::registerThread(OSThread *thread, UnknownStruct arg) {
     s32 i = getThreadIndex(thread);
     if (i == -1) {
         i = doRegisterThread(thread);
diff --git a/src/m/m_thread.cpp b/src/m/m_thread.cpp
index 3311b080..e9a1a136 100644
--- a/src/m/m_thread.cpp
+++ b/src/m/m_thread.cpp
@@ -1,10 +1,10 @@
 #include "m/m_thread.h"
 
-#include "egg/core/eggThreadMonitor.h"
+#include "egg/core/eggThreadMgr.h"
 #include "rvl/OS/OSThread.h"
 
 void mThread::registerThread(OSThread *thread, void *threadArg) {
-    if (threadArg && EGG::ThreadMonitor::getInstance()) {
-        EGG::ThreadMonitor::getInstance()->registerThread(thread, *(EGG::UnknownStruct *)threadArg);
+    if (threadArg && EGG::ThreadMgr::getInstance()) {
+        EGG::ThreadMgr::getInstance()->registerThread(thread, *(EGG::UnknownStruct *)threadArg);
     }
 }