diff --git a/.changeset/purple-teachers-pull.md b/.changeset/purple-teachers-pull.md
new file mode 100644
index 0000000000..a845151cc8
--- /dev/null
+++ b/.changeset/purple-teachers-pull.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/apps/docs/config/routes.json b/apps/docs/config/routes.json
index f1ec7ce7b2..cbf86f8f6b 100644
--- a/apps/docs/config/routes.json
+++ b/apps/docs/config/routes.json
@@ -91,7 +91,7 @@
         {
           "key": "laravel",
           "title": "Laravel",
-          "keywords": "laravel, nextui",
+          "keywords": "laravel, heroui",
           "path": "/docs/frameworks/laravel.mdx",
           "newPost": true
         }
diff --git a/apps/docs/content/blog/introducing-heroui.mdx b/apps/docs/content/blog/introducing-heroui.mdx
index aeba71dcfa..0586780ce3 100644
--- a/apps/docs/content/blog/introducing-heroui.mdx
+++ b/apps/docs/content/blog/introducing-heroui.mdx
@@ -3,7 +3,7 @@ title: "Introducing HeroUI"
 description: "HeroUI is the new identity for NextUI, bringing the same beautiful components and features you love under a new name."
 date: "2025-01-16"
 image: "/blog/introducing-heroui.png"
-tags: ["nextui", "select", "listbox", "scroll-shadow", "multi-select"]
+tags: ["nextui", "heroui", "select", "listbox", "scroll-shadow", "multi-select"]
 author:
   name: "Junior Garcia"
   username: "@jrgarciadev"
@@ -85,7 +85,7 @@ Our 2025 roadmap is packed with exciting new features and components. Upcoming r
 As always, we are incredibly grateful for your continued support and contributions. There are many exciting milestones ahead, and we invite you to join us on this journey.
 
 
