diff --git a/edgedbpkg/edgedb_ext/__init__.py b/edgedbpkg/edgedb_ext/__init__.py
index 010faec..4a66d50 100644
--- a/edgedbpkg/edgedb_ext/__init__.py
+++ b/edgedbpkg/edgedb_ext/__init__.py
@@ -1,3 +1,3 @@
-from .base import EdgeDBExtension, PGEXT_VERSION_AUTO
+from .base import GelServerExtension, PGEXT_VERSION_AUTO
 
-__all__ = ("EdgeDBExtension", "PGEXT_VERSION_AUTO")
+__all__ = ("GelServerExtension", "PGEXT_VERSION_AUTO")
diff --git a/edgedbpkg/edgedb_ext/base.py b/edgedbpkg/edgedb_ext/base.py
index fdfa68a..1721ec1 100644
--- a/edgedbpkg/edgedb_ext/base.py
+++ b/edgedbpkg/edgedb_ext/base.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 from typing import (
     TYPE_CHECKING,
+    Self,
 )
 
 import dataclasses
@@ -27,10 +28,10 @@
 PGEXT_VERSION_AUTO = "auto"
 
 
-class EdgeDBExtension(packages.BuildSystemMakePackage):
+class GelServerExtension(packages.BuildSystemMakePackage):
     # Populated in resolve() when this is built as top-level package.
     bundle_deps: list[packages.BundledPackage] = []
-    _edb: edgedb.EdgeDB | None
+    _edb: edgedb.Gel | None
     _pgext: poetry_dep.Dependency
 
     @classmethod
@@ -44,7 +45,7 @@ def resolve(
         is_release: bool = False,
         target: targets.Target,
         requires: list[poetry_dep.Dependency] | None = None,
-    ) -> EdgeDBExtension:
+    ) -> Self:
         server_slot = ""
         if version is not None:
             server_slot, _, version = version.rpartition("!")
@@ -54,7 +55,7 @@ def resolve(
                 edb = None
             else:
                 raise RuntimeError(
-                    "must specify EdgeDB version as epoch, eg 5!1.0"
+                    "must specify Gel version as epoch, eg 5!1.0"
                 )
         else:
             edb_ver = poetry_version.Version.parse(server_slot)
@@ -63,7 +64,7 @@ def resolve(
                     release=dataclasses.replace(edb_ver.release, minor=0),
                 )
 
-            edb = edgedb.EdgeDB.resolve(
+            edb = edgedb.Gel.resolve(
                 io,
                 version=f"v{edb_ver}",
                 is_release=edb_ver.dev is None,
@@ -84,7 +85,7 @@ def resolve(
             name = packages.canonicalize_name(f"{edb.name_slot}-ext-{pkgname}")
         else:
             name = packages.canonicalize_name(
-                f"{edgedb.EdgeDB.ident}-ext-{pkgname}"
+                f"{edgedb.Gel.ident}-ext-{pkgname}"
             )
 
         ext = super().resolve(
@@ -114,7 +115,7 @@ def resolve(
             else:
                 raise RuntimeError(
                     "could not determine version of PostgreSQL used "
-                    "by the specified EdgeDB version"
+                    "by the specified Gel version"
                 )
 
             pgextname = cls.ident.replace("edbext-", "pgext-")
diff --git a/edgedbpkg/edgedb_ext/postgis/__init__.py b/edgedbpkg/edgedb_ext/postgis/__init__.py
index 0f46682..faf5427 100644
--- a/edgedbpkg/edgedb_ext/postgis/__init__.py
+++ b/edgedbpkg/edgedb_ext/postgis/__init__.py
@@ -7,8 +7,8 @@
 from edgedbpkg import edgedb_ext
 
 
-class PostGIS(edgedb_ext.EdgeDBExtension):
-    title = "edgedb postgis extension"
+class PostGIS(edgedb_ext.GelServerExtension):
+    title = "gel postgis extension"
     ident = "edbext-postgis"
     description = "Geographic Objects for EdgeDB"
     license_id = "GPL-3"
@@ -27,7 +27,7 @@ class PostGIS(edgedb_ext.EdgeDBExtension):
     def get_pgext_ver(cls) -> str | None:
         # FIXME: We should base it on the pinned version in edgedb-postgis,
         # or something like that. auto is broken on non-tagged builds currently.
-        return '3.5.1'
+        return "3.5.1"
         # return edgedb_ext.PGEXT_VERSION_AUTO
 
     def get_make_install_destdir_subdir(
diff --git a/edgedbpkg/edgedb_ext/vectorstore/__init__.py b/edgedbpkg/edgedb_ext/vectorstore/__init__.py
index 8d00f85..dd6e285 100644
--- a/edgedbpkg/edgedb_ext/vectorstore/__init__.py
+++ b/edgedbpkg/edgedb_ext/vectorstore/__init__.py
@@ -5,11 +5,11 @@
 from edgedbpkg import edgedb_ext
 
 
-class Vectorstore(edgedb_ext.EdgeDBExtension):
-    title = "edgedb vectorstore extension"
+class Vectorstore(edgedb_ext.GelServerExtension):
+    title = "gel vectorstore extension"
     ident = "edbext-vectorstore"
     description = (
-        "Premade types to use EdgeDB as a vectorstore with AI frameworks"
+        "Premade types to use Gel as a vectorstore with AI frameworks"
     )
     license_id = "Apache-2.0"
     group = "Applications/Databases"