diff --git a/docs/package.json b/docs/package.json
index 2a25442..90103ea 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,17 +1,17 @@
 {
-  "name": "@ai-form-toolkit/docs",
+  "name": "@gptbundle/docs",
   "version": "0.0.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "prebuild": "pnpm -F @ai-form-toolkit/server build && pnpm -F @ai-form-toolkit/client build",
+    "prebuild": "pnpm -F @gptbundle/server build && pnpm -F @gptbundle/client build",
     "build": "pnpm run prebuild && next build",
     "analyze": "ANALYZE=true next build",
     "start": "next start"
   },
   "dependencies": {
-    "@ai-form-toolkit/client": "workspace:../packages/client",
-    "@ai-form-toolkit/server": "workspace:../packages/server",
+    "@gptbundle/client": "workspace:../packages/client",
+    "@gptbundle/server": "workspace:../packages/server",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@mdx-js/react": "^3.0.0",
diff --git a/docs/src/app/examples/assistant/gen-with-assistant/page.tsx b/docs/src/app/examples/assistant/gen-with-assistant/page.tsx
index d2adf18..66c7af8 100644
--- a/docs/src/app/examples/assistant/gen-with-assistant/page.tsx
+++ b/docs/src/app/examples/assistant/gen-with-assistant/page.tsx
@@ -8,7 +8,7 @@ import ListAltOutlinedIcon from '@mui/icons-material/ListAltOutlined';
 import PsychologyOutlinedIcon from '@mui/icons-material/PsychologyOutlined';
 
 import { useRequestDialog } from '../../../requestDialog';
-import { useGeneratedFormSchema, useFormAssistant } from '@ai-form-toolkit/client';
+import { useGeneratedFormSchema, useFormAssistant } from '@gptbundle/client';
 import LoadingBackdrop from '@/components/Examples/LoadingBackdrop';
 import SchemaFormDemo from '@/components/Forms/SchemaFormDemo';
 import { h2Styles, boxForms } from '../../../../app/examples/formStyles';
diff --git a/docs/src/app/examples/assistant/multi-field-assistant/page.tsx b/docs/src/app/examples/assistant/multi-field-assistant/page.tsx
index bbc4e49..182d58e 100644
--- a/docs/src/app/examples/assistant/multi-field-assistant/page.tsx
+++ b/docs/src/app/examples/assistant/multi-field-assistant/page.tsx
@@ -7,7 +7,7 @@ import AutoFixHighOutlinedIcon from '@mui/icons-material/AutoFixHighOutlined';
 import PsychologyOutlinedIcon from '@mui/icons-material/PsychologyOutlined';
 
 import { useRequestDialog } from '../../../requestDialog';
-import { useFormAssistant } from '@ai-form-toolkit/client';
+import { useFormAssistant } from '@gptbundle/client';
 import { h2Styles, boxForms } from '../../../../app/examples/formStyles';
 
 const CATEGORY_CHOICES = ['Bug', 'Feature', 'Improvement'];
diff --git a/docs/src/app/examples/assistant/single-field-assistant/page.tsx b/docs/src/app/examples/assistant/single-field-assistant/page.tsx
index 1a51c65..c8c2942 100644
--- a/docs/src/app/examples/assistant/single-field-assistant/page.tsx
+++ b/docs/src/app/examples/assistant/single-field-assistant/page.tsx
@@ -5,7 +5,7 @@ import { Button, TextField, Typography, Stack } from '@mui/material';
 import { LoadingButton } from '@mui/lab';
 import TipsAndUpdatesOutlinedIcon from '@mui/icons-material/TipsAndUpdatesOutlined';
 import { useRequestDialog } from '../../../requestDialog';
-import { useFormAssistant } from '@ai-form-toolkit/client';
+import { useFormAssistant } from '@gptbundle/client';
 import { h2Styles, boxForms } from '../../../../app/examples/formStyles';
 
 export default function SingleFieldFormAssistant() {
diff --git a/docs/src/app/examples/generation/checklist/page.tsx b/docs/src/app/examples/generation/checklist/page.tsx
index 7375ee1..47d9369 100644
--- a/docs/src/app/examples/generation/checklist/page.tsx
+++ b/docs/src/app/examples/generation/checklist/page.tsx
@@ -8,7 +8,7 @@ import { RJSFSchema } from '@rjsf/utils';
 import ListAltOutlinedIcon from '@mui/icons-material/ListAltOutlined';
 
 import { useRequestDialog } from '../../../requestDialog';
-import { useGeneratedFormSchema } from '@ai-form-toolkit/client';
+import { useGeneratedFormSchema } from '@gptbundle/client';
 import LoadingBackdrop from '@/components/Examples/LoadingBackdrop';
 import SchemaFormDemo from '@/components/Forms/SchemaFormDemo';
 
diff --git a/docs/src/app/examples/generation/dynamic-form/page.tsx b/docs/src/app/examples/generation/dynamic-form/page.tsx
index 7caa8ab..9c66d06 100644
--- a/docs/src/app/examples/generation/dynamic-form/page.tsx
+++ b/docs/src/app/examples/generation/dynamic-form/page.tsx
@@ -8,7 +8,7 @@ import { RJSFSchema } from '@rjsf/utils';
 import { IChangeEvent } from '@rjsf/core';
 
 import { useRequestDialog } from '../../../requestDialog';
-import { useGeneratedFormSchema } from '@ai-form-toolkit/client';
+import { useGeneratedFormSchema } from '@gptbundle/client';
 import LoadingBackdrop from '@/components/Examples/LoadingBackdrop';
 import SchemaFormDemo from '@/components/Forms/SchemaFormDemo';
 
diff --git a/docs/src/app/examples/generation/entity-relationship-form/page.tsx b/docs/src/app/examples/generation/entity-relationship-form/page.tsx
index f54b97c..00953bd 100644
--- a/docs/src/app/examples/generation/entity-relationship-form/page.tsx
+++ b/docs/src/app/examples/generation/entity-relationship-form/page.tsx
@@ -9,7 +9,7 @@ import { IChangeEvent } from '@rjsf/core';
 import dedent from 'dedent';
 
 import { useRequestDialog } from '../../../requestDialog';
-import { useGeneratedFormSchema } from '@ai-form-toolkit/client';
+import { useGeneratedFormSchema } from '@gptbundle/client';
 import LoadingBackdrop from '@/components/Examples/LoadingBackdrop';
 import SchemaFormDemo from '@/components/Forms/SchemaFormDemo';
 
diff --git a/docs/src/app/examples/generation/exam-form/page.tsx b/docs/src/app/examples/generation/exam-form/page.tsx
index 79b4116..ec0ffd3 100644
--- a/docs/src/app/examples/generation/exam-form/page.tsx
+++ b/docs/src/app/examples/generation/exam-form/page.tsx
@@ -10,7 +10,7 @@ import { IChangeEvent } from '@rjsf/core';
 import dedent from 'dedent';
 
 import { useRequestDialog } from '../../../requestDialog';
-import { useGeneratedFormSchema } from '@ai-form-toolkit/client';
+import { useGeneratedFormSchema } from '@gptbundle/client';
 import LoadingBackdrop from '@/components/Examples/LoadingBackdrop';
 import SchemaFormDemo from '@/components/Forms/SchemaFormDemo';
 
diff --git a/docs/src/app/examples/generation/legal-form/page.tsx b/docs/src/app/examples/generation/legal-form/page.tsx
index 9b53604..7baabe7 100644
--- a/docs/src/app/examples/generation/legal-form/page.tsx
+++ b/docs/src/app/examples/generation/legal-form/page.tsx
@@ -8,7 +8,7 @@ import { RJSFSchema } from '@rjsf/utils';
 import ListAltOutlinedIcon from '@mui/icons-material/ListAltOutlined';
 
 import { useRequestDialog } from '../../../requestDialog';
-import { useGeneratedFormSchema } from '@ai-form-toolkit/client';
+import { useGeneratedFormSchema } from '@gptbundle/client';
 import LoadingBackdrop from '@/components/Examples/LoadingBackdrop';
 import SchemaFormDemo from '@/components/Forms/SchemaFormDemo';
 
diff --git a/docs/src/app/layout.tsx b/docs/src/app/layout.tsx
index f1fc81b..f5b8a5d 100644
--- a/docs/src/app/layout.tsx
+++ b/docs/src/app/layout.tsx
@@ -1,12 +1,12 @@
 import HolyLoader from 'holy-loader';
 import React, { ReactNode } from 'react';
-import { AIFormToolkitConfig } from '@ai-form-toolkit/client';
+import { GptBundleConfig } from '@gptbundle/client';
 import {
   customGenerateGPTFormAutofill,
   customGenerateGPTFormSchema,
   AssistantArgsType,
   GeneratorArgsType,
-} from '@ai-form-toolkit/server';
+} from '@gptbundle/server';
 import MuiThemeWrapper from '@/MuiThemeWrapper';
 import MDXProviderWrapper from '@/MDXProviderWrapper';
 
@@ -40,7 +40,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
       </head>
       <body>
         <HolyLoader />
-        <AIFormToolkitConfig
+        <GptBundleConfig
           generateFormAutofillFn={myGenerateGPTFormAutofill}
           generateFormSchemaFn={myGenerateGPTFormSchema}
         />
diff --git a/docs/src/app/tutorial/form-assistant/content.mdx b/docs/src/app/tutorial/form-assistant/content.mdx
index 885d697..2aaf767 100644
--- a/docs/src/app/tutorial/form-assistant/content.mdx
+++ b/docs/src/app/tutorial/form-assistant/content.mdx
@@ -141,7 +141,7 @@ const { fillFields } = useFormAssistant({
 
 ### Field Assistant Examples
 
-Get creative! Check [the examples](/examples/assistant/field-assistant/) for some ideas:
+Get creative! Check [the examples](/examples) for some ideas:
 
 - You can add a button next to certain fields to trigger the AI assistant to fill only that field.
 - You can add a button to autofill the whole form based on what's already filled and the form field names.
diff --git a/docs/src/app/tutorial/getting-started.mdx b/docs/src/app/tutorial/getting-started.mdx
index 2e00c48..aba44ea 100644
--- a/docs/src/app/tutorial/getting-started.mdx
+++ b/docs/src/app/tutorial/getting-started.mdx
@@ -42,7 +42,7 @@ You can find [a list of all examples here.](/examples) Feel free to explore all
 
 ## Community
 - Contributing - GPTBundle is open source because we believe that streamlining AI is based on transparency. If you are interested contributing to GPTBundle, [check out our GitHub page.](https://github.com/vintasoftware/GPTBundle)
-- Reddit - Join the conversation by [checking us out on Reddit]().
+- Reddit (TBA) - Join the conversation by [checking us out on Reddit]().
 - Support - This project is primarily maintained by Vinta Software. If you require assistance, our team is ready and willing to help. Please feel free to reach out to us via email at [gptbundle@vintasoftware.com.](mailto:gptbundle@vintasoftware.com)
 
 ## Getting Started
@@ -62,7 +62,7 @@ OPENAI_API_KEY=...
 ```
 
 Use the `GptBundleConfig` to provide the action functions from server package to the client-side.
-In Next.js, do that in your [root layout](https:/nextjs.org/docs/app/api-reference/file-conventions/layout):
+In Next.js, do that in your [root layout](https://nextjs.org/docs/app/api-reference/file-conventions/layout):
 
 ```jsx {8-11}
 import { GptBundleConfig } from '@gptbundle/client';
diff --git a/package.json b/package.json
index db5651f..4ce5e77 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ai-form-toolkit",
+  "name": "gptbundle",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -22,8 +22,8 @@
     "test:cov": "jest --coverage",
     "test:watch": "jest --watch",
     "prepare": "husky install",
-    "build": "pnpm -F @ai-form-toolkit/server build && pnpm -F @ai-form-toolkit/client build",
-    "build:watch": "pnpm -F @ai-form-toolkit/server build:watch & pnpm -F @ai-form-toolkit/client build:watch"
+    "build": "pnpm -F @gptbundle/server build && pnpm -F @gptbundle/client build",
+    "build:watch": "pnpm -F @gptbundle/server build:watch & pnpm -F @gptbundle/client build:watch"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index feefade..cf8219c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@ai-form-toolkit/client",
+  "name": "@gptbundle/client",
   "version": "0.0.1",
   "type": "module",
   "files": [
diff --git a/packages/client/src/components/AIFormToolkitConfig.ts b/packages/client/src/components/GptBundleConfig.ts
similarity index 77%
rename from packages/client/src/components/AIFormToolkitConfig.ts
rename to packages/client/src/components/GptBundleConfig.ts
index ee4e146..8140d01 100644
--- a/packages/client/src/components/AIFormToolkitConfig.ts
+++ b/packages/client/src/components/GptBundleConfig.ts
@@ -2,7 +2,7 @@
 
 import { SettingsType, settings } from '../settings';
 
-export function AIFormToolkitConfig(apiSettings: SettingsType) {
+export function GptBundleConfig(apiSettings: SettingsType) {
   settings.generateFormAutofillFn = apiSettings.generateFormAutofillFn;
   settings.generateFormSchemaFn = apiSettings.generateFormSchemaFn;
   return null;
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index a426e69..c175c73 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,4 +1,4 @@
 export * from './settings';
 export * from './hooks/form-assistant';
 export * from './hooks/form-gen';
-export * from './components/AIFormToolkitConfig';
+export * from './components/GptBundleConfig';
diff --git a/packages/server/package.json b/packages/server/package.json
index 934f365..277c15a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@ai-form-toolkit/server",
+  "name": "@gptbundle/server",
   "version": "0.0.1",
   "type": "module",
   "files": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c82c6b3..248fedd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -111,10 +111,10 @@ importers:
 
   docs:
     dependencies:
-      '@ai-form-toolkit/client':
+      '@gptbundle/client':
         specifier: workspace:../packages/client
         version: link:../packages/client
-      '@ai-form-toolkit/server':
+      '@gptbundle/server':
         specifier: workspace:../packages/server
         version: link:../packages/server
       '@emotion/react':
diff --git a/tsconfig.base.json b/tsconfig.base.json
index bc12782..d8f6ada 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -12,7 +12,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "@ai-form-toolkit/*": ["./packages/*/src"],
+      "@gptbundle/*": ["./packages/*/src"],
       "@docs/*": ["./docs/src"]
     }
   }
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 1c29678..edbb481 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -22,7 +22,7 @@
     "noEmit": true,
     "strict": true,
     "paths": {
-      "@ai-form-toolkit/*": ["./packages/*/src"],
+      "@gptbundle/*": ["./packages/*/src"],
       "@docs/*": ["./docs/src"]
     }
   }