diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/.dockerignore b/examples/cloudflare-pages-worker-monorepo/apps/psylon/.dockerignore
similarity index 100%
rename from examples/cloudflare-pages-worker-monorepo/apps/pylon/.dockerignore
rename to examples/cloudflare-pages-worker-monorepo/apps/psylon/.dockerignore
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/.gitignore b/examples/cloudflare-pages-worker-monorepo/apps/psylon/.gitignore
similarity index 100%
rename from examples/cloudflare-pages-worker-monorepo/apps/pylon/.gitignore
rename to examples/cloudflare-pages-worker-monorepo/apps/psylon/.gitignore
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/package.json b/examples/cloudflare-pages-worker-monorepo/apps/psylon/package.json
similarity index 77%
rename from examples/cloudflare-pages-worker-monorepo/apps/pylon/package.json
rename to examples/cloudflare-pages-worker-monorepo/apps/psylon/package.json
index 0e23110..25450eb 100644
--- a/examples/cloudflare-pages-worker-monorepo/apps/pylon/package.json
+++ b/examples/cloudflare-pages-worker-monorepo/apps/psylon/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "pylon",
+  "name": "psylon-worker",
   "version": "0.0.0",
   "private": true,
   "scripts": {
     "deploy": "pylon build && wrangler deploy",
-    "dev": "pylon dev -c 'wrangler dev' --client --client-port 8787 --client-path ../vite-project/gqty/index.ts",
+    "dev": "pylon dev -c 'wrangler dev' --client --client-port 8787 --client-path ../vite-project/pgqty/index.ts",
     "cf-typegen": "wrangler types"
   },
   "dependencies": {
@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/getcronit/pylon.git"
+    "url": "https://github.com/netsnek/psylon.git"
   },
-  "homepage": "https://pylon.cronit.io"
+  "homepage": "https://psylon.dev"
 }
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/pylon.d.ts b/examples/cloudflare-pages-worker-monorepo/apps/psylon/psylon.d.ts
similarity index 100%
rename from examples/cloudflare-pages-worker-monorepo/apps/pylon/pylon.d.ts
rename to examples/cloudflare-pages-worker-monorepo/apps/psylon/psylon.d.ts
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/src/index.ts b/examples/cloudflare-pages-worker-monorepo/apps/psylon/src/index.ts
similarity index 100%
rename from examples/cloudflare-pages-worker-monorepo/apps/pylon/src/index.ts
rename to examples/cloudflare-pages-worker-monorepo/apps/psylon/src/index.ts
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/psylon/tsconfig.json b/examples/cloudflare-pages-worker-monorepo/apps/psylon/tsconfig.json
new file mode 100644
index 0000000..7e5230e
--- /dev/null
+++ b/examples/cloudflare-pages-worker-monorepo/apps/psylon/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "psylon/tsconfig.pylon.json",
+  "include": ["psylon.d.ts", "worker-configuration.d.ts", "src/**/*.ts"]
+}
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/worker-configuration.d.ts b/examples/cloudflare-pages-worker-monorepo/apps/psylon/worker-configuration.d.ts
similarity index 100%
rename from examples/cloudflare-pages-worker-monorepo/apps/pylon/worker-configuration.d.ts
rename to examples/cloudflare-pages-worker-monorepo/apps/psylon/worker-configuration.d.ts
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/wrangler.toml b/examples/cloudflare-pages-worker-monorepo/apps/psylon/wrangler.toml
similarity index 99%
rename from examples/cloudflare-pages-worker-monorepo/apps/pylon/wrangler.toml
rename to examples/cloudflare-pages-worker-monorepo/apps/psylon/wrangler.toml
index 47cb1ee..59416eb 100644
--- a/examples/cloudflare-pages-worker-monorepo/apps/pylon/wrangler.toml
+++ b/examples/cloudflare-pages-worker-monorepo/apps/psylon/wrangler.toml
@@ -1,5 +1,5 @@
 #:schema node_modules/wrangler/config-schema.json
