From 8f957a9a8a731dd001b1eddbfec009b8d7fd11f5 Mon Sep 17 00:00:00 2001
From: MarioCadenas <MarioCadenas@users.noreply.github.com>
Date: Fri, 19 Dec 2025 17:38:31 +0100
Subject: [PATCH] chore: rename

---
 .claude/commands/review-commit.md             |  2 +-
 .claude/commands/review-pr.md                 |  2 +-
 .github/workflows/ci.yml                      |  6 ++---
 CLAUDE.md                                     | 16 ++++++-------
 README.md                                     |  4 ++--
 apps/clean-app/package.json                   |  2 +-
 apps/clean-app/server.ts                      |  2 +-
 apps/dev-playground/client/index.html         |  2 +-
 apps/dev-playground/client/package-lock.json  |  8 +++----
 .../client/src/appKitTypes.d.ts               |  6 ++---
 .../src/components/analytics/filter-bar.tsx   |  2 +-
 .../components/analytics/summary-cards.tsx    |  2 +-
 .../analytics/top-contributors-chart.tsx      |  2 +-
 .../analytics/untagged-apps-table.tsx         |  2 +-
 .../analytics/usage-trends-chart.tsx          |  6 ++---
 .../client/src/components/apps-data-table.tsx |  2 +-
 .../client/src/components/error-component.tsx |  2 +-
 .../client/src/components/layout/header.tsx   |  2 +-
 .../reconnect/connection-status.tsx           |  2 +-
 .../components/reconnect/message-stream.tsx   |  2 +-
 .../src/components/reconnect/page-header.tsx  |  2 +-
 .../src/components/reconnect/test-plan.tsx    |  2 +-
 .../client/src/components/theme-selector.tsx  |  6 ++---
 apps/dev-playground/client/src/index.css      |  2 +-
 .../client/src/lib/utils/filter-utils.ts      |  2 +-
 .../client/src/routes/__root.tsx              |  4 ++--
 .../client/src/routes/analytics.route.tsx     |  2 +-
 .../src/routes/arrow-analytics.route.tsx      |  4 ++--
 .../src/routes/data-visualization.route.tsx   |  6 ++---
 .../client/src/routes/index.tsx               | 10 ++++----
 .../client/src/routes/sql-helpers.route.tsx   | 16 ++++++-------
 .../client/src/routes/telemetry.route.tsx     |  2 +-
 .../client/src/routes/type-safety.route.tsx   | 14 +++++------
 apps/dev-playground/client/vite.config.ts     |  6 ++---
 apps/dev-playground/package-lock.json         | 14 +++++------
 apps/dev-playground/package.json              |  4 ++--
 apps/dev-playground/server/index.ts           |  2 +-
 .../dev-playground/server/reconnect-plugin.ts |  2 +-
 .../server/telemetry-example-plugin.ts        |  2 +-
 biome.json                                    |  2 +-
 docs/README.md                                |  2 +-
 llms-compact.txt                              |  2 +-
 llms.txt                                      | 10 ++++----
 package.json                                  |  4 ++--
 packages/app-kit/src/core/index.ts            |  1 -
 packages/{app-kit-ui => appkit-ui}/CLAUDE.md  |  0
 .../{app-kit-ui => appkit-ui}/components.json |  0
 .../{app-kit-ui => appkit-ui}/package.json    |  2 +-
 .../src/js/arrow/arrow-client.ts              |  0
 .../src/js/arrow/index.ts                     |  0
 .../src/js/arrow/lazy-arrow.ts                |  0
 .../src/js/constants.ts                       |  0
 .../{app-kit-ui => appkit-ui}/src/js/index.ts |  0
 .../src/js/sse/connect-sse.ts                 |  0
 .../src/js/sse/index.ts                       |  0
 .../src/js/sse/types.ts                       |  0
 .../react/charts/__tests__/normalize.test.ts  |  0
 .../react/charts/__tests__/options.test.ts    |  0
 .../src/react/charts/__tests__/theme.test.ts  |  0
 .../src/react/charts/__tests__/types.test.ts  |  0
 .../src/react/charts/__tests__/utils.test.ts  |  0
 .../src/react/charts/area/index.tsx           |  0
 .../src/react/charts/bar/index.tsx            |  0
 .../src/react/charts/base.tsx                 |  0
 .../src/react/charts/chart-error-boundary.tsx |  0
 .../src/react/charts/constants.ts             |  0
 .../src/react/charts/create-chart.tsx         |  0
 .../src/react/charts/empty.tsx                |  0
 .../src/react/charts/error.tsx                |  0
 .../src/react/charts/heatmap/index.tsx        |  0
 .../src/react/charts/index.ts                 |  0
 .../src/react/charts/line/index.tsx           |  0
 .../src/react/charts/loading.tsx              |  0
 .../src/react/charts/normalize.ts             |  0
 .../src/react/charts/options.ts               |  0
 .../src/react/charts/pie/index.tsx            |  0
 .../src/react/charts/radar/index.tsx          |  0
 .../src/react/charts/scatter/index.tsx        |  0
 .../src/react/charts/theme.ts                 |  0
 .../src/react/charts/types.ts                 |  0
 .../src/react/charts/utils.ts                 |  0
 .../src/react/charts/wrapper.tsx              |  0
 .../src/react/error-boundary.tsx              |  0
 .../hooks/__tests__/use-chart-data.test.ts    |  0
 .../src/react/hooks/index.ts                  |  0
 .../src/react/hooks/types.ts                  |  2 +-
 .../src/react/hooks/use-analytics-query.ts    |  0
 .../src/react/hooks/use-chart-data.ts         |  0
 .../src/react/hooks/use-mobile.ts             |  0
 .../src/react/hooks/use-query-hmr.ts          |  0
 .../src/react/index.ts                        |  0
 .../src/react/lib/format.ts                   |  0
 .../src/react/lib/utils.ts                    |  0
 .../src/react/styles/globals.css              |  0
 .../src/react/table/data-table.tsx            |  0
 .../src/react/table/empty.tsx                 |  0
 .../src/react/table/error.tsx                 |  0
 .../src/react/table/index.ts                  |  0
 .../src/react/table/loading.tsx               |  0
 .../src/react/table/table-error-boundary.tsx  |  0
 .../src/react/table/table-wrapper.tsx         |  0
 .../src/react/table/types.ts                  |  0
 .../src/react/ui/accordion.tsx                |  0
 .../src/react/ui/alert-dialog.tsx             |  0
 .../src/react/ui/alert.tsx                    |  0
 .../src/react/ui/aspect-ratio.tsx             |  0
 .../src/react/ui/avatar.tsx                   |  0
 .../src/react/ui/badge.tsx                    |  0
 .../src/react/ui/breadcrumb.tsx               |  0
 .../src/react/ui/button-group.tsx             |  0
 .../src/react/ui/button.tsx                   |  0
 .../src/react/ui/calendar.tsx                 |  0
 .../src/react/ui/card.tsx                     |  0
 .../src/react/ui/carousel.tsx                 |  0
 .../src/react/ui/chart.tsx                    |  0
 .../src/react/ui/checkbox.tsx                 |  0
 .../src/react/ui/collapsible.tsx              |  0
 .../src/react/ui/command.tsx                  |  0
 .../src/react/ui/context-menu.tsx             |  0
 .../src/react/ui/dialog.tsx                   |  0
 .../src/react/ui/drawer.tsx                   |  0
 .../src/react/ui/dropdown-menu.tsx            |  0
 .../src/react/ui/empty.tsx                    |  0
 .../src/react/ui/field.tsx                    |  0
 .../src/react/ui/form.tsx                     |  0
 .../src/react/ui/hover-card.tsx               |  0
 .../src/react/ui/index.ts                     |  0
 .../src/react/ui/input-group.tsx              |  0
 .../src/react/ui/input-otp.tsx                |  0
 .../src/react/ui/input.tsx                    |  0
 .../src/react/ui/item.tsx                     |  0
 .../src/react/ui/kbd.tsx                      |  0
 .../src/react/ui/label.tsx                    |  0
 .../src/react/ui/menubar.tsx                  |  0
 .../src/react/ui/navigation-menu.tsx          |  0
 .../src/react/ui/pagination.tsx               |  0
 .../src/react/ui/popover.tsx                  |  0
 .../src/react/ui/progress.tsx                 |  0
 .../src/react/ui/radio-group.tsx              |  0
 .../src/react/ui/resizable.tsx                |  0
 .../src/react/ui/scroll-area.tsx              |  0
 .../src/react/ui/select.tsx                   |  0
 .../src/react/ui/separator.tsx                |  0
 .../src/react/ui/sheet.tsx                    |  0
 .../src/react/ui/sidebar.tsx                  |  0
 .../src/react/ui/skeleton.tsx                 |  0
 .../src/react/ui/slider.tsx                   |  0
 .../src/react/ui/sonner.tsx                   |  0
 .../src/react/ui/spinner.tsx                  |  0
 .../src/react/ui/switch.tsx                   |  0
 .../src/react/ui/table.tsx                    |  0
 .../src/react/ui/tabs.tsx                     |  0
 .../src/react/ui/textarea.tsx                 |  0
 .../src/react/ui/toggle-group.tsx             |  0
 .../src/react/ui/toggle.tsx                   |  0
 .../src/react/ui/tooltip.tsx                  |  0
 .../src/react/vite-env.d.ts                   |  0
 .../{app-kit-ui => appkit-ui}/tsconfig.json   |  0
 .../tsdown.config.ts                          |  2 +-
 packages/{app-kit => appkit}/CLAUDE.md        |  0
 .../{app-kit => appkit}/bin/generate-types.ts |  0
 packages/{app-kit => appkit}/package.json     |  2 +-
 .../src/analytics/analytics.ts                |  0
 .../src/analytics/defaults.ts                 |  0
 .../src/analytics/index.ts                    |  0
 .../src/analytics/query.ts                    |  0
 .../src/analytics/tests/analytics.test.ts     |  0
 .../src/analytics/tests/query.test.ts         |  0
 .../src/analytics/types.ts                    |  0
 packages/{app-kit => appkit}/src/app/index.ts |  0
 .../{app-kit => appkit}/src/cache/defaults.ts |  0
 .../{app-kit => appkit}/src/cache/index.ts    |  0
 .../src/cache/storage/defaults.ts             |  0
 .../src/cache/storage/index.ts                |  0
 .../src/cache/storage/memory.ts               |  0
 .../src/cache/storage/persistent.ts           |  0
 .../src/cache/tests/cache-manager.test.ts     |  0
 .../src/cache/tests/memory.test.ts            |  0
 .../src/cache/tests/persistent.test.ts        |  0
 .../src/connectors/index.ts                   |  0
 .../src/connectors/lakebase/client.ts         |  2 +-
 .../src/connectors/lakebase/defaults.ts       |  0
 .../src/connectors/lakebase/index.ts          |  0
 .../src/connectors/lakebase/types.ts          |  0
 .../src/connectors/lakebase/utils.ts          |  0
 .../src/connectors/sql-warehouse/client.ts    |  0
 .../src/connectors/sql-warehouse/defaults.ts  |  0
 .../src/connectors/sql-warehouse/index.ts     |  0
 .../src/connectors/tests/lakebase.test.ts     |  0
 .../app-kit.ts => appkit/src/core/appkit.ts}  |  0
 packages/appkit/src/core/index.ts             |  1 +
 .../src/core/tests/databricks.test.ts         |  2 +-
 packages/{app-kit => appkit}/src/index.ts     |  0
 .../src/plugin/dev-reader.ts                  |  0
 .../{app-kit => appkit}/src/plugin/index.ts   |  0
 .../src/plugin/interceptors/cache.ts          |  0
 .../src/plugin/interceptors/retry.ts          |  0
 .../src/plugin/interceptors/telemetry.ts      |  0
 .../src/plugin/interceptors/timeout.ts        |  0
 .../src/plugin/interceptors/types.ts          |  0
 .../{app-kit => appkit}/src/plugin/plugin.ts  |  0
 .../src/plugin/tests/cache.test.ts            |  0
 .../src/plugin/tests/plugin.test.ts           |  0
 .../src/plugin/tests/retry.test.ts            |  0
 .../src/plugin/tests/timeout.test.ts          |  0
 .../src/plugin/to-plugin.ts                   |  0
 .../src/server/base-server.ts                 |  2 +-
 .../{app-kit => appkit}/src/server/index.ts   |  2 +-
 .../src/server/remote-tunnel/denied.html      |  0
 .../src/server/remote-tunnel/gate.ts          |  0
 .../src/server/remote-tunnel/index.html       |  0
 .../remote-tunnel-controller.test.ts          |  0
 .../remote-tunnel/remote-tunnel-controller.ts |  0
 .../remote-tunnel-manager.test.ts             |  0
 .../remote-tunnel/remote-tunnel-manager.ts    |  2 +-
 .../src/server/remote-tunnel/wait.html        |  0
 .../src/server/static-server.ts               |  2 +-
 .../server/tests/remote-tunnel-gate.test.ts   |  0
 .../server/tests/server.integration.test.ts   |  0
 .../src/server/tests/server.test.ts           |  0
 .../src/server/tests/static-server.test.ts    |  0
 .../src/server/tests/utils.test.ts            |  0
 .../src/server/tests/vite-dev-server.test.ts  |  0
 .../{app-kit => appkit}/src/server/types.ts   |  0
 .../{app-kit => appkit}/src/server/utils.ts   |  0
 .../src/server/vite-dev-server.ts             |  2 +-
 .../src/stream/arrow-stream-processor.ts      |  0
 .../{app-kit => appkit}/src/stream/buffers.ts |  0
 .../src/stream/defaults.ts                    |  0
 .../{app-kit => appkit}/src/stream/index.ts   |  0
 .../src/stream/sse-writer.ts                  |  0
 .../src/stream/stream-manager.ts              |  0
 .../src/stream/stream-registry.ts             |  0
 .../tests/arrow-stream-processor.test.ts      |  0
 .../src/stream/tests/stream.test.ts           |  0
 .../{app-kit => appkit}/src/stream/types.ts   |  0
 .../src/stream/validator.ts                   |  0
 .../src/telemetry/config.ts                   |  0
 .../src/telemetry/index.ts                    |  0
 .../src/telemetry/instrumentations.ts         |  0
 .../{app-kit => appkit}/src/telemetry/noop.ts |  0
 .../src/telemetry/telemetry-manager.ts        |  0
 .../src/telemetry/telemetry-provider.ts       |  0
 .../src/telemetry/tests/config.test.ts        |  0
 .../telemetry/tests/plugin-telemetry.test.ts  |  0
 .../tests/telemetry-interceptor.test.ts       |  0
 .../telemetry/tests/telemetry-manager.test.ts |  0
 .../src/telemetry/types.ts                    |  0
 .../src/type-generator/cache.ts               |  0
 .../src/type-generator/expand.ts              |  0
 .../src/type-generator/index.ts               |  6 ++---
 .../src/type-generator/query-registry.ts      |  0
 .../src/type-generator/spinner.ts             |  0
 .../src/type-generator/tests/expand.test.ts   |  0
 .../src/type-generator/tests/index.test.ts    |  0
 .../tests/query-registry.test.ts              |  0
 .../src/type-generator/types.ts               |  0
 .../src/type-generator/vite-plugin.ts         |  0
 .../src/utils/databricks-client-middleware.ts |  0
 .../src/utils/env-validator.ts                |  0
 .../{app-kit => appkit}/src/utils/index.ts    |  0
 .../{app-kit => appkit}/src/utils/merge.ts    |  0
 .../src/utils/vite-config-merge.ts            |  0
 packages/{app-kit => appkit}/tsconfig.json    |  0
 packages/{app-kit => appkit}/tsdown.config.ts |  2 +-
 packages/shared/bin/setup-claude.js           |  8 +++----
 pnpm-lock.yaml                                | 12 +++++-----
 tools/build-notice.ts                         |  4 ++--
 tools/dist.ts                                 |  4 ++--
 tools/playground/deploy-playground.ts         | 23 ++++++++-----------
 tools/test-helpers.ts                         |  6 ++---
 tsconfig.json                                 |  4 ++--
 vitest.config.ts                              | 10 ++++----
 273 files changed, 148 insertions(+), 151 deletions(-)
 delete mode 100644 packages/app-kit/src/core/index.ts
 rename packages/{app-kit-ui => appkit-ui}/CLAUDE.md (100%)
 rename packages/{app-kit-ui => appkit-ui}/components.json (100%)
 rename packages/{app-kit-ui => appkit-ui}/package.json (98%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/arrow/arrow-client.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/arrow/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/arrow/lazy-arrow.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/constants.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/sse/connect-sse.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/sse/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/js/sse/types.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/__tests__/normalize.test.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/__tests__/options.test.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/__tests__/theme.test.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/__tests__/types.test.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/__tests__/utils.test.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/area/index.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/bar/index.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/base.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/chart-error-boundary.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/constants.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/create-chart.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/empty.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/error.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/heatmap/index.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/line/index.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/loading.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/normalize.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/options.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/pie/index.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/radar/index.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/scatter/index.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/theme.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/types.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/utils.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/charts/wrapper.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/error-boundary.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/hooks/__tests__/use-chart-data.test.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/hooks/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/hooks/types.ts (98%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/hooks/use-analytics-query.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/hooks/use-chart-data.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/hooks/use-mobile.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/hooks/use-query-hmr.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/lib/format.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/lib/utils.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/styles/globals.css (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/data-table.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/empty.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/error.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/loading.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/table-error-boundary.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/table-wrapper.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/table/types.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/accordion.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/alert-dialog.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/alert.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/aspect-ratio.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/avatar.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/badge.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/breadcrumb.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/button-group.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/button.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/calendar.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/card.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/carousel.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/chart.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/checkbox.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/collapsible.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/command.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/context-menu.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/dialog.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/drawer.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/dropdown-menu.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/empty.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/field.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/form.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/hover-card.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/index.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/input-group.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/input-otp.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/input.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/item.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/kbd.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/label.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/menubar.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/navigation-menu.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/pagination.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/popover.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/progress.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/radio-group.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/resizable.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/scroll-area.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/select.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/separator.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/sheet.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/sidebar.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/skeleton.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/slider.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/sonner.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/spinner.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/switch.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/table.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/tabs.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/textarea.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/toggle-group.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/toggle.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/ui/tooltip.tsx (100%)
 rename packages/{app-kit-ui => appkit-ui}/src/react/vite-env.d.ts (100%)
 rename packages/{app-kit-ui => appkit-ui}/tsconfig.json (100%)
 rename packages/{app-kit-ui => appkit-ui}/tsdown.config.ts (96%)
 rename packages/{app-kit => appkit}/CLAUDE.md (100%)
 rename packages/{app-kit => appkit}/bin/generate-types.ts (100%)
 rename packages/{app-kit => appkit}/package.json (98%)
 rename packages/{app-kit => appkit}/src/analytics/analytics.ts (100%)
 rename packages/{app-kit => appkit}/src/analytics/defaults.ts (100%)
 rename packages/{app-kit => appkit}/src/analytics/index.ts (100%)
 rename packages/{app-kit => appkit}/src/analytics/query.ts (100%)
 rename packages/{app-kit => appkit}/src/analytics/tests/analytics.test.ts (100%)
 rename packages/{app-kit => appkit}/src/analytics/tests/query.test.ts (100%)
 rename packages/{app-kit => appkit}/src/analytics/types.ts (100%)
 rename packages/{app-kit => appkit}/src/app/index.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/defaults.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/index.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/storage/defaults.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/storage/index.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/storage/memory.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/storage/persistent.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/tests/cache-manager.test.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/tests/memory.test.ts (100%)
 rename packages/{app-kit => appkit}/src/cache/tests/persistent.test.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/index.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/lakebase/client.ts (99%)
 rename packages/{app-kit => appkit}/src/connectors/lakebase/defaults.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/lakebase/index.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/lakebase/types.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/lakebase/utils.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/sql-warehouse/client.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/sql-warehouse/defaults.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/sql-warehouse/index.ts (100%)
 rename packages/{app-kit => appkit}/src/connectors/tests/lakebase.test.ts (100%)
 rename packages/{app-kit/src/core/app-kit.ts => appkit/src/core/appkit.ts} (100%)
 create mode 100644 packages/appkit/src/core/index.ts
 rename packages/{app-kit => appkit}/src/core/tests/databricks.test.ts (99%)
 rename packages/{app-kit => appkit}/src/index.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/dev-reader.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/index.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/interceptors/cache.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/interceptors/retry.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/interceptors/telemetry.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/interceptors/timeout.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/interceptors/types.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/plugin.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/tests/cache.test.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/tests/plugin.test.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/tests/retry.test.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/tests/timeout.test.ts (100%)
 rename packages/{app-kit => appkit}/src/plugin/to-plugin.ts (100%)
 rename packages/{app-kit => appkit}/src/server/base-server.ts (95%)
 rename packages/{app-kit => appkit}/src/server/index.ts (99%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/denied.html (100%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/gate.ts (100%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/index.html (100%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/remote-tunnel-controller.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/remote-tunnel-controller.ts (100%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/remote-tunnel-manager.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/remote-tunnel-manager.ts (99%)
 rename packages/{app-kit => appkit}/src/server/remote-tunnel/wait.html (100%)
 rename packages/{app-kit => appkit}/src/server/static-server.ts (97%)
 rename packages/{app-kit => appkit}/src/server/tests/remote-tunnel-gate.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/tests/server.integration.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/tests/server.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/tests/static-server.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/tests/utils.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/tests/vite-dev-server.test.ts (100%)
 rename packages/{app-kit => appkit}/src/server/types.ts (100%)
 rename packages/{app-kit => appkit}/src/server/utils.ts (100%)
 rename packages/{app-kit => appkit}/src/server/vite-dev-server.ts (99%)
 rename packages/{app-kit => appkit}/src/stream/arrow-stream-processor.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/buffers.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/defaults.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/index.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/sse-writer.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/stream-manager.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/stream-registry.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/tests/arrow-stream-processor.test.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/tests/stream.test.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/types.ts (100%)
 rename packages/{app-kit => appkit}/src/stream/validator.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/config.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/index.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/instrumentations.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/noop.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/telemetry-manager.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/telemetry-provider.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/tests/config.test.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/tests/plugin-telemetry.test.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/tests/telemetry-interceptor.test.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/tests/telemetry-manager.test.ts (100%)
 rename packages/{app-kit => appkit}/src/telemetry/types.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/cache.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/expand.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/index.ts (94%)
 rename packages/{app-kit => appkit}/src/type-generator/query-registry.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/spinner.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/tests/expand.test.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/tests/index.test.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/tests/query-registry.test.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/types.ts (100%)
 rename packages/{app-kit => appkit}/src/type-generator/vite-plugin.ts (100%)
 rename packages/{app-kit => appkit}/src/utils/databricks-client-middleware.ts (100%)
 rename packages/{app-kit => appkit}/src/utils/env-validator.ts (100%)
 rename packages/{app-kit => appkit}/src/utils/index.ts (100%)
 rename packages/{app-kit => appkit}/src/utils/merge.ts (100%)
 rename packages/{app-kit => appkit}/src/utils/vite-config-merge.ts (100%)
 rename packages/{app-kit => appkit}/tsconfig.json (100%)
 rename packages/{app-kit => appkit}/tsdown.config.ts (96%)

diff --git a/.claude/commands/review-commit.md b/.claude/commands/review-commit.md
index d16bb0d..ea00c68 100644
--- a/.claude/commands/review-commit.md
+++ b/.claude/commands/review-commit.md
@@ -8,7 +8,7 @@ Please review the **staged changes** (git diff --cached) in this repository agai
 
 ## Context
 
-This is the **Databricks Apps Kit** (@databricks/app-kit) - a modular TypeScript SDK for building Databricks apps with workflows and plugins.
+This is the **Databricks Apps Kit** (@databricks/appkit) - a modular TypeScript SDK for building Databricks apps with workflows and plugins.
 
 ## SDK Core Principles
 
diff --git a/.claude/commands/review-pr.md b/.claude/commands/review-pr.md
index 5efe0bf..c39fb2e 100644
--- a/.claude/commands/review-pr.md
+++ b/.claude/commands/review-pr.md
@@ -9,7 +9,7 @@ Please review **all changes in the current branch** (compared to $ARGUMENTS or m
 
 ## Context
 
-This is the **Databricks AppKit** (@databricks/app-kit) - a modular TypeScript SDK for building Databricks apps with workflows and plugins.
+This is the **Databricks AppKit** (@databricks/appkit) - a modular TypeScript SDK for building Databricks apps with workflows and plugins.
 
 ## SDK Core Principles
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6fd15e6..4bb789d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     name: Detect Changes
     outputs:
       docs: ${{ steps.filter.outputs.docs }}
-      app-kit: ${{ steps.filter.outputs.app-kit }}
+      appkit: ${{ steps.filter.outputs.appkit }}
     steps:
       - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v3
@@ -31,7 +31,7 @@ jobs:
           filters: |
             docs:
               - 'docs/**'
-            app-kit:
+            appkit:
               - '!docs/**'
 
   lint_and_typecheck:
@@ -61,7 +61,7 @@ jobs:
   test:
     name: Unit Tests
     needs: detect-changes
-    if: needs.detect-changes.outputs.app-kit == 'true'
+    if: needs.detect-changes.outputs.appkit == 'true'
     runs-on:
       group: databricks-protected-runner-group
       labels: linux-ubuntu-latest
diff --git a/CLAUDE.md b/CLAUDE.md
index 68271dc..2f8868c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -14,8 +14,8 @@ Databricks AppKit is a modular TypeScript SDK for building Databricks applicatio
 
 ```
 /packages/
-  /app-kit/          - Core SDK with plugin architecture
-  /app-kit-ui/       - React components and JS utilities
+  /appkit/          - Core SDK with plugin architecture
+  /appkit-ui/       - React components and JS utilities
   /shared/           - Shared TypeScript types across packages
 
 /apps/
@@ -70,8 +70,8 @@ pnpm test:watch       # Run tests in watch mode
 ```
 
 **Test Projects:**
-- `app-kit-ui`: Uses jsdom environment (for React components)
-- `app-kit`: Uses node environment (for Node.js SDK)
+- `appkit-ui`: Uses jsdom environment (for React components)
+- `appkit`: Uses node environment (for Node.js SDK)
 
 ### Code Quality
 ```bash
@@ -113,7 +113,7 @@ AppKit uses a **phase-based plugin architecture** with three initialization phas
 
 **Creating a Plugin:**
 ```typescript
-import { Plugin, toPlugin } from '@databricks/app-kit';
+import { Plugin, toPlugin } from '@databricks/appkit';
 
 class MyPlugin extends Plugin {
   name: string = "my-plugin";
@@ -257,7 +257,7 @@ Biome is used instead of ESLint/Prettier for faster performance:
 pnpm add -Dw <package>
 
 # Package-specific dependencies
-pnpm --filter=@databricks/app-kit add <package>
+pnpm --filter=@databricks/appkit add <package>
 
 # App dependencies
 pnpm --filter=sdk-playground add <package>
@@ -273,7 +273,7 @@ Packages should:
 
 ### Type Generation
 
-`packages/app-kit/src/utils/type-generator.ts` creates plugin registry types at build time. This enables:
+`packages/appkit/src/utils/type-generator.ts` creates plugin registry types at build time. This enables:
 ```typescript
 const AppKit = await createApp({ plugins: [...] });
 AppKit.myPlugin.method();  // Typed based on registered plugins
@@ -291,7 +291,7 @@ The reference app demonstrates AppKit usage:
 **Frontend (`apps/dev-playground/client/`):**
 - Vite + React 19 + TypeScript
 - TanStack Router for file-based routing (routes in `src/routes/`)
-- Components from `@databricks/app-kit-ui`
+- Components from `@databricks/appkit-ui`
 - Route files: `src/routes/<page-name>.route.tsx`
 - Root layout: `src/routes/__root.tsx`
 
diff --git a/README.md b/README.md
index 18e38b7..aed3028 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# App Kit
+# AppKit
 
 > [!WARNING]
 > ## ⚠️ PREVIEW - NOT FOR PRODUCTION USE
@@ -17,7 +17,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for development setup and contribution gu
 
 ## Documentation
 
-The `docs/` directory contains the App Kit documentation site, built with Docusaurus.
+The `docs/` directory contains the AppKit documentation site, built with Docusaurus.
 
 **Working with docs:**
 
diff --git a/apps/clean-app/package.json b/apps/clean-app/package.json
index e31fb90..bd1a3d7 100644
--- a/apps/clean-app/package.json
+++ b/apps/clean-app/package.json
@@ -10,7 +10,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@databricks/app-kit": "workspace:*",
+    "@databricks/appkit": "workspace:*",
     "react": "^19.2.0",
     "react-dom": "^19.2.0"
   },
diff --git a/apps/clean-app/server.ts b/apps/clean-app/server.ts
index cc279cb..a5e7809 100644
--- a/apps/clean-app/server.ts
+++ b/apps/clean-app/server.ts
@@ -1,4 +1,4 @@
-import { createApp, server } from "@databricks/app-kit";
+import { createApp, server } from "@databricks/appkit";
 
 createApp({
   plugins: [server()],
diff --git a/apps/dev-playground/client/index.html b/apps/dev-playground/client/index.html
index 149833a..bbf3c75 100644
--- a/apps/dev-playground/client/index.html
+++ b/apps/dev-playground/client/index.html
@@ -9,7 +9,7 @@
     <div id="root"></div>
     <script>
       (function() {
-        const THEME_STORAGE_KEY = "app-kit-playground-theme";
+        const THEME_STORAGE_KEY = "appkit-playground-theme";
         const storedTheme = localStorage.getItem(THEME_STORAGE_KEY);
         const root = document.documentElement;
         
diff --git a/apps/dev-playground/client/package-lock.json b/apps/dev-playground/client/package-lock.json
index 466dcf8..a0cd6cd 100644
--- a/apps/dev-playground/client/package-lock.json
+++ b/apps/dev-playground/client/package-lock.json
@@ -47,8 +47,8 @@
         "vite": "npm:rolldown-vite@7.1.14"
       }
     },
-    "../../../packages/app-kit-ui": {
-      "name": "@databricks/app-kit-ui",
+    "../../../packages/appkit-ui": {
+      "name": "@databricks/appkit-ui",
       "version": "1.0.0",
       "extraneous": true,
       "dependencies": {
@@ -69,7 +69,7 @@
         "recharts": "^2.0.0 || ^3.0.0"
       }
     },
-    "../../../packages/app-kit-ui/dist": {
+    "../../../packages/appkit-ui/dist": {
       "extraneous": true
     },
     "node_modules/@alloc/quick-lru": {
@@ -6908,7 +6908,7 @@
       }
     },
     "package": {
-      "name": "@databricks/app-kit-ui",
+      "name": "@databricks/appkit-ui",
       "version": "1.0.0",
       "extraneous": true,
       "dependencies": {
diff --git a/apps/dev-playground/client/src/appKitTypes.d.ts b/apps/dev-playground/client/src/appKitTypes.d.ts
index e30fec3..fc9dd81 100644
--- a/apps/dev-playground/client/src/appKitTypes.d.ts
+++ b/apps/dev-playground/client/src/appKitTypes.d.ts
@@ -1,9 +1,9 @@
 // Auto-generated by AppKit - DO NOT EDIT
 // Generated by 'npx appkit-generate-types' or Vite plugin during build
-import "@databricks/app-kit-ui/react";
-import type { SQLTypeMarker, SQLStringMarker, SQLNumberMarker, SQLBooleanMarker, SQLBinaryMarker, SQLDateMarker, SQLTimestampMarker } from "@databricks/app-kit-ui/js";
+import "@databricks/appkit-ui/react";
+import type { SQLTypeMarker, SQLStringMarker, SQLNumberMarker, SQLBooleanMarker, SQLBinaryMarker, SQLDateMarker, SQLTimestampMarker } from "@databricks/appkit-ui/js";
 
-declare module "@databricks/app-kit-ui/react" {
+declare module "@databricks/appkit-ui/react" {
   interface QueryRegistry {
     app_activity_heatmap: {
         name: "app_activity_heatmap";
diff --git a/apps/dev-playground/client/src/components/analytics/filter-bar.tsx b/apps/dev-playground/client/src/components/analytics/filter-bar.tsx
index 593ff3f..6e785b6 100644
--- a/apps/dev-playground/client/src/components/analytics/filter-bar.tsx
+++ b/apps/dev-playground/client/src/components/analytics/filter-bar.tsx
@@ -7,7 +7,7 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 
 interface FilterBarProps {
   filters: DashboardFilters;
diff --git a/apps/dev-playground/client/src/components/analytics/summary-cards.tsx b/apps/dev-playground/client/src/components/analytics/summary-cards.tsx
index f01493e..82f428f 100644
--- a/apps/dev-playground/client/src/components/analytics/summary-cards.tsx
+++ b/apps/dev-playground/client/src/components/analytics/summary-cards.tsx
@@ -4,7 +4,7 @@ import {
   CardHeader,
   CardTitle,
   Skeleton,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 import type { Aggregation, DashboardFilters } from "@/lib/types";
 
 interface SummaryCardsProps {
diff --git a/apps/dev-playground/client/src/components/analytics/top-contributors-chart.tsx b/apps/dev-playground/client/src/components/analytics/top-contributors-chart.tsx
index 598d284..951b177 100644
--- a/apps/dev-playground/client/src/components/analytics/top-contributors-chart.tsx
+++ b/apps/dev-playground/client/src/components/analytics/top-contributors-chart.tsx
@@ -9,7 +9,7 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 
 interface TopContributorsChartProps {
   groupBy: "app" | "user";
diff --git a/apps/dev-playground/client/src/components/analytics/untagged-apps-table.tsx b/apps/dev-playground/client/src/components/analytics/untagged-apps-table.tsx
index 44f6714..e1ec06e 100644
--- a/apps/dev-playground/client/src/components/analytics/untagged-apps-table.tsx
+++ b/apps/dev-playground/client/src/components/analytics/untagged-apps-table.tsx
@@ -5,7 +5,7 @@ import {
   CardDescription,
   CardHeader,
   CardTitle,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 
 interface UntaggedApp {
   id: string;
diff --git a/apps/dev-playground/client/src/components/analytics/usage-trends-chart.tsx b/apps/dev-playground/client/src/components/analytics/usage-trends-chart.tsx
index a877f4e..0b4ba54 100644
--- a/apps/dev-playground/client/src/components/analytics/usage-trends-chart.tsx
+++ b/apps/dev-playground/client/src/components/analytics/usage-trends-chart.tsx
@@ -1,5 +1,5 @@
-import { sql } from "@databricks/app-kit-ui/js";
-import { BarChart } from "@databricks/app-kit-ui/react";
+import { sql } from "@databricks/appkit-ui/js";
+import { BarChart } from "@databricks/appkit-ui/react";
 import {
   Card,
   CardContent,
@@ -10,7 +10,7 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 
 interface UsageTrendsChartProps {
   groupBy: "default" | "app" | "user";
diff --git a/apps/dev-playground/client/src/components/apps-data-table.tsx b/apps/dev-playground/client/src/components/apps-data-table.tsx
index 3b94a9b..2b7ad25 100644
--- a/apps/dev-playground/client/src/components/apps-data-table.tsx
+++ b/apps/dev-playground/client/src/components/apps-data-table.tsx
@@ -12,7 +12,7 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 import {
   type ColumnDef,
   type ColumnFiltersState,
diff --git a/apps/dev-playground/client/src/components/error-component.tsx b/apps/dev-playground/client/src/components/error-component.tsx
index b6666b8..6385a8b 100644
--- a/apps/dev-playground/client/src/components/error-component.tsx
+++ b/apps/dev-playground/client/src/components/error-component.tsx
@@ -5,7 +5,7 @@ import {
   CardContent,
   CardHeader,
   CardTitle,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 
 export function ErrorComponent({ error }: { error: ErrorComponentProps }) {
   return (
diff --git a/apps/dev-playground/client/src/components/layout/header.tsx b/apps/dev-playground/client/src/components/layout/header.tsx
index 728770c..b83452a 100644
--- a/apps/dev-playground/client/src/components/layout/header.tsx
+++ b/apps/dev-playground/client/src/components/layout/header.tsx
@@ -3,7 +3,7 @@ import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 
 export function Header({
   title,
diff --git a/apps/dev-playground/client/src/components/reconnect/connection-status.tsx b/apps/dev-playground/client/src/components/reconnect/connection-status.tsx
index e610bf9..e3aeb9b 100644
--- a/apps/dev-playground/client/src/components/reconnect/connection-status.tsx
+++ b/apps/dev-playground/client/src/components/reconnect/connection-status.tsx
@@ -5,7 +5,7 @@ import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 import { InfoIcon } from "lucide-react";
 import { Timeline } from "./timeline";
 import { getStatusBadgeStyle } from "./utils";
diff --git a/apps/dev-playground/client/src/components/reconnect/message-stream.tsx b/apps/dev-playground/client/src/components/reconnect/message-stream.tsx
index ed18e55..5b1b59d 100644
--- a/apps/dev-playground/client/src/components/reconnect/message-stream.tsx
+++ b/apps/dev-playground/client/src/components/reconnect/message-stream.tsx
@@ -1,4 +1,4 @@
-import { Badge, Card } from "@databricks/app-kit-ui/react";
+import { Badge, Card } from "@databricks/appkit-ui/react";
 
 interface Message {
   count: number;
diff --git a/apps/dev-playground/client/src/components/reconnect/page-header.tsx b/apps/dev-playground/client/src/components/reconnect/page-header.tsx
index 954c8c5..4514fc2 100644
--- a/apps/dev-playground/client/src/components/reconnect/page-header.tsx
+++ b/apps/dev-playground/client/src/components/reconnect/page-header.tsx
@@ -3,7 +3,7 @@ import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 
 export function PageHeader() {
   return (
diff --git a/apps/dev-playground/client/src/components/reconnect/test-plan.tsx b/apps/dev-playground/client/src/components/reconnect/test-plan.tsx
index 0586531..f6121be 100644
--- a/apps/dev-playground/client/src/components/reconnect/test-plan.tsx
+++ b/apps/dev-playground/client/src/components/reconnect/test-plan.tsx
@@ -1,4 +1,4 @@
-import { Card } from "@databricks/app-kit-ui/react";
+import { Card } from "@databricks/appkit-ui/react";
 
 export function TestPlan() {
   return (
diff --git a/apps/dev-playground/client/src/components/theme-selector.tsx b/apps/dev-playground/client/src/components/theme-selector.tsx
index 9cc96e0..5c13f17 100644
--- a/apps/dev-playground/client/src/components/theme-selector.tsx
+++ b/apps/dev-playground/client/src/components/theme-selector.tsx
@@ -5,12 +5,12 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from "@databricks/app-kit-ui/react";
-import { Button } from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
+import { Button } from "@databricks/appkit-ui/react";
 
 type Theme = "light" | "dark" | "system";
 
-const THEME_STORAGE_KEY = "app-kit-playground-theme";
+const THEME_STORAGE_KEY = "appkit-playground-theme";
 
 function getSystemTheme(): "light" | "dark" {
   if (typeof window === "undefined") return "light";
diff --git a/apps/dev-playground/client/src/index.css b/apps/dev-playground/client/src/index.css
index 48a6248..5dcc4cf 100644
--- a/apps/dev-playground/client/src/index.css
+++ b/apps/dev-playground/client/src/index.css
@@ -1 +1 @@
-@import "@databricks/app-kit-ui/styles.css";
+@import "@databricks/appkit-ui/styles.css";
diff --git a/apps/dev-playground/client/src/lib/utils/filter-utils.ts b/apps/dev-playground/client/src/lib/utils/filter-utils.ts
index cdba1fb..ab3e047 100644
--- a/apps/dev-playground/client/src/lib/utils/filter-utils.ts
+++ b/apps/dev-playground/client/src/lib/utils/filter-utils.ts
@@ -1,4 +1,4 @@
-import { sql } from "@databricks/app-kit-ui/js";
+import { sql } from "@databricks/appkit-ui/js";
 import type { Aggregation, DashboardFilters } from "@/lib/types";
 
 const ALLOWED_PERIODS = ["day", "week", "month"] as const;
diff --git a/apps/dev-playground/client/src/routes/__root.tsx b/apps/dev-playground/client/src/routes/__root.tsx
index ef8a901..1742b95 100644
--- a/apps/dev-playground/client/src/routes/__root.tsx
+++ b/apps/dev-playground/client/src/routes/__root.tsx
@@ -6,7 +6,7 @@ import {
   useLocation,
 } from "@tanstack/react-router";
 import { ErrorComponent } from "@/components/error-component";
-import { Button, TooltipProvider } from "@databricks/app-kit-ui/react";
+import { Button, TooltipProvider } from "@databricks/appkit-ui/react";
 import { ThemeSelector } from "@/components/theme-selector";
 
 export const Route = createRootRoute({
@@ -28,7 +28,7 @@ function RootComponent() {
                 className="no-underline text-inherit hover:opacity-80 transition-opacity"
               >
                 <h4 className="text-xl font-semibold tracking-tight text-foreground">
-                  App Kit Playground
+                  AppKit Playground
                 </h4>
               </Link>
               <div className="flex items-center gap-3">
diff --git a/apps/dev-playground/client/src/routes/analytics.route.tsx b/apps/dev-playground/client/src/routes/analytics.route.tsx
index b293d81..d183310 100644
--- a/apps/dev-playground/client/src/routes/analytics.route.tsx
+++ b/apps/dev-playground/client/src/routes/analytics.route.tsx
@@ -1,4 +1,4 @@
-import { useAnalyticsQuery } from "@databricks/app-kit-ui/react";
+import { useAnalyticsQuery } from "@databricks/appkit-ui/react";
 import { createFileRoute, retainSearchParams } from "@tanstack/react-router";
 import { useMemo, useState } from "react";
 import {
diff --git a/apps/dev-playground/client/src/routes/arrow-analytics.route.tsx b/apps/dev-playground/client/src/routes/arrow-analytics.route.tsx
index 74e9447..d4dfee7 100644
--- a/apps/dev-playground/client/src/routes/arrow-analytics.route.tsx
+++ b/apps/dev-playground/client/src/routes/arrow-analytics.route.tsx
@@ -1,5 +1,5 @@
 import { AnalyticsHeader } from "@/components/analytics";
-import { sql } from "@databricks/app-kit-ui/js";
+import { sql } from "@databricks/appkit-ui/js";
 import {
   AreaChart,
   BarChart,
@@ -12,7 +12,7 @@ import {
   HeatmapChart,
   LineChart,
   PieChart,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 import { createFileRoute, retainSearchParams } from "@tanstack/react-router";
 
 export const Route = createFileRoute("/arrow-analytics")({
diff --git a/apps/dev-playground/client/src/routes/data-visualization.route.tsx b/apps/dev-playground/client/src/routes/data-visualization.route.tsx
index 4b3d902..9661d58 100644
--- a/apps/dev-playground/client/src/routes/data-visualization.route.tsx
+++ b/apps/dev-playground/client/src/routes/data-visualization.route.tsx
@@ -1,5 +1,5 @@
 import { Header } from "@/components/layout/header";
-import { sql } from "@databricks/app-kit-ui/js";
+import { sql } from "@databricks/appkit-ui/js";
 import {
   AreaChart,
   BarChart,
@@ -13,7 +13,7 @@ import {
   LineChart,
   PieChart,
   RadarChart,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 import { createFileRoute } from "@tanstack/react-router";
 import { useEffect, useState } from "react";
 import { codeToHtml } from "shiki";
@@ -78,7 +78,7 @@ function DataVisualizationRoute() {
       <div className="max-w-[1200px] mx-auto px-6 py-12">
         <Header
           title="Data Visualization"
-          description="Explore powerful and customizable chart components from the App Kit."
+          description="Explore powerful and customizable chart components from the AppKit."
           tooltip="Showcase of BarChart, AreaChart, LineChart, PieChart, and RadarChart components"
         />
 
diff --git a/apps/dev-playground/client/src/routes/index.tsx b/apps/dev-playground/client/src/routes/index.tsx
index 0950166..3f78342 100644
--- a/apps/dev-playground/client/src/routes/index.tsx
+++ b/apps/dev-playground/client/src/routes/index.tsx
@@ -3,7 +3,7 @@ import {
   retainSearchParams,
   useNavigate,
 } from "@tanstack/react-router";
-import { Button, Card } from "@databricks/app-kit-ui/react";
+import { Button, Card } from "@databricks/appkit-ui/react";
 import { ThemeSelector } from "@/components/theme-selector";
 
 export const Route = createFileRoute("/")({
@@ -24,11 +24,11 @@ function IndexRoute() {
       <div className="max-w-6xl mx-auto px-6 py-20">
         <div className="text-center mb-16">
           <h1 className="text-5xl font-bold text-foreground mb-4">
-            App Kit Playground
+            AppKit Playground
           </h1>
           <p className="text-xl text-muted-foreground max-w-2xl mx-auto">
-            Explore the capabilities of the App Kit with interactive examples
-            and demos
+            Explore the capabilities of the AppKit with interactive examples and
+            demos
           </p>
         </div>
 
@@ -166,7 +166,7 @@ function IndexRoute() {
 
         <div className="text-center pt-12 border-t border-border">
           <p className="text-sm text-muted-foreground">
-            built by databricks using app-kit
+            built by databricks using appkit
           </p>
         </div>
       </div>
diff --git a/apps/dev-playground/client/src/routes/sql-helpers.route.tsx b/apps/dev-playground/client/src/routes/sql-helpers.route.tsx
index 217f0f4..d8d9a42 100644
--- a/apps/dev-playground/client/src/routes/sql-helpers.route.tsx
+++ b/apps/dev-playground/client/src/routes/sql-helpers.route.tsx
@@ -1,4 +1,4 @@
-import { sql } from "@databricks/app-kit-ui/js";
+import { sql } from "@databricks/appkit-ui/js";
 import {
   useAnalyticsQuery,
   Button,
@@ -8,7 +8,7 @@ import {
   CardHeader,
   CardTitle,
   Input,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 import { createFileRoute, retainSearchParams } from "@tanstack/react-router";
 import { useEffect, useMemo, useState } from "react";
 import { codeToHtml } from "shiki";
@@ -288,7 +288,7 @@ function SqlHelpersRoute() {
             title="String"
             description="For text values. Accepts string, number, or boolean."
             type="STRING"
-            code={`import { sql } from "@databricks/app-kit-ui/js";
+            code={`import { sql } from "@databricks/appkit-ui/js";
 
 const params = {
   name: sql.string("${stringValue}")
@@ -308,7 +308,7 @@ const params = {
             title="Number"
             description="For numeric values. Accepts number or numeric string."
             type="NUMERIC"
-            code={`import { sql } from "@databricks/app-kit-ui/js";
+            code={`import { sql } from "@databricks/appkit-ui/js";
 
 const params = {
   count: sql.number(${numberValue})
@@ -329,7 +329,7 @@ const params = {
             title="Boolean"
             description="For true/false values. Accepts boolean, string, or number (0/1)."
             type="BOOLEAN"
-            code={`import { sql } from "@databricks/app-kit-ui/js";
+            code={`import { sql } from "@databricks/appkit-ui/js";
 
 const params = {
   isActive: sql.boolean(${booleanValue})
@@ -359,7 +359,7 @@ const params = {
             title="Date"
             description="For date values. Accepts Date object or YYYY-MM-DD string."
             type="DATE"
-            code={`import { sql } from "@databricks/app-kit-ui/js";
+            code={`import { sql } from "@databricks/appkit-ui/js";
 
 const params = {
   startDate: sql.date("${dateValue}")
@@ -384,7 +384,7 @@ const params2 = {
             title="Timestamp"
             description="For datetime values. Accepts Date, ISO string, or Unix timestamp."
             type="TIMESTAMP"
-            code={`import { sql } from "@databricks/app-kit-ui/js";
+            code={`import { sql } from "@databricks/appkit-ui/js";
 
 const params = {
   createdAt: sql.timestamp("${timestampValue}Z")
@@ -416,7 +416,7 @@ const params3 = {
             title="Binary"
             description="For binary data. Converts to hex-encoded STRING. Use UNHEX(:param) in SQL."
             type="STRING (hex)"
-            code={`import { sql } from "@databricks/app-kit-ui/js";
+            code={`import { sql } from "@databricks/appkit-ui/js";
 
 // From Uint8Array:
 const bytes = new Uint8Array([${Array.from(binaryBytes)
diff --git a/apps/dev-playground/client/src/routes/telemetry.route.tsx b/apps/dev-playground/client/src/routes/telemetry.route.tsx
index a176534..5291da6 100644
--- a/apps/dev-playground/client/src/routes/telemetry.route.tsx
+++ b/apps/dev-playground/client/src/routes/telemetry.route.tsx
@@ -1,5 +1,5 @@
 import { createFileRoute, retainSearchParams } from "@tanstack/react-router";
-import { Button, Card } from "@databricks/app-kit-ui/react";
+import { Button, Card } from "@databricks/appkit-ui/react";
 import { useState } from "react";
 import { Activity, Loader2 } from "lucide-react";
 
diff --git a/apps/dev-playground/client/src/routes/type-safety.route.tsx b/apps/dev-playground/client/src/routes/type-safety.route.tsx
index c7e8572..d2df3ff 100644
--- a/apps/dev-playground/client/src/routes/type-safety.route.tsx
+++ b/apps/dev-playground/client/src/routes/type-safety.route.tsx
@@ -5,7 +5,7 @@ import {
   CardDescription,
   CardHeader,
   CardTitle,
-} from "@databricks/app-kit-ui/react";
+} from "@databricks/appkit-ui/react";
 import { createFileRoute, retainSearchParams } from "@tanstack/react-router";
 import { useEffect, useState } from "react";
 import { codeToHtml } from "shiki";
@@ -57,10 +57,10 @@ GROUP BY period
 ORDER BY period DESC`;
 
 const GENERATED_TYPES = `// Auto-generated by AppKit - DO NOT EDIT
-import "@databricks/app-kit-ui/react";
-import type { SQLStringMarker, SQLDateMarker } from "@databricks/app-kit-ui/js";
+import "@databricks/appkit-ui/react";
+import type { SQLStringMarker, SQLDateMarker } from "@databricks/appkit-ui/js";
 
-declare module "@databricks/app-kit-ui/react" {
+declare module "@databricks/appkit-ui/react" {
   interface QueryRegistry {
     spend_data: {
       name: "spend_data";
@@ -84,8 +84,8 @@ declare module "@databricks/app-kit-ui/react" {
   }
 }`;
 
-const USAGE_EXAMPLE = `import { sql } from "@databricks/app-kit-ui/js";
-import { useAnalyticsQuery } from "@databricks/app-kit-ui/react";
+const USAGE_EXAMPLE = `import { sql } from "@databricks/appkit-ui/js";
+import { useAnalyticsQuery } from "@databricks/appkit-ui/react";
 
 function SpendChart() {
   const { data, loading, error } = useAnalyticsQuery("spend_data", {
@@ -501,7 +501,7 @@ function TypeSafetyRoute() {
             <CardContent>
               <CodeBlock
                 code={`// vite.config.ts
-import { appKitTypesPlugin } from '@databricks/app-kit';
+import { appKitTypesPlugin } from '@databricks/appkit';
 
 export default defineConfig({
   plugins: [
diff --git a/apps/dev-playground/client/vite.config.ts b/apps/dev-playground/client/vite.config.ts
index c9d75ff..f892c62 100644
--- a/apps/dev-playground/client/vite.config.ts
+++ b/apps/dev-playground/client/vite.config.ts
@@ -24,16 +24,16 @@ export default defineConfig({
       "react/jsx-dev-runtime",
       "react/jsx-runtime",
     ],
-    exclude: ["@databricks/app-kit-ui", "@databricks/app-kit"],
+    exclude: ["@databricks/appkit-ui", "@databricks/appkit"],
   },
   resolve: {
     dedupe: ["react", "react-dom", "recharts"],
     preserveSymlinks: true,
     alias: {
       "@": path.resolve(__dirname, "./src"),
-      "@databricks/app-kit-ui": path.resolve(
+      "@databricks/appkit-ui": path.resolve(
         __dirname,
-        "../../../packages/app-kit-ui/dist",
+        "../../../packages/appkit-ui/dist",
       ),
     },
   },
diff --git a/apps/dev-playground/package-lock.json b/apps/dev-playground/package-lock.json
index 1db9ca1..aed50ae 100644
--- a/apps/dev-playground/package-lock.json
+++ b/apps/dev-playground/package-lock.json
@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
-        "@databricks/app-kit": "file:../../packages/app-kit"
+        "@databricks/appkit": "file:../../packages/appkit"
       },
       "devDependencies": {
         "@types/node": "^20.0.0",
@@ -22,8 +22,8 @@
         "vite": "npm:rolldown-vite@7.1.14"
       }
     },
-    "../../packages/app-kit": {
-      "name": "@databricks/app-kit",
+    "../../packages/appkit": {
+      "name": "@databricks/appkit",
       "version": "1.0.0",
       "dependencies": {
         "@databricks/sdk-experimental": "^0.14.2",
@@ -39,7 +39,7 @@
         "@vitejs/plugin-react": "^5.0.4"
       }
     },
-    "../../packages/app-kit/dist": {
+    "../../packages/appkit/dist": {
       "extraneous": true
     },
     "node_modules/@babel/code-frame": {
@@ -361,8 +361,8 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@databricks/app-kit": {
-      "resolved": "../../packages/app-kit",
+    "node_modules/@databricks/appkit": {
+      "resolved": "../../packages/appkit",
       "link": true
     },
     "node_modules/@emnapi/core": {
@@ -2812,7 +2812,7 @@
       }
     },
     "package": {
-      "name": "@databricks/app-kit",
+      "name": "@databricks/appkit",
       "version": "1.0.0",
       "extraneous": true,
       "dependencies": {
diff --git a/apps/dev-playground/package.json b/apps/dev-playground/package.json
index 21022ed..98b1f51 100644
--- a/apps/dev-playground/package.json
+++ b/apps/dev-playground/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "app-kit",
+  "name": "appkit",
   "version": "1.0.0",
   "main": "build/index.js",
   "scripts": {
@@ -21,7 +21,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@databricks/app-kit": "workspace:*",
+    "@databricks/appkit": "workspace:*",
     "zod": "^4.1.13"
   },
   "devDependencies": {
diff --git a/apps/dev-playground/server/index.ts b/apps/dev-playground/server/index.ts
index 439b061..9391c62 100644
--- a/apps/dev-playground/server/index.ts
+++ b/apps/dev-playground/server/index.ts
@@ -1,4 +1,4 @@
-import { analytics, createApp, server } from "@databricks/app-kit";
+import { analytics, createApp, server } from "@databricks/appkit";
 import { reconnect } from "./reconnect-plugin";
 import { telemetryExamples } from "./telemetry-example-plugin";
 
diff --git a/apps/dev-playground/server/reconnect-plugin.ts b/apps/dev-playground/server/reconnect-plugin.ts
index 3c8d8b8..249ca36 100644
--- a/apps/dev-playground/server/reconnect-plugin.ts
+++ b/apps/dev-playground/server/reconnect-plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin, toPlugin } from "@databricks/app-kit";
+import { Plugin, toPlugin } from "@databricks/appkit";
 import type { IAppRouter, StreamExecutionSettings } from "shared";
 
 interface ReconnectResponse {
diff --git a/apps/dev-playground/server/telemetry-example-plugin.ts b/apps/dev-playground/server/telemetry-example-plugin.ts
index 9f31b1a..a3d7eb5 100644
--- a/apps/dev-playground/server/telemetry-example-plugin.ts
+++ b/apps/dev-playground/server/telemetry-example-plugin.ts
@@ -12,7 +12,7 @@ import {
   type Counter,
   type Histogram,
   SeverityNumber,
-} from "@databricks/app-kit";
+} from "@databricks/appkit";
 import type { Request, Response, Router } from "express";
 
 class TelemetryExamples extends Plugin {
diff --git a/biome.json b/biome.json
index bf1c41d..a1d00a1 100644
--- a/biome.json
+++ b/biome.json
@@ -14,7 +14,7 @@
       "!**/*.d.ts",
       "!**/build",
       "!**/coverage",
-      "!packages/app-kit-ui/src/react/ui",
+      "!packages/appkit-ui/src/react/ui",
       "!**/routeTree.gen.ts",
       "!docs/.docusaurus"
     ]
diff --git a/docs/README.md b/docs/README.md
index 5605f30..e96434f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,4 +1,4 @@
-# App Kit Documentation
+# AppKit Documentation
 
 This website is built using [Docusaurus](https://docusaurus.io/), a modern static website generator.
 
diff --git a/llms-compact.txt b/llms-compact.txt
index 0ae0f5f..3f8d694 100644
--- a/llms-compact.txt
+++ b/llms-compact.txt
@@ -1,4 +1,4 @@
-# llms-compact.txt — Quick AI reference for @databricks/app-kit
+# llms-compact.txt — Quick AI reference for @databricks/appkit
 
 Project: Databricks AppKit
 Version: 1.0.0
diff --git a/llms.txt b/llms.txt
index 355d1cf..8554b3b 100644
--- a/llms.txt
+++ b/llms.txt
@@ -1,4 +1,4 @@
-# llms.txt — Guidance for AI systems using the Databricks AppKit (@databricks/app-kit)
+# llms.txt — Guidance for AI systems using the Databricks AppKit (@databricks/appkit)
 
 Project: Databricks AppKit
 Author: Databricks
@@ -27,7 +27,7 @@ Server and plugins already initialized, no custom endpoints.
 Example:
 
 ```ts
-import { createApp, server, analytics } from "@databricks/app-kit";
+import { createApp, server, analytics } from "@databricks/appkit";
 
 await createApp({
   plugins: [
@@ -44,7 +44,7 @@ await createApp({
 Example:
 
 ```ts
-import { createApp, server, analytics } from "@databricks/app-kit";
+import { createApp, server, analytics } from "@databricks/appkit";
 
 const AppKit = await createApp({
   plugins: [
@@ -90,7 +90,7 @@ Databricks AppKit Might not cover all the cases needed, so for those cases a plu
 Here is an example:
 
 ```ts
-import { Plugin, toPlugin } from '@databricks/app-kit';
+import { Plugin, toPlugin } from '@databricks/appkit';
 
 class OpenWeatherPlugin extends Plugin {
   name: string = "open-weather";
@@ -149,7 +149,7 @@ export const openWeather = toPlugin<typeof OpenWeatherPlugin, OpenWeatherConfig,
 Then it would be used as the rest of the plugins
 
 ```ts
-import { createApp, server, analytics } from "@databricks/app-kit";
+import { createApp, server, analytics } from "@databricks/appkit";
 import { openWeather } from './open-weather';
 
 const AppKit = await createApp({
diff --git a/package.json b/package.json
index d3f6da0..1bc4d87 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,8 @@
     "lint": "biome lint .",
     "pack:sdk": "pnpm build && pnpm -r dist",
     "prepare": "husky",
-    "release:dry": "pnpm run pack:sdk && pnpm --filter=@databricks/app-kit release:dry && pnpm --filter=@databricks/app-kit-ui release:dry",
-    "release": "pnpm run pack:sdk && pnpm --filter=@databricks/app-kit release && pnpm --filter=@databricks/app-kit-ui release",
+    "release:dry": "pnpm run pack:sdk && pnpm --filter=@databricks/appkit release:dry && pnpm --filter=@databricks/appkit-ui release:dry",
+    "release": "pnpm run pack:sdk && pnpm --filter=@databricks/appkit release && pnpm --filter=@databricks/appkit-ui release",
     "setup:repo": "./tools/setup.sh",
     "start": "NODE_ENV=production pnpm build:sdk && pnpm --filter=sdk-playground build:app && pnpm --filter=sdk-playground start:local",
     "test:watch": "vitest",
diff --git a/packages/app-kit/src/core/index.ts b/packages/app-kit/src/core/index.ts
deleted file mode 100644
index d6c54df..0000000
--- a/packages/app-kit/src/core/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { createApp } from "./app-kit";
diff --git a/packages/app-kit-ui/CLAUDE.md b/packages/appkit-ui/CLAUDE.md
similarity index 100%
rename from packages/app-kit-ui/CLAUDE.md
rename to packages/appkit-ui/CLAUDE.md
diff --git a/packages/app-kit-ui/components.json b/packages/appkit-ui/components.json
similarity index 100%
rename from packages/app-kit-ui/components.json
rename to packages/appkit-ui/components.json
diff --git a/packages/app-kit-ui/package.json b/packages/appkit-ui/package.json
similarity index 98%
rename from packages/app-kit-ui/package.json
rename to packages/appkit-ui/package.json
index 1505fb4..46102fe 100644
--- a/packages/app-kit-ui/package.json
+++ b/packages/appkit-ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@databricks/app-kit-ui",
+  "name": "@databricks/appkit-ui",
   "type": "module",
   "version": "0.0.2",
   "packageManager": "pnpm@10.21.0",
diff --git a/packages/app-kit-ui/src/js/arrow/arrow-client.ts b/packages/appkit-ui/src/js/arrow/arrow-client.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/arrow/arrow-client.ts
rename to packages/appkit-ui/src/js/arrow/arrow-client.ts
diff --git a/packages/app-kit-ui/src/js/arrow/index.ts b/packages/appkit-ui/src/js/arrow/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/arrow/index.ts
rename to packages/appkit-ui/src/js/arrow/index.ts
diff --git a/packages/app-kit-ui/src/js/arrow/lazy-arrow.ts b/packages/appkit-ui/src/js/arrow/lazy-arrow.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/arrow/lazy-arrow.ts
rename to packages/appkit-ui/src/js/arrow/lazy-arrow.ts
diff --git a/packages/app-kit-ui/src/js/constants.ts b/packages/appkit-ui/src/js/constants.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/constants.ts
rename to packages/appkit-ui/src/js/constants.ts
diff --git a/packages/app-kit-ui/src/js/index.ts b/packages/appkit-ui/src/js/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/index.ts
rename to packages/appkit-ui/src/js/index.ts
diff --git a/packages/app-kit-ui/src/js/sse/connect-sse.ts b/packages/appkit-ui/src/js/sse/connect-sse.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/sse/connect-sse.ts
rename to packages/appkit-ui/src/js/sse/connect-sse.ts
diff --git a/packages/app-kit-ui/src/js/sse/index.ts b/packages/appkit-ui/src/js/sse/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/sse/index.ts
rename to packages/appkit-ui/src/js/sse/index.ts
diff --git a/packages/app-kit-ui/src/js/sse/types.ts b/packages/appkit-ui/src/js/sse/types.ts
similarity index 100%
rename from packages/app-kit-ui/src/js/sse/types.ts
rename to packages/appkit-ui/src/js/sse/types.ts
diff --git a/packages/app-kit-ui/src/react/charts/__tests__/normalize.test.ts b/packages/appkit-ui/src/react/charts/__tests__/normalize.test.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/__tests__/normalize.test.ts
rename to packages/appkit-ui/src/react/charts/__tests__/normalize.test.ts
diff --git a/packages/app-kit-ui/src/react/charts/__tests__/options.test.ts b/packages/appkit-ui/src/react/charts/__tests__/options.test.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/__tests__/options.test.ts
rename to packages/appkit-ui/src/react/charts/__tests__/options.test.ts
diff --git a/packages/app-kit-ui/src/react/charts/__tests__/theme.test.ts b/packages/appkit-ui/src/react/charts/__tests__/theme.test.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/__tests__/theme.test.ts
rename to packages/appkit-ui/src/react/charts/__tests__/theme.test.ts
diff --git a/packages/app-kit-ui/src/react/charts/__tests__/types.test.ts b/packages/appkit-ui/src/react/charts/__tests__/types.test.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/__tests__/types.test.ts
rename to packages/appkit-ui/src/react/charts/__tests__/types.test.ts
diff --git a/packages/app-kit-ui/src/react/charts/__tests__/utils.test.ts b/packages/appkit-ui/src/react/charts/__tests__/utils.test.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/__tests__/utils.test.ts
rename to packages/appkit-ui/src/react/charts/__tests__/utils.test.ts
diff --git a/packages/app-kit-ui/src/react/charts/area/index.tsx b/packages/appkit-ui/src/react/charts/area/index.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/area/index.tsx
rename to packages/appkit-ui/src/react/charts/area/index.tsx
diff --git a/packages/app-kit-ui/src/react/charts/bar/index.tsx b/packages/appkit-ui/src/react/charts/bar/index.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/bar/index.tsx
rename to packages/appkit-ui/src/react/charts/bar/index.tsx
diff --git a/packages/app-kit-ui/src/react/charts/base.tsx b/packages/appkit-ui/src/react/charts/base.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/base.tsx
rename to packages/appkit-ui/src/react/charts/base.tsx
diff --git a/packages/app-kit-ui/src/react/charts/chart-error-boundary.tsx b/packages/appkit-ui/src/react/charts/chart-error-boundary.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/chart-error-boundary.tsx
rename to packages/appkit-ui/src/react/charts/chart-error-boundary.tsx
diff --git a/packages/app-kit-ui/src/react/charts/constants.ts b/packages/appkit-ui/src/react/charts/constants.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/constants.ts
rename to packages/appkit-ui/src/react/charts/constants.ts
diff --git a/packages/app-kit-ui/src/react/charts/create-chart.tsx b/packages/appkit-ui/src/react/charts/create-chart.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/create-chart.tsx
rename to packages/appkit-ui/src/react/charts/create-chart.tsx
diff --git a/packages/app-kit-ui/src/react/charts/empty.tsx b/packages/appkit-ui/src/react/charts/empty.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/empty.tsx
rename to packages/appkit-ui/src/react/charts/empty.tsx
diff --git a/packages/app-kit-ui/src/react/charts/error.tsx b/packages/appkit-ui/src/react/charts/error.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/error.tsx
rename to packages/appkit-ui/src/react/charts/error.tsx
diff --git a/packages/app-kit-ui/src/react/charts/heatmap/index.tsx b/packages/appkit-ui/src/react/charts/heatmap/index.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/heatmap/index.tsx
rename to packages/appkit-ui/src/react/charts/heatmap/index.tsx
diff --git a/packages/app-kit-ui/src/react/charts/index.ts b/packages/appkit-ui/src/react/charts/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/index.ts
rename to packages/appkit-ui/src/react/charts/index.ts
diff --git a/packages/app-kit-ui/src/react/charts/line/index.tsx b/packages/appkit-ui/src/react/charts/line/index.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/line/index.tsx
rename to packages/appkit-ui/src/react/charts/line/index.tsx
diff --git a/packages/app-kit-ui/src/react/charts/loading.tsx b/packages/appkit-ui/src/react/charts/loading.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/loading.tsx
rename to packages/appkit-ui/src/react/charts/loading.tsx
diff --git a/packages/app-kit-ui/src/react/charts/normalize.ts b/packages/appkit-ui/src/react/charts/normalize.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/normalize.ts
rename to packages/appkit-ui/src/react/charts/normalize.ts
diff --git a/packages/app-kit-ui/src/react/charts/options.ts b/packages/appkit-ui/src/react/charts/options.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/options.ts
rename to packages/appkit-ui/src/react/charts/options.ts
diff --git a/packages/app-kit-ui/src/react/charts/pie/index.tsx b/packages/appkit-ui/src/react/charts/pie/index.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/pie/index.tsx
rename to packages/appkit-ui/src/react/charts/pie/index.tsx
diff --git a/packages/app-kit-ui/src/react/charts/radar/index.tsx b/packages/appkit-ui/src/react/charts/radar/index.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/radar/index.tsx
rename to packages/appkit-ui/src/react/charts/radar/index.tsx
diff --git a/packages/app-kit-ui/src/react/charts/scatter/index.tsx b/packages/appkit-ui/src/react/charts/scatter/index.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/scatter/index.tsx
rename to packages/appkit-ui/src/react/charts/scatter/index.tsx
diff --git a/packages/app-kit-ui/src/react/charts/theme.ts b/packages/appkit-ui/src/react/charts/theme.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/theme.ts
rename to packages/appkit-ui/src/react/charts/theme.ts
diff --git a/packages/app-kit-ui/src/react/charts/types.ts b/packages/appkit-ui/src/react/charts/types.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/types.ts
rename to packages/appkit-ui/src/react/charts/types.ts
diff --git a/packages/app-kit-ui/src/react/charts/utils.ts b/packages/appkit-ui/src/react/charts/utils.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/utils.ts
rename to packages/appkit-ui/src/react/charts/utils.ts
diff --git a/packages/app-kit-ui/src/react/charts/wrapper.tsx b/packages/appkit-ui/src/react/charts/wrapper.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/charts/wrapper.tsx
rename to packages/appkit-ui/src/react/charts/wrapper.tsx
diff --git a/packages/app-kit-ui/src/react/error-boundary.tsx b/packages/appkit-ui/src/react/error-boundary.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/error-boundary.tsx
rename to packages/appkit-ui/src/react/error-boundary.tsx
diff --git a/packages/app-kit-ui/src/react/hooks/__tests__/use-chart-data.test.ts b/packages/appkit-ui/src/react/hooks/__tests__/use-chart-data.test.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/hooks/__tests__/use-chart-data.test.ts
rename to packages/appkit-ui/src/react/hooks/__tests__/use-chart-data.test.ts
diff --git a/packages/app-kit-ui/src/react/hooks/index.ts b/packages/appkit-ui/src/react/hooks/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/hooks/index.ts
rename to packages/appkit-ui/src/react/hooks/index.ts
diff --git a/packages/app-kit-ui/src/react/hooks/types.ts b/packages/appkit-ui/src/react/hooks/types.ts
similarity index 98%
rename from packages/app-kit-ui/src/react/hooks/types.ts
rename to packages/appkit-ui/src/react/hooks/types.ts
index 9451b03..5db725f 100644
--- a/packages/app-kit-ui/src/react/hooks/types.ts
+++ b/packages/appkit-ui/src/react/hooks/types.ts
@@ -60,7 +60,7 @@ export interface UseAnalyticsQueryResult<T> {
  * @example
  * ```typescript
  * // config/appKitTypes.d.ts
- * declare module "@databricks/app-kit-ui/react" {
+ * declare module "@databricks/appkit-ui/react" {
  *   interface QueryRegistry {
  *     apps_list: {
  *       name: "apps_list";
diff --git a/packages/app-kit-ui/src/react/hooks/use-analytics-query.ts b/packages/appkit-ui/src/react/hooks/use-analytics-query.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/hooks/use-analytics-query.ts
rename to packages/appkit-ui/src/react/hooks/use-analytics-query.ts
diff --git a/packages/app-kit-ui/src/react/hooks/use-chart-data.ts b/packages/appkit-ui/src/react/hooks/use-chart-data.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/hooks/use-chart-data.ts
rename to packages/appkit-ui/src/react/hooks/use-chart-data.ts
diff --git a/packages/app-kit-ui/src/react/hooks/use-mobile.ts b/packages/appkit-ui/src/react/hooks/use-mobile.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/hooks/use-mobile.ts
rename to packages/appkit-ui/src/react/hooks/use-mobile.ts
diff --git a/packages/app-kit-ui/src/react/hooks/use-query-hmr.ts b/packages/appkit-ui/src/react/hooks/use-query-hmr.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/hooks/use-query-hmr.ts
rename to packages/appkit-ui/src/react/hooks/use-query-hmr.ts
diff --git a/packages/app-kit-ui/src/react/index.ts b/packages/appkit-ui/src/react/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/index.ts
rename to packages/appkit-ui/src/react/index.ts
diff --git a/packages/app-kit-ui/src/react/lib/format.ts b/packages/appkit-ui/src/react/lib/format.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/lib/format.ts
rename to packages/appkit-ui/src/react/lib/format.ts
diff --git a/packages/app-kit-ui/src/react/lib/utils.ts b/packages/appkit-ui/src/react/lib/utils.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/lib/utils.ts
rename to packages/appkit-ui/src/react/lib/utils.ts
diff --git a/packages/app-kit-ui/src/react/styles/globals.css b/packages/appkit-ui/src/react/styles/globals.css
similarity index 100%
rename from packages/app-kit-ui/src/react/styles/globals.css
rename to packages/appkit-ui/src/react/styles/globals.css
diff --git a/packages/app-kit-ui/src/react/table/data-table.tsx b/packages/appkit-ui/src/react/table/data-table.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/table/data-table.tsx
rename to packages/appkit-ui/src/react/table/data-table.tsx
diff --git a/packages/app-kit-ui/src/react/table/empty.tsx b/packages/appkit-ui/src/react/table/empty.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/table/empty.tsx
rename to packages/appkit-ui/src/react/table/empty.tsx
diff --git a/packages/app-kit-ui/src/react/table/error.tsx b/packages/appkit-ui/src/react/table/error.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/table/error.tsx
rename to packages/appkit-ui/src/react/table/error.tsx
diff --git a/packages/app-kit-ui/src/react/table/index.ts b/packages/appkit-ui/src/react/table/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/table/index.ts
rename to packages/appkit-ui/src/react/table/index.ts
diff --git a/packages/app-kit-ui/src/react/table/loading.tsx b/packages/appkit-ui/src/react/table/loading.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/table/loading.tsx
rename to packages/appkit-ui/src/react/table/loading.tsx
diff --git a/packages/app-kit-ui/src/react/table/table-error-boundary.tsx b/packages/appkit-ui/src/react/table/table-error-boundary.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/table/table-error-boundary.tsx
rename to packages/appkit-ui/src/react/table/table-error-boundary.tsx
diff --git a/packages/app-kit-ui/src/react/table/table-wrapper.tsx b/packages/appkit-ui/src/react/table/table-wrapper.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/table/table-wrapper.tsx
rename to packages/appkit-ui/src/react/table/table-wrapper.tsx
diff --git a/packages/app-kit-ui/src/react/table/types.ts b/packages/appkit-ui/src/react/table/types.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/table/types.ts
rename to packages/appkit-ui/src/react/table/types.ts
diff --git a/packages/app-kit-ui/src/react/ui/accordion.tsx b/packages/appkit-ui/src/react/ui/accordion.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/accordion.tsx
rename to packages/appkit-ui/src/react/ui/accordion.tsx
diff --git a/packages/app-kit-ui/src/react/ui/alert-dialog.tsx b/packages/appkit-ui/src/react/ui/alert-dialog.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/alert-dialog.tsx
rename to packages/appkit-ui/src/react/ui/alert-dialog.tsx
diff --git a/packages/app-kit-ui/src/react/ui/alert.tsx b/packages/appkit-ui/src/react/ui/alert.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/alert.tsx
rename to packages/appkit-ui/src/react/ui/alert.tsx
diff --git a/packages/app-kit-ui/src/react/ui/aspect-ratio.tsx b/packages/appkit-ui/src/react/ui/aspect-ratio.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/aspect-ratio.tsx
rename to packages/appkit-ui/src/react/ui/aspect-ratio.tsx
diff --git a/packages/app-kit-ui/src/react/ui/avatar.tsx b/packages/appkit-ui/src/react/ui/avatar.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/avatar.tsx
rename to packages/appkit-ui/src/react/ui/avatar.tsx
diff --git a/packages/app-kit-ui/src/react/ui/badge.tsx b/packages/appkit-ui/src/react/ui/badge.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/badge.tsx
rename to packages/appkit-ui/src/react/ui/badge.tsx
diff --git a/packages/app-kit-ui/src/react/ui/breadcrumb.tsx b/packages/appkit-ui/src/react/ui/breadcrumb.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/breadcrumb.tsx
rename to packages/appkit-ui/src/react/ui/breadcrumb.tsx
diff --git a/packages/app-kit-ui/src/react/ui/button-group.tsx b/packages/appkit-ui/src/react/ui/button-group.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/button-group.tsx
rename to packages/appkit-ui/src/react/ui/button-group.tsx
diff --git a/packages/app-kit-ui/src/react/ui/button.tsx b/packages/appkit-ui/src/react/ui/button.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/button.tsx
rename to packages/appkit-ui/src/react/ui/button.tsx
diff --git a/packages/app-kit-ui/src/react/ui/calendar.tsx b/packages/appkit-ui/src/react/ui/calendar.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/calendar.tsx
rename to packages/appkit-ui/src/react/ui/calendar.tsx
diff --git a/packages/app-kit-ui/src/react/ui/card.tsx b/packages/appkit-ui/src/react/ui/card.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/card.tsx
rename to packages/appkit-ui/src/react/ui/card.tsx
diff --git a/packages/app-kit-ui/src/react/ui/carousel.tsx b/packages/appkit-ui/src/react/ui/carousel.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/carousel.tsx
rename to packages/appkit-ui/src/react/ui/carousel.tsx
diff --git a/packages/app-kit-ui/src/react/ui/chart.tsx b/packages/appkit-ui/src/react/ui/chart.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/chart.tsx
rename to packages/appkit-ui/src/react/ui/chart.tsx
diff --git a/packages/app-kit-ui/src/react/ui/checkbox.tsx b/packages/appkit-ui/src/react/ui/checkbox.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/checkbox.tsx
rename to packages/appkit-ui/src/react/ui/checkbox.tsx
diff --git a/packages/app-kit-ui/src/react/ui/collapsible.tsx b/packages/appkit-ui/src/react/ui/collapsible.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/collapsible.tsx
rename to packages/appkit-ui/src/react/ui/collapsible.tsx
diff --git a/packages/app-kit-ui/src/react/ui/command.tsx b/packages/appkit-ui/src/react/ui/command.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/command.tsx
rename to packages/appkit-ui/src/react/ui/command.tsx
diff --git a/packages/app-kit-ui/src/react/ui/context-menu.tsx b/packages/appkit-ui/src/react/ui/context-menu.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/context-menu.tsx
rename to packages/appkit-ui/src/react/ui/context-menu.tsx
diff --git a/packages/app-kit-ui/src/react/ui/dialog.tsx b/packages/appkit-ui/src/react/ui/dialog.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/dialog.tsx
rename to packages/appkit-ui/src/react/ui/dialog.tsx
diff --git a/packages/app-kit-ui/src/react/ui/drawer.tsx b/packages/appkit-ui/src/react/ui/drawer.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/drawer.tsx
rename to packages/appkit-ui/src/react/ui/drawer.tsx
diff --git a/packages/app-kit-ui/src/react/ui/dropdown-menu.tsx b/packages/appkit-ui/src/react/ui/dropdown-menu.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/dropdown-menu.tsx
rename to packages/appkit-ui/src/react/ui/dropdown-menu.tsx
diff --git a/packages/app-kit-ui/src/react/ui/empty.tsx b/packages/appkit-ui/src/react/ui/empty.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/empty.tsx
rename to packages/appkit-ui/src/react/ui/empty.tsx
diff --git a/packages/app-kit-ui/src/react/ui/field.tsx b/packages/appkit-ui/src/react/ui/field.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/field.tsx
rename to packages/appkit-ui/src/react/ui/field.tsx
diff --git a/packages/app-kit-ui/src/react/ui/form.tsx b/packages/appkit-ui/src/react/ui/form.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/form.tsx
rename to packages/appkit-ui/src/react/ui/form.tsx
diff --git a/packages/app-kit-ui/src/react/ui/hover-card.tsx b/packages/appkit-ui/src/react/ui/hover-card.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/hover-card.tsx
rename to packages/appkit-ui/src/react/ui/hover-card.tsx
diff --git a/packages/app-kit-ui/src/react/ui/index.ts b/packages/appkit-ui/src/react/ui/index.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/index.ts
rename to packages/appkit-ui/src/react/ui/index.ts
diff --git a/packages/app-kit-ui/src/react/ui/input-group.tsx b/packages/appkit-ui/src/react/ui/input-group.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/input-group.tsx
rename to packages/appkit-ui/src/react/ui/input-group.tsx
diff --git a/packages/app-kit-ui/src/react/ui/input-otp.tsx b/packages/appkit-ui/src/react/ui/input-otp.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/input-otp.tsx
rename to packages/appkit-ui/src/react/ui/input-otp.tsx
diff --git a/packages/app-kit-ui/src/react/ui/input.tsx b/packages/appkit-ui/src/react/ui/input.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/input.tsx
rename to packages/appkit-ui/src/react/ui/input.tsx
diff --git a/packages/app-kit-ui/src/react/ui/item.tsx b/packages/appkit-ui/src/react/ui/item.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/item.tsx
rename to packages/appkit-ui/src/react/ui/item.tsx
diff --git a/packages/app-kit-ui/src/react/ui/kbd.tsx b/packages/appkit-ui/src/react/ui/kbd.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/kbd.tsx
rename to packages/appkit-ui/src/react/ui/kbd.tsx
diff --git a/packages/app-kit-ui/src/react/ui/label.tsx b/packages/appkit-ui/src/react/ui/label.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/label.tsx
rename to packages/appkit-ui/src/react/ui/label.tsx
diff --git a/packages/app-kit-ui/src/react/ui/menubar.tsx b/packages/appkit-ui/src/react/ui/menubar.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/menubar.tsx
rename to packages/appkit-ui/src/react/ui/menubar.tsx
diff --git a/packages/app-kit-ui/src/react/ui/navigation-menu.tsx b/packages/appkit-ui/src/react/ui/navigation-menu.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/navigation-menu.tsx
rename to packages/appkit-ui/src/react/ui/navigation-menu.tsx
diff --git a/packages/app-kit-ui/src/react/ui/pagination.tsx b/packages/appkit-ui/src/react/ui/pagination.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/pagination.tsx
rename to packages/appkit-ui/src/react/ui/pagination.tsx
diff --git a/packages/app-kit-ui/src/react/ui/popover.tsx b/packages/appkit-ui/src/react/ui/popover.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/popover.tsx
rename to packages/appkit-ui/src/react/ui/popover.tsx
diff --git a/packages/app-kit-ui/src/react/ui/progress.tsx b/packages/appkit-ui/src/react/ui/progress.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/progress.tsx
rename to packages/appkit-ui/src/react/ui/progress.tsx
diff --git a/packages/app-kit-ui/src/react/ui/radio-group.tsx b/packages/appkit-ui/src/react/ui/radio-group.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/radio-group.tsx
rename to packages/appkit-ui/src/react/ui/radio-group.tsx
diff --git a/packages/app-kit-ui/src/react/ui/resizable.tsx b/packages/appkit-ui/src/react/ui/resizable.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/resizable.tsx
rename to packages/appkit-ui/src/react/ui/resizable.tsx
diff --git a/packages/app-kit-ui/src/react/ui/scroll-area.tsx b/packages/appkit-ui/src/react/ui/scroll-area.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/scroll-area.tsx
rename to packages/appkit-ui/src/react/ui/scroll-area.tsx
diff --git a/packages/app-kit-ui/src/react/ui/select.tsx b/packages/appkit-ui/src/react/ui/select.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/select.tsx
rename to packages/appkit-ui/src/react/ui/select.tsx
diff --git a/packages/app-kit-ui/src/react/ui/separator.tsx b/packages/appkit-ui/src/react/ui/separator.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/separator.tsx
rename to packages/appkit-ui/src/react/ui/separator.tsx
diff --git a/packages/app-kit-ui/src/react/ui/sheet.tsx b/packages/appkit-ui/src/react/ui/sheet.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/sheet.tsx
rename to packages/appkit-ui/src/react/ui/sheet.tsx
diff --git a/packages/app-kit-ui/src/react/ui/sidebar.tsx b/packages/appkit-ui/src/react/ui/sidebar.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/sidebar.tsx
rename to packages/appkit-ui/src/react/ui/sidebar.tsx
diff --git a/packages/app-kit-ui/src/react/ui/skeleton.tsx b/packages/appkit-ui/src/react/ui/skeleton.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/skeleton.tsx
rename to packages/appkit-ui/src/react/ui/skeleton.tsx
diff --git a/packages/app-kit-ui/src/react/ui/slider.tsx b/packages/appkit-ui/src/react/ui/slider.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/slider.tsx
rename to packages/appkit-ui/src/react/ui/slider.tsx
diff --git a/packages/app-kit-ui/src/react/ui/sonner.tsx b/packages/appkit-ui/src/react/ui/sonner.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/sonner.tsx
rename to packages/appkit-ui/src/react/ui/sonner.tsx
diff --git a/packages/app-kit-ui/src/react/ui/spinner.tsx b/packages/appkit-ui/src/react/ui/spinner.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/spinner.tsx
rename to packages/appkit-ui/src/react/ui/spinner.tsx
diff --git a/packages/app-kit-ui/src/react/ui/switch.tsx b/packages/appkit-ui/src/react/ui/switch.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/switch.tsx
rename to packages/appkit-ui/src/react/ui/switch.tsx
diff --git a/packages/app-kit-ui/src/react/ui/table.tsx b/packages/appkit-ui/src/react/ui/table.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/table.tsx
rename to packages/appkit-ui/src/react/ui/table.tsx
diff --git a/packages/app-kit-ui/src/react/ui/tabs.tsx b/packages/appkit-ui/src/react/ui/tabs.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/tabs.tsx
rename to packages/appkit-ui/src/react/ui/tabs.tsx
diff --git a/packages/app-kit-ui/src/react/ui/textarea.tsx b/packages/appkit-ui/src/react/ui/textarea.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/textarea.tsx
rename to packages/appkit-ui/src/react/ui/textarea.tsx
diff --git a/packages/app-kit-ui/src/react/ui/toggle-group.tsx b/packages/appkit-ui/src/react/ui/toggle-group.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/toggle-group.tsx
rename to packages/appkit-ui/src/react/ui/toggle-group.tsx
diff --git a/packages/app-kit-ui/src/react/ui/toggle.tsx b/packages/appkit-ui/src/react/ui/toggle.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/toggle.tsx
rename to packages/appkit-ui/src/react/ui/toggle.tsx
diff --git a/packages/app-kit-ui/src/react/ui/tooltip.tsx b/packages/appkit-ui/src/react/ui/tooltip.tsx
similarity index 100%
rename from packages/app-kit-ui/src/react/ui/tooltip.tsx
rename to packages/appkit-ui/src/react/ui/tooltip.tsx
diff --git a/packages/app-kit-ui/src/react/vite-env.d.ts b/packages/appkit-ui/src/react/vite-env.d.ts
similarity index 100%
rename from packages/app-kit-ui/src/react/vite-env.d.ts
rename to packages/appkit-ui/src/react/vite-env.d.ts
diff --git a/packages/app-kit-ui/tsconfig.json b/packages/appkit-ui/tsconfig.json
similarity index 100%
rename from packages/app-kit-ui/tsconfig.json
rename to packages/appkit-ui/tsconfig.json
diff --git a/packages/app-kit-ui/tsdown.config.ts b/packages/appkit-ui/tsdown.config.ts
similarity index 96%
rename from packages/app-kit-ui/tsdown.config.ts
rename to packages/appkit-ui/tsdown.config.ts
index 486f69b..fc329e1 100644
--- a/packages/app-kit-ui/tsdown.config.ts
+++ b/packages/appkit-ui/tsdown.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsdown";
 export default defineConfig([
   {
     publint: true,
-    name: "@databricks/app-kit-ui",
+    name: "@databricks/appkit-ui",
     entry: ["src/js/index.ts", "src/react/index.ts"],
     outDir: "dist",
     platform: "browser",
diff --git a/packages/app-kit/CLAUDE.md b/packages/appkit/CLAUDE.md
similarity index 100%
rename from packages/app-kit/CLAUDE.md
rename to packages/appkit/CLAUDE.md
diff --git a/packages/app-kit/bin/generate-types.ts b/packages/appkit/bin/generate-types.ts
similarity index 100%
rename from packages/app-kit/bin/generate-types.ts
rename to packages/appkit/bin/generate-types.ts
diff --git a/packages/app-kit/package.json b/packages/appkit/package.json
similarity index 98%
rename from packages/app-kit/package.json
rename to packages/appkit/package.json
index 2bc95e3..0cd361c 100644
--- a/packages/app-kit/package.json
+++ b/packages/appkit/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@databricks/app-kit",
+  "name": "@databricks/appkit",
   "type": "module",
   "version": "0.0.2",
   "main": "./dist/index.js",
diff --git a/packages/app-kit/src/analytics/analytics.ts b/packages/appkit/src/analytics/analytics.ts
similarity index 100%
rename from packages/app-kit/src/analytics/analytics.ts
rename to packages/appkit/src/analytics/analytics.ts
diff --git a/packages/app-kit/src/analytics/defaults.ts b/packages/appkit/src/analytics/defaults.ts
similarity index 100%
rename from packages/app-kit/src/analytics/defaults.ts
rename to packages/appkit/src/analytics/defaults.ts
diff --git a/packages/app-kit/src/analytics/index.ts b/packages/appkit/src/analytics/index.ts
similarity index 100%
rename from packages/app-kit/src/analytics/index.ts
rename to packages/appkit/src/analytics/index.ts
diff --git a/packages/app-kit/src/analytics/query.ts b/packages/appkit/src/analytics/query.ts
similarity index 100%
rename from packages/app-kit/src/analytics/query.ts
rename to packages/appkit/src/analytics/query.ts
diff --git a/packages/app-kit/src/analytics/tests/analytics.test.ts b/packages/appkit/src/analytics/tests/analytics.test.ts
similarity index 100%
rename from packages/app-kit/src/analytics/tests/analytics.test.ts
rename to packages/appkit/src/analytics/tests/analytics.test.ts
diff --git a/packages/app-kit/src/analytics/tests/query.test.ts b/packages/appkit/src/analytics/tests/query.test.ts
similarity index 100%
rename from packages/app-kit/src/analytics/tests/query.test.ts
rename to packages/appkit/src/analytics/tests/query.test.ts
diff --git a/packages/app-kit/src/analytics/types.ts b/packages/appkit/src/analytics/types.ts
similarity index 100%
rename from packages/app-kit/src/analytics/types.ts
rename to packages/appkit/src/analytics/types.ts
diff --git a/packages/app-kit/src/app/index.ts b/packages/appkit/src/app/index.ts
similarity index 100%
rename from packages/app-kit/src/app/index.ts
rename to packages/appkit/src/app/index.ts
diff --git a/packages/app-kit/src/cache/defaults.ts b/packages/appkit/src/cache/defaults.ts
similarity index 100%
rename from packages/app-kit/src/cache/defaults.ts
rename to packages/appkit/src/cache/defaults.ts
diff --git a/packages/app-kit/src/cache/index.ts b/packages/appkit/src/cache/index.ts
similarity index 100%
rename from packages/app-kit/src/cache/index.ts
rename to packages/appkit/src/cache/index.ts
diff --git a/packages/app-kit/src/cache/storage/defaults.ts b/packages/appkit/src/cache/storage/defaults.ts
similarity index 100%
rename from packages/app-kit/src/cache/storage/defaults.ts
rename to packages/appkit/src/cache/storage/defaults.ts
diff --git a/packages/app-kit/src/cache/storage/index.ts b/packages/appkit/src/cache/storage/index.ts
similarity index 100%
rename from packages/app-kit/src/cache/storage/index.ts
rename to packages/appkit/src/cache/storage/index.ts
diff --git a/packages/app-kit/src/cache/storage/memory.ts b/packages/appkit/src/cache/storage/memory.ts
similarity index 100%
rename from packages/app-kit/src/cache/storage/memory.ts
rename to packages/appkit/src/cache/storage/memory.ts
diff --git a/packages/app-kit/src/cache/storage/persistent.ts b/packages/appkit/src/cache/storage/persistent.ts
similarity index 100%
rename from packages/app-kit/src/cache/storage/persistent.ts
rename to packages/appkit/src/cache/storage/persistent.ts
diff --git a/packages/app-kit/src/cache/tests/cache-manager.test.ts b/packages/appkit/src/cache/tests/cache-manager.test.ts
similarity index 100%
rename from packages/app-kit/src/cache/tests/cache-manager.test.ts
rename to packages/appkit/src/cache/tests/cache-manager.test.ts
diff --git a/packages/app-kit/src/cache/tests/memory.test.ts b/packages/appkit/src/cache/tests/memory.test.ts
similarity index 100%
rename from packages/app-kit/src/cache/tests/memory.test.ts
rename to packages/appkit/src/cache/tests/memory.test.ts
diff --git a/packages/app-kit/src/cache/tests/persistent.test.ts b/packages/appkit/src/cache/tests/persistent.test.ts
similarity index 100%
rename from packages/app-kit/src/cache/tests/persistent.test.ts
rename to packages/appkit/src/cache/tests/persistent.test.ts
diff --git a/packages/app-kit/src/connectors/index.ts b/packages/appkit/src/connectors/index.ts
similarity index 100%
rename from packages/app-kit/src/connectors/index.ts
rename to packages/appkit/src/connectors/index.ts
diff --git a/packages/app-kit/src/connectors/lakebase/client.ts b/packages/appkit/src/connectors/lakebase/client.ts
similarity index 99%
rename from packages/app-kit/src/connectors/lakebase/client.ts
rename to packages/appkit/src/connectors/lakebase/client.ts
index 34e57c2..053f166 100644
--- a/packages/app-kit/src/connectors/lakebase/client.ts
+++ b/packages/appkit/src/connectors/lakebase/client.ts
@@ -283,7 +283,7 @@ export class LakebaseConnector {
       return serviceDatabricksClient;
     } catch (_error) {
       throw new Error(
-        "Databricks workspace client not available. Either pass it in config or use within App Kit request context.",
+        "Databricks workspace client not available. Either pass it in config or use within AppKit request context.",
       );
     }
   }
diff --git a/packages/app-kit/src/connectors/lakebase/defaults.ts b/packages/appkit/src/connectors/lakebase/defaults.ts
similarity index 100%
rename from packages/app-kit/src/connectors/lakebase/defaults.ts
rename to packages/appkit/src/connectors/lakebase/defaults.ts
diff --git a/packages/app-kit/src/connectors/lakebase/index.ts b/packages/appkit/src/connectors/lakebase/index.ts
similarity index 100%
rename from packages/app-kit/src/connectors/lakebase/index.ts
rename to packages/appkit/src/connectors/lakebase/index.ts
diff --git a/packages/app-kit/src/connectors/lakebase/types.ts b/packages/appkit/src/connectors/lakebase/types.ts
similarity index 100%
rename from packages/app-kit/src/connectors/lakebase/types.ts
rename to packages/appkit/src/connectors/lakebase/types.ts
diff --git a/packages/app-kit/src/connectors/lakebase/utils.ts b/packages/appkit/src/connectors/lakebase/utils.ts
similarity index 100%
rename from packages/app-kit/src/connectors/lakebase/utils.ts
rename to packages/appkit/src/connectors/lakebase/utils.ts
diff --git a/packages/app-kit/src/connectors/sql-warehouse/client.ts b/packages/appkit/src/connectors/sql-warehouse/client.ts
similarity index 100%
rename from packages/app-kit/src/connectors/sql-warehouse/client.ts
rename to packages/appkit/src/connectors/sql-warehouse/client.ts
diff --git a/packages/app-kit/src/connectors/sql-warehouse/defaults.ts b/packages/appkit/src/connectors/sql-warehouse/defaults.ts
similarity index 100%
rename from packages/app-kit/src/connectors/sql-warehouse/defaults.ts
rename to packages/appkit/src/connectors/sql-warehouse/defaults.ts
diff --git a/packages/app-kit/src/connectors/sql-warehouse/index.ts b/packages/appkit/src/connectors/sql-warehouse/index.ts
similarity index 100%
rename from packages/app-kit/src/connectors/sql-warehouse/index.ts
rename to packages/appkit/src/connectors/sql-warehouse/index.ts
diff --git a/packages/app-kit/src/connectors/tests/lakebase.test.ts b/packages/appkit/src/connectors/tests/lakebase.test.ts
similarity index 100%
rename from packages/app-kit/src/connectors/tests/lakebase.test.ts
rename to packages/appkit/src/connectors/tests/lakebase.test.ts
diff --git a/packages/app-kit/src/core/app-kit.ts b/packages/appkit/src/core/appkit.ts
similarity index 100%
rename from packages/app-kit/src/core/app-kit.ts
rename to packages/appkit/src/core/appkit.ts
diff --git a/packages/appkit/src/core/index.ts b/packages/appkit/src/core/index.ts
new file mode 100644
index 0000000..742429c
--- /dev/null
+++ b/packages/appkit/src/core/index.ts
@@ -0,0 +1 @@
+export { createApp } from "./appkit";
diff --git a/packages/app-kit/src/core/tests/databricks.test.ts b/packages/appkit/src/core/tests/databricks.test.ts
similarity index 99%
rename from packages/app-kit/src/core/tests/databricks.test.ts
rename to packages/appkit/src/core/tests/databricks.test.ts
index 00e1a5b..6dc6a8a 100644
--- a/packages/app-kit/src/core/tests/databricks.test.ts
+++ b/packages/appkit/src/core/tests/databricks.test.ts
@@ -1,7 +1,7 @@
 import type { BasePlugin } from "shared";
 import { setupDatabricksEnv } from "@tools/test-helpers";
 import { beforeEach, describe, expect, test, vi } from "vitest";
-import { createApp, AppKit } from "../app-kit";
+import { createApp, AppKit } from "../appkit";
 
 // Mock environment validation
 vi.mock("../utils", () => ({
diff --git a/packages/app-kit/src/index.ts b/packages/appkit/src/index.ts
similarity index 100%
rename from packages/app-kit/src/index.ts
rename to packages/appkit/src/index.ts
diff --git a/packages/app-kit/src/plugin/dev-reader.ts b/packages/appkit/src/plugin/dev-reader.ts
similarity index 100%
rename from packages/app-kit/src/plugin/dev-reader.ts
rename to packages/appkit/src/plugin/dev-reader.ts
diff --git a/packages/app-kit/src/plugin/index.ts b/packages/appkit/src/plugin/index.ts
similarity index 100%
rename from packages/app-kit/src/plugin/index.ts
rename to packages/appkit/src/plugin/index.ts
diff --git a/packages/app-kit/src/plugin/interceptors/cache.ts b/packages/appkit/src/plugin/interceptors/cache.ts
similarity index 100%
rename from packages/app-kit/src/plugin/interceptors/cache.ts
rename to packages/appkit/src/plugin/interceptors/cache.ts
diff --git a/packages/app-kit/src/plugin/interceptors/retry.ts b/packages/appkit/src/plugin/interceptors/retry.ts
similarity index 100%
rename from packages/app-kit/src/plugin/interceptors/retry.ts
rename to packages/appkit/src/plugin/interceptors/retry.ts
diff --git a/packages/app-kit/src/plugin/interceptors/telemetry.ts b/packages/appkit/src/plugin/interceptors/telemetry.ts
similarity index 100%
rename from packages/app-kit/src/plugin/interceptors/telemetry.ts
rename to packages/appkit/src/plugin/interceptors/telemetry.ts
diff --git a/packages/app-kit/src/plugin/interceptors/timeout.ts b/packages/appkit/src/plugin/interceptors/timeout.ts
similarity index 100%
rename from packages/app-kit/src/plugin/interceptors/timeout.ts
rename to packages/appkit/src/plugin/interceptors/timeout.ts
diff --git a/packages/app-kit/src/plugin/interceptors/types.ts b/packages/appkit/src/plugin/interceptors/types.ts
similarity index 100%
rename from packages/app-kit/src/plugin/interceptors/types.ts
rename to packages/appkit/src/plugin/interceptors/types.ts
diff --git a/packages/app-kit/src/plugin/plugin.ts b/packages/appkit/src/plugin/plugin.ts
similarity index 100%
rename from packages/app-kit/src/plugin/plugin.ts
rename to packages/appkit/src/plugin/plugin.ts
diff --git a/packages/app-kit/src/plugin/tests/cache.test.ts b/packages/appkit/src/plugin/tests/cache.test.ts
similarity index 100%
rename from packages/app-kit/src/plugin/tests/cache.test.ts
rename to packages/appkit/src/plugin/tests/cache.test.ts
diff --git a/packages/app-kit/src/plugin/tests/plugin.test.ts b/packages/appkit/src/plugin/tests/plugin.test.ts
similarity index 100%
rename from packages/app-kit/src/plugin/tests/plugin.test.ts
rename to packages/appkit/src/plugin/tests/plugin.test.ts
diff --git a/packages/app-kit/src/plugin/tests/retry.test.ts b/packages/appkit/src/plugin/tests/retry.test.ts
similarity index 100%
rename from packages/app-kit/src/plugin/tests/retry.test.ts
rename to packages/appkit/src/plugin/tests/retry.test.ts
diff --git a/packages/app-kit/src/plugin/tests/timeout.test.ts b/packages/appkit/src/plugin/tests/timeout.test.ts
similarity index 100%
rename from packages/app-kit/src/plugin/tests/timeout.test.ts
rename to packages/appkit/src/plugin/tests/timeout.test.ts
diff --git a/packages/app-kit/src/plugin/to-plugin.ts b/packages/appkit/src/plugin/to-plugin.ts
similarity index 100%
rename from packages/app-kit/src/plugin/to-plugin.ts
rename to packages/appkit/src/plugin/to-plugin.ts
diff --git a/packages/app-kit/src/server/base-server.ts b/packages/appkit/src/server/base-server.ts
similarity index 95%
rename from packages/app-kit/src/server/base-server.ts
rename to packages/appkit/src/server/base-server.ts
index d3cb20b..e8b493c 100644
--- a/packages/app-kit/src/server/base-server.ts
+++ b/packages/appkit/src/server/base-server.ts
@@ -2,7 +2,7 @@ import type express from "express";
 import { type PluginEndpoints, getConfigScript } from "./utils";
 
 /**
- * Base server for the App Kit.
+ * Base server for the AppKit.
  *
  * Abstract base class that provides common functionality for serving
  * frontend applications. Subclasses implement specific serving strategies
diff --git a/packages/app-kit/src/server/index.ts b/packages/appkit/src/server/index.ts
similarity index 99%
rename from packages/app-kit/src/server/index.ts
rename to packages/appkit/src/server/index.ts
index c786bec..ea837b2 100644
--- a/packages/app-kit/src/server/index.ts
+++ b/packages/appkit/src/server/index.ts
@@ -16,7 +16,7 @@ import { ViteDevServer } from "./vite-dev-server";
 dotenv.config({ path: path.resolve(process.cwd(), "./.env") });
 
 /**
- * Server plugin for the App Kit.
+ * Server plugin for the AppKit.
  *
  * This plugin is responsible for starting the server and serving the static files.
  * It also handles the remote tunneling for development purposes.
diff --git a/packages/app-kit/src/server/remote-tunnel/denied.html b/packages/appkit/src/server/remote-tunnel/denied.html
similarity index 100%
rename from packages/app-kit/src/server/remote-tunnel/denied.html
rename to packages/appkit/src/server/remote-tunnel/denied.html
diff --git a/packages/app-kit/src/server/remote-tunnel/gate.ts b/packages/appkit/src/server/remote-tunnel/gate.ts
similarity index 100%
rename from packages/app-kit/src/server/remote-tunnel/gate.ts
rename to packages/appkit/src/server/remote-tunnel/gate.ts
diff --git a/packages/app-kit/src/server/remote-tunnel/index.html b/packages/appkit/src/server/remote-tunnel/index.html
similarity index 100%
rename from packages/app-kit/src/server/remote-tunnel/index.html
rename to packages/appkit/src/server/remote-tunnel/index.html
diff --git a/packages/app-kit/src/server/remote-tunnel/remote-tunnel-controller.test.ts b/packages/appkit/src/server/remote-tunnel/remote-tunnel-controller.test.ts
similarity index 100%
rename from packages/app-kit/src/server/remote-tunnel/remote-tunnel-controller.test.ts
rename to packages/appkit/src/server/remote-tunnel/remote-tunnel-controller.test.ts
diff --git a/packages/app-kit/src/server/remote-tunnel/remote-tunnel-controller.ts b/packages/appkit/src/server/remote-tunnel/remote-tunnel-controller.ts
similarity index 100%
rename from packages/app-kit/src/server/remote-tunnel/remote-tunnel-controller.ts
rename to packages/appkit/src/server/remote-tunnel/remote-tunnel-controller.ts
diff --git a/packages/app-kit/src/server/remote-tunnel/remote-tunnel-manager.test.ts b/packages/appkit/src/server/remote-tunnel/remote-tunnel-manager.test.ts
similarity index 100%
rename from packages/app-kit/src/server/remote-tunnel/remote-tunnel-manager.test.ts
rename to packages/appkit/src/server/remote-tunnel/remote-tunnel-manager.test.ts
diff --git a/packages/app-kit/src/server/remote-tunnel/remote-tunnel-manager.ts b/packages/appkit/src/server/remote-tunnel/remote-tunnel-manager.ts
similarity index 99%
rename from packages/app-kit/src/server/remote-tunnel/remote-tunnel-manager.ts
rename to packages/appkit/src/server/remote-tunnel/remote-tunnel-manager.ts
index fdbc8aa..e88ebf0 100644
--- a/packages/app-kit/src/server/remote-tunnel/remote-tunnel-manager.ts
+++ b/packages/appkit/src/server/remote-tunnel/remote-tunnel-manager.ts
@@ -24,7 +24,7 @@ interface DevFileReader {
 }
 
 /**
- * Remote tunnel manager for the App Kit.
+ * Remote tunnel manager for the AppKit.
  *
  * This class is responsible for managing the remote tunnels for the development server.
  * It also handles the asset fetching and the HMR for the development server.
diff --git a/packages/app-kit/src/server/remote-tunnel/wait.html b/packages/appkit/src/server/remote-tunnel/wait.html
similarity index 100%
rename from packages/app-kit/src/server/remote-tunnel/wait.html
rename to packages/appkit/src/server/remote-tunnel/wait.html
diff --git a/packages/app-kit/src/server/static-server.ts b/packages/appkit/src/server/static-server.ts
similarity index 97%
rename from packages/app-kit/src/server/static-server.ts
rename to packages/appkit/src/server/static-server.ts
index 4af5059..50081f6 100644
--- a/packages/app-kit/src/server/static-server.ts
+++ b/packages/appkit/src/server/static-server.ts
@@ -6,7 +6,7 @@ import { BaseServer } from "./base-server";
 import type { PluginEndpoints } from "./utils";
 
 /**
- * Static server for the App Kit.
+ * Static server for the AppKit.
  *
  * Serves pre-built static files in production mode. Handles SPA routing
  * by serving index.html for non-API routes and injects runtime configuration.
diff --git a/packages/app-kit/src/server/tests/remote-tunnel-gate.test.ts b/packages/appkit/src/server/tests/remote-tunnel-gate.test.ts
similarity index 100%
rename from packages/app-kit/src/server/tests/remote-tunnel-gate.test.ts
rename to packages/appkit/src/server/tests/remote-tunnel-gate.test.ts
diff --git a/packages/app-kit/src/server/tests/server.integration.test.ts b/packages/appkit/src/server/tests/server.integration.test.ts
similarity index 100%
rename from packages/app-kit/src/server/tests/server.integration.test.ts
rename to packages/appkit/src/server/tests/server.integration.test.ts
diff --git a/packages/app-kit/src/server/tests/server.test.ts b/packages/appkit/src/server/tests/server.test.ts
similarity index 100%
rename from packages/app-kit/src/server/tests/server.test.ts
rename to packages/appkit/src/server/tests/server.test.ts
diff --git a/packages/app-kit/src/server/tests/static-server.test.ts b/packages/appkit/src/server/tests/static-server.test.ts
similarity index 100%
rename from packages/app-kit/src/server/tests/static-server.test.ts
rename to packages/appkit/src/server/tests/static-server.test.ts
diff --git a/packages/app-kit/src/server/tests/utils.test.ts b/packages/appkit/src/server/tests/utils.test.ts
similarity index 100%
rename from packages/app-kit/src/server/tests/utils.test.ts
rename to packages/appkit/src/server/tests/utils.test.ts
diff --git a/packages/app-kit/src/server/tests/vite-dev-server.test.ts b/packages/appkit/src/server/tests/vite-dev-server.test.ts
similarity index 100%
rename from packages/app-kit/src/server/tests/vite-dev-server.test.ts
rename to packages/appkit/src/server/tests/vite-dev-server.test.ts
diff --git a/packages/app-kit/src/server/types.ts b/packages/appkit/src/server/types.ts
similarity index 100%
rename from packages/app-kit/src/server/types.ts
rename to packages/appkit/src/server/types.ts
diff --git a/packages/app-kit/src/server/utils.ts b/packages/appkit/src/server/utils.ts
similarity index 100%
rename from packages/app-kit/src/server/utils.ts
rename to packages/appkit/src/server/utils.ts
diff --git a/packages/app-kit/src/server/vite-dev-server.ts b/packages/appkit/src/server/vite-dev-server.ts
similarity index 99%
rename from packages/app-kit/src/server/vite-dev-server.ts
rename to packages/appkit/src/server/vite-dev-server.ts
index 5aaa853..30ad558 100644
--- a/packages/app-kit/src/server/vite-dev-server.ts
+++ b/packages/appkit/src/server/vite-dev-server.ts
@@ -8,7 +8,7 @@ import type { PluginEndpoints } from "./utils";
 import { appKitTypesPlugin } from "../type-generator/vite-plugin";
 
 /**
- * Vite dev server for the App Kit.
+ * Vite dev server for the AppKit.
  *
  * This class is responsible for serving the Vite dev server for the development server.
  * It also handles the index.html file for the development server.
diff --git a/packages/app-kit/src/stream/arrow-stream-processor.ts b/packages/appkit/src/stream/arrow-stream-processor.ts
similarity index 100%
rename from packages/app-kit/src/stream/arrow-stream-processor.ts
rename to packages/appkit/src/stream/arrow-stream-processor.ts
diff --git a/packages/app-kit/src/stream/buffers.ts b/packages/appkit/src/stream/buffers.ts
similarity index 100%
rename from packages/app-kit/src/stream/buffers.ts
rename to packages/appkit/src/stream/buffers.ts
diff --git a/packages/app-kit/src/stream/defaults.ts b/packages/appkit/src/stream/defaults.ts
similarity index 100%
rename from packages/app-kit/src/stream/defaults.ts
rename to packages/appkit/src/stream/defaults.ts
diff --git a/packages/app-kit/src/stream/index.ts b/packages/appkit/src/stream/index.ts
similarity index 100%
rename from packages/app-kit/src/stream/index.ts
rename to packages/appkit/src/stream/index.ts
diff --git a/packages/app-kit/src/stream/sse-writer.ts b/packages/appkit/src/stream/sse-writer.ts
similarity index 100%
rename from packages/app-kit/src/stream/sse-writer.ts
rename to packages/appkit/src/stream/sse-writer.ts
diff --git a/packages/app-kit/src/stream/stream-manager.ts b/packages/appkit/src/stream/stream-manager.ts
similarity index 100%
rename from packages/app-kit/src/stream/stream-manager.ts
rename to packages/appkit/src/stream/stream-manager.ts
diff --git a/packages/app-kit/src/stream/stream-registry.ts b/packages/appkit/src/stream/stream-registry.ts
similarity index 100%
rename from packages/app-kit/src/stream/stream-registry.ts
rename to packages/appkit/src/stream/stream-registry.ts
diff --git a/packages/app-kit/src/stream/tests/arrow-stream-processor.test.ts b/packages/appkit/src/stream/tests/arrow-stream-processor.test.ts
similarity index 100%
rename from packages/app-kit/src/stream/tests/arrow-stream-processor.test.ts
rename to packages/appkit/src/stream/tests/arrow-stream-processor.test.ts
diff --git a/packages/app-kit/src/stream/tests/stream.test.ts b/packages/appkit/src/stream/tests/stream.test.ts
similarity index 100%
rename from packages/app-kit/src/stream/tests/stream.test.ts
rename to packages/appkit/src/stream/tests/stream.test.ts
diff --git a/packages/app-kit/src/stream/types.ts b/packages/appkit/src/stream/types.ts
similarity index 100%
rename from packages/app-kit/src/stream/types.ts
rename to packages/appkit/src/stream/types.ts
diff --git a/packages/app-kit/src/stream/validator.ts b/packages/appkit/src/stream/validator.ts
similarity index 100%
rename from packages/app-kit/src/stream/validator.ts
rename to packages/appkit/src/stream/validator.ts
diff --git a/packages/app-kit/src/telemetry/config.ts b/packages/appkit/src/telemetry/config.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/config.ts
rename to packages/appkit/src/telemetry/config.ts
diff --git a/packages/app-kit/src/telemetry/index.ts b/packages/appkit/src/telemetry/index.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/index.ts
rename to packages/appkit/src/telemetry/index.ts
diff --git a/packages/app-kit/src/telemetry/instrumentations.ts b/packages/appkit/src/telemetry/instrumentations.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/instrumentations.ts
rename to packages/appkit/src/telemetry/instrumentations.ts
diff --git a/packages/app-kit/src/telemetry/noop.ts b/packages/appkit/src/telemetry/noop.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/noop.ts
rename to packages/appkit/src/telemetry/noop.ts
diff --git a/packages/app-kit/src/telemetry/telemetry-manager.ts b/packages/appkit/src/telemetry/telemetry-manager.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/telemetry-manager.ts
rename to packages/appkit/src/telemetry/telemetry-manager.ts
diff --git a/packages/app-kit/src/telemetry/telemetry-provider.ts b/packages/appkit/src/telemetry/telemetry-provider.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/telemetry-provider.ts
rename to packages/appkit/src/telemetry/telemetry-provider.ts
diff --git a/packages/app-kit/src/telemetry/tests/config.test.ts b/packages/appkit/src/telemetry/tests/config.test.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/tests/config.test.ts
rename to packages/appkit/src/telemetry/tests/config.test.ts
diff --git a/packages/app-kit/src/telemetry/tests/plugin-telemetry.test.ts b/packages/appkit/src/telemetry/tests/plugin-telemetry.test.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/tests/plugin-telemetry.test.ts
rename to packages/appkit/src/telemetry/tests/plugin-telemetry.test.ts
diff --git a/packages/app-kit/src/telemetry/tests/telemetry-interceptor.test.ts b/packages/appkit/src/telemetry/tests/telemetry-interceptor.test.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/tests/telemetry-interceptor.test.ts
rename to packages/appkit/src/telemetry/tests/telemetry-interceptor.test.ts
diff --git a/packages/app-kit/src/telemetry/tests/telemetry-manager.test.ts b/packages/appkit/src/telemetry/tests/telemetry-manager.test.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/tests/telemetry-manager.test.ts
rename to packages/appkit/src/telemetry/tests/telemetry-manager.test.ts
diff --git a/packages/app-kit/src/telemetry/types.ts b/packages/appkit/src/telemetry/types.ts
similarity index 100%
rename from packages/app-kit/src/telemetry/types.ts
rename to packages/appkit/src/telemetry/types.ts
diff --git a/packages/app-kit/src/type-generator/cache.ts b/packages/appkit/src/type-generator/cache.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/cache.ts
rename to packages/appkit/src/type-generator/cache.ts
diff --git a/packages/app-kit/src/type-generator/expand.ts b/packages/appkit/src/type-generator/expand.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/expand.ts
rename to packages/appkit/src/type-generator/expand.ts
diff --git a/packages/app-kit/src/type-generator/index.ts b/packages/appkit/src/type-generator/index.ts
similarity index 94%
rename from packages/app-kit/src/type-generator/index.ts
rename to packages/appkit/src/type-generator/index.ts
index a6d07c6..085db6d 100644
--- a/packages/app-kit/src/type-generator/index.ts
+++ b/packages/appkit/src/type-generator/index.ts
@@ -26,10 +26,10 @@ function generateTypeDeclarations(querySchemas: QuerySchema[] = []): string {
 
   return `// Auto-generated by AppKit - DO NOT EDIT
 // Generated by 'npx appkit-generate-types' or Vite plugin during build
-import "@databricks/app-kit-ui/react";
-import type { SQLTypeMarker, SQLStringMarker, SQLNumberMarker, SQLBooleanMarker, SQLBinaryMarker, SQLDateMarker, SQLTimestampMarker } from "@databricks/app-kit-ui/js";
+import "@databricks/appkit-ui/react";
+import type { SQLTypeMarker, SQLStringMarker, SQLNumberMarker, SQLBooleanMarker, SQLBinaryMarker, SQLDateMarker, SQLTimestampMarker } from "@databricks/appkit-ui/js";
 
-declare module "@databricks/app-kit-ui/react" {
+declare module "@databricks/appkit-ui/react" {
   interface QueryRegistry {${querySection}}
 }
 `;
diff --git a/packages/app-kit/src/type-generator/query-registry.ts b/packages/appkit/src/type-generator/query-registry.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/query-registry.ts
rename to packages/appkit/src/type-generator/query-registry.ts
diff --git a/packages/app-kit/src/type-generator/spinner.ts b/packages/appkit/src/type-generator/spinner.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/spinner.ts
rename to packages/appkit/src/type-generator/spinner.ts
diff --git a/packages/app-kit/src/type-generator/tests/expand.test.ts b/packages/appkit/src/type-generator/tests/expand.test.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/tests/expand.test.ts
rename to packages/appkit/src/type-generator/tests/expand.test.ts
diff --git a/packages/app-kit/src/type-generator/tests/index.test.ts b/packages/appkit/src/type-generator/tests/index.test.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/tests/index.test.ts
rename to packages/appkit/src/type-generator/tests/index.test.ts
diff --git a/packages/app-kit/src/type-generator/tests/query-registry.test.ts b/packages/appkit/src/type-generator/tests/query-registry.test.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/tests/query-registry.test.ts
rename to packages/appkit/src/type-generator/tests/query-registry.test.ts
diff --git a/packages/app-kit/src/type-generator/types.ts b/packages/appkit/src/type-generator/types.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/types.ts
rename to packages/appkit/src/type-generator/types.ts
diff --git a/packages/app-kit/src/type-generator/vite-plugin.ts b/packages/appkit/src/type-generator/vite-plugin.ts
similarity index 100%
rename from packages/app-kit/src/type-generator/vite-plugin.ts
rename to packages/appkit/src/type-generator/vite-plugin.ts
diff --git a/packages/app-kit/src/utils/databricks-client-middleware.ts b/packages/appkit/src/utils/databricks-client-middleware.ts
similarity index 100%
rename from packages/app-kit/src/utils/databricks-client-middleware.ts
rename to packages/appkit/src/utils/databricks-client-middleware.ts
diff --git a/packages/app-kit/src/utils/env-validator.ts b/packages/appkit/src/utils/env-validator.ts
similarity index 100%
rename from packages/app-kit/src/utils/env-validator.ts
rename to packages/appkit/src/utils/env-validator.ts
diff --git a/packages/app-kit/src/utils/index.ts b/packages/appkit/src/utils/index.ts
similarity index 100%
rename from packages/app-kit/src/utils/index.ts
rename to packages/appkit/src/utils/index.ts
diff --git a/packages/app-kit/src/utils/merge.ts b/packages/appkit/src/utils/merge.ts
similarity index 100%
rename from packages/app-kit/src/utils/merge.ts
rename to packages/appkit/src/utils/merge.ts
diff --git a/packages/app-kit/src/utils/vite-config-merge.ts b/packages/appkit/src/utils/vite-config-merge.ts
similarity index 100%
rename from packages/app-kit/src/utils/vite-config-merge.ts
rename to packages/appkit/src/utils/vite-config-merge.ts
diff --git a/packages/app-kit/tsconfig.json b/packages/appkit/tsconfig.json
similarity index 100%
rename from packages/app-kit/tsconfig.json
rename to packages/appkit/tsconfig.json
diff --git a/packages/app-kit/tsdown.config.ts b/packages/appkit/tsdown.config.ts
similarity index 96%
rename from packages/app-kit/tsdown.config.ts
rename to packages/appkit/tsdown.config.ts
index be6aa68..6d525cd 100644
--- a/packages/app-kit/tsdown.config.ts
+++ b/packages/appkit/tsdown.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "tsdown";
 export default defineConfig([
   {
     publint: true,
-    name: "@databricks/app-kit",
+    name: "@databricks/appkit",
     entry: "src/index.ts",
     outDir: "dist",
     hash: false,
diff --git a/packages/shared/bin/setup-claude.js b/packages/shared/bin/setup-claude.js
index b0edd96..41538e5 100644
--- a/packages/shared/bin/setup-claude.js
+++ b/packages/shared/bin/setup-claude.js
@@ -3,7 +3,7 @@
 /**
  * CLI tool to setup CLAUDE.md for Databricks AppKit packages.
  *
- * This bin is included in both @databricks/app-kit and @databricks/app-kit-ui
+ * This bin is included in both @databricks/appkit and @databricks/appkit-ui
  * so it's available regardless of which package the user installs.
  *
  * Usage:
@@ -15,9 +15,9 @@ import fs from "node:fs";
 import path from "node:path";
 
 const PACKAGES = [
-  { name: "@databricks/app-kit", description: "Backend SDK" },
+  { name: "@databricks/appkit", description: "Backend SDK" },
   {
-    name: "@databricks/app-kit-ui",
+    name: "@databricks/appkit-ui",
     description: "UI Integration, Charts, Tables, SSE, and more.",
   },
 ];
@@ -133,7 +133,7 @@ Examples:
   const installed = findInstalledPackages();
 
   if (installed.length === 0) {
-    console.log("No @databricks/app-kit packages found in node_modules.");
+    console.log("No @databricks/appkit packages found in node_modules.");
     console.log("\nMake sure you've installed at least one of:");
     PACKAGES.forEach((pkg) => {
       console.log(`  - ${pkg.name}`);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 551eb19..6cb6ac7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -71,9 +71,9 @@ importers:
 
   apps/clean-app:
     dependencies:
-      '@databricks/app-kit':
+      '@databricks/appkit':
         specifier: workspace:*
-        version: link:../../packages/app-kit
+        version: link:../../packages/appkit
       react:
         specifier: ^19.2.0
         version: 19.2.0
@@ -120,9 +120,9 @@ importers:
 
   apps/dev-playground:
     dependencies:
-      '@databricks/app-kit':
+      '@databricks/appkit':
         specifier: workspace:*
-        version: link:../../packages/app-kit
+        version: link:../../packages/appkit
       zod:
         specifier: ^4.1.13
         version: 4.1.13
@@ -186,7 +186,7 @@ importers:
         specifier: ~5.6.2
         version: 5.6.3
 
-  packages/app-kit:
+  packages/appkit:
     dependencies:
       '@databricks/sdk-experimental':
         specifier: ^0.15.0
@@ -268,7 +268,7 @@ importers:
         specifier: ^5.1.1
         version: 5.1.1(rolldown-vite@7.1.14(@types/node@24.10.1)(esbuild@0.25.10)(jiti@2.6.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))
 
-  packages/app-kit-ui:
+  packages/appkit-ui:
     dependencies:
       '@hookform/resolvers':
         specifier: ^5.2.2
diff --git a/tools/build-notice.ts b/tools/build-notice.ts
index 31abea7..fa9bce5 100644
--- a/tools/build-notice.ts
+++ b/tools/build-notice.ts
@@ -17,8 +17,8 @@ type PackageJson = {
 
 // Packages whose direct dependencies we want to include in NOTICE.md
 const PUBLISHED_PACKAGES = [
-  "packages/app-kit",
-  "packages/app-kit-ui",
+  "packages/appkit",
+  "packages/appkit-ui",
   "packages/shared",
 ];
 
diff --git a/tools/dist.ts b/tools/dist.ts
index 81ef265..d8e062c 100644
--- a/tools/dist.ts
+++ b/tools/dist.ts
@@ -12,7 +12,7 @@ delete pkg.dependencies.shared;
 pkg.exports = pkg.publishConfig.exports;
 delete pkg.publishConfig.exports;
 
-const isAppKitPackage = pkg.name?.startsWith("@databricks/app-kit");
+const isAppKitPackage = pkg.name?.startsWith("@databricks/appkit");
 const sharedBin = path.join(
   __dirname,
   "../packages/shared/bin/setup-claude.js",
@@ -22,7 +22,7 @@ const sharedPostinstall = path.join(
   "../packages/shared/scripts/postinstall.js",
 );
 
-// Add appkit-setup bin and postinstall for @databricks/app-kit* packages
+// Add appkit-setup bin and postinstall for @databricks/appkit* packages
 if (isAppKitPackage) {
   if (fs.existsSync(sharedBin)) {
     pkg.bin = pkg.bin || {};
diff --git a/tools/playground/deploy-playground.ts b/tools/playground/deploy-playground.ts
index 1beb70e..81f8f1c 100644
--- a/tools/playground/deploy-playground.ts
+++ b/tools/playground/deploy-playground.ts
@@ -19,29 +19,29 @@ const TMP_FOLDER = path.join(process.cwd(), "deployable");
 
 const appKitPackageJson = JSON.parse(
   fs.readFileSync(
-    path.join(process.cwd(), "packages", "app-kit", "package.json"),
+    path.join(process.cwd(), "packages", "appkit", "package.json"),
     "utf-8",
   ),
 );
 const appKitUiPackageJson = JSON.parse(
   fs.readFileSync(
-    path.join(process.cwd(), "packages", "app-kit-ui", "package.json"),
+    path.join(process.cwd(), "packages", "appkit-ui", "package.json"),
     "utf-8",
   ),
 );
 const appKitTarball = path.join(
   process.cwd(),
   "packages",
-  "app-kit",
+  "appkit",
   "tmp",
-  `databricks-app-kit-${appKitPackageJson.version}.tgz`,
+  `databricks-appkit-${appKitPackageJson.version}.tgz`,
 );
 const appKitUiTarball = path.join(
   process.cwd(),
   "packages",
-  "app-kit-ui",
+  "appkit-ui",
   "tmp",
-  `databricks-app-kit-ui-${appKitUiPackageJson.version}.tgz`,
+  `databricks-appkit-ui-${appKitUiPackageJson.version}.tgz`,
 );
 
 async function deployPlayground() {
@@ -88,12 +88,12 @@ async function deployPlayground() {
 
   playgroundPackageJson.dependencies = {
     ...playgroundPackageJson.dependencies,
-    "@databricks/app-kit": `file:./databricks-app-kit-${appKitPackageJson.version}.tgz`,
+    "@databricks/appkit": `file:./databricks-appkit-${appKitPackageJson.version}.tgz`,
   };
 
   clientPackageJson.dependencies = {
     ...clientPackageJson.dependencies,
-    "@databricks/app-kit-ui": `file:./databricks-app-kit-ui-${appKitUiPackageJson.version}.tgz`,
+    "@databricks/appkit-ui": `file:./databricks-appkit-ui-${appKitUiPackageJson.version}.tgz`,
   };
 
   fs.writeFileSync(
@@ -106,17 +106,14 @@ async function deployPlayground() {
   );
   fs.copyFileSync(
     appKitTarball,
-    path.join(
-      TMP_FOLDER,
-      `databricks-app-kit-${appKitPackageJson.version}.tgz`,
-    ),
+    path.join(TMP_FOLDER, `databricks-appkit-${appKitPackageJson.version}.tgz`),
   );
   fs.copyFileSync(
     appKitUiTarball,
     path.join(
       TMP_FOLDER,
       "client",
-      `databricks-app-kit-ui-${appKitUiPackageJson.version}.tgz`,
+      `databricks-appkit-ui-${appKitUiPackageJson.version}.tgz`,
     ),
   );
 
diff --git a/tools/test-helpers.ts b/tools/test-helpers.ts
index 0ec4129..dd6fa4c 100644
--- a/tools/test-helpers.ts
+++ b/tools/test-helpers.ts
@@ -2,8 +2,8 @@ import type { IAppRouter } from "shared";
 import type {
   InstrumentConfig,
   ITelemetry,
-} from "../packages/app-kit/src/telemetry/types";
-import type { RequestContext } from "../packages/app-kit/src/utils/databricks-client-middleware";
+} from "../packages/appkit/src/telemetry/types";
+import type { RequestContext } from "../packages/appkit/src/utils/databricks-client-middleware";
 import { vi } from "vitest";
 import type { SpanOptions, Span } from "@opentelemetry/api";
 
@@ -202,7 +202,7 @@ export async function runWithRequestContext<T>(
 
   // Use vi.spyOn to mock getRequestContext and getWorkspaceClient
   const utilsModule = await import(
-    "../packages/app-kit/src/utils/databricks-client-middleware"
+    "../packages/appkit/src/utils/databricks-client-middleware"
   );
 
   const contextSpy = vi
diff --git a/tsconfig.json b/tsconfig.json
index d53d26f..275b2ce 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,8 +13,8 @@
     "skipLibCheck": true,
     "lib": ["ES2021"],
     "paths": {
-      "@databricks/app-kit": ["packages/app-kit/*"],
-      "@databricks/app-kit-ui": ["packages/app-kit-ui/*"],
+      "@databricks/appkit": ["packages/appkit/*"],
+      "@databricks/appkit-ui": ["packages/appkit-ui/*"],
       "shared": ["packages/shared/src"],
       "@tools/*": ["tools/*"]
     }
diff --git a/vitest.config.ts b/vitest.config.ts
index a829b6c..1238e62 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -23,20 +23,20 @@ export default defineConfig({
         plugins: [react()],
         resolve: {
           alias: {
-            "@": path.resolve(__dirname, "./packages/app-kit-ui/src"),
+            "@": path.resolve(__dirname, "./packages/appkit-ui/src"),
           },
         },
         test: {
-          name: "app-kit-ui",
-          root: "./packages/app-kit-ui",
+          name: "appkit-ui",
+          root: "./packages/appkit-ui",
           environment: "jsdom",
         },
       },
       {
         plugins: [tsconfigPaths()],
         test: {
-          name: "app-kit",
-          root: "./packages/app-kit",
+          name: "appkit",
+          root: "./packages/appkit",
           environment: "node",
         },
       },