diff --git a/apps/hosting-service/package.json b/apps/hosting-service/package.json
index 07b55f4..77d4984 100644
--- a/apps/hosting-service/package.json
+++ b/apps/hosting-service/package.json
@@ -16,13 +16,13 @@
     "@atproto/sync": "^0.1.36",
     "@atproto/xrpc": "^0.7.5",
     "@hono/node-server": "^1.19.6",
-    "@wisp/atproto-utils": "workspace:*",
-    "@wisp/constants": "workspace:*",
-    "@wisp/database": "workspace:*",
-    "@wisp/fs-utils": "workspace:*",
-    "@wisp/lexicons": "workspace:*",
-    "@wisp/observability": "workspace:*",
-    "@wisp/safe-fetch": "workspace:*",
+    "@wispplace/atproto-utils": "workspace:*",
+    "@wispplace/constants": "workspace:*",
+    "@wispplace/database": "workspace:*",
+    "@wispplace/fs-utils": "workspace:*",
+    "@wispplace/lexicons": "workspace:*",
+    "@wispplace/observability": "workspace:*",
+    "@wispplace/safe-fetch": "workspace:*",
     "hono": "^4.10.4",
     "mime-types": "^2.1.35",
     "multiformats": "^13.4.1",
diff --git a/apps/hosting-service/src/index.ts b/apps/hosting-service/src/index.ts
index 1097ccb..1c4c520 100644
--- a/apps/hosting-service/src/index.ts
+++ b/apps/hosting-service/src/index.ts
@@ -1,7 +1,7 @@
 import app from './server';
 import { serve } from '@hono/node-server';
 import { FirehoseWorker } from './lib/firehose';
-import { createLogger, initializeGrafanaExporters } from '@wisp/observability';
+import { createLogger, initializeGrafanaExporters } from '@wispplace/observability';
 import { mkdirSync, existsSync } from 'fs';
 import { backfillCache } from './lib/backfill';
 import { startDomainCacheCleanup, stopDomainCacheCleanup, setCacheOnlyMode, closeDatabase } from './lib/db';
diff --git a/apps/hosting-service/src/lib/backfill.ts b/apps/hosting-service/src/lib/backfill.ts
index c901f7d..c3a50aa 100644
--- a/apps/hosting-service/src/lib/backfill.ts
+++ b/apps/hosting-service/src/lib/backfill.ts
@@ -1,6 +1,6 @@
 import { getAllSites } from './db';
 import { fetchSiteRecord, getPdsForDid, downloadAndCacheSite, isCached } from './utils';
-import { createLogger } from '@wisp/observability';
+import { createLogger } from '@wispplace/observability';
 import { markSiteAsBeingCached, unmarkSiteAsBeingCached } from './cache';
 import { clearRedirectRulesCache } from './site-cache';
 
diff --git a/apps/hosting-service/src/lib/db.ts b/apps/hosting-service/src/lib/db.ts
index fc11c5a..faf044f 100644
--- a/apps/hosting-service/src/lib/db.ts
+++ b/apps/hosting-service/src/lib/db.ts
@@ -1,6 +1,6 @@
 import postgres from 'postgres';
 import { createHash } from 'crypto';
-import type { DomainLookup, CustomDomainLookup } from '@wisp/database';
+import type { DomainLookup, CustomDomainLookup } from '@wispplace/database';
 
 // Global cache-only mode flag (set by index.ts)
 let cacheOnlyMode = false;
diff --git a/apps/hosting-service/src/lib/file-serving.ts b/apps/hosting-service/src/lib/file-serving.ts
index c4531d4..e3cd3f4 100644
--- a/apps/hosting-service/src/lib/file-serving.ts
+++ b/apps/hosting-service/src/lib/file-serving.ts
@@ -5,8 +5,8 @@
 
 import { readFile } from 'fs/promises';
 import { lookup } from 'mime-types';
-import type { Record as WispSettings } from '@wisp/lexicons/types/place/wisp/settings';
-import { shouldCompressMimeType } from '@wisp/atproto-utils/compression';
+import type { Record as WispSettings } from '@wispplace/lexicons/types/place/wisp/settings';
+import { shouldCompressMimeType } from '@wispplace/atproto-utils/compression';
 import { rewrittenHtmlCache, getCacheKey, isSiteBeingCached } from './cache';
 import { getCachedFilePath, getCachedSettings } from './utils';
 import { loadRedirectRules, matchRedirectRule, parseCookies, parseQueryString } from './redirects';
diff --git a/apps/hosting-service/src/lib/firehose.ts b/apps/hosting-service/src/lib/firehose.ts
index 00058de..0a4dbea 100644
--- a/apps/hosting-service/src/lib/firehose.ts
+++ b/apps/hosting-service/src/lib/firehose.ts
@@ -5,9 +5,9 @@ import {
 	fetchSiteRecord
 } from './utils'
 import { upsertSite, tryAcquireLock, releaseLock } from './db'
-import { safeFetch } from '@wisp/safe-fetch'
-// import { isRecord, validateRecord } from '@wisp/lexicons/types/place/wisp/fs'
-import { isRecord } from '@wisp/lexicons/types/place/wisp/fs'
+import { safeFetch } from '@wispplace/safe-fetch'
+// import { isRecord, validateRecord } from '@wispplace/lexicons/types/place/wisp/fs'
+import { isRecord } from '@wispplace/lexicons/types/place/wisp/fs'
 import { Firehose } from '@atproto/sync'
 import { IdResolver } from '@atproto/identity'
 import { invalidateSiteCache, markSiteAsBeingCached, unmarkSiteAsBeingCached } from './cache'
diff --git a/apps/hosting-service/src/lib/redirects.ts b/apps/hosting-service/src/lib/redirects.ts
index 30b6870..8e80a29 100644
--- a/apps/hosting-service/src/lib/redirects.ts
+++ b/apps/hosting-service/src/lib/redirects.ts
@@ -1,6 +1,6 @@
 import { readFile } from 'fs/promises';
 import { existsSync } from 'fs';
-import { parseRedirectsFile, type RedirectRule } from '@wisp/fs-utils';
+import { parseRedirectsFile, type RedirectRule } from '@wispplace/fs-utils';
 
 // Re-export everything from the shared package
 export {
@@ -11,7 +11,7 @@ export {
   type RedirectRule,
   type RedirectMatch,
   type MatchRedirectContext,
-} from '@wisp/fs-utils';
+} from '@wispplace/fs-utils';
 
 /**
  * Load redirect rules from a cached site
diff --git a/apps/hosting-service/src/lib/request-utils.ts b/apps/hosting-service/src/lib/request-utils.ts
index 9cf2074..6b0bfb1 100644
--- a/apps/hosting-service/src/lib/request-utils.ts
+++ b/apps/hosting-service/src/lib/request-utils.ts
@@ -2,7 +2,7 @@
  * Request utilities for validation and helper functions
  */
 
-import type { Record as WispSettings } from '@wisp/lexicons/types/place/wisp/settings';
+import type { Record as WispSettings } from '@wispplace/lexicons/types/place/wisp/settings';
 import { access } from 'fs/promises';
 
 /**
diff --git a/apps/hosting-service/src/lib/site-cache.ts b/apps/hosting-service/src/lib/site-cache.ts
index a9b6929..5fe76cf 100644
--- a/apps/hosting-service/src/lib/site-cache.ts
+++ b/apps/hosting-service/src/lib/site-cache.ts
@@ -2,7 +2,7 @@
  * Site caching management utilities
  */
 
-import { createLogger } from '@wisp/observability';
+import { createLogger } from '@wispplace/observability';
 import { fetchSiteRecord, getPdsForDid, downloadAndCacheSite, isCached } from './utils';
 import { markSiteAsBeingCached, unmarkSiteAsBeingCached, LRUCache } from './cache';
 import type { RedirectRule } from './redirects';
