diff --git a/.github/workflows/compact.yml b/.github/workflows/compact.yml
index 63f6f282fa26..c5d39f72aeca 100644
--- a/.github/workflows/compact.yml
+++ b/.github/workflows/compact.yml
@@ -36,7 +36,9 @@ jobs:
           ref: ${{ github.base_ref || 'main' }}
       # On `main` branch, generates test vectors and serializes them to disk using `Compact`.
       - name: Generate compact vectors
-        run: ${{ matrix.bin }} -- test-vectors compact --write
+        run: |
+          ${{ matrix.bin }} -- test-vectors compact --write &&
+          for f in ./testdata/micro/compact/*; do mv "$f" "$(dirname "$f")/$(basename "$f" | awk -F '__' '{print $NF}')"; done
       - name: Checkout PR
         uses: actions/checkout@v4
         with:
diff --git a/crates/cli/commands/src/test_vectors/compact.rs b/crates/cli/commands/src/test_vectors/compact.rs
index 162ee1ceaa49..94552d5c2158 100644
--- a/crates/cli/commands/src/test_vectors/compact.rs
+++ b/crates/cli/commands/src/test_vectors/compact.rs
@@ -267,5 +267,5 @@ where
 }
 
 pub fn type_name<T>() -> String {
-    std::any::type_name::<T>().replace("::", "__")
+    std::any::type_name::<T>().split("::").last().unwrap_or(std::any::type_name::<T>()).to_string()
 }