diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index 7f56b851..8d2827e1 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -1778,7 +1778,7 @@ static void FreeAssociatedMemory( const QueueItem& item )
         ptr = MemRead<uint64_t>( &item.gpuZoneBegin.srcloc );
         tracy_free( (void*)ptr );
         break;
-    case QueueType::CallstackMemory:
+    case QueueType::CallstackSerial:
     case QueueType::Callstack:
         ptr = MemRead<uint64_t>( &item.callstackFat.ptr );
         tracy_free( (void*)ptr );
@@ -2152,7 +2152,7 @@ Profiler::DequeueStatus Profiler::DequeueSerial()
             {
                 switch( (QueueType)idx )
                 {
-                case QueueType::CallstackMemory:
+                case QueueType::CallstackSerial:
                     ptr = MemRead<uint64_t>( &item->callstackFat.ptr );
                     SendCallstackPayload( ptr );
                     tracy_free( (void*)ptr );
diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp
index 9bc12795..161e1624 100644
--- a/client/TracyProfiler.hpp
+++ b/client/TracyProfiler.hpp
@@ -401,7 +401,7 @@ public:
         auto callstack = Callstack( depth );
 
         profiler.m_serialLock.lock();
-        SendCallstackMemory( callstack );
+        SendCallstackSerial( callstack );
         SendMemAlloc( QueueType::MemAllocCallstack, thread, ptr, size );
         profiler.m_serialLock.unlock();
 #else
@@ -423,7 +423,7 @@ public:
         auto callstack = Callstack( depth );
 
         profiler.m_serialLock.lock();
-        SendCallstackMemory( callstack );
+        SendCallstackSerial( callstack );
         SendMemFree( QueueType::MemFreeCallstack, thread, ptr );
         profiler.m_serialLock.unlock();
 #else
@@ -473,7 +473,7 @@ public:
         auto callstack = Callstack( depth );
 
         profiler.m_serialLock.lock();
-        SendCallstackMemory( callstack );
+        SendCallstackSerial( callstack );
         SendMemName( name );
         SendMemAlloc( QueueType::MemAllocCallstackNamed, thread, ptr, size );
         profiler.m_serialLock.unlock();
@@ -496,7 +496,7 @@ public:
         auto callstack = Callstack( depth );
 
         profiler.m_serialLock.lock();
-        SendCallstackMemory( callstack );
+        SendCallstackSerial( callstack );
         SendMemName( name );
         SendMemFree( QueueType::MemFreeCallstackNamed, thread, ptr );
         profiler.m_serialLock.unlock();
@@ -672,11 +672,11 @@ private:
     void CalibrateDelay();
     void ReportTopology();
 
-    static tracy_force_inline void SendCallstackMemory( void* ptr )
+    static tracy_force_inline void SendCallstackSerial( void* ptr )
     {
 #ifdef TRACY_HAS_CALLSTACK
         auto item = GetProfiler().m_serialQueue.prepare_next();
-        MemWrite( &item->hdr.type, QueueType::CallstackMemory );
+        MemWrite( &item->hdr.type, QueueType::CallstackSerial );
         MemWrite( &item->callstackFat.ptr, (uint64_t)ptr );
         GetProfiler().m_serialQueue.commit_next();
 #endif
diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp
index d30b6a22..bce4eed0 100644
--- a/common/TracyQueue.hpp
+++ b/common/TracyQueue.hpp
@@ -17,7 +17,7 @@ enum class QueueType : uint8_t
     MessageAppInfo,
     ZoneBeginAllocSrcLoc,
     ZoneBeginAllocSrcLocCallstack,
-    CallstackMemory,
+    CallstackSerial,
     Callstack,
     CallstackAlloc,
     CallstackSample,
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index 1abb975c..59ae01a7 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -4260,8 +4260,8 @@ bool Worker::Process( const QueueItem& ev )
     case QueueType::MemFreeCallstackNamed:
         ProcessMemFreeCallstackNamed( ev.memFree );
         break;
-    case QueueType::CallstackMemory:
-        ProcessCallstackMemory();
+    case QueueType::CallstackSerial:
+        ProcessCallstackSerial();
         break;
     case QueueType::Callstack:
     case QueueType::CallstackAlloc:
@@ -4549,7 +4549,7 @@ void Worker::MemFreeFailure( uint64_t thread )
 {
     m_failure = Failure::MemFree;
     m_failureData.thread = thread;
-    m_failureData.callstack = m_memNextCallstack;
+    m_failureData.callstack = m_serialNextCallstack;
 }
 
 void Worker::FrameEndFailure()
@@ -5525,9 +5525,9 @@ void Worker::ProcessMemAllocCallstack( const QueueMemAlloc& ev )
 {
     auto mem = ProcessMemAlloc( ev );
     assert( mem );
-    assert( m_memNextCallstack != 0 );
-    mem->SetCsAlloc( m_memNextCallstack );
-    m_memNextCallstack = 0;
+    assert( m_serialNextCallstack != 0 );
+    mem->SetCsAlloc( m_serialNextCallstack );
+    m_serialNextCallstack = 0;
 }
 
 void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
@@ -5544,17 +5544,17 @@ void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
     }
     auto mem = ProcessMemAllocImpl( memname, *it->second, ev );
     assert( mem );
-    assert( m_memNextCallstack != 0 );
-    mem->SetCsAlloc( m_memNextCallstack );
-    m_memNextCallstack = 0;
+    assert( m_serialNextCallstack != 0 );
+    mem->SetCsAlloc( m_serialNextCallstack );
+    m_serialNextCallstack = 0;
 }
 
 void Worker::ProcessMemFreeCallstack( const QueueMemFree& ev )
 {
     auto mem = ProcessMemFree( ev );
-    assert( m_memNextCallstack != 0 );
-    if( mem ) mem->csFree.SetVal( m_memNextCallstack );
-    m_memNextCallstack = 0;
+    assert( m_serialNextCallstack != 0 );
+    if( mem ) mem->csFree.SetVal( m_serialNextCallstack );
+    m_serialNextCallstack = 0;
 }
 
 void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
@@ -5570,16 +5570,16 @@ void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
         it->second->name = memname;
     }
     auto mem = ProcessMemFreeImpl( memname, *it->second, ev );