-name = "pylon"
+name = "psylon"
 main = ".pylon/index.js"
 compatibility_date = "2024-09-03"
 compatibility_flags = ["nodejs_compat_v2"]
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/pylon/tsconfig.json b/examples/cloudflare-pages-worker-monorepo/apps/pylon/tsconfig.json
deleted file mode 100644
index 042fc6b..0000000
--- a/examples/cloudflare-pages-worker-monorepo/apps/pylon/tsconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "psylon/tsconfig.pylon.json",
-  "include": ["pylon.d.ts", "worker-configuration.d.ts", "src/**/*.ts"]
-}
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/package.json b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/package.json
index 41a3312..f1d773e 100644
--- a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/package.json
+++ b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/package.json
@@ -11,7 +11,7 @@
     "deploy": "bun run build && wrangler pages deploy dist"
   },
   "dependencies": {
-    "@gqty/react": "^3.0.4",
+    "@pgqty/react": "^4.2.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/gqty/index.ts b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/pgqty/index.ts
similarity index 93%
rename from examples/cloudflare-pages-worker-monorepo/apps/vite-project/gqty/index.ts
rename to examples/cloudflare-pages-worker-monorepo/apps/vite-project/pgqty/index.ts
index 7df04a7..2db795f 100644
--- a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/gqty/index.ts
+++ b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/pgqty/index.ts
@@ -2,16 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /**
- * GQty: You can safely modify this file based on your needs.
+ * pgqty: You can safely modify this file based on your needs.
  */
 
-import {createReactClient} from '@gqty/react'
+import {createReactClient} from '@pgqty/react'
 import {
   Cache,
   createClient,
   defaultResponseHandler,
   type QueryFetcher
-} from 'gqty'
+} from 'pgqty'
 import {
   generatedSchema,
   scalarsEnumsHash,
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/gqty/schema.generated.ts b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/pgqty/schema.generated.ts
similarity index 95%
rename from examples/cloudflare-pages-worker-monorepo/apps/vite-project/gqty/schema.generated.ts
rename to examples/cloudflare-pages-worker-monorepo/apps/vite-project/pgqty/schema.generated.ts
index 27d6cc2..6a43374 100644
--- a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/gqty/schema.generated.ts
+++ b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/pgqty/schema.generated.ts
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /**
- * GQty AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
+ * pgqty AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
  */
 
-import {type ScalarsEnumsHash} from 'gqty'
+import {type ScalarsEnumsHash} from 'pgqty'
 
 export type Maybe<T> = T | null
 export type InputMaybe<T> = Maybe<T>
diff --git a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/src/App.tsx b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/src/App.tsx
index 687bd67..75caf33 100644
--- a/examples/cloudflare-pages-worker-monorepo/apps/vite-project/src/App.tsx
+++ b/examples/cloudflare-pages-worker-monorepo/apps/vite-project/src/App.tsx
@@ -4,7 +4,7 @@
 import pylonLogo from '/pylon.svg'
 import './App.css'
 
-import {resolve, useQuery} from '../gqty'
+import {resolve, useQuery} from '../pgqty'
 
 function App() {
   const data = useQuery()
diff --git a/packages/create-pylon/package.json b/packages/create-pylon/package.json
index 5862e1b..1cb2c1f 100644
--- a/packages/create-pylon/package.json
+++ b/packages/create-pylon/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-psylon",
   "type": "module",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "CLI for creating a Psylon",
   "scripts": {
     "build": "rimraf ./dist && esbuild ./src/index.ts --bundle --platform=node --target=node18 --format=esm --minify --outdir=./dist --sourcemap=linked --packages=external"
diff --git a/packages/create-pylon/src/index.ts b/packages/create-pylon/src/index.ts
index 5ac3f87..5eb4f40 100644
--- a/packages/create-pylon/src/index.ts
+++ b/packages/create-pylon/src/index.ts
@@ -290,7 +290,7 @@ program
   .addOption(
     new Option(
       '--client',
-      'Enable client generation (https://pylon.cronit.io/docs/integrations/gqty)'
+      'Enable client generation (https://pylon.cronit.io/docs/integrations/pgqty)'
     )
   )
   .addOption(new Option('--client-path <clientPath>', 'Client path'))
@@ -433,7 +433,7 @@ async function main(
       clientArg ||
       (await confirm({
         message:
-          'Would you like to enable client generation? (https://pylon.cronit.io/docs/integrations/gqty)',
+          'Would you like to enable client generation? (https://pylon.cronit.io/docs/integrations/pgqty)',
         default: false
       }))
 
@@ -450,7 +450,7 @@ async function main(
 
         clientPath = await input({
           message: 'Path to generate the client to',
-          default: path.join(clientRoot, 'gqty/index.ts'),
+          default: path.join(clientRoot, 'psylon/index.ts'),
           validate: value => {
             // Check if the path starts with the client root (take care of .)
             if (!value.startsWith(clientRoot === '.' ? '' : clientRoot)) {
diff --git a/packages/pylon/CHANGELOG.md b/packages/psylon/CHANGELOG.md
similarity index 100%
rename from packages/pylon/CHANGELOG.md
rename to packages/psylon/CHANGELOG.md
diff --git a/packages/pylon/README.md b/packages/psylon/README.md
similarity index 92%
rename from packages/pylon/README.md
rename to packages/psylon/README.md
index 0c84cb0..2ca768e 100644
--- a/packages/pylon/README.md
+++ b/packages/psylon/README.md
@@ -49,10 +49,23 @@ to Psylon where appropriate.
 
 Canonical repository: https://github.com/netsnek/psylon
 
+## Version lineage
+
+Psylon is a fork of Pylon v2.
+
+- `pylon@2.9.6` – last upstream Pylon v2 release from @schettn under the `@getcronit` scope.
+- `psylon@2.9.6` – first Psylon release, based on `pylon@2.9.6` with rebranding, new package names,
+  and essentially the same feature set as that upstream release.
+- `psylon@2.9.7` and later – new releases maintained by Netsnek e. U. under the `psylon` and
+  `@netsnek/*` package names.
+
+From `psylon@2.9.6` onwards, the histories diverge: Psylon keeps the Pylon v2 runtime, focuses on
+GraphQL-based microservices, and selectively backports security fixes and compatible improvements
+from Pylon v3.
+
 ## Roadmap
 
-Psylons roadmap is centered around GraphQL via GQty and its pgqty fork.
-For current plans and discussion, see
+Psylon uses pgqty (a fork of GQty) as its GraphQL client layer. For current plans and discussion, see
 [gqty-dev/gqty#2051](https://github.com/gqty-dev/gqty/issues/2051).
 
 ## Create
diff --git a/packages/pylon/package.json b/packages/psylon/package.json
similarity index 95%
rename from packages/pylon/package.json
rename to packages/psylon/package.json
index 2ed745c..983dd0e 100644
--- a/packages/pylon/package.json
+++ b/packages/psylon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "psylon",
-  "version": "2.9.6",
+  "version": "2.10.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/getcronit/pylon.git",
-    "directory": "packages/pylon"
+    "directory": "packages/psylon"
   },
   "homepage": "https://pylon.cronit.io",
   "dependencies": {
diff --git a/packages/pylon/src/app/envelop/use-sentry.ts b/packages/psylon/src/app/envelop/use-sentry.ts
similarity index 100%
rename from packages/pylon/src/app/envelop/use-sentry.ts
rename to packages/psylon/src/app/envelop/use-sentry.ts
diff --git a/packages/pylon/src/app/envelop/use-viewer.ts b/packages/psylon/src/app/envelop/use-viewer.ts
similarity index 100%
rename from packages/pylon/src/app/envelop/use-viewer.ts
rename to packages/psylon/src/app/envelop/use-viewer.ts
diff --git a/packages/pylon/src/app/handler/pylon-handler.ts b/packages/psylon/src/app/handler/pylon-handler.ts
similarity index 100%
rename from packages/pylon/src/app/handler/pylon-handler.ts
rename to packages/psylon/src/app/handler/pylon-handler.ts
diff --git a/packages/pylon/src/app/index.ts b/packages/psylon/src/app/index.ts
similarity index 100%
rename from packages/pylon/src/app/index.ts
rename to packages/psylon/src/app/index.ts
diff --git a/packages/pylon/src/auth/decorators/requireAuth.ts b/packages/psylon/src/auth/decorators/requireAuth.ts
similarity index 100%
rename from packages/pylon/src/auth/decorators/requireAuth.ts
rename to packages/psylon/src/auth/decorators/requireAuth.ts
diff --git a/packages/pylon/src/auth/index.ts b/packages/psylon/src/auth/index.ts
similarity index 100%
rename from packages/pylon/src/auth/index.ts
rename to packages/psylon/src/auth/index.ts
diff --git a/packages/pylon/src/context.ts b/packages/psylon/src/context.ts
similarity index 100%
rename from packages/pylon/src/context.ts
rename to packages/psylon/src/context.ts
diff --git a/packages/pylon/src/create-decorator.ts b/packages/psylon/src/create-decorator.ts
similarity index 100%
rename from packages/pylon/src/create-decorator.ts
rename to packages/psylon/src/create-decorator.ts
diff --git a/packages/pylon/src/define-pylon.ts b/packages/psylon/src/define-pylon.ts
similarity index 100%
rename from packages/pylon/src/define-pylon.ts
rename to packages/psylon/src/define-pylon.ts
diff --git a/packages/pylon/src/get-env.ts b/packages/psylon/src/get-env.ts
similarity index 100%
rename from packages/pylon/src/get-env.ts
rename to packages/psylon/src/get-env.ts
diff --git a/packages/pylon/src/index.ts b/packages/psylon/src/index.ts
similarity index 100%
rename from packages/pylon/src/index.ts
rename to packages/psylon/src/index.ts
diff --git a/packages/pylon/tsconfig.json b/packages/psylon/tsconfig.json
similarity index 100%
rename from packages/pylon/tsconfig.json
rename to packages/psylon/tsconfig.json
diff --git a/packages/pylon/tsconfig.pylon.json b/packages/psylon/tsconfig.pylon.json
similarity index 100%
rename from packages/pylon/tsconfig.pylon.json
rename to packages/psylon/tsconfig.pylon.json
diff --git a/packages/pylon-dev/package.json b/packages/pylon-dev/package.json
index 2ebb789..d56b6c9 100644
--- a/packages/pylon-dev/package.json
+++ b/packages/pylon-dev/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@netsnek/psylon-dev",
   "type": "module",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "CLI for creating a Pylon",
   "scripts": {
     "build": "rimraf ./dist && esbuild ./src/index.ts --bundle --platform=node --target=node18 --format=esm --minify --outdir=./dist --sourcemap=linked --packages=external"
@@ -23,7 +23,7 @@
   "dependencies": {
     "@netsnek/psylon-builder": "workspace:^",
     "@netsnek/psylon-telemetry": "workspace:^",
-    "@gqty/cli": "^4.2.0",
+    "@pgqty/cli": "^5.0.0",
     "commander": "^12.1.0",
     "consola": "^3.2.3",
     "dotenv": "^16.4.5",
diff --git a/packages/pylon-dev/src/index.ts b/packages/pylon-dev/src/index.ts
index 1d25124..358485a 100644
--- a/packages/pylon-dev/src/index.ts
+++ b/packages/pylon-dev/src/index.ts
@@ -4,7 +4,7 @@
 
 
 import {build} from '@netsnek/psylon-builder'
-import {fetchSchema, generateClient} from '@gqty/cli'
+import {fetchSchema, generateClient} from '@pgqty/cli'
 import {program, type Command} from 'commander'
 import {consola} from 'consola'
 import path from 'path'
@@ -51,7 +51,7 @@ program
   .option(
     '--client-path <clientPath>',
     'Path to generate the client to',
-    'gqty/index.ts'
+    'pgqty/index.ts'
   )
   .option(
     '--client-port <clientPort>',