diff --git a/src/lib/AST/ClangHelpers.hpp b/src/lib/AST/ClangHelpers.hpp
index 6340930f3a..2cd2cbf0ef 100644
--- a/src/lib/AST/ClangHelpers.hpp
+++ b/src/lib/AST/ClangHelpers.hpp
@@ -985,17 +985,17 @@ namespace detail {
     template <class T>
     requires (!std::is_pointer_v<T>)
     void
-    printTraceName(T const& D, ASTContext const& C, SmallString<256>& symbol_name);
+    printTraceName(T const& D, ASTContext const& C, std::string& symbol_name);
 
     template <class T>
     void
-    printTraceName(T const* D, ASTContext const& C, SmallString<256>& symbol_name)
+    printTraceName(T const* D, ASTContext const& C, std::string& symbol_name)
     {
         if (!D)
         {
             return;
         }
-        llvm::raw_svector_ostream os(symbol_name);
+        llvm::raw_string_ostream os(symbol_name);
         if constexpr (std::derived_from<T, Decl>)
         {
             if (NamedDecl const* ND = dyn_cast<NamedDecl>(D))
@@ -1052,14 +1052,14 @@ namespace detail {
     template <class T>
     requires (!std::is_pointer_v<T>)
     void
-    printTraceName(T const& D, ASTContext const& C, SmallString<256>& symbol_name)
+    printTraceName(T const& D, ASTContext const& C, std::string& symbol_name)
     {
         printTraceName(&D, C, symbol_name);
     }
 
     template <class T>
     void
-    printTraceName(std::optional<T> const& D, ASTContext const& C, SmallString<256>& symbol_name)
+    printTraceName(std::optional<T> const& D, ASTContext const& C, std::string& symbol_name)
     {
         if (D)
         {
@@ -1076,9 +1076,9 @@ namespace detail {
 #    define MRDOCS_SYMBOL_TRACE_LABEL_(a)    MRDOCS_SYMBOL_TRACE_MERGE_(symbol_name_, a)
 #    define MRDOCS_SYMBOL_TRACE_UNIQUE_NAME  MRDOCS_SYMBOL_TRACE_LABEL_(__LINE__)
 #define MRDOCS_SYMBOL_TRACE(D, C) \
-    SmallString<256> MRDOCS_SYMBOL_TRACE_UNIQUE_NAME;         \
+    std::string MRDOCS_SYMBOL_TRACE_UNIQUE_NAME;         \
     detail::printTraceName(D, C, MRDOCS_SYMBOL_TRACE_UNIQUE_NAME); \
-    report::trace("{}", std::string_view(MRDOCS_SYMBOL_TRACE_UNIQUE_NAME.str()))
+    report::trace("{}", MRDOCS_SYMBOL_TRACE_UNIQUE_NAME)
 #endif
 
 } // clang::mrdocs
diff --git a/test-files/golden-tests/remove_bad_files.sh b/test-files/golden-tests/remove_bad_files.sh
index fab5073c19..60e20dd2b9 100644
--- a/test-files/golden-tests/remove_bad_files.sh
+++ b/test-files/golden-tests/remove_bad_files.sh
@@ -1,19 +1,15 @@
 #!/bin/bash
 # This script finds and deletes all files with the extension ".bad.*" in the current directory and its subdirectories.
-# It is useful for cleaning up unwanted or temporary files generated during testing or development.
 
-# Use the find command to locate all files with the ".bad.*" extension and store them in an array.
-# The -name option specifies the pattern to match.
-# The -type f option ensures that only files are matched.
-mapfile -t files < <(find . -name "*.bad.*" -type f)
+files=()
+while IFS= read -r -d $'\0' file; do
+    files+=("$file")
+done < <(find . -name "*.bad.*" -type f -print0)
 
-# Count the number of files found.
 file_count=${#files[@]}
 
-# Delete the files.
 for file in "${files[@]}"; do
     rm "$file"
 done
 
-# Print the number of files deleted.
 echo "Deleted $file_count files."
\ No newline at end of file
diff --git a/test-files/golden-tests/symbols/using/alias-template.adoc b/test-files/golden-tests/symbols/typedef/alias-template.adoc
similarity index 100%
rename from test-files/golden-tests/symbols/using/alias-template.adoc
rename to test-files/golden-tests/symbols/typedef/alias-template.adoc
diff --git a/test-files/golden-tests/symbols/using/alias-template.cpp b/test-files/golden-tests/symbols/typedef/alias-template.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/using/alias-template.cpp
rename to test-files/golden-tests/symbols/typedef/alias-template.cpp
diff --git a/test-files/golden-tests/symbols/using/alias-template.html b/test-files/golden-tests/symbols/typedef/alias-template.html
similarity index 100%
rename from test-files/golden-tests/symbols/using/alias-template.html
rename to test-files/golden-tests/symbols/typedef/alias-template.html
diff --git a/test-files/golden-tests/symbols/using/alias-template.xml b/test-files/golden-tests/symbols/typedef/alias-template.xml
similarity index 100%
rename from test-files/golden-tests/symbols/using/alias-template.xml
rename to test-files/golden-tests/symbols/typedef/alias-template.xml
diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.adoc b/test-files/golden-tests/symbols/typedef/decay-to-primary.adoc
similarity index 100%
rename from test-files/golden-tests/symbols/using/decay-to-primary.adoc
rename to test-files/golden-tests/symbols/typedef/decay-to-primary.adoc
diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.cpp b/test-files/golden-tests/symbols/typedef/decay-to-primary.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/using/decay-to-primary.cpp
rename to test-files/golden-tests/symbols/typedef/decay-to-primary.cpp
diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.html b/test-files/golden-tests/symbols/typedef/decay-to-primary.html
similarity index 100%
rename from test-files/golden-tests/symbols/using/decay-to-primary.html
rename to test-files/golden-tests/symbols/typedef/decay-to-primary.html
diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.xml b/test-files/golden-tests/symbols/typedef/decay-to-primary.xml
similarity index 100%
rename from test-files/golden-tests/symbols/using/decay-to-primary.xml
rename to test-files/golden-tests/symbols/typedef/decay-to-primary.xml
diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.adoc b/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc
similarity index 100%
rename from test-files/golden-tests/symbols/using/dependency-propagation.adoc
rename to test-files/golden-tests/symbols/typedef/dependency-propagation.adoc
diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.cpp b/test-files/golden-tests/symbols/typedef/dependency-propagation.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/using/dependency-propagation.cpp
rename to test-files/golden-tests/symbols/typedef/dependency-propagation.cpp
diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.html b/test-files/golden-tests/symbols/typedef/dependency-propagation.html
similarity index 100%
rename from test-files/golden-tests/symbols/using/dependency-propagation.html
rename to test-files/golden-tests/symbols/typedef/dependency-propagation.html
diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.xml b/test-files/golden-tests/symbols/typedef/dependency-propagation.xml
similarity index 100%
rename from test-files/golden-tests/symbols/using/dependency-propagation.xml
rename to test-files/golden-tests/symbols/typedef/dependency-propagation.xml
diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.yml b/test-files/golden-tests/symbols/typedef/dependency-propagation.yml
similarity index 100%
rename from test-files/golden-tests/symbols/using/dependency-propagation.yml
rename to test-files/golden-tests/symbols/typedef/dependency-propagation.yml
diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc b/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.adoc
similarity index 100%
rename from test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc
rename to test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.adoc
diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.cpp b/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.cpp
rename to test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.cpp
diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html b/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.html
similarity index 100%
rename from test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html
rename to test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.html
diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.xml b/test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.xml
similarity index 100%
rename from test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.xml
rename to test-files/golden-tests/symbols/typedef/implicit-instantiation-member-ref.xml
diff --git a/test-files/golden-tests/symbols/using/using-1.adoc b/test-files/golden-tests/symbols/using-directive/using-1.adoc
similarity index 100%
rename from test-files/golden-tests/symbols/using/using-1.adoc
rename to test-files/golden-tests/symbols/using-directive/using-1.adoc
diff --git a/test-files/golden-tests/symbols/using/using-1.cpp b/test-files/golden-tests/symbols/using-directive/using-1.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/using/using-1.cpp
rename to test-files/golden-tests/symbols/using-directive/using-1.cpp
diff --git a/test-files/golden-tests/symbols/using/using-1.html b/test-files/golden-tests/symbols/using-directive/using-1.html
similarity index 100%
rename from test-files/golden-tests/symbols/using/using-1.html
rename to test-files/golden-tests/symbols/using-directive/using-1.html
diff --git a/test-files/golden-tests/symbols/using/using-1.xml b/test-files/golden-tests/symbols/using-directive/using-1.xml
similarity index 100%
rename from test-files/golden-tests/symbols/using/using-1.xml
rename to test-files/golden-tests/symbols/using-directive/using-1.xml