-    assert( m_memNextCallstack != 0 );
-    if( mem ) mem->csFree.SetVal( m_memNextCallstack );
-    m_memNextCallstack = 0;
+    assert( m_serialNextCallstack != 0 );
+    if( mem ) mem->csFree.SetVal( m_serialNextCallstack );
+    m_serialNextCallstack = 0;
 }
 
-void Worker::ProcessCallstackMemory()
+void Worker::ProcessCallstackSerial()
 {
     assert( m_pendingCallstackId != 0 );
-    assert( m_memNextCallstack == 0 );
-    m_memNextCallstack = m_pendingCallstackId;
+    assert( m_serialNextCallstack == 0 );
+    m_serialNextCallstack = m_pendingCallstackId;
     m_pendingCallstackId = 0;
 }
 
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index 6593c4ee..11443c6a 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -648,7 +648,7 @@ private:
     tracy_force_inline void ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev );
     tracy_force_inline void ProcessMemFreeCallstack( const QueueMemFree& ev );
     tracy_force_inline void ProcessMemFreeCallstackNamed( const QueueMemFree& ev );
-    tracy_force_inline void ProcessCallstackMemory();
+    tracy_force_inline void ProcessCallstackSerial();
     tracy_force_inline void ProcessCallstack();
     tracy_force_inline void ProcessCallstackSample( const QueueCallstackSample& ev );
     tracy_force_inline void ProcessCallstackFrameSize( const QueueCallstackFrameSize& ev );
@@ -880,7 +880,7 @@ private:
     uint64_t m_callstackAllocNextIdx = 0;
     uint64_t m_callstackParentNextIdx = 0;
 
-    uint32_t m_memNextCallstack = 0;
+    uint32_t m_serialNextCallstack = 0;
     uint64_t m_memNamePayload = 0;
 
     Slab<64*1024*1024> m_slab;