diff --git a/BUILD.md b/BUILD.md
index 5d352b73..0ae1909f 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -13,7 +13,7 @@ This guide explains how to build distributable binaries for CodeNomad.
 All commands now run inside the workspace packages. From the repo root you can target the Electron app package directly:
 
 ```bash
-npm run build --workspace @codenomad/electron-app
+npm run build --workspace @neuralnomads/codenomad-electron-app
 ```
 
 ### Build for Current Platform (macOS default)
diff --git a/README.md b/README.md
index 9b8a5076..44429b9e 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ CodeNomad now ships as a small workspace with two packages:
 - `packages/ui` — SolidJS renderer, Tailwind styles, and standalone Vite configuration for building the UI bundle independently.
 - `packages/electron-app` — Electron main/preload processes plus packaging scripts. It consumes the UI package during development/build via `electron-vite`.
 
-Use `npm run dev --workspace @codenomad/electron-app` for the Electron shell and `npm run dev --workspace @codenomad/ui` for UI-only work. Working with the workspace requires Node.js 18+ with npm 7 or newer so the workspace protocol is available.
+Use `npm run dev --workspace @neuralnomads/codenomad-electron-app` for the Electron shell and `npm run dev --workspace @codenomad/ui` for UI-only work. Working with the workspace requires Node.js 18+ with npm 7 or newer so the workspace protocol is available.
 
 ## Downloads
 
diff --git a/package-lock.json b/package-lock.json
index 295bf889..b144ce8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -317,7 +317,7 @@
       "resolved": "packages/server",
       "link": true
     },
-    "node_modules/@codenomad/electron-app": {
+    "node_modules/@neuralnomads/codenomad-electron-app": {
       "resolved": "packages/electron-app",
       "link": true
     },
@@ -8430,7 +8430,7 @@
       "license": "MIT"
     },
     "packages/electron-app": {
-      "name": "@codenomad/electron-app",
+      "name": "@neuralnomads/codenomad-electron-app",
       "version": "0.1.2",
       "dependencies": {
         "@neuralnomads/codenomad": "file:../server",
diff --git a/package.json b/package.json
index efe62d4f..f2fd96e9 100644
--- a/package.json
+++ b/package.json
@@ -9,14 +9,14 @@
     ]
   },
   "scripts": {
-    "dev": "npm run dev --workspace @codenomad/electron-app",
-    "dev:electron": "npm run dev --workspace @codenomad/electron-app",
-    "dev:ui": "npm run dev --workspace @codenomad/ui",
-    "build": "npm run build --workspace @codenomad/electron-app",
+    "dev": "npm run dev --workspace @neuralnomads/codenomad-electron-app",
+    "dev:electron": "npm run dev --workspace @neuralnomads/codenomad-electron-app",
+    "build": "npm run build --workspace @neuralnomads/codenomad-electron-app",
     "build:ui": "npm run build --workspace @codenomad/ui",
-    "build:mac-x64": "npm run build:mac-x64 --workspace @codenomad/electron-app",
-    "build:binaries": "npm run build:binaries --workspace @codenomad/electron-app",
-    "typecheck": "npm run typecheck --workspace @codenomad/ui && npm run typecheck --workspace @codenomad/electron-app"
+    "build:mac-x64": "npm run build:mac-x64 --workspace @neuralnomads/codenomad-electron-app",
+    "build:binaries": "npm run build:binaries --workspace @neuralnomads/codenomad-electron-app",
+    "typecheck": "npm run typecheck --workspace @codenomad/ui && npm run typecheck --workspace @neuralnomads/codenomad-electron-app"
+
   },
   "dependencies": {
     "7zip-bin": "^5.2.0",
diff --git a/packages/electron-app/package.json b/packages/electron-app/package.json
index ad01316c..22541bad 100644
--- a/packages/electron-app/package.json
+++ b/packages/electron-app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@codenomad/electron-app",
+  "name": "@neuralnomads/codenomad-electron-app",
   "version": "0.1.2",
   "description": "CodeNomad - AI coding assistant",
   "author": {