diff --git a/.changeset/pre.json b/.changeset/pre.json
index be6d29e..21cc86f 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -2,8 +2,8 @@
   "mode": "pre",
   "tag": "alpha",
   "initialVersions": {
-    "@create-stapler-app/cli": "0.1.0",
-    "@create-stapler-app/core": "0.1.0"
+    "@tonik/create-stapler-app": "0.1.0",
+    "@tonik/create-stapler-app-core": "0.1.0"
   },
   "changesets": []
 }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 16ea179..49e4385 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,15 +15,13 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Node.js 20.x
+      - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 20.x
+          node-version: 20.9.0
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 9.6.0
+        uses: pnpm/action-setup@v4
 
       - name: Install Dependencies
         run: pnpm install
diff --git a/packages/cli/index.ts b/packages/cli/index.ts
index 3e31020..a0424ad 100644
--- a/packages/cli/index.ts
+++ b/packages/cli/index.ts
@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { Command } from 'commander';
 import gradient from 'gradient-string';
 import inquirer from 'inquirer';
-import { createProject } from '@create-stapler-app/core';
+import { createProject } from '@tonik/create-stapler-app-core';
 
 const asciiArt = `
 .&&&%                                                         &&&&                                    
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bfd1109..1adf245 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -15,7 +15,7 @@
     "dev": "tsc -w"
   },
   "dependencies": {
-    "@create-stapler-app/core": "workspace:*",
+    "@tonik/create-stapler-app-core": "workspace:*",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "gradient-string": "^3.0.0",
diff --git a/packages/core/package.json b/packages/core/package.json
index 510db25..a356122 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@create-stapler-app/core",
+  "name": "@tonik/create-stapler-app-core",
   "version": "0.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e32802e..7867927 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -93,7 +93,7 @@ importers:
 
   packages/cli:
     dependencies:
-      '@create-stapler-app/core':
+      '@tonik/create-stapler-app-core':
         specifier: workspace:*
         version: link:../core
       chalk: