diff --git a/.github/workflows.src/tests.inc.yml b/.github/workflows.src/tests.inc.yml
index 63d8e416a71..c12f2be3f38 100644
--- a/.github/workflows.src/tests.inc.yml
+++ b/.github/workflows.src/tests.inc.yml
@@ -148,7 +148,7 @@
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -423,7 +423,7 @@
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -436,8 +436,8 @@
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/.github/workflows/tests-ha.yml b/.github/workflows/tests-ha.yml
index d517c7ab77c..cbff8f4fa08 100644
--- a/.github/workflows/tests-ha.yml
+++ b/.github/workflows/tests-ha.yml
@@ -194,7 +194,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -477,7 +477,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -490,8 +490,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/.github/workflows/tests-inplace.yml b/.github/workflows/tests-inplace.yml
index 4a9ca6c7168..2fa2f46a828 100644
--- a/.github/workflows/tests-inplace.yml
+++ b/.github/workflows/tests-inplace.yml
@@ -179,7 +179,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -474,7 +474,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -487,8 +487,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
@@ -637,7 +637,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -650,8 +650,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/.github/workflows/tests-managed-pg.yml b/.github/workflows/tests-managed-pg.yml
index 8f15038f718..9b5b7ec7f42 100644
--- a/.github/workflows/tests-managed-pg.yml
+++ b/.github/workflows/tests-managed-pg.yml
@@ -179,7 +179,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -508,7 +508,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -521,8 +521,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
@@ -751,7 +751,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -764,8 +764,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
@@ -1042,7 +1042,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -1055,8 +1055,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
@@ -1299,7 +1299,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -1312,8 +1312,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
@@ -1544,7 +1544,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -1557,8 +1557,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/.github/workflows/tests-patches.yml b/.github/workflows/tests-patches.yml
index 60a8e5ecdb5..0a9ef8b4139 100644
--- a/.github/workflows/tests-patches.yml
+++ b/.github/workflows/tests-patches.yml
@@ -181,7 +181,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -477,7 +477,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -490,8 +490,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/.github/workflows/tests-pg-versions.yml b/.github/workflows/tests-pg-versions.yml
index b76eb426724..b889d54d346 100644
--- a/.github/workflows/tests-pg-versions.yml
+++ b/.github/workflows/tests-pg-versions.yml
@@ -179,7 +179,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -506,7 +506,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -519,8 +519,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/.github/workflows/tests-pool.yml b/.github/workflows/tests-pool.yml
index 18f31029fe0..c092da00428 100644
--- a/.github/workflows/tests-pool.yml
+++ b/.github/workflows/tests-pool.yml
@@ -189,7 +189,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
diff --git a/.github/workflows/tests-reflection.yml b/.github/workflows/tests-reflection.yml
index b94d608406f..f65303f004a 100644
--- a/.github/workflows/tests-reflection.yml
+++ b/.github/workflows/tests-reflection.yml
@@ -181,7 +181,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -464,7 +464,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -477,8 +477,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2c562113af5..2549e2b866d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -191,7 +191,7 @@ jobs:
         CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
       run: |
         if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/edgedb edb/cli/edgedb
+          cp -v build/cli/bin/gel edb/cli/gel
         else
           python setup.py -v build_cli
         fi
@@ -557,7 +557,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -570,8 +570,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
@@ -738,7 +738,7 @@ jobs:
     - name: Validate cached binaries
       run: |
         # Validate EdgeDB CLI
-        ./build/cli/bin/edgedb --version || exit 1
+        ./build/cli/bin/gel --version || exit 1
 
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
@@ -751,8 +751,8 @@ jobs:
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/edgedb edb/cli/edgedb
-        cp -v build/cli/bin/edgedb edb/cli/gel
+        cp -v build/cli/bin/gel edb/cli/edgedb
+        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/
diff --git a/setup.py b/setup.py
index 7a5b93e3797..067b5ccb278 100644
--- a/setup.py
+++ b/setup.py
@@ -530,7 +530,7 @@ def _compile_cli(build_base, build_temp):
     args = [
         'cargo', 'install',
         '--verbose', '--verbose',
-        '--bin', 'edgedb',
+        '--bin', 'gel',
         '--root', rust_root,
         '--features=dev_mode',
         '--locked',
@@ -564,7 +564,7 @@ def _compile_cli(build_base, build_temp):
             pass
 
         shutil.copy(
-            rust_root / 'bin' / 'edgedb',
+            rust_root / 'bin' / 'gel',
             cli_dest,
         )