diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4937618..c1483383 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,8 +119,8 @@ add_executable(shadps4
     src/core/hle/libraries/libkernel/libkernel.h
     src/core/hle/libraries/libscegnmdriver/libscegnmdriver.cpp
     src/core/hle/libraries/libscegnmdriver/libscegnmdriver.h
-    src/core/hle/kernel/ThreadManagement.cpp
-    src/core/hle/kernel/ThreadManagement.h
+    src/core/hle/kernel/thread_management.cpp
+    src/core/hle/kernel/thread_management.h
     src/core/hle/kernel/memory_management.cpp
     src/core/hle/kernel/memory_management.h
     src/core/hle/error_codes.h
diff --git a/src/core/hle/kernel/ThreadManagement.cpp b/src/core/hle/kernel/thread_management.cpp
similarity index 92%
rename from src/core/hle/kernel/ThreadManagement.cpp
rename to src/core/hle/kernel/thread_management.cpp
index 0aef3ce4..b7945850 100644
--- a/src/core/hle/kernel/ThreadManagement.cpp
+++ b/src/core/hle/kernel/thread_management.cpp
@@ -1,17 +1,16 @@
 #include "common/debug.h"
-#include "core/hle/kernel/ThreadManagement.h"
+#include "core/hle/kernel/thread_management.h"
 #include "core/hle/error_codes.h"
 
 namespace Core::Kernel {
 
-thread_local PthreadInternal* g_pthread_self = nullptr;
+thread_local PthreadInternal g_pthread_self{};
 PThreadCxt* g_pthread_cxt = nullptr;
 
 void Pthread_Init_Self_MainThread() {
-    g_pthread_self = new PthreadInternal{};
-    scePthreadAttrInit(&g_pthread_self->attr);
-    g_pthread_self->pth = pthread_self();
-    g_pthread_self->name = "Main_Thread";
+    scePthreadAttrInit(&g_pthread_self.attr);
+    g_pthread_self.pth = pthread_self();
+    g_pthread_self.name = "Main_Thread";
 }
 
 int scePthreadAttrInit(ScePthreadAttr* attr) {
diff --git a/src/core/hle/kernel/ThreadManagement.h b/src/core/hle/kernel/thread_management.h
similarity index 100%
rename from src/core/hle/kernel/ThreadManagement.h
rename to src/core/hle/kernel/thread_management.h
diff --git a/src/core/linker.cpp b/src/core/linker.cpp
index 18809e41..2d773247 100644
--- a/src/core/linker.cpp
+++ b/src/core/linker.cpp
@@ -4,9 +4,9 @@
 #include "common/string_util.h"
 #include "core/aerolib/aerolib.h"
 #include "core/aerolib/stubs.h"
+#include "core/hle/kernel/thread_management.h"
 #include "core/linker.h"
 #include "core/virtual_memory.h"
-#include "core/hle/kernel/ThreadManagement.h"
 
 namespace Core {