diff --git a/README.md b/README.md
index 971ea99..dfc344b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-# ember-headless-form
+# @universal-ember/form 
+
+[![CI](https://github.com/universal-ember/form/actions/workflows/ci.yml/badge.svg?branch=main&event=push)](https://github.com/universal-ember/form/actions/workflows/ci.yml)
 
-[![CI](https://github.com/CrowdStrike/ember-headless-form/actions/workflows/ci.yml/badge.svg?branch=main&event=push)](https://github.com/CrowdStrike/ember-headless-form/actions/workflows/ci.yml)
 
 The Ember.js addon that distills the common behavior and accessibility best practices of forms into reusable components, without any opinions on specific markup or styling. Use it to build your forms directly, or to build your opinionated forms component kit on top of it.
 
@@ -34,6 +35,10 @@ Visit our [documentation website](https://ember-headless-form.pages.dev/).
 
 See the [Contributing](CONTRIBUTING.md) guide for details.
 
+## Credits
+
+Originally from [CrowdStrike's ember-headless-form](https://github.com/crowdstrike/ember-headless-form)
+
 ## License
 
 This project is licensed under the [MIT License](LICENSE.md).
diff --git a/docs-app/.docfy-config.js b/docs-app/.docfy-config.js
index fff51fa..efc9f3b 100644
--- a/docs-app/.docfy-config.js
+++ b/docs-app/.docfy-config.js
@@ -6,7 +6,7 @@ const monorepoRoot = path.resolve(__dirname, '..');
 
 module.exports = {
   repository: {
-    url: 'https://github.com/CrowdStrike/ember-headless-form',
+    url: 'https://github.com/CrowdStrike/@universal-ember/form',
     editBranch: 'main',
   },
   sources: [
diff --git a/docs-app/ember-cli-build.js b/docs-app/ember-cli-build.js
index 67f1eb2..05071f6 100644
--- a/docs-app/ember-cli-build.js
+++ b/docs-app/ember-cli-build.js
@@ -7,7 +7,7 @@ const isProduction = () => EmberApp.env() === 'production';
 module.exports = function (defaults) {
   let app = new EmberApp(defaults, {
     autoImport: {
-      watchDependencies: ['ember-headless-form'],
+      watchDependencies: ['@universal-ember/form'],
     },
     'ember-cli-babel': {
       enableTypeScriptTransform: true,
diff --git a/docs-app/package.json b/docs-app/package.json
index 8132eb6..ca4ecce 100644
--- a/docs-app/package.json
+++ b/docs-app/package.json
@@ -123,9 +123,9 @@
     "ember-browser-services": "^5.0.0",
     "ember-changeset": "^4.1.2",
     "ember-changeset-validations": "^4.1.1",
-    "ember-headless-form": "workspace:*",
-    "ember-headless-form-changeset": "workspace:*",
-    "ember-headless-form-yup": "workspace:*",
+    "@universal-ember/form": "workspace:*",
+    "@universal-ember/form-changeset": "workspace:*",
+    "@universal-ember/form-yup": "workspace:*",
     "ember-modifier": "^4.0.0",
     "ember-resources": "^7.0.0",
     "highlight.js": "^11.6.0",
@@ -135,13 +135,13 @@
     "yup": "^1.0.0"
   },
   "dependenciesMeta": {
-    "ember-headless-form": {
+    "@universal-ember/form": {
       "injected": true
     },
-    "ember-headless-form-changeset": {
+    "@universal-ember/form-changeset": {
       "injected": true
     },
-    "ember-headless-form-yup": {
+    "@universal-ember/form-yup": {
       "injected": true
     }
   }
diff --git a/internal/sync-pnpm/package.json b/internal/sync-pnpm/package.json
index 9ce6c0b..731da2a 100644
--- a/internal/sync-pnpm/package.json
+++ b/internal/sync-pnpm/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "description": "Sync build artifacts of workspace packages to pnpm injected/hard linked copies",
-  "repository": "https://github.com/CrowdStrike/ember-headless-form.git",
+  "repository": "https://github.com/CrowdStrike/@universal-ember/form.git",
   "license": "MIT",
   "author": "CrowdStrike UX Team",
   "main": "index.js",
@@ -22,4 +22,4 @@
   "volta": {
     "extends": "../../package.json"
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index e92b09f..6401e81 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "ember-headless-form",
+  "name": "@universal-ember/form",
   "version": "0.0.0",
   "private": true,
-  "repository": "https://github.com/CrowdStrike/ember-headless-form.git",
+  "repository": "https://github.com/CrowdStrike/@universal-ember/form.git",
   "license": "MIT",
   "author": "CrowdStrike UX Team",
   "scripts": {
diff --git a/packages/changeset/package.json b/packages/changeset/package.json
index a74da8a..c205139 100644
--- a/packages/changeset/package.json
+++ b/packages/changeset/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "ember-headless-form-changeset",
+  "name": "@universal-ember/form-changeset",
   "version": "1.0.0",
-  "description": "Integrates ember-changeset with ember-headless-form",
+  "description": "Integrates ember-changeset with @universal-ember/form",
   "keywords": [
     "ember-addon"
   ],
-  "repository": "https://github.com/CrowdStrike/ember-headless-form.git",
+  "repository": "https://github.com/CrowdStrike/@universal-ember/form.git",
   "license": "MIT",
   "author": "CrowdStrike UX Team",
   "files": [
@@ -28,7 +28,7 @@
     "@embroider/addon-shim": "^1.0.0"
   },
   "peerDependencies": {
-    "ember-headless-form": "workspace:^1",
+    "@universal-ember/form": "workspace:^1",
     "validated-changeset": "^1.3.4",
     "ember-changeset": "^4.1.2",
     "ember-source": ">=4.4.0"
@@ -39,7 +39,7 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.23.6",
     "@babel/plugin-syntax-decorators": "^7.23.3",
-    "ember-headless-form": "workspace:^1",
+    "@universal-ember/form": "workspace:^1",
     "@embroider/addon-dev": "^7.0.0",
     "@glimmer/component": "^1.1.2",
     "@glint/core": "^1.4.0",
diff --git a/packages/changeset/src/helpers/validate-changeset.ts b/packages/changeset/src/helpers/validate-changeset.ts
index 1a47f68..640da48 100644
--- a/packages/changeset/src/helpers/validate-changeset.ts
+++ b/packages/changeset/src/helpers/validate-changeset.ts
@@ -1,6 +1,6 @@
 import { isChangeset } from 'validated-changeset';
 
-import type { ErrorRecord, FormValidateCallback } from 'ember-headless-form';
+import type { ErrorRecord, FormValidateCallback } from '@universal-ember/form';
 import type { EmberChangeset } from 'ember-changeset';
 import { assert } from '@ember/debug';
 
diff --git a/packages/ember-headless-form/package.json b/packages/ember-headless-form/package.json
index 7b6ea24..ff94e9a 100644
--- a/packages/ember-headless-form/package.json
+++ b/packages/ember-headless-form/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "ember-headless-form",
+  "name": "@universal-ember/form",
   "version": "1.1.1",
   "description": "The default blueprint for Embroider v2 addons.",
   "keywords": [
     "ember-addon"
   ],
-  "repository": "https://github.com/CrowdStrike/ember-headless-form.git",
+  "repository": "https://github.com/CrowdStrike/@universal-ember/form.git",
   "license": "MIT",
   "author": "CrowdStrike UX Team",
   "files": [
diff --git a/packages/ember-headless-form/src/components/headless-form.gts b/packages/ember-headless-form/src/components/headless-form.gts
index 04b566f..7bfcd07 100644
--- a/packages/ember-headless-form/src/components/headless-form.gts
+++ b/packages/ember-headless-form/src/components/headless-form.gts
@@ -370,7 +370,7 @@ export default class HeadlessFormComponent<
     const form = this.formElement;
 
     assert(
-      'Form element expected to be present. If you see this, please report it as a bug to ember-headless-form!',
+      'Form element expected to be present. If you see this, please report it as a bug to @universal-ember/form!',
       form
     );
 
@@ -383,7 +383,7 @@ export default class HeadlessFormComponent<
     for (const el of form.elements) {
       // This is just to make TS happy, as we need to access properties on el that only form elements have, but elements in `form.elements` are just typed as plain `Element`. Should never occur in reality.
       assert(
-        'Unexpected form element. If you see this, please report it as a bug to ember-headless-form!',
+        'Unexpected form element. If you see this, please report it as a bug to @universal-ember/form!',
         el instanceof HTMLInputElement ||
           el instanceof HTMLTextAreaElement ||
           el instanceof HTMLSelectElement ||
@@ -478,7 +478,7 @@ export default class HeadlessFormComponent<
       }
     } else {
       assert(
-        'Validation errors expected to be present. If you see this, please report it as a bug to ember-headless-form!',
+        'Validation errors expected to be present. If you see this, please report it as a bug to @universal-ember/form!',
         // Do *not* use optional chaining due to https://github.com/ember-cli/babel-plugin-debug-macros/issues/89
         this.validationState && this.validationState.isResolved
       );
diff --git a/packages/yup/package.json b/packages/yup/package.json
index 915d3b1..7dcb6ed 100644
--- a/packages/yup/package.json
+++ b/packages/yup/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "ember-headless-form-yup",
+  "name": "@universal-ember/form-yup",
   "version": "1.0.0",
-  "description": "Integrates yup-based validations with ember-headless-form",
+  "description": "Integrates yup-based validations with @universal-ember/form",
   "keywords": [
     "ember-addon"
   ],
-  "repository": "https://github.com/CrowdStrike/ember-headless-form.git",
+  "repository": "https://github.com/CrowdStrike/@universal-ember/form.git",
   "license": "MIT",
   "author": "CrowdStrike UX Team",
   "files": [
@@ -30,7 +30,7 @@
   },
   "peerDependencies": {
     "yup": "^1.0.0",
-    "ember-headless-form": "workspace:^1",
+    "@universal-ember/form": "workspace:^1",
     "ember-source": ">=4.4.0"
   },
   "devDependencies": {
@@ -39,7 +39,7 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.23.6",
     "@babel/plugin-syntax-decorators": "^7.23.3",
-    "ember-headless-form": "workspace:^1",
+    "@universal-ember/form": "workspace:^1",
     "@embroider/addon-dev": "^7.0.0",
     "@glimmer/component": "^1.1.2",
     "@glint/core": "^1.4.0",
diff --git a/packages/yup/src/helpers/validate-yup.ts b/packages/yup/src/helpers/validate-yup.ts
index 19dbbfe..3c58be8 100644
--- a/packages/yup/src/helpers/validate-yup.ts
+++ b/packages/yup/src/helpers/validate-yup.ts
@@ -2,7 +2,7 @@ import type {
   ErrorRecord,
   FormKey,
   FormValidateCallback,
-} from 'ember-headless-form';
+} from '@universal-ember/form';
 import { assert } from '@ember/debug';
 
 import type { ObjectSchema, ValidationError } from 'yup';
@@ -24,7 +24,7 @@ export default function validateChangeset<DATA extends object>(
 
       for (const { path, type, value, message } of validationError.inner) {
         assert(
-          'Received undefined path for yup validation error. If you see this, please report it as a bug to ember-headless-form!',
+          'Received undefined path for yup validation error. If you see this, please report it as a bug to @universal-ember/form!',
           path !== undefined
         );
         const key = path as FormKey<DATA>; // yup maybe could have stricter types here, as path will always refer to a key of its schema
diff --git a/test-app/ember-cli-build.js b/test-app/ember-cli-build.js
index 918a57d..4f86b53 100644
--- a/test-app/ember-cli-build.js
+++ b/test-app/ember-cli-build.js
@@ -10,8 +10,8 @@ module.exports = function (defaults) {
 
     autoImport: {
       watchDependencies: [
-        'ember-headless-form',
-        '@ember-headless-form/changeset',
+        '@universal-ember/form',
+        '@@universal-ember/form/changeset',
       ],
       // See https://github.com/ef4/ember-auto-import/issues/564#issuecomment-1448820349
       earlyBootSet: () => ['@glimmer/tracking'],
diff --git a/test-app/package.json b/test-app/package.json
index ee3ce35..8d8da43 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -2,7 +2,7 @@
   "name": "test-app",
   "version": "0.0.0",
   "private": true,
-  "description": "Test app for ember-headless-form addon",
+  "description": "Test app for @universal-ember/form addon",
   "repository": "",
   "license": "MIT",
   "author": "",
@@ -90,9 +90,9 @@
     "ember-data": "^5.3.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-fetch": "^8.1.2",
-    "ember-headless-form": "workspace:*",
-    "ember-headless-form-changeset": "workspace:*",
-    "ember-headless-form-yup": "workspace:*",
+    "@universal-ember/form": "workspace:*",
+    "@universal-ember/form-changeset": "workspace:*",
+    "@universal-ember/form-yup": "workspace:*",
     "ember-load-initializers": "^3.0.1",
     "ember-page-title": "^9.0.0",
     "ember-qunit": "^8.0.0",
@@ -122,13 +122,13 @@
     "yup": "^1.0.0"
   },
   "dependenciesMeta": {
-    "ember-headless-form": {
+    "@universal-ember/form": {
       "injected": true
     },
-    "ember-headless-form-changeset": {
+    "@universal-ember/form-changeset": {
       "injected": true
     },
-    "ember-headless-form-yup": {
+    "@universal-ember/form-yup": {
       "injected": true
     }
   },
diff --git a/test-app/tests/integration/components/async-yup-test.gts b/test-app/tests/integration/components/async-yup-test.gts
index 6bbf9dc..a68730d 100644
--- a/test-app/tests/integration/components/async-yup-test.gts
+++ b/test-app/tests/integration/components/async-yup-test.gts
@@ -3,8 +3,8 @@
 import { click, fillIn, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
-import { validateYup } from 'ember-headless-form-yup';
+import { HeadlessForm } from '@universal-ember/form';
+import { validateYup } from '@universal-ember/form-yup';
 import sinon from 'sinon';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 import { object, string } from 'yup';
diff --git a/test-app/tests/integration/components/changeset-test.gts b/test-app/tests/integration/components/changeset-test.gts
index 240c23c..3573113 100644
--- a/test-app/tests/integration/components/changeset-test.gts
+++ b/test-app/tests/integration/components/changeset-test.gts
@@ -4,8 +4,8 @@ import { click, fillIn, render, setupOnerror } from '@ember/test-helpers';
 import { module, skip,test } from 'qunit';
 
 import { Changeset } from 'ember-changeset';
-import { HeadlessForm } from 'ember-headless-form';
-import { validateChangeset } from 'ember-headless-form-changeset';
+import { HeadlessForm } from '@universal-ember/form';
+import { validateChangeset } from '@universal-ember/form-changeset';
 import sinon from 'sinon';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
diff --git a/test-app/tests/integration/components/headless-form-async-test.gts b/test-app/tests/integration/components/headless-form-async-test.gts
index e60292c..21971c7 100644
--- a/test-app/tests/integration/components/headless-form-async-test.gts
+++ b/test-app/tests/integration/components/headless-form-async-test.gts
@@ -3,10 +3,10 @@
 import { click, render, rerender, waitFor } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
-import type { FieldValidateCallback } from 'ember-headless-form';
+import type { FieldValidateCallback } from '@universal-ember/form';
 
 module('Integration Component HeadlessForm > Async state', function (hooks) {
   setupRenderingTest(hooks);
diff --git a/test-app/tests/integration/components/headless-form-basic-test.gts b/test-app/tests/integration/components/headless-form-basic-test.gts
index 9e4a293..a09c87c 100644
--- a/test-app/tests/integration/components/headless-form-basic-test.gts
+++ b/test-app/tests/integration/components/headless-form-basic-test.gts
@@ -3,7 +3,7 @@
 import { render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import type { RenderingTestContext } from '@ember/test-helpers';
diff --git a/test-app/tests/integration/components/headless-form-control-checkbox-group-test.gts b/test-app/tests/integration/components/headless-form-control-checkbox-group-test.gts
index 5575d02..e682e12 100644
--- a/test-app/tests/integration/components/headless-form-control-checkbox-group-test.gts
+++ b/test-app/tests/integration/components/headless-form-control-checkbox-group-test.gts
@@ -3,7 +3,7 @@
 import { click, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import type { RenderingTestContext } from '@ember/test-helpers';
diff --git a/test-app/tests/integration/components/headless-form-control-checkbox-test.gts b/test-app/tests/integration/components/headless-form-control-checkbox-test.gts
index 56a7341..a5d73cc 100644
--- a/test-app/tests/integration/components/headless-form-control-checkbox-test.gts
+++ b/test-app/tests/integration/components/headless-form-control-checkbox-test.gts
@@ -3,7 +3,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 module('Integration Component HeadlessForm > Checkbox', function (hooks) {
diff --git a/test-app/tests/integration/components/headless-form-control-input-test.gts b/test-app/tests/integration/components/headless-form-control-input-test.gts
index c1930c2..1a48cbc 100644
--- a/test-app/tests/integration/components/headless-form-control-input-test.gts
+++ b/test-app/tests/integration/components/headless-form-control-input-test.gts
@@ -3,10 +3,10 @@
 import { render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
-import type { InputType } from 'ember-headless-form';
+import type { InputType } from '@universal-ember/form';
 
 module('Integration Component HeadlessForm > Input', function (hooks) {
   setupRenderingTest(hooks);
diff --git a/test-app/tests/integration/components/headless-form-control-radio-test.gts b/test-app/tests/integration/components/headless-form-control-radio-test.gts
index 9e856a5..58fc8b7 100644
--- a/test-app/tests/integration/components/headless-form-control-radio-test.gts
+++ b/test-app/tests/integration/components/headless-form-control-radio-test.gts
@@ -3,7 +3,7 @@
 import { click, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import type { RenderingTestContext } from '@ember/test-helpers';
diff --git a/test-app/tests/integration/components/headless-form-control-select-test.gts b/test-app/tests/integration/components/headless-form-control-select-test.gts
index f9f13d5..8265e99 100644
--- a/test-app/tests/integration/components/headless-form-control-select-test.gts
+++ b/test-app/tests/integration/components/headless-form-control-select-test.gts
@@ -3,7 +3,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 module('Integration Component HeadlessForm > Select', function (hooks) {
diff --git a/test-app/tests/integration/components/headless-form-control-textarea-test.gts b/test-app/tests/integration/components/headless-form-control-textarea-test.gts
index 9d1baea..1510c36 100644
--- a/test-app/tests/integration/components/headless-form-control-textarea-test.gts
+++ b/test-app/tests/integration/components/headless-form-control-textarea-test.gts
@@ -3,7 +3,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 module('Integration Component HeadlessForm > Textarea', function (hooks) {
diff --git a/test-app/tests/integration/components/headless-form-custom-controls-test.gts b/test-app/tests/integration/components/headless-form-custom-controls-test.gts
index 68bd2c3..4bb4e4f 100644
--- a/test-app/tests/integration/components/headless-form-custom-controls-test.gts
+++ b/test-app/tests/integration/components/headless-form-custom-controls-test.gts
@@ -13,7 +13,7 @@ import {
 } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import sinon from 'sinon';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
diff --git a/test-app/tests/integration/components/headless-form-data-test.gts b/test-app/tests/integration/components/headless-form-data-test.gts
index 6d4aa29..44c07e6 100644
--- a/test-app/tests/integration/components/headless-form-data-test.gts
+++ b/test-app/tests/integration/components/headless-form-data-test.gts
@@ -14,7 +14,7 @@ import {
 import { module, test } from 'qunit';
 import { getOwnConfig, macroCondition } from '@embroider/macros';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import sinon from 'sinon';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
diff --git a/test-app/tests/integration/components/headless-form-glint-test.gts b/test-app/tests/integration/components/headless-form-glint-test.gts
index c5fe962..040e159 100644
--- a/test-app/tests/integration/components/headless-form-glint-test.gts
+++ b/test-app/tests/integration/components/headless-form-glint-test.gts
@@ -3,7 +3,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 module('Integration Component HeadlessForm > Glint', function (hooks) {
diff --git a/test-app/tests/integration/components/headless-form-native-validation-test.gts b/test-app/tests/integration/components/headless-form-native-validation-test.gts
index 55cbb8f..98a186c 100644
--- a/test-app/tests/integration/components/headless-form-native-validation-test.gts
+++ b/test-app/tests/integration/components/headless-form-native-validation-test.gts
@@ -3,7 +3,7 @@
 import { blur, click, fillIn, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import sinon from 'sinon';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
diff --git a/test-app/tests/integration/components/headless-form-reset-test.gts b/test-app/tests/integration/components/headless-form-reset-test.gts
index 71c6215..68bc34c 100644
--- a/test-app/tests/integration/components/headless-form-reset-test.gts
+++ b/test-app/tests/integration/components/headless-form-reset-test.gts
@@ -4,7 +4,7 @@ import { on } from '@ember/modifier';
 import { click, fillIn, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 interface TestFormData {
diff --git a/test-app/tests/integration/components/headless-form-validation-test.gts b/test-app/tests/integration/components/headless-form-validation-test.gts
index a027024..8b02028 100644
--- a/test-app/tests/integration/components/headless-form-validation-test.gts
+++ b/test-app/tests/integration/components/headless-form-validation-test.gts
@@ -4,7 +4,7 @@ import { tracked } from '@glimmer/tracking';
 import { blur, click, fillIn, render, rerender } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
+import { HeadlessForm } from '@universal-ember/form';
 import sinon from 'sinon';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
@@ -16,7 +16,7 @@ import type {
   FieldValidateCallback,
   FormValidateCallback,
   ValidationError,
-} from 'ember-headless-form';
+} from '@universal-ember/form';
 
 module('Integration Component HeadlessForm > Validation', function (hooks) {
   setupRenderingTest(hooks);
diff --git a/test-app/tests/integration/components/yup-test.gts b/test-app/tests/integration/components/yup-test.gts
index 15bbbe9..5ba4813 100644
--- a/test-app/tests/integration/components/yup-test.gts
+++ b/test-app/tests/integration/components/yup-test.gts
@@ -3,8 +3,8 @@
 import { click, fillIn, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { HeadlessForm } from 'ember-headless-form';
-import { validateYup } from 'ember-headless-form-yup';
+import { HeadlessForm } from '@universal-ember/form';
+import { validateYup } from '@universal-ember/form-yup';
 import sinon from 'sinon';
 import { setupRenderingTest } from 'test-app/tests/helpers';
 import { object, string } from 'yup';
diff --git a/test-app/tests/unit/helpers/validate-changeset-test.ts b/test-app/tests/unit/helpers/validate-changeset-test.ts
index ec97758..96fa262 100644
--- a/test-app/tests/unit/helpers/validate-changeset-test.ts
+++ b/test-app/tests/unit/helpers/validate-changeset-test.ts
@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 
 import { Changeset } from 'ember-changeset';
-import { validateChangeset } from 'ember-headless-form-changeset';
+import { validateChangeset } from '@universal-ember/form-changeset';
 
 import type { ValidatorAction } from 'ember-changeset/types';
 
diff --git a/test-app/tests/unit/helpers/validate-yup-test.ts b/test-app/tests/unit/helpers/validate-yup-test.ts
index 7d566f9..8c91b4f 100644
--- a/test-app/tests/unit/helpers/validate-yup-test.ts
+++ b/test-app/tests/unit/helpers/validate-yup-test.ts
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { validateYup } from 'ember-headless-form-yup';
+import { validateYup } from '@universal-ember/form-yup';
 import { object, string } from 'yup';
 
 module('Unit | Helpers | validate-yup', function () {
diff --git a/test-app/types/global.d.ts b/test-app/types/global.d.ts
index 6c9810d..5b28598 100644
--- a/test-app/types/global.d.ts
+++ b/test-app/types/global.d.ts
@@ -2,8 +2,8 @@ import '@glint/environment-ember-loose';
 import '@glint/environment-ember-template-imports';
 
 import type { HelperLike } from '@glint/template';
-import type HeadlessFormRegistry from 'ember-headless-form/template-registry';
-import type HeadlessFormYupRegistry from 'ember-headless-form-yup/template-registry';
+import type HeadlessFormRegistry from '@universal-ember/form/template-registry';
+import type HeadlessFormYupRegistry from '@universal-ember/form-yup/template-registry';
 
 // Types for compiled templates
 // declare module 'test-app/templates/*' {