diff --git a/packages/ad-script/src/internal/__tests__/backend-vocabulary.test.ts b/packages/ad-script/src/internal/__tests__/format-backend-vocabulary.test.ts
similarity index 100%
rename from packages/ad-script/src/internal/__tests__/backend-vocabulary.test.ts
rename to packages/ad-script/src/internal/__tests__/format-backend-vocabulary.test.ts
diff --git a/packages/maestro/src/daemon-port/__tests__/run-script.test.ts b/packages/maestro/src/daemon-port/__tests__/run-script-execution.test.ts
similarity index 100%
rename from packages/maestro/src/daemon-port/__tests__/run-script.test.ts
rename to packages/maestro/src/daemon-port/__tests__/run-script-execution.test.ts
diff --git a/packages/maestro/src/internal/__tests__/export-label-projection.test.ts b/packages/maestro/src/internal/__tests__/export-flow-label-projection.test.ts
similarity index 100%
rename from packages/maestro/src/internal/__tests__/export-label-projection.test.ts
rename to packages/maestro/src/internal/__tests__/export-flow-label-projection.test.ts
diff --git a/packages/maestro/src/internal/__tests__/facade-failure-suggestions.test.ts b/packages/maestro/src/internal/__tests__/facade-execution-failure-suggestions.test.ts
similarity index 100%
rename from packages/maestro/src/internal/__tests__/facade-failure-suggestions.test.ts
rename to packages/maestro/src/internal/__tests__/facade-execution-failure-suggestions.test.ts
diff --git a/packages/maestro/src/internal/__tests__/runtime-port-gestures.test.ts b/packages/maestro/src/internal/__tests__/runtime-port-commands-gestures.test.ts
similarity index 100%
rename from packages/maestro/src/internal/__tests__/runtime-port-gestures.test.ts
rename to packages/maestro/src/internal/__tests__/runtime-port-commands-gestures.test.ts
diff --git a/packages/maestro/src/internal/__tests__/runtime-port.test.ts b/packages/maestro/src/internal/__tests__/runtime-port-commands.test.ts
similarity index 100%
rename from packages/maestro/src/internal/__tests__/runtime-port.test.ts
rename to packages/maestro/src/internal/__tests__/runtime-port-commands.test.ts
diff --git a/packages/maestro/src/internal/__tests__/scroll-container-classification.test.ts b/packages/maestro/src/internal/__tests__/runtime-port-geometry-scroll-container.test.ts
similarity index 100%
rename from packages/maestro/src/internal/__tests__/scroll-container-classification.test.ts
rename to packages/maestro/src/internal/__tests__/runtime-port-geometry-scroll-container.test.ts
diff --git a/packages/replay-port/package.json b/packages/replay-port/package.json
index a2066fced2..a76b534c3a 100644
--- a/packages/replay-port/package.json
+++ b/packages/replay-port/package.json
@@ -112,10 +112,6 @@
       "types": "./src/daemon-port/session-replay-video-recording.ts",
       "default": "./src/daemon-port/session-replay-video-recording.ts"
     },
-    "./session-test-infrastructure": {
-      "types": "./src/daemon-port/session-test-infrastructure.ts",
-      "default": "./src/daemon-port/session-test-infrastructure.ts"
-    },
     "./session-test-outcome": {
       "types": "./src/daemon-port/session-test-outcome.ts",
       "default": "./src/daemon-port/session-test-outcome.ts"
diff --git a/packages/replay-port/src/__tests__/session-replay-builtin-vars.test.ts b/packages/replay-port/src/__tests__/session-replay-vars.test.ts
similarity index 100%
rename from packages/replay-port/src/__tests__/session-replay-builtin-vars.test.ts
rename to packages/replay-port/src/__tests__/session-replay-vars.test.ts
diff --git a/packages/session-journal/package.json b/packages/session-journal/package.json
index d23e2faf8c..d5b68fbd98 100644
--- a/packages/session-journal/package.json
+++ b/packages/session-journal/package.json
@@ -16,18 +16,6 @@
       "types": "./src/session-event-log.ts",
       "default": "./src/session-event-log.ts"
     },
-    "./session-event-log-lines": {
-      "types": "./src/session-event-log-lines.ts",
-      "default": "./src/session-event-log-lines.ts"
-    },
-    "./session-event-log-window": {
-      "types": "./src/session-event-log-window.ts",
-      "default": "./src/session-event-log-window.ts"
-    },
-    "./session-event-request": {
-      "types": "./src/session-event-request.ts",
-      "default": "./src/session-event-request.ts"
-    },
     "./session-event-action": {
       "types": "./src/session-event-action.ts",
       "default": "./src/session-event-action.ts"