diff --git a/docs/clients/js/driver.rst b/docs/clients/js/driver.rst
index 7304ee9e019..17c7000d4ee 100644
--- a/docs/clients/js/driver.rst
+++ b/docs/clients/js/driver.rst
@@ -414,7 +414,7 @@ JavaScript code. Here is an example:
 
 .. code-block:: javascript
 
-    const email = "timmy@geldata.com"
+    const email = "timmy@example.com"
 
     await client.transaction(async tx => {
       await tx.execute(
diff --git a/docs/datamodel/access_policies.rst b/docs/datamodel/access_policies.rst
index b33d6911249..94345b2ec56 100644
--- a/docs/datamodel/access_policies.rst
+++ b/docs/datamodel/access_policies.rst
@@ -290,7 +290,7 @@ Let's do some experiments.
 
 .. code-block:: edgeql-repl
 
-  db> insert User { email := "test@geldata.com" };
+  db> insert User { email := "test@example.com" };
   {default::User {id: be44b326-03db-11ed-b346-7f1594474966}}
   db> set global current_user :=
   ...   <uuid>"be44b326-03db-11ed-b346-7f1594474966";
diff --git a/docs/guides/auth/webauthn.rst b/docs/guides/auth/webauthn.rst
index 149af912d6f..6c22952a213 100644
--- a/docs/guides/auth/webauthn.rst
+++ b/docs/guides/auth/webauthn.rst
@@ -534,7 +534,7 @@ resulting credential or assertion to the server. Writing out the low-level
 handling of serialization and deserialization of the WebAuthn data is beyond the
 scope of this guide, but we publish a WebAuthn client library that you can use
 to simlify this process. The library is available on npm as part of our
-``@edgedb/auth-core`` library. Here is an example of how you might set up a form
+``@gel/auth-core`` library. Here is an example of how you might set up a form
 with appropriate click handlers to perform the WebAuthn sign in and sign up
 ceremonies.
 
@@ -542,7 +542,7 @@ ceremonies.
 
 .. code-block:: javascript
 
-  import { WebAuthnClient } from "@edgedb/auth-core/webauthn";
+  import { WebAuthnClient } from "@gel/auth-core/webauthn";
 
   const webAuthnClient = new WebAuthnClient({
     signupOptionsUrl: "http://localhost:3000/auth/webauthn/register/options",
diff --git a/docs/guides/datamigrations/postgres.rst b/docs/guides/datamigrations/postgres.rst
index f2f510959d7..e30f8b051d9 100644
--- a/docs/guides/datamigrations/postgres.rst
+++ b/docs/guides/datamigrations/postgres.rst
@@ -559,7 +559,7 @@ this:
     {
       default::User {
         name: 'Cameron',
-        email: 'cameron@edgedb.com',
+        email: 'cameron@example.com',
         status: {},
         badge: default::Badge {name: 'admin'},
         bookmark: {
diff --git a/docs/guides/deployment/heroku.rst b/docs/guides/deployment/heroku.rst
index 155ee617fef..0027a373a16 100644
--- a/docs/guides/deployment/heroku.rst
+++ b/docs/guides/deployment/heroku.rst
@@ -50,7 +50,7 @@ run during the build step on Heroku because it needs access to a running
 
 .. code-block:: bash
 
-   $ yarn install && npx @edgedb/generate edgeql-js
+   $ yarn install && npx @gel/generate edgeql-js
 
 The ``dbschema/edgeql-js`` directory was added to the ``.gitignore`` in the
 upstream project so we'll remove it here.
diff --git a/docs/guides/tutorials/chatgpt_bot.rst b/docs/guides/tutorials/chatgpt_bot.rst
index f25af94789e..e67988ac8cc 100644
--- a/docs/guides/tutorials/chatgpt_bot.rst
+++ b/docs/guides/tutorials/chatgpt_bot.rst
@@ -595,13 +595,13 @@ libraries that will help us.
 
     $ npm install openai edgedb
     $ npm install \
-        @edgedb/generate \
+        @gel/generate \
         gpt-tokenizer \
         dotenv \
         tsx \
         --save-dev
 
-The ``@edgedb/generate`` package provides a set of code generation tools that
+The ``@gel/generate`` package provides a set of code generation tools that
 are useful when developing an Gel-backed applications with
 TypeScript/JavaScript. We're going to write queries using our
 :ref:`query builder <gel-js-qb>`, but before we can, we
@@ -609,7 +609,7 @@ need to run the query builder generator.
 
 .. code-block:: bash
 
-    $ npx @edgedb/generate edgeql-js
+    $ npx @gel/generate edgeql-js
 
 Answer "y" when asked about adding the query builder to ``.gitignore``.
 
@@ -1139,7 +1139,7 @@ Let's add a script to ``package.json`` that will invoke and execute
           "typescript": "5.1.6"
         },
         "devDependencies": {
-          "@edgedb/generate": "^0.3.3",
+          "@gel/generate": "^0.3.3",
           "@types/node": "20.4.8",
           "@types/react": "18.2.18",
           "@types/react-dom": "18.2.7",
diff --git a/docs/guides/tutorials/nextjs_app_router.rst b/docs/guides/tutorials/nextjs_app_router.rst
index cde394e53a0..b1acea6bfe1 100644
--- a/docs/guides/tutorials/nextjs_app_router.rst
+++ b/docs/guides/tutorials/nextjs_app_router.rst
@@ -349,20 +349,20 @@ First, install the generator to your project.
 
 .. code-block:: bash
 
-  $ npm install --save-dev @edgedb/generate
-  $ # or yarn add --dev @edgedb/generate
-  $ # or pnpm add --dev @edgedb/generate
-  $ # or bun add --dev @edgedb/generate
+  $ npm install --save-dev @gel/generate
+  $ # or yarn add --dev @gel/generate
+  $ # or pnpm add --dev @gel/generate
+  $ # or bun add --dev @gel/generate
 
 Then generate the query builder with the following command.
 
 .. code-block:: bash
 
-  $ npx @edgedb/generate edgeql-js
+  $ npx @gel/generate edgeql-js
   Generating query builder...
   Detected tsconfig.json, generating TypeScript files.
      To override this, use the --target flag.
-     Run `npx @edgedb/generate --help` for full options.
+     Run `npx @gel/generate --help` for full options.
   Introspecting database schema...
   Writing files to ./dbschema/edgeql-js
   Generation complete! 🤘
@@ -544,7 +544,7 @@ cloud instance.
 
 Add the following ``prebuild`` script to your ``package.json``. When Vercel
 initializes the build, it will trigger this script which will generate the
-query builder. The ``npx @edgedb/generate edgeql-js`` command will read the
+query builder. The ``npx @gel/generate edgeql-js`` command will read the
 value of the ``EDGEDB_SECRET_KEY`` and ``EDGEDB_INSTANCE`` variables,
 connect to the database, and generate the query builder before Vercel
 starts building the project.
@@ -557,7 +557,7 @@ starts building the project.
       "build": "next build",
       "start": "next start",
       "lint": "next lint",
-  +   "prebuild": "npx @edgedb/generate edgeql-js"
+  +   "prebuild": "npx @gel/generate edgeql-js"
     },
 
 **#3 Deploy to Vercel**
@@ -637,7 +637,7 @@ database. Open a REPL and ``insert`` some blog posts:
 
 Add the following ``prebuild`` script to your ``package.json``. When Vercel
 initializes the build, it will trigger this script which will generate the
-query builder. The ``npx @edgedb/generate edgeql-js`` command will read the
+query builder. The ``npx @gel/generate edgeql-js`` command will read the
 value of the ``EDGEDB_DSN`` variable, connect to the database, and generate
 the query builder before Vercel starts building the project.
 
@@ -649,7 +649,7 @@ the query builder before Vercel starts building the project.
       "build": "next build",
       "start": "next start",
       "lint": "next lint",
-  +   "prebuild": "npx @edgedb/generate edgeql-js"
+  +   "prebuild": "npx @gel/generate edgeql-js"
     },
 
 **#5 Deploy to Vercel**
diff --git a/docs/guides/tutorials/nextjs_pages_router.rst b/docs/guides/tutorials/nextjs_pages_router.rst
index 927ad1f44a5..557cc010552 100644
--- a/docs/guides/tutorials/nextjs_pages_router.rst
+++ b/docs/guides/tutorials/nextjs_pages_router.rst
@@ -358,17 +358,17 @@ First, install the generator to your project.
 
 .. code-block:: bash
 
-  $ yarn add --dev @edgedb/generate
+  $ yarn add --dev @gel/generate
 
 Then generate the query builder with the following command.
 
 .. code-block:: bash
 
-  $ npx @edgedb/generate edgeql-js
+  $ npx @gel/generate edgeql-js
   Generating query builder...
   Detected tsconfig.json, generating TypeScript files.
      To override this, use the --target flag.
-     Run `npx @edgedb/generate --help` for full options.
+     Run `npx @gel/generate --help` for full options.
   Introspecting database schema...
   Writing files to ./dbschema/edgeql-js
   Generation complete! 🤘
@@ -597,7 +597,7 @@ database. Open a REPL and ``insert`` some blog posts:
 
 Add the following ``prebuild`` script to your ``package.json``. When Vercel
 initializes the build, it will trigger this script which will generate the
-query builder. The ``npx @edgedb/generate edgeql-js`` command will read the
+query builder. The ``npx @gel/generate edgeql-js`` command will read the
 value of the ``EDGEDB_DSN`` variable, connect to the database, and generate the
 query builder before Vercel starts building the project.
 
@@ -609,7 +609,7 @@ query builder before Vercel starts building the project.
       "build": "next build",
       "start": "next start",
       "lint": "next lint",
-  +   "prebuild": "npx @edgedb/generate edgeql-js"
+  +   "prebuild": "npx @gel/generate edgeql-js"
     },
 
 **#5 Deploy to Vercel**
diff --git a/docs/guides/tutorials/trpc.rst b/docs/guides/tutorials/trpc.rst
index 4d61b21a521..1507065bbc3 100644
--- a/docs/guides/tutorials/trpc.rst
+++ b/docs/guides/tutorials/trpc.rst
@@ -287,7 +287,7 @@ context that provides the user session and Gel client to the tRPC API.
    .. code-block:: typescript
 
       import { createClient } from "edgedb";
-      import createAuth from "@edgedb/auth-nextjs/app";
+      import createAuth from "@gel/auth-nextjs/app";
 
       // Initialize Gel client
       export const edgedbClient = createClient();
@@ -375,7 +375,7 @@ authentication and context for tRPC procedures.
    .. code-block:: typescript
 
       import { createClient } from "edgedb";
-      import createExpressAuth from "@edgedb/auth-express";
+      import createExpressAuth from "@gel/auth-express";
 
       // Initialize Gel client
       const edgedbClient = createClient();