diff --git a/src/xenia/cpu/thread.cc b/src/xenia/cpu/thread.cc
index 97f036b1f..5cc9736f1 100644
--- a/src/xenia/cpu/thread.cc
+++ b/src/xenia/cpu/thread.cc
@@ -13,14 +13,14 @@
 namespace xe {
 namespace cpu {
 
-thread_local Thread* Thread::current_thread_tls_ = nullptr;
+thread_local Thread* Thread::current_thread_ = nullptr;
 
 Thread::Thread() {}
 Thread::~Thread() {}
 
-bool Thread::IsInThread() { return current_thread_tls_ != nullptr; }
+bool Thread::IsInThread() { return current_thread_ != nullptr; }
 
-Thread* Thread::GetCurrentThread() { return current_thread_tls_; }
+Thread* Thread::GetCurrentThread() { return current_thread_; }
 uint32_t Thread::GetCurrentThreadId() {
   return Thread::GetCurrentThread()->thread_state()->thread_id();
 }
diff --git a/src/xenia/cpu/thread.h b/src/xenia/cpu/thread.h
index d1b68bf10..4878e9725 100644
--- a/src/xenia/cpu/thread.h
+++ b/src/xenia/cpu/thread.h
@@ -40,7 +40,7 @@ class Thread {
   const std::string& thread_name() const { return thread_name_; }
 
  protected:
-  static thread_local Thread* current_thread_tls_;
+  thread_local static Thread* current_thread_;
 
   ThreadState* thread_state_ = nullptr;
   std::unique_ptr<xe::threading::Thread> thread_ = nullptr;
diff --git a/src/xenia/kernel/xthread.cc b/src/xenia/kernel/xthread.cc
index 42af839c1..fbb18df02 100644
--- a/src/xenia/kernel/xthread.cc
+++ b/src/xenia/kernel/xthread.cc
@@ -101,14 +101,16 @@ XThread::~XThread() {
   }
 }
 
+thread_local XThread* current_xthread_tls_ = nullptr;
+
 bool XThread::IsInThread() { return Thread::IsInThread(); }
 
 bool XThread::IsInThread(XThread* other) {
-  return current_thread_tls_ == other;
+  return current_xthread_tls_ == other;
 }
 
 XThread* XThread::GetCurrentThread() {
-  XThread* thread = reinterpret_cast<XThread*>(current_thread_tls_);
+  XThread* thread = reinterpret_cast<XThread*>(current_xthread_tls_);
   if (!thread) {
     assert_always("Attempting to use kernel stuff from a non-kernel thread");
   }
@@ -370,17 +372,19 @@ X_STATUS XThread::Create() {
     xe::threading::set_current_thread_id(handle());
 
     // Set name immediately, if we have one.
-    thread_->set_name(name());
+    thread_->set_name(thread_name_);
 
     // Profiler needs to know about the thread.
-    xe::Profiler::ThreadEnter(name().c_str());
+    xe::Profiler::ThreadEnter(thread_name_.c_str());
 
     // Execute user code.
-    current_thread_tls_ = this;
+    current_xthread_tls_ = this;
+    current_thread_ = this;
     running_ = true;
     Execute();
     running_ = false;
-    current_thread_tls_ = nullptr;
+    current_thread_ = nullptr;
+    current_xthread_tls_ = nullptr;
 
     xe::Profiler::ThreadExit();
 
@@ -439,7 +443,8 @@ X_STATUS XThread::Exit(int exit_code) {
   emulator()->processor()->OnThreadExit(thread_id_);
 
   // NOTE: unless PlatformExit fails, expect it to never return!
-  current_thread_tls_ = nullptr;
+  current_xthread_tls_ = nullptr;
+  current_thread_ = nullptr;
   xe::Profiler::ThreadExit();
 
   running_ = false;
@@ -989,7 +994,8 @@ object_ref<XThread> XThread::Restore(KernelState* kernel_state,
       Clock::SetGuestTickCount(state.tick_count_);
       Clock::SetGuestSystemTime(state.system_time_);
 
-      current_thread_tls_ = thread;
+      current_xthread_tls_ = thread;
+      current_thread_ = thread;
 
       // Acquire any mutants
       for (auto mutant : thread->pending_mutant_acquires_) {
@@ -1005,7 +1011,8 @@ object_ref<XThread> XThread::Restore(KernelState* kernel_state,
       uint32_t pc = state.context.pc;
       thread->kernel_state_->processor()->ExecuteRaw(thread->thread_state_, pc);
 
-      current_thread_tls_ = nullptr;
+      current_thread_ = nullptr;
+      current_xthread_tls_ = nullptr;
 
       xe::Profiler::ThreadExit();