diff --git a/README.md b/README.md
index 4e17778f6..e6f3cc880 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 ![Stack Logo](/assets/logo.png)
 
 <h3 align="center">
-    <a href="https://docs.stackframe.co">📘 Documentation</a>
-    | <a href="https://stackframe-demo.vercel.app/">Demo</a>
-    | <a href="https://stackframe.co/">Stackframe</a>
+    <a href="https://docs.stack-auth.com">📘 Documentation</a>
+    | <a href="https://demo.stack-auth.com/">Demo</a>
+    | <a href="https://stack-auth.com/">Website</a>
     | <a href="https://discord.gg/pD4nyYyKrb">Discord</a>
 </h4>
 
@@ -49,7 +49,7 @@ To get started with Stack, you need to [create a Next.js project](https://nextjs
 npm install @stackframe/stack
 ```
 
-For setup, refer to [our documentation](https://docs.stackframe.co).
+For setup, refer to [our documentation](https://docs.stack-auth.com).
 
 ## Development
 
diff --git a/docs/.env b/docs/.env
index aaa5ff6e3..ae8d0d62f 100644
--- a/docs/.env
+++ b/docs/.env
@@ -1,2 +1,2 @@
-STACKFRAME_URL=https://stackframe.co
+STACKFRAME_URL=https://stack-auth.com
 STACK_HEAD_TAGS=[]
diff --git a/docs/docs/01-getting-started/01-setup.md b/docs/docs/01-getting-started/01-setup.md
index 0bf31665e..1d902f6f8 100644
--- a/docs/docs/01-getting-started/01-setup.md
+++ b/docs/docs/01-getting-started/01-setup.md
@@ -21,7 +21,7 @@ npm install @stackframe/stack
 
 ## Setup
 
-1. If you haven't already, [register a new account on Stack](https://app.stackframe.co/handler/signup). Create a project in the dashboard, create a new API key from the left sidebar, and copy the project ID, publishable client key, and secret server key into a new file called `.env.local` in the root of your Next.js project:
+1. If you haven't already, [register a new account on Stack](https://app.stack-auth.com/handler/signup). Create a project in the dashboard, create a new API key from the left sidebar, and copy the project ID, publishable client key, and secret server key into a new file called `.env.local` in the root of your Next.js project:
 
     ```javascript
     NEXT_PUBLIC_STACK_PROJECT_ID=<your-project-id>
diff --git a/docs/docs/03-api-documentation/01-app.md b/docs/docs/03-api-documentation/01-app.md
index 334951739..96d84aa16 100644
--- a/docs/docs/03-api-documentation/01-app.md
+++ b/docs/docs/03-api-documentation/01-app.md
@@ -99,4 +99,4 @@ export const stackApp = new StackServerApp({
 
     The URL of the handler root. If you want to change the URL of your handler to something other than `/handler`, you can change it here. 
 
-    Note that you also need to change the `[...stack]/page.tsx` file to the corresponding location. When you want to use your website in a non-local environment, you need to change the handler URL in the Stackframe dashboard as well.
\ No newline at end of file
+    Note that you also need to change the `[...stack]/page.tsx` file to the corresponding location. When you want to use your website in a non-local environment, you need to change the handler URL in the Stack dashboard as well.
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index ac59f12ac..842d586eb 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -13,7 +13,7 @@ const config = {
   favicon: "img/favicon.ico",
 
   // Set the production url of your site here
-  url: "https://docs.stackframe.co",
+  url: "https://docs.stack-auth.com",
   // Set the /<baseUrl>/ pathname under which your site is served
   // For GitHub pages deployment, it is often '/<projectName>/'
   baseUrl: "/",
@@ -79,7 +79,7 @@ const config = {
           },
           {
             href: process.env.STACKFRAME_URL,
-            label: "Stackframe",
+            label: "Stack",
             position: "left",
           },
           {
diff --git a/packages/stack-server/.env b/packages/stack-server/.env
index fea17caf6..741f81298 100644
--- a/packages/stack-server/.env
+++ b/packages/stack-server/.env
@@ -22,5 +22,5 @@ STACK_ACCESS_TOKEN_EXPIRATION_TIME=# enter the expiration time for the access to
 
 NEXT_PUBLIC_STACK_HEAD_TAGS=[{ "tagName": "script", "attributes": {}, "innerHTML": "// insert head tags here" }]
 
-NEXT_PUBLIC_DOC_URL=https://docs.stackframe.co
+NEXT_PUBLIC_DOC_URL=https://docs.stack-auth.com
 
diff --git a/packages/stack-server/src/app/api/v1/route.ts b/packages/stack-server/src/app/api/v1/route.ts
index 4f8322d57..5c605ed3f 100644
--- a/packages/stack-server/src/app/api/v1/route.ts
+++ b/packages/stack-server/src/app/api/v1/route.ts
@@ -14,7 +14,7 @@ export const GET = smartRouteHandler({
     return {
       statusCode: 200,
       bodyType: "text",
-      body: "Welcome to the Stack API endpoint! Please refer to the documentation at https://docs.stackframe.co.",
+      body: "Welcome to the Stack API endpoint! Please refer to the documentation at https://docs.stack-auth.com.",
     };
   },
 });
diff --git a/packages/stack/src/lib/stack-app.ts b/packages/stack/src/lib/stack-app.ts
index e4880c251..f716de190 100644
--- a/packages/stack/src/lib/stack-app.ts
+++ b/packages/stack/src/lib/stack-app.ts
@@ -113,7 +113,7 @@ export type StackClientAppJson<HasTokenStore extends boolean, ProjectId extends
   currentProjectJson: ClientProjectJson,
 };
 
-const defaultBaseUrl = "https://app.stackframe.co";
+const defaultBaseUrl = "https://app.stack-auth.com";
 
 function createEmptyTokenStore() {
   const store = new AsyncStore<TokenObject>();