diff --git a/packages/template/src/components-page/account-settings/active-sessions/active-sessions-page.tsx b/packages/template/src/components-page/account-settings/active-sessions/active-sessions-page.tsx
index 66c90dea5..9118f3fc0 100644
--- a/packages/template/src/components-page/account-settings/active-sessions/active-sessions-page.tsx
+++ b/packages/template/src/components-page/account-settings/active-sessions/active-sessions-page.tsx
@@ -4,7 +4,7 @@ import { runAsynchronously } from "@hexclave/shared/dist/utils/promises";
 import { ActionCell, Badge, Button, Skeleton, Table, TableBody, TableCell, TableHead, TableHeader, TableRow, Typography } from "@hexclave/ui";
 import { useEffect, useState } from "react";
 import { useUser } from "../../../lib/hooks";
-import { ActiveSession } from "../../../lib/stack-app/users";
+import { ActiveSession } from "../../../lib/hexclave-app/users";
 import { useTranslation } from "../../../lib/translations";
 import { PageLayout } from "../page-layout";
 
diff --git a/packages/template/src/components-page/account-settings/api-keys/api-keys-page.tsx b/packages/template/src/components-page/account-settings/api-keys/api-keys-page.tsx
index 5ba21ac9f..64bbda458 100644
--- a/packages/template/src/components-page/account-settings/api-keys/api-keys-page.tsx
+++ b/packages/template/src/components-page/account-settings/api-keys/api-keys-page.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
 import { CreateApiKeyDialog, ShowApiKeyDialog } from "../../../components/api-key-dialogs";
 import { ApiKeyTable } from "../../../components/api-key-table";
 import { useUser } from "../../../lib/hooks";
-import { ApiKey, ApiKeyCreationOptions } from "../../../lib/stack-app/api-keys";
+import { ApiKey, ApiKeyCreationOptions } from "../../../lib/hexclave-app/api-keys";
 import { useTranslation } from "../../../lib/translations";
 import { PageLayout } from "../page-layout";
 
diff --git a/packages/template/src/components-page/account-settings/payments/payments-panel.tsx b/packages/template/src/components-page/account-settings/payments/payments-panel.tsx
index 7ab0ff34b..7a52c86f8 100644
--- a/packages/template/src/components-page/account-settings/payments/payments-panel.tsx
+++ b/packages/template/src/components-page/account-settings/payments/payments-panel.tsx
@@ -11,7 +11,7 @@ import { envVars } from "../../../lib/env";
 import { useTranslation } from "../../../lib/translations";
 import { Section } from "../section";
 import { Result } from "@hexclave/shared/dist/utils/results";