diff --git a/apps/hosting-service/src/lib/utils.test.ts b/apps/hosting-service/src/lib/utils.test.ts
index a6fee3c..351913a 100644
--- a/apps/hosting-service/src/lib/utils.test.ts
+++ b/apps/hosting-service/src/lib/utils.test.ts
@@ -8,15 +8,15 @@ import type {
 	Entry as FsEntry,
 	File as FsFile,
 	Subfs as FsSubfs,
-} from '@wisp/lexicons/types/place/wisp/fs'
+} from '@wispplace/lexicons/types/place/wisp/fs'
 import type {
 	Record as SubfsRecord,
 	Directory as SubfsDirectory,
 	Entry as SubfsEntry,
 	File as SubfsFile,
 	Subfs as SubfsSubfs,
-} from '@wisp/lexicons/types/place/wisp/subfs'
-import type { $Typed } from '@wisp/lexicons/util'
+} from '@wispplace/lexicons/types/place/wisp/subfs'
+import type { $Typed } from '@wispplace/lexicons/util'
 
 describe('sanitizePath', () => {
 	test('allows normal file paths', () => {
diff --git a/apps/hosting-service/src/lib/utils.ts b/apps/hosting-service/src/lib/utils.ts
index 226d06d..b62ce46 100644
--- a/apps/hosting-service/src/lib/utils.ts
+++ b/apps/hosting-service/src/lib/utils.ts
@@ -1,15 +1,15 @@
-import type { Record as WispFsRecord, Directory, Entry, File } from '@wisp/lexicons/types/place/wisp/fs';
-import type { Record as SubfsRecord } from '@wisp/lexicons/types/place/wisp/subfs';
-import type { Record as WispSettings } from '@wisp/lexicons/types/place/wisp/settings';
+import type { Record as WispFsRecord, Directory, Entry, File } from '@wispplace/lexicons/types/place/wisp/fs';
+import type { Record as SubfsRecord } from '@wispplace/lexicons/types/place/wisp/subfs';
+import type { Record as WispSettings } from '@wispplace/lexicons/types/place/wisp/settings';
 import { existsSync, mkdirSync, readFileSync, rmSync } from 'fs';
 import { writeFile, readFile, rename } from 'fs/promises';
 import { Readable } from 'stream';
-import { safeFetchJson, safeFetchBlob } from '@wisp/safe-fetch';
+import { safeFetchJson, safeFetchBlob } from '@wispplace/safe-fetch';
 import { CID } from 'multiformats';
-import { extractBlobCid, resolveDid, getPdsForDid, didWebToHttps } from '@wisp/atproto-utils';
-import { sanitizePath, collectFileCidsFromEntries, countFilesInDirectory } from '@wisp/fs-utils';
-import { shouldCompressMimeType } from '@wisp/atproto-utils/compression';
-import { MAX_BLOB_SIZE, MAX_FILE_COUNT, MAX_SITE_SIZE } from '@wisp/constants';
+import { extractBlobCid, resolveDid, getPdsForDid, didWebToHttps } from '@wispplace/atproto-utils';
+import { sanitizePath, collectFileCidsFromEntries, countFilesInDirectory } from '@wispplace/fs-utils';
+import { shouldCompressMimeType } from '@wispplace/atproto-utils/compression';
+import { MAX_BLOB_SIZE, MAX_FILE_COUNT, MAX_SITE_SIZE } from '@wispplace/constants';
 import { storage } from './storage';
 
 // Re-export shared utilities for local usage and tests
diff --git a/apps/hosting-service/src/server.ts b/apps/hosting-service/src/server.ts
index 067f589..88843dd 100644
--- a/apps/hosting-service/src/server.ts
+++ b/apps/hosting-service/src/server.ts
@@ -7,9 +7,9 @@ import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import { getWispDomain, getCustomDomain, getCustomDomainByHash } from './lib/db';
 import { resolveDid } from './lib/utils';
-import { logCollector, errorTracker, metricsCollector } from '@wisp/observability';
-import { observabilityMiddleware, observabilityErrorHandler } from '@wisp/observability/middleware/hono';
-import { sanitizePath } from '@wisp/fs-utils';
+import { logCollector, errorTracker, metricsCollector } from '@wispplace/observability';
+import { observabilityMiddleware, observabilityErrorHandler } from '@wispplace/observability/middleware/hono';
+import { sanitizePath } from '@wispplace/fs-utils';
 import { isSiteBeingCached } from './lib/cache';
 import { isValidRkey, extractHeaders } from './lib/request-utils';
 import { siteUpdatingResponse } from './lib/page-generators';
diff --git a/apps/hosting-service/tsconfig.json b/apps/hosting-service/tsconfig.json
index a6b5322..de3fef7 100644
--- a/apps/hosting-service/tsconfig.json
+++ b/apps/hosting-service/tsconfig.json
@@ -28,7 +28,7 @@
 		/* Workspace Paths */
 		"baseUrl": ".",
 		"paths": {
-			"@wisp/*": ["../../packages/@wisp/*/src"]
+			"@wispplace/*": ["../../packages/@wispplace/*/src"]
 		}
 	},
 	"include": ["src/**/*"],
diff --git a/apps/main-app/package.json b/apps/main-app/package.json
index e1e69ea..66bd7d3 100644
--- a/apps/main-app/package.json
+++ b/apps/main-app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/main-app",
+  "name": "@wispplace/main-app",
   "version": "1.0.50",
   "private": true,
   "scripts": {
@@ -31,13 +31,13 @@
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-tabs": "^1.1.13",
     "@tanstack/react-query": "^5.90.2",
-    "@wisp/atproto-utils": "workspace:*",
-    "@wisp/css": "workspace:*",
-    "@wisp/constants": "workspace:*",
-    "@wisp/database": "workspace:*",
-    "@wisp/fs-utils": "workspace:*",
-    "@wisp/lexicons": "workspace:*",
-    "@wisp/observability": "workspace:*",
+    "@wispplace/atproto-utils": "workspace:*",
+    "@wispplace/css": "workspace:*",
+    "@wispplace/constants": "workspace:*",
+    "@wispplace/database": "workspace:*",
+    "@wispplace/fs-utils": "workspace:*",
+    "@wispplace/lexicons": "workspace:*",
+    "@wispplace/observability": "workspace:*",
     "actor-typeahead": "^0.1.1",
     "atproto-ui": "^0.12.0",
     "bun-plugin-tailwind": "^0.1.2",
diff --git a/apps/main-app/src/index.ts b/apps/main-app/src/index.ts
index 588db95..65e9696 100644
--- a/apps/main-app/src/index.ts
+++ b/apps/main-app/src/index.ts
@@ -7,7 +7,7 @@ import { cors } from '@elysiajs/cors'
 import { staticPlugin } from '@elysiajs/static'
 
 import type { Config } from './lib/types'
-import { BASE_HOST } from '@wisp/constants'
+import { BASE_HOST } from '@wispplace/constants'
 import {
 	createClientMetadata,
 	getOAuthClient,
@@ -23,9 +23,9 @@ import { userRoutes } from './routes/user'
 import { siteRoutes } from './routes/site'
 import { csrfProtection } from './lib/csrf'
 import { DNSVerificationWorker } from './lib/dns-verification-worker'
-import { createLogger, logCollector, initializeGrafanaExporters } from '@wisp/observability'
-import { observabilityMiddleware } from '@wisp/observability/middleware/elysia'
-import { css as wispCss } from '@wisp/css'
+import { createLogger, logCollector, initializeGrafanaExporters } from '@wispplace/observability'
+import { observabilityMiddleware } from '@wispplace/observability/middleware/elysia'
+import { css as wispCss } from '@wispplace/css'
 import { promptAdminSetup } from './lib/admin-auth'
 import { adminRoutes } from './routes/admin'
 
diff --git a/apps/main-app/src/lib/db.ts b/apps/main-app/src/lib/db.ts
index 92966a4..02838a4 100644
--- a/apps/main-app/src/lib/db.ts
+++ b/apps/main-app/src/lib/db.ts
@@ -1,5 +1,5 @@
 import { SQL } from "bun";
-import { BASE_HOST } from "@wisp/constants";
+import { BASE_HOST } from "@wispplace/constants";
 
 export const db = new SQL(
     process.env.NODE_ENV === 'production'
diff --git a/apps/main-app/src/lib/logger.ts b/apps/main-app/src/lib/logger.ts
index bac9d5c..24bfba0 100644
--- a/apps/main-app/src/lib/logger.ts
+++ b/apps/main-app/src/lib/logger.ts
@@ -1,9 +1,9 @@
 /**
- * Main app logger using @wisp/observability
+ * Main app logger using @wispplace/observability
  *
  * Note: This file is kept for backward compatibility.
- * New code should import createLogger from @wisp/observability directly.
+ * New code should import createLogger from @wispplace/observability directly.
  */
-import { createLogger } from '@wisp/observability'
+import { createLogger } from '@wispplace/observability'
 
 export const logger = createLogger('main-app')
diff --git a/apps/main-app/src/lib/upload-jobs.ts b/apps/main-app/src/lib/upload-jobs.ts
index 64ef376..d78dd45 100644
--- a/apps/main-app/src/lib/upload-jobs.ts
+++ b/apps/main-app/src/lib/upload-jobs.ts
@@ -1,4 +1,4 @@
-import { createLogger } from '@wisp/observability';
+import { createLogger } from '@wispplace/observability';
 
 const logger = createLogger('main-app');
 
diff --git a/apps/main-app/src/routes/admin.ts b/apps/main-app/src/routes/admin.ts
index 1d7b6de..140d249 100644
--- a/apps/main-app/src/routes/admin.ts
+++ b/apps/main-app/src/routes/admin.ts
@@ -1,7 +1,7 @@
 // Admin API routes
 import { Elysia, t } from 'elysia'
 import { adminAuth, requireAdmin } from '../lib/admin-auth'
-import { logCollector, errorTracker, metricsCollector } from '@wisp/observability'
+import { logCollector, errorTracker, metricsCollector } from '@wispplace/observability'
 import { db } from '../lib/db'
 
 export const adminRoutes = (cookieSecret: string) =>
diff --git a/apps/main-app/src/routes/auth.ts b/apps/main-app/src/routes/auth.ts
index 0fda1cf..911d12a 100644
--- a/apps/main-app/src/routes/auth.ts
+++ b/apps/main-app/src/routes/auth.ts
@@ -3,7 +3,7 @@ import { NodeOAuthClient } from '@atproto/oauth-client-node'
 import { getSitesByDid, getDomainByDid, getCookieSecret } from '../lib/db'
 import { syncSitesFromPDS } from '../lib/sync-sites'
 import { authenticateRequest } from '../lib/wisp-auth'
-import { createLogger } from '@wisp/observability'
+import { createLogger } from '@wispplace/observability'
 
 const logger = createLogger('main-app')
 
diff --git a/apps/main-app/src/routes/domain.ts b/apps/main-app/src/routes/domain.ts
index 19d575b..cb49605 100644
--- a/apps/main-app/src/routes/domain.ts
+++ b/apps/main-app/src/routes/domain.ts
@@ -22,7 +22,7 @@ import {
 } from '../lib/db'
 import { createHash } from 'crypto'
 import { verifyCustomDomain } from '../lib/dns-verify'
-import { createLogger } from '@wisp/observability'
+import { createLogger } from '@wispplace/observability'
 
 const logger = createLogger('main-app')
 
diff --git a/apps/main-app/src/routes/site.ts b/apps/main-app/src/routes/site.ts
index 69d6511..8951756 100644
--- a/apps/main-app/src/routes/site.ts
+++ b/apps/main-app/src/routes/site.ts
@@ -3,8 +3,8 @@ import { requireAuth } from '../lib/wisp-auth'
 import { NodeOAuthClient } from '@atproto/oauth-client-node'
 import { Agent } from '@atproto/api'
 import { deleteSite } from '../lib/db'
-import { createLogger } from '@wisp/observability'
-import { extractSubfsUris } from '@wisp/atproto-utils'
+import { createLogger } from '@wispplace/observability'
+import { extractSubfsUris } from '@wispplace/atproto-utils'
 
 const logger = createLogger('main-app')
 
diff --git a/apps/main-app/src/routes/user.ts b/apps/main-app/src/routes/user.ts
index 65baddf..56d2688 100644
--- a/apps/main-app/src/routes/user.ts
+++ b/apps/main-app/src/routes/user.ts
@@ -3,8 +3,8 @@ import { requireAuth } from '../lib/wisp-auth'
 import { NodeOAuthClient } from '@atproto/oauth-client-node'
 import { getSitesByDid, getDomainByDid, getCustomDomainsByDid, getWispDomainInfo, getDomainsBySite, getAllWispDomains } from '../lib/db'
 import { syncSitesFromPDS } from '../lib/sync-sites'
-import { createLogger } from '@wisp/observability'
-import { getHandleForDid } from '@wisp/atproto-utils'
+import { createLogger } from '@wispplace/observability'
+import { getHandleForDid } from '@wispplace/atproto-utils'
 
 const logger = createLogger('main-app')
 
diff --git a/apps/main-app/src/routes/wisp.ts b/apps/main-app/src/routes/wisp.ts
index d34729d..d98a399 100644
--- a/apps/main-app/src/routes/wisp.ts
+++ b/apps/main-app/src/routes/wisp.ts
@@ -11,21 +11,21 @@ import {
     findLargeDirectories,
     replaceDirectoryWithSubfs,
     estimateDirectorySize
-} from '@wisp/fs-utils'
+} from '@wispplace/fs-utils'
 import {
     shouldCompressFile,
     compressFile,
     computeCID,
     extractBlobMap,
     extractSubfsUris
-} from '@wisp/atproto-utils'
-import { createManifest } from '@wisp/fs-utils'
+} from '@wispplace/atproto-utils'
+import { createManifest } from '@wispplace/fs-utils'
 import { upsertSite } from '../lib/db'
-import { createLogger } from '@wisp/observability'
-// import { validateRecord, type Directory } from '@wisp/lexicons/types/place/wisp/fs'
-import { type Directory } from '@wisp/lexicons/types/place/wisp/fs'
-// import { validateRecord as validateSubfsRecord } from '@wisp/lexicons/types/place/wisp/subfs'
-import { MAX_SITE_SIZE, MAX_FILE_SIZE, MAX_FILE_COUNT } from '@wisp/constants'
+import { createLogger } from '@wispplace/observability'
+// import { validateRecord, type Directory } from '@wispplace/lexicons/types/place/wisp/fs'
+import { type Directory } from '@wispplace/lexicons/types/place/wisp/fs'
+// import { validateRecord as validateSubfsRecord } from '@wispplace/lexicons/types/place/wisp/subfs'
+import { MAX_SITE_SIZE, MAX_FILE_SIZE, MAX_FILE_COUNT } from '@wispplace/constants'
 import {
     createUploadJob,
     getUploadJob,
diff --git a/apps/main-app/tsconfig.json b/apps/main-app/tsconfig.json
index dfc4920..1546a53 100644
--- a/apps/main-app/tsconfig.json
+++ b/apps/main-app/tsconfig.json
@@ -6,7 +6,7 @@
       "@server": ["./src/index.ts"],
       "@server/*": ["./src/*"],
       "@public/*": ["./public/*"],
-      "@wisp/*": ["../../packages/@wisp/*/src"]
+      "@wispplace/*": ["../../packages/@wispplace/*/src"]
     }
   },
   "include": ["src/**/*", "public/**/*", "scripts/**/*"],
diff --git a/bun.lock b/bun.lock
index ace9223..e59c6b3 100644
--- a/bun.lock
+++ b/bun.lock
@@ -25,13 +25,13 @@
         "@atproto/sync": "^0.1.36",
         "@atproto/xrpc": "^0.7.5",
         "@hono/node-server": "^1.19.6",
-        "@wisp/atproto-utils": "workspace:*",
-        "@wisp/constants": "workspace:*",
-        "@wisp/database": "workspace:*",
-        "@wisp/fs-utils": "workspace:*",
-        "@wisp/lexicons": "workspace:*",
-        "@wisp/observability": "workspace:*",
-        "@wisp/safe-fetch": "workspace:*",
+        "@wispplace/atproto-utils": "workspace:*",
+        "@wispplace/constants": "workspace:*",
+        "@wispplace/database": "workspace:*",
+        "@wispplace/fs-utils": "workspace:*",
+        "@wispplace/lexicons": "workspace:*",
+        "@wispplace/observability": "workspace:*",
+        "@wispplace/safe-fetch": "workspace:*",
         "hono": "^4.10.4",
         "mime-types": "^2.1.35",
         "multiformats": "^13.4.1",
@@ -47,7 +47,7 @@
       },
     },
     "apps/main-app": {
-      "name": "@wisp/main-app",
+      "name": "@wispplace/main-app",
       "version": "1.0.50",
       "dependencies": {
         "@atproto-labs/did-resolver": "^0.2.4",
@@ -69,13 +69,13 @@
         "@radix-ui/react-slot": "^1.2.3",
         "@radix-ui/react-tabs": "^1.1.13",
         "@tanstack/react-query": "^5.90.2",
-        "@wisp/atproto-utils": "workspace:*",
-        "@wisp/constants": "workspace:*",
-        "@wisp/css": "workspace:*",
-        "@wisp/database": "workspace:*",
-        "@wisp/fs-utils": "workspace:*",
-        "@wisp/lexicons": "workspace:*",
-        "@wisp/observability": "workspace:*",
+        "@wispplace/atproto-utils": "workspace:*",
+        "@wispplace/constants": "workspace:*",
+        "@wispplace/css": "workspace:*",
+        "@wispplace/database": "workspace:*",
+        "@wispplace/fs-utils": "workspace:*",
+        "@wispplace/lexicons": "workspace:*",
+        "@wispplace/observability": "workspace:*",
         "actor-typeahead": "^0.1.1",
         "atproto-ui": "^0.12.0",
         "bun-plugin-tailwind": "^0.1.2",
@@ -127,10 +127,10 @@
         "@types/bun": "latest",
         "@types/mime-types": "^3.0.1",
         "@types/node": "^22.0.0",
-        "@wisp/atproto-utils": "workspace:*",
-        "@wisp/constants": "workspace:*",
-        "@wisp/fs-utils": "workspace:*",
-        "@wisp/lexicons": "workspace:*",
+        "@wispplace/atproto-utils": "workspace:*",
+        "@wispplace/constants": "workspace:*",
+        "@wispplace/fs-utils": "workspace:*",
+        "@wispplace/lexicons": "workspace:*",
         "commander": "^14.0.2",
         "hono": "^4.7.4",
         "ignore": "^7.0.5",
@@ -141,43 +141,43 @@
         "typescript": "^5",
       },
     },
-    "packages/@wisp/atproto-utils": {
-      "name": "@wisp/atproto-utils",
+    "packages/@wispplace/atproto-utils": {
+      "name": "@wispplace/atproto-utils",
       "version": "1.0.0",
       "dependencies": {
         "@atproto/api": "^0.18.17",
-        "@wisp/lexicons": "workspace:*",
+        "@wispplace/lexicons": "workspace:*",
         "multiformats": "^13.3.1",
       },
       "devDependencies": {
         "@atproto/lexicon": "^0.6.1",
       },
     },
-    "packages/@wisp/constants": {
-      "name": "@wisp/constants",
+    "packages/@wispplace/constants": {
+      "name": "@wispplace/constants",
       "version": "1.0.0",
     },
-    "packages/@wisp/css": {
-      "name": "@wisp/css",
+    "packages/@wispplace/css": {
+      "name": "@wispplace/css",
       "version": "1.0.0",
     },
-    "packages/@wisp/database": {
-      "name": "@wisp/database",
+    "packages/@wispplace/database": {
+      "name": "@wispplace/database",
       "version": "1.0.0",
       "dependencies": {
         "postgres": "^3.4.5",
       },
     },
-    "packages/@wisp/fs-utils": {
-      "name": "@wisp/fs-utils",
+    "packages/@wispplace/fs-utils": {
+      "name": "@wispplace/fs-utils",
       "version": "1.0.0",
       "dependencies": {
         "@atproto/api": "^0.18.17",
-        "@wisp/lexicons": "workspace:*",
+        "@wispplace/lexicons": "workspace:*",
       },
     },
-    "packages/@wisp/lexicons": {
-      "name": "@wisp/lexicons",
+    "packages/@wispplace/lexicons": {
+      "name": "@wispplace/lexicons",
       "version": "1.0.0",
       "dependencies": {
         "@atproto/lexicon": "^0.5.1",
@@ -188,8 +188,8 @@
         "multiformats": "^13.4.1",
       },
     },
-    "packages/@wisp/observability": {
-      "name": "@wisp/observability",
+    "packages/@wispplace/observability": {
+      "name": "@wispplace/observability",
       "version": "1.0.0",
       "dependencies": {
         "@opentelemetry/api": "^1.9.0",
@@ -214,8 +214,8 @@
         "hono",
       ],
     },
-    "packages/@wisp/safe-fetch": {
-      "name": "@wisp/safe-fetch",
+    "packages/@wispplace/safe-fetch": {
+      "name": "@wispplace/safe-fetch",
       "version": "1.0.0",
     },
   },
@@ -838,23 +838,23 @@
 
     "@types/shimmer": ["@types/shimmer@1.2.0", "", {}, "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg=="],
 
-    "@wisp/atproto-utils": ["@wisp/atproto-utils@workspace:packages/@wisp/atproto-utils"],
+    "@wispplace/atproto-utils": ["@wispplace/atproto-utils@workspace:packages/@wispplace/atproto-utils"],
 
-    "@wisp/constants": ["@wisp/constants@workspace:packages/@wisp/constants"],
+    "@wispplace/constants": ["@wispplace/constants@workspace:packages/@wispplace/constants"],
 
-    "@wisp/css": ["@wisp/css@workspace:packages/@wisp/css"],
+    "@wispplace/css": ["@wispplace/css@workspace:packages/@wispplace/css"],
 
-    "@wisp/database": ["@wisp/database@workspace:packages/@wisp/database"],
+    "@wispplace/database": ["@wispplace/database@workspace:packages/@wispplace/database"],
 
-    "@wisp/fs-utils": ["@wisp/fs-utils@workspace:packages/@wisp/fs-utils"],
+    "@wispplace/fs-utils": ["@wispplace/fs-utils@workspace:packages/@wispplace/fs-utils"],
 
-    "@wisp/lexicons": ["@wisp/lexicons@workspace:packages/@wisp/lexicons"],
+    "@wispplace/lexicons": ["@wispplace/lexicons@workspace:packages/@wispplace/lexicons"],
 
-    "@wisp/main-app": ["@wisp/main-app@workspace:apps/main-app"],
+    "@wispplace/main-app": ["@wispplace/main-app@workspace:apps/main-app"],
 
-    "@wisp/observability": ["@wisp/observability@workspace:packages/@wisp/observability"],
+    "@wispplace/observability": ["@wispplace/observability@workspace:packages/@wispplace/observability"],
 
-    "@wisp/safe-fetch": ["@wisp/safe-fetch@workspace:packages/@wisp/safe-fetch"],
+    "@wispplace/safe-fetch": ["@wispplace/safe-fetch@workspace:packages/@wispplace/safe-fetch"],
 
     "abort-controller": ["abort-controller@3.0.0", "", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="],
 
@@ -1538,9 +1538,9 @@
 
     "@types/bun/bun-types": ["bun-types@1.3.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ=="],
 
-    "@wisp/lexicons/@atproto/lexicon": ["@atproto/lexicon@0.5.2", "", { "dependencies": { "@atproto/common-web": "^0.4.4", "@atproto/syntax": "^0.4.1", "iso-datestring-validator": "^2.2.2", "multiformats": "^9.9.0", "zod": "^3.23.8" } }, "sha512-lRmJgMA8f5j7VB5Iu5cp188ald5FuI4FlmZ7nn6EBrk1dgOstWVrI5Ft6K3z2vjyLZRG6nzknlsw+tDP63p7bQ=="],
+    "@wispplace/lexicons/@atproto/lexicon": ["@atproto/lexicon@0.5.2", "", { "dependencies": { "@atproto/common-web": "^0.4.4", "@atproto/syntax": "^0.4.1", "iso-datestring-validator": "^2.2.2", "multiformats": "^9.9.0", "zod": "^3.23.8" } }, "sha512-lRmJgMA8f5j7VB5Iu5cp188ald5FuI4FlmZ7nn6EBrk1dgOstWVrI5Ft6K3z2vjyLZRG6nzknlsw+tDP63p7bQ=="],
 
-    "@wisp/main-app/@atproto/api": ["@atproto/api@0.17.7", "", { "dependencies": { "@atproto/common-web": "^0.4.3", "@atproto/lexicon": "^0.5.1", "@atproto/syntax": "^0.4.1", "@atproto/xrpc": "^0.7.5", "await-lock": "^2.2.2", "multiformats": "^9.9.0", "tlds": "^1.234.0", "zod": "^3.23.8" } }, "sha512-V+OJBZq9chcrD21xk1bUa6oc5DSKfQj5DmUPf5rmZncqL1w9ZEbS38H5cMyqqdhfgo2LWeDRdZHD0rvNyJsIaw=="],
+    "@wispplace/main-app/@atproto/api": ["@atproto/api@0.17.7", "", { "dependencies": { "@atproto/common-web": "^0.4.3", "@atproto/lexicon": "^0.5.1", "@atproto/syntax": "^0.4.1", "@atproto/xrpc": "^0.7.5", "await-lock": "^2.2.2", "multiformats": "^9.9.0", "tlds": "^1.234.0", "zod": "^3.23.8" } }, "sha512-V+OJBZq9chcrD21xk1bUa6oc5DSKfQj5DmUPf5rmZncqL1w9ZEbS38H5cMyqqdhfgo2LWeDRdZHD0rvNyJsIaw=="],
 
     "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
 
@@ -1564,6 +1564,8 @@
 
     "wisp-hosting-service/@atproto/lexicon": ["@atproto/lexicon@0.5.2", "", { "dependencies": { "@atproto/common-web": "^0.4.4", "@atproto/syntax": "^0.4.1", "iso-datestring-validator": "^2.2.2", "multiformats": "^9.9.0", "zod": "^3.23.8" } }, "sha512-lRmJgMA8f5j7VB5Iu5cp188ald5FuI4FlmZ7nn6EBrk1dgOstWVrI5Ft6K3z2vjyLZRG6nzknlsw+tDP63p7bQ=="],
 
+    "wispctl/@types/bun": ["@types/bun@1.3.8", "", { "dependencies": { "bun-types": "1.3.8" } }, "sha512-3LvWJ2q5GerAXYxO2mffLTqOzEu5qnhEAlh48Vnu8WQfnmSwbgagjGZV6BoHKJztENYEDn6QmVd949W4uESRJA=="],
+
     "wispctl/@types/mime-types": ["@types/mime-types@3.0.1", "", {}, "sha512-xRMsfuQbnRq1Ef+C+RKaENOxXX87Ygl38W1vDfPHRku02TgQr+Qd8iivLtAMcR0KF5/29xlnFihkTlbqFrGOVQ=="],
 
     "wispctl/mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="],
@@ -1628,11 +1630,11 @@
 
     "@tokenizer/inflate/debug/ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
 
-    "@wisp/lexicons/@atproto/lexicon/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="],
+    "@wispplace/lexicons/@atproto/lexicon/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="],
 
-    "@wisp/main-app/@atproto/api/@atproto/lexicon": ["@atproto/lexicon@0.5.2", "", { "dependencies": { "@atproto/common-web": "^0.4.4", "@atproto/syntax": "^0.4.1", "iso-datestring-validator": "^2.2.2", "multiformats": "^9.9.0", "zod": "^3.23.8" } }, "sha512-lRmJgMA8f5j7VB5Iu5cp188ald5FuI4FlmZ7nn6EBrk1dgOstWVrI5Ft6K3z2vjyLZRG6nzknlsw+tDP63p7bQ=="],
+    "@wispplace/main-app/@atproto/api/@atproto/lexicon": ["@atproto/lexicon@0.5.2", "", { "dependencies": { "@atproto/common-web": "^0.4.4", "@atproto/syntax": "^0.4.1", "iso-datestring-validator": "^2.2.2", "multiformats": "^9.9.0", "zod": "^3.23.8" } }, "sha512-lRmJgMA8f5j7VB5Iu5cp188ald5FuI4FlmZ7nn6EBrk1dgOstWVrI5Ft6K3z2vjyLZRG6nzknlsw+tDP63p7bQ=="],
 
-    "@wisp/main-app/@atproto/api/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="],
+    "@wispplace/main-app/@atproto/api/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="],
 
     "pino-abstract-transport/readable-stream/buffer": ["buffer@6.0.3", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="],
 
diff --git a/cli/commands/deploy.ts b/cli/commands/deploy.ts
index 1763ca4..4b22274 100644
--- a/cli/commands/deploy.ts
+++ b/cli/commands/deploy.ts
@@ -1,7 +1,7 @@
 import type { Agent, BlobRef } from '@atproto/api';
-import type { Directory, Record as FsRecord } from '@wisp/lexicons/types/place/wisp/fs';
-import type { Record as SubfsRecord } from '@wisp/lexicons/types/place/wisp/subfs';
-import type { Record as SettingsRecord } from '@wisp/lexicons/types/place/wisp/settings';
+import type { Directory, Record as FsRecord } from '@wispplace/lexicons/types/place/wisp/fs';
+import type { Record as SubfsRecord } from '@wispplace/lexicons/types/place/wisp/subfs';
+import type { Record as SettingsRecord } from '@wispplace/lexicons/types/place/wisp/settings';
 import {
   processUploadedFiles,
   updateFileBlobs,
@@ -13,9 +13,9 @@ import {
   countFilesInDirectory,
   type UploadedFile,
   type FileUploadResult
-} from '@wisp/fs-utils';
-import { computeCID, extractBlobMap, shouldCompressFile, compressFile, extractSubfsUris } from '@wisp/atproto-utils';
-import { MAX_SITE_SIZE, MAX_FILE_COUNT, MAX_FILE_SIZE } from '@wisp/constants';
+} from '@wispplace/fs-utils';
+import { computeCID, extractBlobMap, shouldCompressFile, compressFile, extractSubfsUris } from '@wispplace/atproto-utils';
+import { MAX_SITE_SIZE, MAX_FILE_COUNT, MAX_FILE_SIZE } from '@wispplace/constants';
 import { readdirSync, statSync, readFileSync, existsSync } from 'fs';
 import { join, relative, basename } from 'path';
 import ignore, { type Ignore } from 'ignore';
diff --git a/cli/commands/pull.ts b/cli/commands/pull.ts
index d9528b7..3bc0801 100644
--- a/cli/commands/pull.ts
+++ b/cli/commands/pull.ts
@@ -1,7 +1,7 @@
-import type { Directory, Entry, File, Record as FsRecord } from '@wisp/lexicons/types/place/wisp/fs';
-import type { Record as SubfsRecord } from '@wisp/lexicons/types/place/wisp/subfs';
-import { extractBlobCid, resolveDid, getPdsForDid } from '@wisp/atproto-utils';
-import { sanitizePath } from '@wisp/fs-utils';
+import type { Directory, Entry, File, Record as FsRecord } from '@wispplace/lexicons/types/place/wisp/fs';
+import type { Record as SubfsRecord } from '@wispplace/lexicons/types/place/wisp/subfs';
+import { extractBlobCid, resolveDid, getPdsForDid } from '@wispplace/atproto-utils';
+import { sanitizePath } from '@wispplace/fs-utils';
 import { existsSync, mkdirSync, writeFileSync, rmSync, renameSync, readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { gunzipSync } from 'zlib';
diff --git a/cli/commands/serve.ts b/cli/commands/serve.ts
index 4e8218d..399c8be 100644
--- a/cli/commands/serve.ts
+++ b/cli/commands/serve.ts
@@ -2,14 +2,14 @@ import { IdResolver } from '@atproto/identity';
 import { Firehose } from '@atproto/sync';
 import { Hono } from 'hono';
 import { serve as honoNodeServe } from '@hono/node-server';
-import type { Record as SettingsRecord } from '@wisp/lexicons/types/place/wisp/settings';
-import { resolveDid, getPdsForDid } from '@wisp/atproto-utils';
+import type { Record as SettingsRecord } from '@wispplace/lexicons/types/place/wisp/settings';
+import { resolveDid, getPdsForDid } from '@wispplace/atproto-utils';
 import { existsSync, readFileSync, statSync, readdirSync } from 'fs';
 import { join, extname } from 'path';
 import { lookup } from 'mime-types';
 import { pull } from './pull.ts';
 import { createSpinner, pc } from '../lib/progress.ts';
-import { parseRedirectsFile, matchRedirectRule, parseQueryString, type RedirectRule } from '@wisp/fs-utils';
+import { parseRedirectsFile, matchRedirectRule, parseQueryString, type RedirectRule } from '@wispplace/fs-utils';
 import { isBun } from '../lib/runtime.ts';
 import { BunFirehose } from '../lib/firehose.ts';
 
diff --git a/cli/lib/auth.ts b/cli/lib/auth.ts
index 0d6be3e..4bf557f 100644
--- a/cli/lib/auth.ts
+++ b/cli/lib/auth.ts
@@ -1,6 +1,6 @@
 import { NodeOAuthClient, type NodeSavedSession, type NodeSavedState, type NodeSavedStateStore, type NodeSavedSessionStore } from "@atproto/oauth-client-node";
 import { Agent, CredentialSession } from "@atproto/api";
-import { resolvePdsFromHandle } from "@wisp/atproto-utils";
+import { resolvePdsFromHandle } from "@wispplace/atproto-utils";
 import { Hono } from "hono";
 import { serve as honoNodeServe } from "@hono/node-server";
 import open from "open";
diff --git a/cli/package.json b/cli/package.json
index 3eb66f0..0e0d7f9 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -30,10 +30,10 @@
     "@types/bun": "latest",
     "@types/mime-types": "^3.0.1",
     "@types/node": "^22.0.0",
-    "@wisp/atproto-utils": "workspace:*",
-    "@wisp/constants": "workspace:*",
-    "@wisp/fs-utils": "workspace:*",
-    "@wisp/lexicons": "workspace:*",
+    "@wispplace/atproto-utils": "workspace:*",
+    "@wispplace/constants": "workspace:*",
+    "@wispplace/fs-utils": "workspace:*",
+    "@wispplace/lexicons": "workspace:*",
     "commander": "^14.0.2",
     "hono": "^4.7.4",
     "ignore": "^7.0.5",
diff --git a/cli/tsconfig.json b/cli/tsconfig.json
index e8f841d..b25ea7c 100644
--- a/cli/tsconfig.json
+++ b/cli/tsconfig.json
@@ -29,7 +29,7 @@
     // Workspace paths
     "baseUrl": ".",
     "paths": {
-      "@wisp/*": ["../packages/@wisp/*/src"]
+      "@wispplace/*": ["../packages/@wispplace/*/src"]
     },
     "types": ["bun"]
   },
diff --git a/package.json b/package.json
index ea48f8e..1ff7129 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "@wisp/monorepo",
+  "name": "@wispplace/monorepo",
   "version": "1.0.50",
   "private": true,
   "workspaces": [
-    "packages/@wisp/*",
+    "packages/@wispplace/*",
     "apps/main-app",
     "apps/hosting-service",
     "cli"
diff --git a/packages/@wisp/atproto-utils/package.json b/packages/@wispplace/atproto-utils/package.json
similarity index 89%
rename from packages/@wisp/atproto-utils/package.json
rename to packages/@wispplace/atproto-utils/package.json
index 0f6f67a..59f1262 100644
--- a/packages/@wisp/atproto-utils/package.json
+++ b/packages/@wispplace/atproto-utils/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/atproto-utils",
+  "name": "@wispplace/atproto-utils",
   "version": "1.0.0",
   "private": true,
   "type": "module",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@atproto/api": "^0.18.17",
-    "@wisp/lexicons": "workspace:*",
+    "@wispplace/lexicons": "workspace:*",
     "multiformats": "^13.3.1"
   },
   "devDependencies": {
diff --git a/packages/@wisp/atproto-utils/src/blob.ts b/packages/@wispplace/atproto-utils/src/blob.ts
similarity index 97%
rename from packages/@wisp/atproto-utils/src/blob.ts
rename to packages/@wispplace/atproto-utils/src/blob.ts
index 93ad217..6f20e19 100644
--- a/packages/@wisp/atproto-utils/src/blob.ts
+++ b/packages/@wispplace/atproto-utils/src/blob.ts
@@ -1,5 +1,5 @@
 import type { BlobRef } from "@atproto/api";
-import type { Directory, File } from "@wisp/lexicons/types/place/wisp/fs";
+import type { Directory, File } from "@wispplace/lexicons/types/place/wisp/fs";
 import { CID } from 'multiformats/cid';
 import { sha256 } from 'multiformats/hashes/sha2';
 import * as raw from 'multiformats/codecs/raw';
diff --git a/packages/@wisp/atproto-utils/src/compression.ts b/packages/@wispplace/atproto-utils/src/compression.ts
similarity index 100%
rename from packages/@wisp/atproto-utils/src/compression.ts
rename to packages/@wispplace/atproto-utils/src/compression.ts
diff --git a/packages/@wisp/atproto-utils/src/identity.ts b/packages/@wispplace/atproto-utils/src/identity.ts
similarity index 100%
rename from packages/@wisp/atproto-utils/src/identity.ts
rename to packages/@wispplace/atproto-utils/src/identity.ts
diff --git a/packages/@wisp/atproto-utils/src/index.ts b/packages/@wispplace/atproto-utils/src/index.ts
similarity index 100%
rename from packages/@wisp/atproto-utils/src/index.ts
rename to packages/@wispplace/atproto-utils/src/index.ts
diff --git a/packages/@wisp/atproto-utils/src/subfs.ts b/packages/@wispplace/atproto-utils/src/subfs.ts
similarity index 91%
rename from packages/@wisp/atproto-utils/src/subfs.ts
rename to packages/@wispplace/atproto-utils/src/subfs.ts
index 2e22019..9340397 100644
--- a/packages/@wisp/atproto-utils/src/subfs.ts
+++ b/packages/@wispplace/atproto-utils/src/subfs.ts
@@ -1,4 +1,4 @@
-import type { Directory } from "@wisp/lexicons/types/place/wisp/fs";
+import type { Directory } from "@wispplace/lexicons/types/place/wisp/fs";
 
 /**
  * Extract all subfs URIs from a directory tree with their mount paths
diff --git a/packages/@wisp/atproto-utils/tsconfig.json b/packages/@wispplace/atproto-utils/tsconfig.json
similarity index 100%
rename from packages/@wisp/atproto-utils/tsconfig.json
rename to packages/@wispplace/atproto-utils/tsconfig.json
diff --git a/packages/@wisp/safe-fetch/package.json b/packages/@wispplace/constants/package.json
similarity index 86%
rename from packages/@wisp/safe-fetch/package.json
rename to packages/@wispplace/constants/package.json
index a103472..587e17b 100644
--- a/packages/@wisp/safe-fetch/package.json
+++ b/packages/@wispplace/constants/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/safe-fetch",
+  "name": "@wispplace/constants",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/@wisp/constants/src/index.ts b/packages/@wispplace/constants/src/index.ts
similarity index 100%
rename from packages/@wisp/constants/src/index.ts
rename to packages/@wispplace/constants/src/index.ts
diff --git a/packages/@wisp/constants/tsconfig.json b/packages/@wispplace/constants/tsconfig.json
similarity index 100%
rename from packages/@wisp/constants/tsconfig.json
rename to packages/@wispplace/constants/tsconfig.json
diff --git a/packages/@wisp/css/README.md b/packages/@wispplace/css/README.md
similarity index 100%
rename from packages/@wisp/css/README.md
rename to packages/@wispplace/css/README.md
diff --git a/packages/@wisp/css/index.html b/packages/@wispplace/css/index.html
similarity index 100%
rename from packages/@wisp/css/index.html
rename to packages/@wispplace/css/index.html
diff --git a/packages/@wisp/css/index.ts b/packages/@wispplace/css/index.ts
similarity index 100%
rename from packages/@wisp/css/index.ts
rename to packages/@wispplace/css/index.ts
diff --git a/packages/@wisp/css/package.json b/packages/@wispplace/css/package.json
similarity index 81%
rename from packages/@wisp/css/package.json
rename to packages/@wispplace/css/package.json
index f259afd..0c63613 100644
--- a/packages/@wisp/css/package.json
+++ b/packages/@wispplace/css/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/css",
+  "name": "@wispplace/css",
   "version": "1.0.0",
   "description": "A minimal, monospace-first CSS stylesheet with automatic light/dark mode",
   "main": "index.ts",
@@ -20,6 +20,6 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nekomimi-pet/wisp.place-monorepo"
+    "url": "https://tangled.org/nekomimi-pet/wisp.place-monorepo"
   }
 }
diff --git a/packages/@wisp/css/wisp.css b/packages/@wispplace/css/wisp.css
similarity index 100%
rename from packages/@wisp/css/wisp.css
rename to packages/@wispplace/css/wisp.css
diff --git a/packages/@wisp/database/package.json b/packages/@wispplace/database/package.json
similarity index 91%
rename from packages/@wisp/database/package.json
rename to packages/@wispplace/database/package.json
index 3475b8c..99740a1 100644
--- a/packages/@wisp/database/package.json
+++ b/packages/@wispplace/database/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/database",
+  "name": "@wispplace/database",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/@wisp/database/src/index.ts b/packages/@wispplace/database/src/index.ts
similarity index 100%
rename from packages/@wisp/database/src/index.ts
rename to packages/@wispplace/database/src/index.ts
diff --git a/packages/@wisp/database/src/types.ts b/packages/@wispplace/database/src/types.ts
similarity index 100%
rename from packages/@wisp/database/src/types.ts
rename to packages/@wispplace/database/src/types.ts
diff --git a/packages/@wisp/database/tsconfig.json b/packages/@wispplace/database/tsconfig.json
similarity index 100%
rename from packages/@wisp/database/tsconfig.json
rename to packages/@wispplace/database/tsconfig.json
diff --git a/packages/@wisp/fs-utils/package.json b/packages/@wispplace/fs-utils/package.json
similarity index 91%
rename from packages/@wisp/fs-utils/package.json
rename to packages/@wispplace/fs-utils/package.json
index eb2479a..3d7129a 100644
--- a/packages/@wisp/fs-utils/package.json
+++ b/packages/@wispplace/fs-utils/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/fs-utils",
+  "name": "@wispplace/fs-utils",
   "version": "1.0.0",
   "private": true,
   "type": "module",
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "@atproto/api": "^0.18.17",
-    "@wisp/lexicons": "workspace:*"
+    "@wispplace/lexicons": "workspace:*"
   }
 }
diff --git a/packages/@wisp/fs-utils/src/index.ts b/packages/@wispplace/fs-utils/src/index.ts
similarity index 100%
rename from packages/@wisp/fs-utils/src/index.ts
rename to packages/@wispplace/fs-utils/src/index.ts
diff --git a/packages/@wisp/fs-utils/src/manifest.ts b/packages/@wispplace/fs-utils/src/manifest.ts
similarity index 79%
rename from packages/@wisp/fs-utils/src/manifest.ts
rename to packages/@wispplace/fs-utils/src/manifest.ts
index 2cf5472..716ac66 100644
--- a/packages/@wisp/fs-utils/src/manifest.ts
+++ b/packages/@wispplace/fs-utils/src/manifest.ts
@@ -1,5 +1,5 @@
-import type { Record, Directory } from "@wisp/lexicons/types/place/wisp/fs";
-// import { validateRecord } from "@wisp/lexicons/types/place/wisp/fs";
+import type { Record, Directory } from "@wispplace/lexicons/types/place/wisp/fs";
+// import { validateRecord } from "@wispplace/lexicons/types/place/wisp/fs";
 
 /**
  * Create the manifest record for a site
diff --git a/packages/@wisp/fs-utils/src/path.ts b/packages/@wispplace/fs-utils/src/path.ts
similarity index 100%
rename from packages/@wisp/fs-utils/src/path.ts
rename to packages/@wispplace/fs-utils/src/path.ts
diff --git a/packages/@wisp/fs-utils/src/redirects.test.ts b/packages/@wispplace/fs-utils/src/redirects.test.ts
similarity index 100%
rename from packages/@wisp/fs-utils/src/redirects.test.ts
rename to packages/@wispplace/fs-utils/src/redirects.test.ts
diff --git a/packages/@wisp/fs-utils/src/redirects.ts b/packages/@wispplace/fs-utils/src/redirects.ts
similarity index 100%
rename from packages/@wisp/fs-utils/src/redirects.ts
rename to packages/@wispplace/fs-utils/src/redirects.ts
diff --git a/packages/@wisp/fs-utils/src/subfs-split.ts b/packages/@wispplace/fs-utils/src/subfs-split.ts
similarity index 98%
rename from packages/@wisp/fs-utils/src/subfs-split.ts
rename to packages/@wispplace/fs-utils/src/subfs-split.ts
index e259937..300ab04 100644
--- a/packages/@wisp/fs-utils/src/subfs-split.ts
+++ b/packages/@wispplace/fs-utils/src/subfs-split.ts
@@ -1,4 +1,4 @@
-import type { Directory } from "@wisp/lexicons/types/place/wisp/fs";
+import type { Directory } from "@wispplace/lexicons/types/place/wisp/fs";
 
 /**
  * Estimate the JSON size of a directory tree
diff --git a/packages/@wisp/fs-utils/src/tree.test.ts b/packages/@wispplace/fs-utils/src/tree.test.ts
similarity index 100%
rename from packages/@wisp/fs-utils/src/tree.test.ts
rename to packages/@wispplace/fs-utils/src/tree.test.ts
diff --git a/packages/@wisp/fs-utils/src/tree.ts b/packages/@wispplace/fs-utils/src/tree.ts
similarity index 98%
rename from packages/@wisp/fs-utils/src/tree.ts
rename to packages/@wispplace/fs-utils/src/tree.ts
index 81e66b5..a1ca0fc 100644
--- a/packages/@wisp/fs-utils/src/tree.ts
+++ b/packages/@wispplace/fs-utils/src/tree.ts
@@ -1,5 +1,5 @@
 import type { BlobRef } from "@atproto/api";
-import type { Directory, Entry, File } from "@wisp/lexicons/types/place/wisp/fs";
+import type { Directory, Entry, File } from "@wispplace/lexicons/types/place/wisp/fs";
 
 export interface UploadedFile {
 	name: string;
diff --git a/packages/@wisp/fs-utils/tsconfig.json b/packages/@wispplace/fs-utils/tsconfig.json
similarity index 100%
rename from packages/@wisp/fs-utils/tsconfig.json
rename to packages/@wispplace/fs-utils/tsconfig.json
diff --git a/packages/@wisp/lexicons/README.md b/packages/@wispplace/lexicons/README.md
similarity index 100%
rename from packages/@wisp/lexicons/README.md
rename to packages/@wispplace/lexicons/README.md
diff --git a/packages/@wisp/lexicons/package.json b/packages/@wispplace/lexicons/package.json
similarity index 97%
rename from packages/@wisp/lexicons/package.json
rename to packages/@wispplace/lexicons/package.json
index 2355131..a96c2e0 100644
--- a/packages/@wisp/lexicons/package.json
+++ b/packages/@wispplace/lexicons/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/lexicons",
+  "name": "@wispplace/lexicons",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/@wisp/lexicons/src/index.ts b/packages/@wispplace/lexicons/src/index.ts
similarity index 100%
rename from packages/@wisp/lexicons/src/index.ts
rename to packages/@wispplace/lexicons/src/index.ts
diff --git a/packages/@wisp/lexicons/src/lexicons.ts b/packages/@wispplace/lexicons/src/lexicons.ts
similarity index 100%
rename from packages/@wisp/lexicons/src/lexicons.ts
rename to packages/@wispplace/lexicons/src/lexicons.ts
diff --git a/packages/@wisp/lexicons/src/types/place/wisp/fs.ts b/packages/@wispplace/lexicons/src/types/place/wisp/fs.ts
similarity index 100%
rename from packages/@wisp/lexicons/src/types/place/wisp/fs.ts
rename to packages/@wispplace/lexicons/src/types/place/wisp/fs.ts
diff --git a/packages/@wisp/lexicons/src/types/place/wisp/settings.ts b/packages/@wispplace/lexicons/src/types/place/wisp/settings.ts
similarity index 100%
rename from packages/@wisp/lexicons/src/types/place/wisp/settings.ts
rename to packages/@wispplace/lexicons/src/types/place/wisp/settings.ts
diff --git a/packages/@wisp/lexicons/src/types/place/wisp/subfs.ts b/packages/@wispplace/lexicons/src/types/place/wisp/subfs.ts
similarity index 100%
rename from packages/@wisp/lexicons/src/types/place/wisp/subfs.ts
rename to packages/@wispplace/lexicons/src/types/place/wisp/subfs.ts
diff --git a/packages/@wisp/lexicons/src/util.ts b/packages/@wispplace/lexicons/src/util.ts
similarity index 100%
rename from packages/@wisp/lexicons/src/util.ts
rename to packages/@wispplace/lexicons/src/util.ts
diff --git a/packages/@wisp/lexicons/tsconfig.json b/packages/@wispplace/lexicons/tsconfig.json
similarity index 100%
rename from packages/@wisp/lexicons/tsconfig.json
rename to packages/@wispplace/lexicons/tsconfig.json
diff --git a/packages/@wisp/observability/.env.example b/packages/@wispplace/observability/.env.example
similarity index 100%
rename from packages/@wisp/observability/.env.example
rename to packages/@wispplace/observability/.env.example
diff --git a/packages/@wisp/observability/README.md b/packages/@wispplace/observability/README.md
similarity index 100%
rename from packages/@wisp/observability/README.md
rename to packages/@wispplace/observability/README.md
diff --git a/packages/@wisp/observability/package.json b/packages/@wispplace/observability/package.json
similarity index 97%
rename from packages/@wisp/observability/package.json
rename to packages/@wispplace/observability/package.json
index f92f4a2..e94597e 100644
--- a/packages/@wisp/observability/package.json
+++ b/packages/@wispplace/observability/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/observability",
+  "name": "@wispplace/observability",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/@wisp/observability/src/core.ts b/packages/@wispplace/observability/src/core.ts
similarity index 100%
rename from packages/@wisp/observability/src/core.ts
rename to packages/@wispplace/observability/src/core.ts
diff --git a/packages/@wisp/observability/src/exporters.ts b/packages/@wispplace/observability/src/exporters.ts
similarity index 100%
rename from packages/@wisp/observability/src/exporters.ts
rename to packages/@wispplace/observability/src/exporters.ts
diff --git a/packages/@wisp/observability/src/index.ts b/packages/@wispplace/observability/src/index.ts
similarity index 71%
rename from packages/@wisp/observability/src/index.ts
rename to packages/@wispplace/observability/src/index.ts
index 711d9c0..8dd2a41 100644
--- a/packages/@wisp/observability/src/index.ts
+++ b/packages/@wispplace/observability/src/index.ts
@@ -1,5 +1,5 @@
 /**
- * @wisp/observability
+ * @wispplace/observability
  * Framework-agnostic observability package with Elysia and Hono middleware
  */
 
@@ -15,5 +15,5 @@ export {
 } from './exporters'
 
 // Note: Middleware should be imported from specific subpaths:
-// - import { observabilityMiddleware } from '@wisp/observability/middleware/elysia'
-// - import { observabilityMiddleware, observabilityErrorHandler } from '@wisp/observability/middleware/hono'
+// - import { observabilityMiddleware } from '@wispplace/observability/middleware/elysia'
+// - import { observabilityMiddleware, observabilityErrorHandler } from '@wispplace/observability/middleware/hono'
diff --git a/packages/@wisp/observability/src/integration-test.test.ts b/packages/@wispplace/observability/src/integration-test.test.ts
similarity index 100%
rename from packages/@wisp/observability/src/integration-test.test.ts
rename to packages/@wispplace/observability/src/integration-test.test.ts
diff --git a/packages/@wisp/observability/src/middleware/elysia.ts b/packages/@wispplace/observability/src/middleware/elysia.ts
similarity index 100%
rename from packages/@wisp/observability/src/middleware/elysia.ts
rename to packages/@wispplace/observability/src/middleware/elysia.ts
diff --git a/packages/@wisp/observability/src/middleware/hono.ts b/packages/@wispplace/observability/src/middleware/hono.ts
similarity index 100%
rename from packages/@wisp/observability/src/middleware/hono.ts
rename to packages/@wispplace/observability/src/middleware/hono.ts
diff --git a/packages/@wisp/observability/tsconfig.json b/packages/@wispplace/observability/tsconfig.json
similarity index 100%
rename from packages/@wisp/observability/tsconfig.json
rename to packages/@wispplace/observability/tsconfig.json
diff --git a/packages/@wisp/constants/package.json b/packages/@wispplace/safe-fetch/package.json
similarity index 86%
rename from packages/@wisp/constants/package.json
rename to packages/@wispplace/safe-fetch/package.json
index eeedcf7..811c0f5 100644
--- a/packages/@wisp/constants/package.json
+++ b/packages/@wispplace/safe-fetch/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@wisp/constants",
+  "name": "@wispplace/safe-fetch",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/@wisp/safe-fetch/src/index.ts b/packages/@wispplace/safe-fetch/src/index.ts
similarity index 100%
rename from packages/@wisp/safe-fetch/src/index.ts
rename to packages/@wispplace/safe-fetch/src/index.ts
diff --git a/packages/@wisp/safe-fetch/tsconfig.json b/packages/@wispplace/safe-fetch/tsconfig.json
similarity index 100%
rename from packages/@wisp/safe-fetch/tsconfig.json
rename to packages/@wispplace/safe-fetch/tsconfig.json