diff --git a/.dockerignore b/.dockerignore
index 893ad8ac9..294a8b307 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -146,8 +146,6 @@ __pycache__/
 packages/js/*
 packages/react/*
 packages/next/*
-packages/stack/*
 !packages/js/package.json
 !packages/react/package.json
 !packages/next/package.json
-!packages/stack/package.json
diff --git a/.github/workflows/e2e-api-tests.yaml b/.github/workflows/e2e-api-tests.yaml
index 584988e63..1af38021b 100644
--- a/.github/workflows/e2e-api-tests.yaml
+++ b/.github/workflows/e2e-api-tests.yaml
@@ -21,7 +21,6 @@ jobs:
       STACK_DATABASE_CONNECTION_STRING: "postgres://postgres:PASSWORD-PLACEHOLDER--uqfEC1hmmv@localhost:8128/stackframe"
       STACK_EXTERNAL_DB_SYNC_MAX_DURATION_MS: "20000"
       STACK_EXTERNAL_DB_SYNC_DIRECT: "false"
-      STACK_RUN_SETUP_WIZARD_TESTS: ${{ matrix.freestyle-mode != 'prod' && 'true' || '' }}
 
     strategy:
       matrix:
diff --git a/.gitignore b/.gitignore
index 42217cf10..dd3880690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,12 +139,10 @@ __pycache__/
 packages/js/*
 packages/react/*
 packages/next/*
-packages/stack/*
 packages/tanstack-start/*
 !packages/js/package.json
 !packages/react/package.json
 !packages/next/package.json
-!packages/stack/package.json
 !packages/tanstack-start/package.json
 
 # claude code
diff --git a/apps/dashboard/scripts/bundle-type-definitions.ts b/apps/dashboard/scripts/bundle-type-definitions.ts
index 141cfff98..bce071d8a 100644
--- a/apps/dashboard/scripts/bundle-type-definitions.ts
+++ b/apps/dashboard/scripts/bundle-type-definitions.ts
@@ -12,15 +12,15 @@ async function main() {
   console.log('[Bundle Type Definitions] Finding Stack SDK type definition files...');
   
   const rootPath = path.resolve(process.cwd(), '../..');
-  const stackAppPath = path.join(rootPath, 'packages/template/src/lib/stack-app');
+  const hexclaveAppPath = path.join(rootPath, 'packages/template/src/lib/hexclave-app');
   const outputPath = path.join(rootPath, 'apps/dashboard/src/generated/bundled-type-definitions.ts');
   
-  const files = await glob(`${stackAppPath}/**/*.ts`, {
+  const files = await glob(`${hexclaveAppPath}/**/*.ts`, {
     ignore: [
-      `${stackAppPath}/**/implementations/**`,
-      `${stackAppPath}/**/utils/**`,
-      `${stackAppPath}/**/*.d.ts`,
-      `${stackAppPath}/**/global.css`,
+      `${hexclaveAppPath}/**/implementations/**`,
+      `${hexclaveAppPath}/**/utils/**`,
+      `${hexclaveAppPath}/**/*.d.ts`,
+      `${hexclaveAppPath}/**/global.css`,
     ],
   });
   files.sort();
@@ -30,7 +30,7 @@ async function main() {
   const bundledFiles: TypeDefinitionFile[] = [];
   
   for (const filePath of files) {
-    const relativePath = path.relative(stackAppPath, filePath);
+    const relativePath = path.relative(hexclaveAppPath, filePath);
     const content = await fs.readFile(filePath, 'utf8');
     
     bundledFiles.push({
diff --git a/packages/shared/src/interface/admin-metrics.ts b/packages/shared/src/interface/admin-metrics.ts
index 9c4910447..8f137900f 100644
--- a/packages/shared/src/interface/admin-metrics.ts
+++ b/packages/shared/src/interface/admin-metrics.ts
@@ -4,7 +4,7 @@ import { yupArray, yupMixed, yupNumber, yupObject, yupRecord, yupString } from "
 // Single source of truth for the `/internal/metrics` endpoint shape.
 //
 // Both the backend route handler (`apps/backend/src/app/api/latest/internal/metrics/route.tsx`)
-// and the dashboard hook (`apps/dashboard/src/lib/stack-app-internals.ts`) import
+// and the dashboard hook (`apps/dashboard/src/lib/hexclave-app-internals.ts`) import
 // these schemas. The runtime validation lives in the schemas; the static types
 // are derived via `yup.InferType` so we never have to keep parallel copies in
 // sync.
diff --git a/packages/shared/src/utils/urls.tsx b/packages/shared/src/utils/urls.tsx
index 25aef0379..97c07ea87 100644
--- a/packages/shared/src/utils/urls.tsx
+++ b/packages/shared/src/utils/urls.tsx
@@ -198,7 +198,7 @@ import.meta.vitest?.test("matchHostnamePattern", ({ expect }) => {
 
 export function getHardcodedFallbackUrls(primaryBaseUrl: string): string[] {
   // `defaultBaseUrl` in `@stackframe/*` SDK builds is `https://api.stack-auth.com`
-  // (see `packages/template/src/lib/stack-app/apps/implementations/common.ts`).
+  // (see `packages/template/src/lib/hexclave-app/apps/implementations/common.ts`).
   // The `@hexclave/*` mirror packages will get this rewritten to the hexclave
   // hostname by `scripts/rewrite-packages-to-hexclave.ts` in a follow-up PR; both
   // branches below stay listed so either build resolves its own fallback set.