-import type { CustomerInvoiceStatus, CustomerInvoicesList, CustomerInvoicesListOptions } from "../../../lib/stack-app/customers";
+import type { CustomerInvoiceStatus, CustomerInvoicesList, CustomerInvoicesListOptions } from "../../../lib/hexclave-app/customers";
 
 type PaymentMethodSummary = {
   id: string,
diff --git a/packages/template/src/components-page/account-settings/teams/team-api-keys-section.tsx b/packages/template/src/components-page/account-settings/teams/team-api-keys-section.tsx
index fa65d449c..8f9b9bc30 100644
--- a/packages/template/src/components-page/account-settings/teams/team-api-keys-section.tsx
+++ b/packages/template/src/components-page/account-settings/teams/team-api-keys-section.tsx
@@ -4,8 +4,8 @@ import { useState } from "react";
 import { CreateApiKeyDialog, ShowApiKeyDialog } from "../../../components/api-key-dialogs";
 import { ApiKeyTable } from "../../../components/api-key-table";
 import { useStackApp, useUser } from "../../../lib/hooks";
-import { TeamApiKeyFirstView } from "../../../lib/stack-app/api-keys";
-import { Team } from "../../../lib/stack-app/teams";
+import { TeamApiKeyFirstView } from "../../../lib/hexclave-app/api-keys";
+import { Team } from "../../../lib/hexclave-app/teams";
 import { useTranslation } from "../../../lib/translations";
 import { Section } from "../section";
 
diff --git a/packages/template/src/components-page/cli-auth-confirm.test.tsx b/packages/template/src/components-page/cli-auth-confirm.test.tsx
index 963cf2e82..000f06169 100644
--- a/packages/template/src/components-page/cli-auth-confirm.test.tsx
+++ b/packages/template/src/components-page/cli-auth-confirm.test.tsx
@@ -4,8 +4,8 @@ import { runAsynchronously } from "@hexclave/shared/dist/utils/promises";
 import React, { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { StackClientApp } from "../lib/stack-app/apps/interfaces/client-app";
-import { hexclaveAppInternalsSymbol } from "../lib/stack-app/common";
+import type { StackClientApp } from "../lib/hexclave-app/apps/interfaces/client-app";
+import { hexclaveAppInternalsSymbol } from "../lib/hexclave-app/common";
 import { HexclaveContext } from "../providers/hexclave-context";
 import { useCliAuthConfirmation } from "./cli-auth-confirm";
 
diff --git a/packages/template/src/components-page/cli-auth-confirm.tsx b/packages/template/src/components-page/cli-auth-confirm.tsx
index 84a127242..c1eb406d1 100644
--- a/packages/template/src/components-page/cli-auth-confirm.tsx
+++ b/packages/template/src/components-page/cli-auth-confirm.tsx
@@ -5,8 +5,8 @@ import { Typography } from "@hexclave/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { MessageCard } from "../components/message-cards/message-card";
 import { useTranslation } from "../lib/translations";
-import { hexclaveAppInternalsSymbol } from "../lib/stack-app/common";
-import type { StackClientApp } from "../lib/stack-app/apps/interfaces/client-app";
+import { hexclaveAppInternalsSymbol } from "../lib/hexclave-app/common";
+import type { StackClientApp } from "../lib/hexclave-app/apps/interfaces/client-app";
 import { useStackApp } from "../lib/hooks";
 
 async function postCliAuthComplete(app: StackClientApp, body: Record<string, unknown>) {
diff --git a/packages/template/src/components-page/hexclave-handler-client.tsx b/packages/template/src/components-page/hexclave-handler-client.tsx
index 121296f99..408113f70 100644
--- a/packages/template/src/components-page/hexclave-handler-client.tsx
+++ b/packages/template/src/components-page/hexclave-handler-client.tsx
@@ -11,8 +11,8 @@ import { useRef } from 'react';
 // END_PLATFORM */
 import { SignIn, SignUp, StackServerApp } from "..";
 import { useStackApp } from "../lib/hooks";
-import { HandlerUrls, StackClientApp, hexclaveAppInternalsSymbol } from "../lib/stack-app";
-import { isLocalHandlerUrlTarget, resolveUnknownHandlerPathFallbackUrl } from "../lib/stack-app/url-targets";
+import { HandlerUrls, StackClientApp, hexclaveAppInternalsSymbol } from "../lib/hexclave-app";
+import { isLocalHandlerUrlTarget, resolveUnknownHandlerPathFallbackUrl } from "../lib/hexclave-app/url-targets";
 import { AccountSettings } from "./account-settings";
 import { CliAuthConfirmation } from "./cli-auth-confirm";
 import { EmailVerification } from "./email-verification";
diff --git a/packages/template/src/components-page/oauth-callback.tsx b/packages/template/src/components-page/oauth-callback.tsx
index de55c914d..e8f1a131f 100644
--- a/packages/template/src/components-page/oauth-callback.tsx
+++ b/packages/template/src/components-page/oauth-callback.tsx
@@ -8,7 +8,7 @@ import { useEffect, useRef, useState } from "react";
 import { useStackApp } from "..";
 import { MaybeFullPage } from "../components/elements/maybe-full-page";
 import { StyledLink } from "../components/link";
-import { hexclaveAppInternalsSymbol } from "../lib/stack-app";
+import { hexclaveAppInternalsSymbol } from "../lib/hexclave-app";
 import { useTranslation } from "../lib/translations";
 
 export function OAuthCallback({ fullPage }: { fullPage?: boolean }) {
diff --git a/packages/template/src/components/api-key-dialogs.tsx b/packages/template/src/components/api-key-dialogs.tsx
index 82c6a21ee..7f8ceb8f3 100644
--- a/packages/template/src/components/api-key-dialogs.tsx
+++ b/packages/template/src/components/api-key-dialogs.tsx
@@ -10,7 +10,7 @@ import { useForm } from 'react-hook-form';
 import * as yup from "yup";
 import { useUser } from '..';
 import { FormWarningText } from '../components/elements/form-warning';
-import { ApiKey, ApiKeyCreationOptions, ApiKeyType } from "../lib/stack-app/api-keys";
+import { ApiKey, ApiKeyCreationOptions, ApiKeyType } from "../lib/hexclave-app/api-keys";
 import { useTranslation } from "../lib/translations";
 
 // Constants for expiration options
diff --git a/packages/template/src/components/api-key-table.tsx b/packages/template/src/components/api-key-table.tsx
index 338d2843d..63e58e289 100644
--- a/packages/template/src/components/api-key-table.tsx
+++ b/packages/template/src/components/api-key-table.tsx
@@ -2,7 +2,7 @@
 import { ActionCell, ActionDialog, BadgeCell, DataTable, DataTableColumnHeader, DataTableFacetedFilter, DateCell, SearchToolbarItem, TextCell, standardFilterFn } from "@hexclave/ui";
 import { ColumnDef, Row, Table } from "@tanstack/react-table";
 import { useMemo, useState } from "react";
-import { ApiKey } from "../lib/stack-app/api-keys";
+import { ApiKey } from "../lib/hexclave-app/api-keys";
 
 type ExtendedApiKey = ApiKey & {
   status: 'valid' | 'expired' | 'revoked',
diff --git a/packages/template/src/dev-tool/dev-tool-core.ts b/packages/template/src/dev-tool/dev-tool-core.ts
index 56d1b0ceb..6359d3391 100644
--- a/packages/template/src/dev-tool/dev-tool-core.ts
+++ b/packages/template/src/dev-tool/dev-tool-core.ts
@@ -3,12 +3,12 @@
 import type { RequestLogEntry } from "@hexclave/shared/dist/interface/client-interface";
 import { runAsynchronously } from "@hexclave/shared/dist/utils/promises";
 import { isLocalhost } from "@hexclave/shared/dist/utils/urls";
-import type { StackClientApp } from "../lib/stack-app";
+import type { StackClientApp } from "../lib/hexclave-app";
 import { envVars } from "../lib/env";
-import { getBaseUrl } from "../lib/stack-app/apps/implementations/common";
-import type { HandlerUrlOptions, HandlerUrls, HandlerUrlTarget } from "../lib/stack-app/common";
-import { hexclaveAppInternalsSymbol } from "../lib/stack-app/common";
-import { getPagePrompt } from "../lib/stack-app/url-targets";
+import { getBaseUrl } from "../lib/hexclave-app/apps/implementations/common";
+import type { HandlerUrlOptions, HandlerUrls, HandlerUrlTarget } from "../lib/hexclave-app/common";
+import { hexclaveAppInternalsSymbol } from "../lib/hexclave-app/common";
+import { getPagePrompt } from "../lib/hexclave-app/url-targets";
 import { devToolCSS } from "./dev-tool-styles";
 import type { TriggerCorner, TriggerPlacement } from "./dev-tool-trigger-position";
 import { clampTriggerPosition, getSnappedTriggerPlacement, resolveTriggerPosition } from "./dev-tool-trigger-position";
diff --git a/packages/template/src/dev-tool/index.ts b/packages/template/src/dev-tool/index.ts
index 937c85ce4..1334a22b3 100644
--- a/packages/template/src/dev-tool/index.ts
+++ b/packages/template/src/dev-tool/index.ts
@@ -1,6 +1,6 @@
 // IF_PLATFORM js-like
 
-import type { StackClientApp } from "../lib/stack-app";
+import type { StackClientApp } from "../lib/hexclave-app";
 import { captureError } from "@hexclave/shared/dist/utils/errors";
 import { runAsynchronously } from "@hexclave/shared/dist/utils/promises";
 import { isLocalhost } from "@hexclave/shared/dist/utils/urls";
diff --git a/packages/template/src/index.ts b/packages/template/src/index.ts
index 429b0016d..27447e069 100644
--- a/packages/template/src/index.ts
+++ b/packages/template/src/index.ts
@@ -1,4 +1,4 @@
-export * from './lib/stack-app';
+export * from './lib/hexclave-app';
 export { getConvexProvidersConfig } from "./integrations/convex";
 // Hexclave aliases and legacy Stack* names — @deprecated JSDoc lives on the original
 // declarations in @hexclave/shared/config so it survives dts bundling
@@ -7,7 +7,7 @@ export type { HexclaveConfig, StackConfig } from "@hexclave/shared/config";
 export { defineHexclaveConfig, defineStackConfig } from "@hexclave/shared/config";
 
 // IF_PLATFORM react-like
-export type { AnalyticsOptions, AnalyticsReplayOptions } from "./lib/stack-app/apps/implementations/session-replay";
+export type { AnalyticsOptions, AnalyticsReplayOptions } from "./lib/hexclave-app/apps/implementations/session-replay";
 // Hexclave aliases and legacy Stack* names — @deprecated JSDoc lives on the original
 // declarations in the source files (so it survives dts bundling).
 export { HexclaveHandler, StackHandler } from "./components-page/hexclave-handler";
diff --git a/packages/template/src/integrations/convex.ts b/packages/template/src/integrations/convex.ts
index 3aeed25f5..d5f720f51 100644
--- a/packages/template/src/integrations/convex.ts
+++ b/packages/template/src/integrations/convex.ts
@@ -1,5 +1,5 @@
 import { urlString } from "@hexclave/shared/dist/utils/urls";
-import { defaultBaseUrl } from "../lib/stack-app/apps/implementations/common";
+import { defaultBaseUrl } from "../lib/hexclave-app/apps/implementations/common";
 
 export function getConvexProvidersConfig(options: {
   baseUrl?: string,
diff --git a/packages/template/src/lib/stack-app/api-keys/index.ts b/packages/template/src/lib/hexclave-app/api-keys/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/api-keys/index.ts
rename to packages/template/src/lib/hexclave-app/api-keys/index.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/admin-app-impl.ts b/packages/template/src/lib/hexclave-app/apps/implementations/admin-app-impl.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/admin-app-impl.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/admin-app-impl.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.cross-domain.test.ts b/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.cross-domain.test.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/client-app-impl.cross-domain.test.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.cross-domain.test.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.oauth-prefetch.test.ts b/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.oauth-prefetch.test.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/client-app-impl.oauth-prefetch.test.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.oauth-prefetch.test.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts b/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.ts
similarity index 99%
rename from packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.ts
index 3db377ab6..26c9a104e 100644
--- a/packages/template/src/lib/stack-app/apps/implementations/client-app-impl.ts
+++ b/packages/template/src/lib/hexclave-app/apps/implementations/client-app-impl.ts
@@ -624,7 +624,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
     const resolvedOptions = resolveConstructorOptions(options);
 
     if (!_HexclaveClientAppImplIncomplete.LazyStackAdminAppImpl.value) {
-      throw new HexclaveAssertionError("Admin app implementation not initialized. Did you import the _HexclaveClientApp from stack-app/apps/implementations/index.ts? You can't import it directly from ./apps/implementations/client-app-impl.ts as that causes a circular dependency (see the comment at _LazyHexclaveAdminAppImpl for more details).");
+      throw new HexclaveAssertionError("Admin app implementation not initialized. Did you import the _HexclaveClientApp from hexclave-app/apps/implementations/index.ts? You can't import it directly from ./apps/implementations/client-app-impl.ts as that causes a circular dependency (see the comment at _LazyHexclaveAdminAppImpl for more details).");
     }
 
     this._options = resolvedOptions;
diff --git a/packages/template/src/lib/stack-app/apps/implementations/common.ts b/packages/template/src/lib/hexclave-app/apps/implementations/common.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/common.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/common.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/event-tracker.test.ts b/packages/template/src/lib/hexclave-app/apps/implementations/event-tracker.test.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/event-tracker.test.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/event-tracker.test.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/event-tracker.ts b/packages/template/src/lib/hexclave-app/apps/implementations/event-tracker.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/event-tracker.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/event-tracker.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/index.ts b/packages/template/src/lib/hexclave-app/apps/implementations/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/index.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/index.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/redirect-page-urls.ts b/packages/template/src/lib/hexclave-app/apps/implementations/redirect-page-urls.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/redirect-page-urls.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/redirect-page-urls.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts b/packages/template/src/lib/hexclave-app/apps/implementations/server-app-impl.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/server-app-impl.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/server-app-impl.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/session-refresh-subscription.test.ts b/packages/template/src/lib/hexclave-app/apps/implementations/session-refresh-subscription.test.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/session-refresh-subscription.test.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/session-refresh-subscription.test.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/session-refresh-subscription.ts b/packages/template/src/lib/hexclave-app/apps/implementations/session-refresh-subscription.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/session-refresh-subscription.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/session-refresh-subscription.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/session-replay.test.ts b/packages/template/src/lib/hexclave-app/apps/implementations/session-replay.test.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/session-replay.test.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/session-replay.test.ts
diff --git a/packages/template/src/lib/stack-app/apps/implementations/session-replay.ts b/packages/template/src/lib/hexclave-app/apps/implementations/session-replay.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/implementations/session-replay.ts
rename to packages/template/src/lib/hexclave-app/apps/implementations/session-replay.ts
diff --git a/packages/template/src/lib/stack-app/apps/index.ts b/packages/template/src/lib/hexclave-app/apps/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/index.ts
rename to packages/template/src/lib/hexclave-app/apps/index.ts
diff --git a/packages/template/src/lib/stack-app/apps/interfaces/admin-app.ts b/packages/template/src/lib/hexclave-app/apps/interfaces/admin-app.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/interfaces/admin-app.ts
rename to packages/template/src/lib/hexclave-app/apps/interfaces/admin-app.ts
diff --git a/packages/template/src/lib/stack-app/apps/interfaces/client-app.ts b/packages/template/src/lib/hexclave-app/apps/interfaces/client-app.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/interfaces/client-app.ts
rename to packages/template/src/lib/hexclave-app/apps/interfaces/client-app.ts
diff --git a/packages/template/src/lib/stack-app/apps/interfaces/server-app.ts b/packages/template/src/lib/hexclave-app/apps/interfaces/server-app.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/apps/interfaces/server-app.ts
rename to packages/template/src/lib/hexclave-app/apps/interfaces/server-app.ts
diff --git a/packages/template/src/lib/stack-app/common.ts b/packages/template/src/lib/hexclave-app/common.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/common.ts
rename to packages/template/src/lib/hexclave-app/common.ts
diff --git a/packages/template/src/lib/stack-app/connected-accounts/index.ts b/packages/template/src/lib/hexclave-app/connected-accounts/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/connected-accounts/index.ts
rename to packages/template/src/lib/hexclave-app/connected-accounts/index.ts
diff --git a/packages/template/src/lib/stack-app/contact-channels/index.ts b/packages/template/src/lib/hexclave-app/contact-channels/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/contact-channels/index.ts
rename to packages/template/src/lib/hexclave-app/contact-channels/index.ts
diff --git a/packages/template/src/lib/stack-app/customers/index.ts b/packages/template/src/lib/hexclave-app/customers/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/customers/index.ts
rename to packages/template/src/lib/hexclave-app/customers/index.ts
diff --git a/packages/template/src/lib/stack-app/data-vault/index.ts b/packages/template/src/lib/hexclave-app/data-vault/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/data-vault/index.ts
rename to packages/template/src/lib/hexclave-app/data-vault/index.ts
diff --git a/packages/template/src/lib/stack-app/email-templates/index.ts b/packages/template/src/lib/hexclave-app/email-templates/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/email-templates/index.ts
rename to packages/template/src/lib/hexclave-app/email-templates/index.ts
diff --git a/packages/template/src/lib/stack-app/email/index.ts b/packages/template/src/lib/hexclave-app/email/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/email/index.ts
rename to packages/template/src/lib/hexclave-app/email/index.ts
diff --git a/packages/template/src/lib/stack-app/index.ts b/packages/template/src/lib/hexclave-app/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/index.ts
rename to packages/template/src/lib/hexclave-app/index.ts
diff --git a/packages/template/src/lib/stack-app/internal-api-keys/index.ts b/packages/template/src/lib/hexclave-app/internal-api-keys/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/internal-api-keys/index.ts
rename to packages/template/src/lib/hexclave-app/internal-api-keys/index.ts
diff --git a/packages/template/src/lib/stack-app/notification-categories/index.ts b/packages/template/src/lib/hexclave-app/notification-categories/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/notification-categories/index.ts
rename to packages/template/src/lib/hexclave-app/notification-categories/index.ts
diff --git a/packages/template/src/lib/stack-app/permissions/index.ts b/packages/template/src/lib/hexclave-app/permissions/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/permissions/index.ts
rename to packages/template/src/lib/hexclave-app/permissions/index.ts
diff --git a/packages/template/src/lib/stack-app/project-configs/index.ts b/packages/template/src/lib/hexclave-app/project-configs/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/project-configs/index.ts
rename to packages/template/src/lib/hexclave-app/project-configs/index.ts
diff --git a/packages/template/src/lib/stack-app/projects/index.ts b/packages/template/src/lib/hexclave-app/projects/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/projects/index.ts
rename to packages/template/src/lib/hexclave-app/projects/index.ts
diff --git a/packages/template/src/lib/stack-app/session-replays/index.ts b/packages/template/src/lib/hexclave-app/session-replays/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/session-replays/index.ts
rename to packages/template/src/lib/hexclave-app/session-replays/index.ts
diff --git a/packages/template/src/lib/stack-app/teams/index.ts b/packages/template/src/lib/hexclave-app/teams/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/teams/index.ts
rename to packages/template/src/lib/hexclave-app/teams/index.ts
diff --git a/packages/template/src/lib/stack-app/url-targets.test.ts b/packages/template/src/lib/hexclave-app/url-targets.test.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/url-targets.test.ts
rename to packages/template/src/lib/hexclave-app/url-targets.test.ts
diff --git a/packages/template/src/lib/stack-app/url-targets.ts b/packages/template/src/lib/hexclave-app/url-targets.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/url-targets.ts
rename to packages/template/src/lib/hexclave-app/url-targets.ts
diff --git a/packages/template/src/lib/stack-app/users/index.ts b/packages/template/src/lib/hexclave-app/users/index.ts
similarity index 100%
rename from packages/template/src/lib/stack-app/users/index.ts
rename to packages/template/src/lib/hexclave-app/users/index.ts
diff --git a/packages/template/src/lib/hooks.tsx b/packages/template/src/lib/hooks.tsx
index 5e2fa3690..0e7b1a94c 100644
--- a/packages/template/src/lib/hooks.tsx
+++ b/packages/template/src/lib/hooks.tsx
@@ -1,6 +1,6 @@
 import { useContext } from "react";
 import { HexclaveContext } from "../providers/hexclave-context";
-import type { GetUserOptions as AppGetUserOptions, CurrentInternalUser, CurrentUser, StackClientApp } from "./stack-app";
+import type { GetUserOptions as AppGetUserOptions, CurrentInternalUser, CurrentUser, StackClientApp } from "./hexclave-app";
 
 type GetUserOptions = AppGetUserOptions<true> & {
   projectIdMustMatch?: string,
diff --git a/packages/template/src/providers/hexclave-context.tsx b/packages/template/src/providers/hexclave-context.tsx
index fbd587ef5..b0861faaa 100644
--- a/packages/template/src/providers/hexclave-context.tsx
+++ b/packages/template/src/providers/hexclave-context.tsx
@@ -2,7 +2,7 @@
 
 import React from "react";
 import { createGlobal } from "@hexclave/shared/dist/utils/globals";
-import type { StackClientApp } from "../lib/stack-app/apps/interfaces/client-app";
+import type { StackClientApp } from "../lib/hexclave-app/apps/interfaces/client-app";
 
 type HexclaveContextValue = {
   app: StackClientApp<true>,
diff --git a/packages/template/src/providers/hexclave-provider-client.tsx b/packages/template/src/providers/hexclave-provider-client.tsx
index 2e4e06a92..1549b2845 100644
--- a/packages/template/src/providers/hexclave-provider-client.tsx
+++ b/packages/template/src/providers/hexclave-provider-client.tsx
@@ -4,7 +4,7 @@ import { CurrentUserCrud } from "@hexclave/shared/dist/interface/crud/current-us
 import { globalVar } from "@hexclave/shared/dist/utils/globals";
 import React, { useEffect } from "react";
 import { useStackApp } from "../lib/hooks";
-import { StackClientApp, StackClientAppJson, hexclaveAppInternalsSymbol } from "../lib/stack-app";
+import { StackClientApp, StackClientAppJson, hexclaveAppInternalsSymbol } from "../lib/hexclave-app";
 import { HexclaveContext } from "./hexclave-context";
 
 export function HexclaveProviderClient(props: {
diff --git a/packages/template/src/providers/hexclave-provider.tsx b/packages/template/src/providers/hexclave-provider.tsx
index e731ca8e8..4c428c9f5 100644
--- a/packages/template/src/providers/hexclave-provider.tsx
+++ b/packages/template/src/providers/hexclave-provider.tsx
@@ -1,5 +1,5 @@
 import React, { Suspense } from 'react';
-import { StackAdminApp, StackClientApp, StackServerApp, hexclaveAppInternalsSymbol } from '../lib/stack-app';
+import { StackAdminApp, StackClientApp, StackServerApp, hexclaveAppInternalsSymbol } from '../lib/hexclave-app';
 import { HexclaveProviderClient } from './hexclave-provider-client';
 import { TranslationProvider } from './translation-provider';