diff --git a/benchmarks/annotations/aiohttp.json b/benchmarks/annotations/aiohttp.json
index 748d2abd9..4bf322b65 100644
--- a/benchmarks/annotations/aiohttp.json
+++ b/benchmarks/annotations/aiohttp.json
@@ -21,7 +21,7 @@
       "aiohttp/client_ws.py"
     ],
     "secondary": [
-      "aiohttp/_websocket/reader.py"
+      "aiohttp/_websocket/reader_py.py"
     ],
     "category": "semantic"
   },
diff --git a/benchmarks/annotations/model2vec.json b/benchmarks/annotations/model2vec.json
index a4bdf04e6..7225c88bd 100644
--- a/benchmarks/annotations/model2vec.json
+++ b/benchmarks/annotations/model2vec.json
@@ -22,9 +22,7 @@
     "relevant": [
       "model2vec/tokenizer/tokenizer.py"
     ],
-    "secondary": [
-      "model2vec/distill/utils.py"
-    ],
+    "secondary": [],
     "category": "semantic"
   },
   {
@@ -122,7 +120,7 @@
   {
     "query": "how vocabulary is pruned during distillation",
     "relevant": [
-      "model2vec/distill/utils.py"
+      "model2vec/tokenizer/tokenizer.py"
     ],
     "secondary": [
       "model2vec/distill/distillation.py"
diff --git a/benchmarks/annotations/pydantic.json b/benchmarks/annotations/pydantic.json
index e2ad7a798..569c8c322 100644
--- a/benchmarks/annotations/pydantic.json
+++ b/benchmarks/annotations/pydantic.json
@@ -31,7 +31,7 @@
       "pydantic/functional_validators.py"
     ],
     "secondary": [
-      "pydantic/class_validators.py"
+      "pydantic/deprecated/class_validators.py"
     ],
     "category": "semantic"
   },
diff --git a/benchmarks/annotations/vitest.json b/benchmarks/annotations/vitest.json
index 534de07d5..30f0d9d56 100644
--- a/benchmarks/annotations/vitest.json
+++ b/benchmarks/annotations/vitest.json
@@ -55,8 +55,8 @@
   },
   {
     "query": "test reporter interface for listening to test events and results",
-    "relevant": ["packages/vitest/src/public/reporters.ts"],
-    "secondary": [],
+    "relevant": ["packages/vitest/src/node/types/reporter.ts"],
+    "secondary": ["packages/vitest/src/node/reporters/index.ts"],
     "category": "semantic"
   },
   {
diff --git a/benchmarks/annotations/zod.json b/benchmarks/annotations/zod.json
index 6ba85c183..db103ab07 100644
--- a/benchmarks/annotations/zod.json
+++ b/benchmarks/annotations/zod.json
@@ -37,20 +37,20 @@
   },
   {
     "query": "union and discriminated union schema types",
-    "relevant": ["packages/zod/src/v4/core/api.ts"],
-    "secondary": ["packages/zod/src/v4/core/schemas.ts"],
+    "relevant": ["packages/zod/src/v4/core/schemas.ts"],
+    "secondary": ["packages/zod/src/v4/classic/schemas.ts"],
     "category": "semantic"
   },
   {
     "query": "optional and nullable type wrappers",
-    "relevant": ["packages/zod/src/v4/core/api.ts"],
-    "secondary": [],
+    "relevant": ["packages/zod/src/v4/core/schemas.ts"],
+    "secondary": ["packages/zod/src/v4/classic/schemas.ts"],
     "category": "semantic"
   },
   {
     "query": "z.transform and z.pipe for chaining Zod output transformations",
-    "relevant": ["packages/zod/src/v4/core/api.ts"],
-    "secondary": [],
+    "relevant": ["packages/zod/src/v4/core/schemas.ts"],
+    "secondary": ["packages/zod/src/v4/classic/schemas.ts"],
     "category": "semantic"
   },
   {
@@ -85,20 +85,20 @@
   },
   {
     "query": "z.record and z.map schema builders for key-value types",
-    "relevant": ["packages/zod/src/v4/core/api.ts"],
-    "secondary": [],
+    "relevant": ["packages/zod/src/v4/core/schemas.ts"],
+    "secondary": ["packages/zod/src/v4/classic/schemas.ts"],
     "category": "semantic"
   },
   {
     "query": "ZodDefault and ZodCatch schema wrappers that supply fallback values on parse failure",
-    "relevant": ["packages/zod/src/v4/core/api.ts"],
-    "secondary": [],
+    "relevant": ["packages/zod/src/v4/core/schemas.ts"],
+    "secondary": ["packages/zod/src/v4/classic/schemas.ts"],
     "category": "semantic"
   },
   {
     "query": "enum schema types for literal value sets",
-    "relevant": ["packages/zod/src/v4/core/api.ts"],
-    "secondary": [],
+    "relevant": ["packages/zod/src/v4/core/schemas.ts"],
+    "secondary": ["packages/zod/src/v4/classic/schemas.ts"],
     "category": "semantic"
   },
   {