diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
index c9902782f..6d7d122e5 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
@@ -516,6 +516,9 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *apiWrapper, const Shader
 
       const DataType &innertype = dataTypes[type.InnerType()];
 
+      if(sourceName == var.name)
+        sourceName = GetHumanName(innertype.id);
+
       const bool ssbo = (v.storage == StorageClass::StorageBuffer) ||
                         (decorations[innertype.id].flags & Decorations::BufferBlock);