diff --git a/src/dbg_info/dbg_info.c b/src/dbg_info/dbg_info.c
index 8e90de47..f215f99b 100644
--- a/src/dbg_info/dbg_info.c
+++ b/src/dbg_info/dbg_info.c
@@ -1151,28 +1151,8 @@ di_search_artifact_create(String8 key, B32 *cancel_signal, B32 *retry_out, U64 *
           U64 element_count = 0;
           void *table_base = rdi_section_raw_table_from_kind(rdi, section_kind, &element_count);
           U64 element_size = rdi_section_element_size_table[section_kind];
-          
-          // rjf: determine name string index offset, depending on table kind
-          U64 element_name_idx_off = 0;
-          switch(section_kind)
-          {
-            default:{}break;
-            case RDI_SectionKind_Procedures:
-            case RDI_SectionKind_GlobalVariables:
-            case RDI_SectionKind_ThreadVariables:
-            {
-              element_name_idx_off = OffsetOf(RDI_Symbol, name_string_idx);
-            }break;
-            case RDI_SectionKind_UDTs:
-            {
-              // NOTE(rjf): name must be determined from self_type_idx
-            }break;
-            case RDI_SectionKind_SourceFiles:
-            {
-              // NOTE(rjf): name must be determined from file path node chain
-            }break;
-          }
-          
+          
+          // rjf: do search
           Rng1U64 range = lane_range(element_count);
           for EachInRange(idx, range)
           {
@@ -1190,9 +1170,8 @@ di_search_artifact_create(String8 key, B32 *cancel_signal, B32 *retry_out, U64 *
               case RDI_SectionKind_UDTs:
               {
                 RDI_UDT *udt = (RDI_UDT *)element;
-                RDI_TypeNode *type_node = rdi_element_from_name_idx(rdi, TypeNodes, udt->self_type_idx);
-                name.str = rdi_string_from_idx(rdi, type_node->user_defined.name_string_idx, &name.size);
-                name = str8_copy(arena, name);
+                RDI_TypeNode *type_node = rdi_element_from_name_idx(rdi, TypeNodes, udt->self_type_idx);
+                name = fully_qualified_from_rdi_string_and_container(arena, rdi, type_node->user_defined.name_string_idx, udt->container_idx, udt->container_flags);
               }break;
               case RDI_SectionKind_SourceFiles:
               {
@@ -1213,11 +1192,9 @@ di_search_artifact_create(String8 key, B32 *cancel_signal, B32 *retry_out, U64 *
                 scratch_end(scratch);
               }break;
               default:
-              {
-                U32 name_idx = *(U32 *)((U8 *)element + element_name_idx_off);
-                U64 name_size = 0;
-                U8 *name_base = rdi_string_from_idx(rdi, name_idx, &name_size);
-                name = str8(name_base, name_size);
+              {
+                RDI_Symbol *symbol = (RDI_Symbol *)element;
+                name = fully_qualified_str8_from_rdi_symbol(arena, rdi, symbol);
               }break;
             }
             if(name.size == 0) { continue; }
diff --git a/src/raddbg/raddbg_eval.c b/src/raddbg/raddbg_eval.c
index 603df8ad..3721477c 100644
--- a/src/raddbg/raddbg_eval.c
+++ b/src/raddbg/raddbg_eval.c
@@ -1812,17 +1812,12 @@ E_TYPE_EXPAND_RANGE_FUNCTION_DEF(debug_info_table)
         case RDI_SectionKind_Constants:
         {
           RDI_Symbol *symbol = (RDI_Symbol *)rdi_section_raw_element_from_kind_idx(rdi, accel->section, element_idx);
-          String8 symbol_name = {0};
-          symbol_name.str = rdi_string_from_idx(rdi, symbol->name_string_idx, &symbol_name.size);
-          item_string = symbol_name;
+          item_string = fully_qualified_str8_from_rdi_symbol(scratch.arena, rdi, symbol);
         }break;
         case RDI_SectionKind_UDTs:
         {
           RDI_UDT *udt = rdi_element_from_name_idx(rdi, UDTs, element_idx);
-          RDI_TypeNode *type_node = rdi_element_from_name_idx(rdi, TypeNodes, udt->self_type_idx);
-          String8 name = {0};
-          name.str = rdi_string_from_idx(rdi, type_node->user_defined.name_string_idx, &name.size);
-          item_string = name;
+          item_string = fully_qualified_str8_from_rdi_udt(scratch.arena, rdi, udt);
         }break;
         case RDI_SectionKind_SourceFiles:
         {