-Special thanks to our amazing team members who made this rebranding possible after a lot of hard work and dedication [@winchesHe](https://github.com/winchesHe), 
+Special thanks to our amazing team members who made this rebranding possible after a lot of hard work and dedication [@winchesHe](https://github.com/winchesHe),
 [@wingkwong](https://github.com/wingkwong), [@Peterl561](https://github.com/Peterl561), [@macci001](https://github.com/macci001), [@vinroger](https://github.com/vinroger), [@ryo-manba](https://github.com/ryo-manba), [@tianenpang](https://github.com/tianenpang),
 [@andressul_](https://x.com/andressul_), [@danieloiteiro](https://dribbble.com/DanielOiteiro/about), [@jrgarciadev](https://x.com/jrgarciadev). 🚀
 
diff --git a/apps/docs/content/docs/frameworks/nextjs.mdx b/apps/docs/content/docs/frameworks/nextjs.mdx
index 9b6fde3809..d4452f8572 100644
--- a/apps/docs/content/docs/frameworks/nextjs.mdx
+++ b/apps/docs/content/docs/frameworks/nextjs.mdx
@@ -295,9 +295,9 @@ If you are starting a new project, you can run one of the following commands to
 
 <PackageManagers
   commands={{
-    npm: 'npx create-next-app -e https://github.com/heroui-org/next-pages-template',
-    yarn: 'yarn create next-app -e https://github.com/heroui-org/next-pages-template',
-    pnpm: 'pnpm create next-app -e https://github.com/heroui-org/next-pages-template'
+    npm: 'npx create-next-app -e https://github.com/heroui-inc/next-pages-template',
+    yarn: 'yarn create next-app -e https://github.com/heroui-inc/next-pages-template',
+    pnpm: 'pnpm create next-app -e https://github.com/heroui-inc/next-pages-template'
   }}
 />
 
diff --git a/apps/docs/content/docs/guide/cli.mdx b/apps/docs/content/docs/guide/cli.mdx
index e5e9789d2e..49a333bdbb 100644
--- a/apps/docs/content/docs/guide/cli.mdx
+++ b/apps/docs/content/docs/guide/cli.mdx
@@ -340,4 +340,4 @@ Environment Info:
 
 Explore the complete CLI commands and features in the [API References](/docs/api-references/cli-api).
 
-For updates and source code, visit the [GitHub Repository](https://github.com/heroui-org/heroui-cli).
+For updates and source code, visit the [GitHub Repository](https://github.com/heroui-inc/heroui-cli).
diff --git a/apps/docs/content/docs/guide/figma.mdx b/apps/docs/content/docs/guide/figma.mdx
index 7b9cc6d0d5..79625b61b9 100644
--- a/apps/docs/content/docs/guide/figma.mdx
+++ b/apps/docs/content/docs/guide/figma.mdx
@@ -10,7 +10,7 @@ HeroUI components recreated in Figma. It includes components, colors, and typogr
 <iframe
   className="w-full border border-transparent dark:border-default-200/50 object-fit rounded-xl shadow-lg aspect-video"
   height="600"
-  src="https://embed.figma.com/file/1267584376234254760/hf_embed?community_viewer=true&embed_host=nextui"
+  src="https://embed.figma.com/file/1267584376234254760/hf_embed?community_viewer=true&embed_host=heroui"
   title="HeroUI Figma Kit"
   width="800"
 />
diff --git a/apps/docs/utils/get-sponsors.ts b/apps/docs/utils/get-sponsors.ts
index 3610f75d2c..62f4f09868 100644
--- a/apps/docs/utils/get-sponsors.ts
+++ b/apps/docs/utils/get-sponsors.ts
@@ -10,7 +10,7 @@ export const getSponsors = async () => {
     // if (!__PROD__) {
     //   return mockData;
     // }
-    const res = await fetch("https://opencollective.com/nextui/members/all.json");
+    const res = await fetch("https://opencollective.com/heroui/members/all.json");
     const data = (await res.json()) as Sponsor[];
 
     // filter out repeated sponsors
diff --git a/packages/components/accordion/README.md b/packages/components/accordion/README.md
index e72584032f..f9284fd44d 100644
--- a/packages/components/accordion/README.md
+++ b/packages/components/accordion/README.md
@@ -1,4 +1,4 @@
-# @heroui-org/accordion
+# @heroui-inc/accordion
 
 Accordion display a list of high-level options that can expand/collapse to reveal more information.
 
diff --git a/packages/core/react/README.md b/packages/core/react/README.md
index 1699613a16..a11dfd6aa0 100644
--- a/packages/core/react/README.md
+++ b/packages/core/react/README.md
@@ -7,13 +7,13 @@
 </br>
 <p align="center">
   <a href="https://github.com/heroui-inc/heroui/blob/main/LICENSE">
-    <img src="https://img.shields.io/npm/l/@nextui-org/react?style=flat" alt="License">
+    <img src="https://img.shields.io/npm/l/@heroui/react?style=flat" alt="License">
   </a>
   <a href="https://codecov.io/gh/jrgarciadev/nextui">
     <img src="https://codecov.io/gh/jrgarciadev/nextui/branch/main/graph/badge.svg?token=QJF2QKR5N4" alt="codecov badge">
   </a>
   <!-- <a href="https://github.com/heroui-inc/heroui/actions/workflows/main.yaml">
-    <img src="https://github.com/heroui-inc/heroui/actions/workflows/main.yaml/badge.svg" alt="CI/CD nextui">
+    <img src="https://github.com/heroui-inc/heroui/actions/workflows/main.yaml/badge.svg" alt="CI/CD heroui">
   </a> -->
   <a href="https://www.npmjs.com/package/@heroui/react">
     <img src="https://img.shields.io/npm/dm/@heroui/react.svg?style=flat-round" alt="npm downloads">
diff --git a/packages/core/system/README.md b/packages/core/system/README.md
index 2997d17c6c..ee5aeb78a1 100644
--- a/packages/core/system/README.md
+++ b/packages/core/system/README.md
@@ -1,6 +1,6 @@
 # @heroui/system
 
-NextUI system primitives, here you can find the `extendVariants` utility, `HeroUIProvider` and some other utilities.
+HeroUI system primitives, here you can find the `extendVariants` utility, `HeroUIProvider` and some other utilities.
 
 Please refer to the [documentation](https://heroui.com) for more information.
 
diff --git a/packages/core/theme/README.md b/packages/core/theme/README.md
index 4921528361..db4b54f0b1 100644
--- a/packages/core/theme/README.md
+++ b/packages/core/theme/README.md
@@ -1,6 +1,6 @@
 # @heroui/theme
 
-NextUI theme primitives, here you can find the TailwindCSS `plugin`, `colors`, `layout`, `spacing`, `typography` and some other utilities.
+HeroUI theme primitives, here you can find the TailwindCSS `plugin`, `colors`, `layout`, `spacing`, `typography` and some other utilities.
 
 Please refer to the [documentation](https://heroui.com/theme) for more information.
 
diff --git a/plop/component/src/use-{{componentName}}.ts.hbs b/plop/component/src/use-{{componentName}}.ts.hbs
index c22fc04fa1..28b23b445d 100644
--- a/plop/component/src/use-{{componentName}}.ts.hbs
+++ b/plop/component/src/use-{{componentName}}.ts.hbs
@@ -1,12 +1,12 @@
 import type { {{capitalize componentName}}VariantProps } from "@heroui/theme";
 
-import {HTMLNextUIProps,mapPropsVariants} from "@heroui/system";
+import {HTMLHeroUIProps, mapPropsVariants} from "@heroui/system";
 import { {{componentName}} } from "@heroui/theme";
 import {ReactRef, useDOMRef} from "@heroui/react-utils";
 import {objectToDeps} from "@heroui/shared-utils";
 import {useMemo} from "react";
 
-interface Props extends HTMLNextUIProps<"div"> {
+interface Props extends HTMLHeroUIProps<"div"> {
   /**
    * Ref to the DOM node.
    */
diff --git a/plop/component/src/{{componentName}}.tsx.hbs b/plop/component/src/{{componentName}}.tsx.hbs
index 98233e08e6..159c7250c9 100644
--- a/plop/component/src/{{componentName}}.tsx.hbs
+++ b/plop/component/src/{{componentName}}.tsx.hbs
@@ -14,6 +14,6 @@ const {{capitalize componentName}} = forwardRef<"div", {{capitalize componentNam
   );
 });
 
-{{capitalize componentName}}.displayName = "NextUI.{{capitalize componentName}}";
+{{capitalize componentName}}.displayName = "HeroUI.{{capitalize componentName}}";
 
 export default {{capitalize componentName}};