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 ff8aa8dbc..963cf2e82 100644
--- a/packages/template/src/components-page/cli-auth-confirm.test.tsx
+++ b/packages/template/src/components-page/cli-auth-confirm.test.tsx
@@ -6,7 +6,7 @@ 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 { HexclaveContext } from "../providers/stack-context";
+import { HexclaveContext } from "../providers/hexclave-context";
 import { useCliAuthConfirmation } from "./cli-auth-confirm";
 
 const previousActEnvironment = Reflect.get(globalThis, "IS_REACT_ACT_ENVIRONMENT");
diff --git a/packages/template/src/components-page/stack-handler-client.tsx b/packages/template/src/components-page/hexclave-handler-client.tsx
similarity index 100%
rename from packages/template/src/components-page/stack-handler-client.tsx
rename to packages/template/src/components-page/hexclave-handler-client.tsx
diff --git a/packages/template/src/components-page/stack-handler.tsx b/packages/template/src/components-page/hexclave-handler.tsx
similarity index 93%
rename from packages/template/src/components-page/stack-handler.tsx
rename to packages/template/src/components-page/hexclave-handler.tsx
index 3f56fe15e..194a15638 100644
--- a/packages/template/src/components-page/stack-handler.tsx
+++ b/packages/template/src/components-page/hexclave-handler.tsx
@@ -4,7 +4,7 @@
 //     Only plain objects, and a few built-ins, can be passed to Client Components from Server Components. Classes or null prototypes are not supported.
 // This file exists as a component that can be both client and server, ignores the non-serializable props, and returns <HexclaveHandlerClient />
 
-import { BaseHandlerProps, HexclaveHandlerClient } from "./stack-handler-client";
+import { BaseHandlerProps, HexclaveHandlerClient } from "./hexclave-handler-client";
 
 type HexclaveHandlerProps = BaseHandlerProps & { location?: string } & {
   /**
@@ -39,6 +39,6 @@ export const HexclaveHandler = HandlerImpl;
 export const StackHandler = HandlerImpl;
 
 // Default export preserved for backwards compatibility (legacy `as`-rename re-exports).
-// Points at the deprecated alias so that `import StackHandler from ".../stack-handler"` still
+// Points at the deprecated alias so that `import StackHandler from ".../hexclave-handler"` still
 // surfaces the deprecation. Internal re-exports in template/src/index.ts use the named exports.
 export default StackHandler;
diff --git a/packages/template/src/index.ts b/packages/template/src/index.ts
index e5170583c..429b0016d 100644
--- a/packages/template/src/index.ts
+++ b/packages/template/src/index.ts
@@ -10,9 +10,9 @@ export { defineHexclaveConfig, defineStackConfig } from "@hexclave/shared/config
 export type { AnalyticsOptions, AnalyticsReplayOptions } from "./lib/stack-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/stack-handler";
+export { HexclaveHandler, StackHandler } from "./components-page/hexclave-handler";
 export { useHexclaveApp, useStackApp } from "./lib/hooks";
-export { HexclaveProvider, StackProvider } from "./providers/stack-provider";
+export { HexclaveProvider, StackProvider } from "./providers/hexclave-provider";
 export { HexclaveTheme, StackTheme } from './providers/theme-provider';
 export { useUser } from "./lib/hooks";
 
diff --git a/packages/template/src/lib/hooks.tsx b/packages/template/src/lib/hooks.tsx
index 83624cf66..5e2fa3690 100644
--- a/packages/template/src/lib/hooks.tsx
+++ b/packages/template/src/lib/hooks.tsx
@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { HexclaveContext } from "../providers/stack-context";
+import { HexclaveContext } from "../providers/hexclave-context";
 import type { GetUserOptions as AppGetUserOptions, CurrentInternalUser, CurrentUser, StackClientApp } from "./stack-app";
 
 type GetUserOptions = AppGetUserOptions<true> & {
diff --git a/packages/template/src/providers/stack-context.tsx b/packages/template/src/providers/hexclave-context.tsx
similarity index 100%
rename from packages/template/src/providers/stack-context.tsx
rename to packages/template/src/providers/hexclave-context.tsx
diff --git a/packages/template/src/providers/stack-provider-client.tsx b/packages/template/src/providers/hexclave-provider-client.tsx
similarity index 96%
rename from packages/template/src/providers/stack-provider-client.tsx
rename to packages/template/src/providers/hexclave-provider-client.tsx
index 2561c14e0..2e4e06a92 100644
--- a/packages/template/src/providers/stack-provider-client.tsx
+++ b/packages/template/src/providers/hexclave-provider-client.tsx
@@ -5,7 +5,7 @@ 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 { HexclaveContext } from "./stack-context";
+import { HexclaveContext } from "./hexclave-context";
 
 export function HexclaveProviderClient(props: {
   app: StackClientAppJson<true, string> | StackClientApp<true>,
diff --git a/packages/template/src/providers/stack-provider.tsx b/packages/template/src/providers/hexclave-provider.tsx
similarity index 98%
rename from packages/template/src/providers/stack-provider.tsx
rename to packages/template/src/providers/hexclave-provider.tsx
index 3292ffbdb..e731ca8e8 100644
--- a/packages/template/src/providers/stack-provider.tsx
+++ b/packages/template/src/providers/hexclave-provider.tsx
@@ -1,6 +1,6 @@
 import React, { Suspense } from 'react';
 import { StackAdminApp, StackClientApp, StackServerApp, hexclaveAppInternalsSymbol } from '../lib/stack-app';
-import { HexclaveProviderClient } from './stack-provider-client';
+import { HexclaveProviderClient } from './hexclave-provider-client';
 import { TranslationProvider } from './translation-provider';
 
 // IF_PLATFORM next