diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2b5b04..5be713e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,17 @@ Pre-1.0 versions treat MINOR as feature releases and PATCH as bug fixes.
 
 ---
 
+## [0.4.6] — 2026-04-11
+
+### Changes
+- **Removed all WHM trademark references** — "WHM" is a registered trademark of cPanel, L.L.C. All occurrences replaced with "NixServer":
+  - Sidebar menu item "Basic WebHost Manager® Setup" → "Basic NixServer Setup"
+  - Sidebar menu item "WHM Marketplace" → "NixServer Marketplace"
+  - Sidebar menu item "OpenAPI Documentation for WHM" → "OpenAPI Documentation for NixServer"
+  - Internal npm package name `@nixpanel/whm` → `@nixpanel/nixserver`
+
+---
+
 ## [0.4.5] — 2026-04-11
 
 ### Bug Fixes
diff --git a/nixserver/package.json b/nixserver/package.json
index 9264bcf..73b57a1 100644
--- a/nixserver/package.json
+++ b/nixserver/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@nixpanel/whm",
-  "version": "0.4.3",
+  "name": "@nixpanel/nixserver",
+  "version": "0.4.6",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/nixserver/src/components/Layout.tsx b/nixserver/src/components/Layout.tsx
index f5f0f50..1ff01bd 100644
--- a/nixserver/src/components/Layout.tsx
+++ b/nixserver/src/components/Layout.tsx
@@ -28,7 +28,7 @@ const NAV: NavCategory[] = [
     label: 'Server Configuration',
     icon: Settings,
     items: [
-      { label: 'Basic WebHost Manager® Setup',    to: '/settings' },
+      { label: 'Basic NixServer Setup',             to: '/settings' },
       { label: 'Change Root Password',             to: '/security' },
       { label: 'Configure Analytics',              to: '/settings' },
       { label: 'Configure Cron Jobs',              to: '/settings' },
@@ -40,7 +40,7 @@ const NAV: NavCategory[] = [
       { label: 'Terminal',                         to: '/system'   },
       { label: 'Tweak Settings',                   to: '/settings' },
       { label: 'Update Preferences',               to: '/settings' },
-      { label: 'WHM Marketplace',                  to: '/settings' },
+      { label: 'NixServer Marketplace',             to: '/settings' },
     ],
   },
   {
@@ -424,7 +424,7 @@ const NAV: NavCategory[] = [
       { label: 'Manage API Tokens',                  to: '/settings' },
       { label: 'Manage Hooks',                       to: '/settings' },
       { label: 'OpenAPI Documentation for NixPanel', to: '/settings' },
-      { label: 'OpenAPI Documentation for WHM',      to: '/settings' },
+      { label: 'OpenAPI Documentation for NixServer', to: '/settings' },
     ],
   },
   {
diff --git a/package.json b/package.json
index a6f7cc4..eface42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nixpanel-server",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "private": true,
   "workspaces": [
     "server",
diff --git a/server/src/app.ts b/server/src/app.ts
index abcd1ab..9315d7b 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -60,7 +60,7 @@ export async function buildApp() {
   // ─── Static files ────────────────────────────────────────────────────────────
 
   // NixServer frontend
-  const whmDist = path.resolve(__dirname, '../../nixserver/dist')
+  const nixserverDist = path.resolve(__dirname, '../../nixserver/dist')
   const cpanelDist = path.resolve(__dirname, '../../nixclient/dist')
 
   // ─── API Routes ──────────────────────────────────────────────────────────────
@@ -73,7 +73,7 @@ export async function buildApp() {
 
   fastify.get('/api/health', async () => ({
     status: 'ok',
-    version: '0.4.5',
+    version: '0.4.6',
     timestamp: new Date().toISOString(),
   }))