diff --git a/tests/warp-drive__schema-record/tests/legacy/create/basic-fields-test.ts b/tests/warp-drive__schema-record/tests/legacy/basic-fields-create-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/legacy/create/basic-fields-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/basic-fields-create-test.ts
diff --git a/tests/warp-drive__schema-record/tests/legacy/reactivity/basic-fields-test.ts b/tests/warp-drive__schema-record/tests/legacy/basic-fields-reactivity-test.ts
similarity index 99%
rename from tests/warp-drive__schema-record/tests/legacy/reactivity/basic-fields-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/basic-fields-reactivity-test.ts
index f32c50b4f6e..8a762f56238 100644
--- a/tests/warp-drive__schema-record/tests/legacy/reactivity/basic-fields-test.ts
+++ b/tests/warp-drive__schema-record/tests/legacy/basic-fields-reactivity-test.ts
@@ -15,8 +15,8 @@ import type { StableRecordIdentifier } from '@warp-drive/core-types';
 import { Type } from '@warp-drive/core-types/symbols';
 import type { SchemaRecord, Transformation } from '@warp-drive/schema-record';
 
-import { simplePayloadNormalize } from '../../-utils/normalize-payload';
-import { reactiveContext } from '../../-utils/reactive-context';
+import { simplePayloadNormalize } from '../-utils/normalize-payload';
+import { reactiveContext } from '../-utils/reactive-context';
 
 interface User {
   id: string | null;
diff --git a/tests/warp-drive__schema-record/tests/legacy/reads/basic-fields-test.ts b/tests/warp-drive__schema-record/tests/legacy/basic-fields-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/legacy/reads/basic-fields-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/basic-fields-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/legacy/mode-test.ts b/tests/warp-drive__schema-record/tests/legacy/legacy-mode-activation-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/legacy/mode-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/legacy-mode-activation-test.ts
diff --git a/tests/warp-drive__schema-record/tests/legacy/create/relationships-test.ts b/tests/warp-drive__schema-record/tests/legacy/relationships-create-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/legacy/create/relationships-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/relationships-create-test.ts
diff --git a/tests/warp-drive__schema-record/tests/legacy/edit/relationships-test.ts b/tests/warp-drive__schema-record/tests/legacy/relationships-edit-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/legacy/edit/relationships-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/relationships-edit-test.ts
diff --git a/tests/warp-drive__schema-record/tests/legacy/reactivity/relationships-test.ts b/tests/warp-drive__schema-record/tests/legacy/relationships-reactivity-test.ts
similarity index 99%
rename from tests/warp-drive__schema-record/tests/legacy/reactivity/relationships-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/relationships-reactivity-test.ts
index 2d31f540139..f2bf6505485 100644
--- a/tests/warp-drive__schema-record/tests/legacy/reactivity/relationships-test.ts
+++ b/tests/warp-drive__schema-record/tests/legacy/relationships-reactivity-test.ts
@@ -14,7 +14,7 @@ import type { Type } from '@warp-drive/core-types/symbols';
 
 import type Store from 'warp-drive__schema-record/services/store';
 
-import { reactiveContext } from '../../-utils/reactive-context';
+import { reactiveContext } from '../-utils/reactive-context';
 
 module('Legacy | Reactivity | relationships', function (hooks) {
   setupRenderingTest(hooks);
diff --git a/tests/warp-drive__schema-record/tests/legacy/reads/relationships-test.ts b/tests/warp-drive__schema-record/tests/legacy/relationships-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/legacy/reads/relationships-test.ts
rename to tests/warp-drive__schema-record/tests/legacy/relationships-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/alias-test.ts b/tests/warp-drive__schema-record/tests/polaris/alias-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/alias-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/alias-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reactivity/array-test.ts b/tests/warp-drive__schema-record/tests/polaris/array-field-reactivity-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reactivity/array-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/array-field-reactivity-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/array-test.ts b/tests/warp-drive__schema-record/tests/polaris/array-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/array-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/array-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/writes/array-test.ts b/tests/warp-drive__schema-record/tests/polaris/array-field-write-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/writes/array-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/array-field-write-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/basic-fields-test.ts b/tests/warp-drive__schema-record/tests/polaris/basic-fields-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/basic-fields-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/basic-fields-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reactivity/basic-fields-test.ts b/tests/warp-drive__schema-record/tests/polaris/basic-fields-reactivity-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reactivity/basic-fields-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/basic-fields-reactivity-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/belongs-to-test.ts b/tests/warp-drive__schema-record/tests/polaris/belongs-to-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/belongs-to-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/belongs-to-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reactivity/derivation-test.ts b/tests/warp-drive__schema-record/tests/polaris/derivation-field-reactivity-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reactivity/derivation-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/derivation-field-reactivity-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/derivation-test.ts b/tests/warp-drive__schema-record/tests/polaris/derivation-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/derivation-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/derivation-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/has-many-test.ts b/tests/warp-drive__schema-record/tests/polaris/has-many-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/has-many-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/has-many-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reactivity/object-test.ts b/tests/warp-drive__schema-record/tests/polaris/object-field-reactivity-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reactivity/object-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/object-field-reactivity-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/object-test.ts b/tests/warp-drive__schema-record/tests/polaris/object-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/object-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/object-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/writes/object-test.ts b/tests/warp-drive__schema-record/tests/polaris/object-field-write-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/writes/object-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/object-field-write-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reactivity/resource-test.ts b/tests/warp-drive__schema-record/tests/polaris/resource-field-reactivity-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reactivity/resource-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/resource-field-reactivity-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/resource-test.ts b/tests/warp-drive__schema-record/tests/polaris/resource-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/resource-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/resource-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reactivity/schema-array-test.ts b/tests/warp-drive__schema-record/tests/polaris/schema-array-field-reactivity-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reactivity/schema-array-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/schema-array-field-reactivity-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/schema-array-test.ts b/tests/warp-drive__schema-record/tests/polaris/schema-array-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/schema-array-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/schema-array-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/writes/schema-array-test.ts b/tests/warp-drive__schema-record/tests/polaris/schema-array-field-write-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/writes/schema-array-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/schema-array-field-write-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reactivity/schema-object-test.ts b/tests/warp-drive__schema-record/tests/polaris/schema-object-field-reactivity-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reactivity/schema-object-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/schema-object-field-reactivity-test.ts
diff --git a/tests/warp-drive__schema-record/tests/reads/schema-object-test.ts b/tests/warp-drive__schema-record/tests/polaris/schema-object-field-read-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/reads/schema-object-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/schema-object-field-read-test.ts
diff --git a/tests/warp-drive__schema-record/tests/writes/schema-object-test.ts b/tests/warp-drive__schema-record/tests/polaris/schema-object-field-write-test.ts
similarity index 100%
rename from tests/warp-drive__schema-record/tests/writes/schema-object-test.ts
rename to tests/warp-drive__schema-record/tests/polaris/schema-object-field-write-test.ts