diff --git a/.github/workflows/container-rerelay-aws.yaml b/.github/workflows/container-relay-aws.yaml
similarity index 92%
rename from .github/workflows/container-rerelay-aws.yaml
rename to .github/workflows/container-relay-aws.yaml
index f06c91f0..8afc12b6 100644
--- a/.github/workflows/container-rerelay-aws.yaml
+++ b/.github/workflows/container-relay-aws.yaml
@@ -1,14 +1,14 @@
-name: container-rerelay-aws
+name: container-relay-aws
 on: [push]
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
   PASSWORD: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_PASSWORD }}
   # github.repository as <account>/<repo>
-  IMAGE_NAME: rerelay
+  IMAGE_NAME: relay
 
 jobs:
-  container-rerelay-aws:
+  container-relay-aws:
     if: github.repository == 'bluesky-social/indigo'
     runs-on: ubuntu-latest
     permissions:
@@ -44,7 +44,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./cmd/rerelay/Dockerfile
+          file: ./cmd/relay/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/HACKING.md b/HACKING.md
index 86a939d0..699fecb6 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -4,7 +4,7 @@
 Run with, eg, `go run ./cmd/rainbow`):
 
 - `cmd/bigsky`: relay daemon
-- `cmd/rerelay`: new (sync v1.1) relay daemon
+- `cmd/relay`: new (sync v1.1) relay daemon
 - `cmd/palomar`: search indexer and query servcie (OpenSearch)
 - `cmd/gosky`: client CLI for talking to a PDS
 - `cmd/lexgen`: codegen tool for lexicons (Lexicon JSON to Go package)
diff --git a/Makefile b/Makefile
index 02439dd4..bff6fd45 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ help: ## Print info about all commands
 build: ## Build all executables
 	go build ./cmd/gosky
 	go build ./cmd/bigsky
-	go build ./cmd/rerelay
+	go build ./cmd/relay
 	go build ./cmd/beemo
 	go build ./cmd/lexgen
 	go build ./cmd/stress