diff --git a/.gitignore b/.gitignore
index 88e9f43..38f80bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@ config.json
 
 # Lokales Cold Backup (mbox) nicht versionieren
 backup/
-/emailforwarder
-/emailforwarder.exe
+/mail-graveyard
+/mail-graveyard.exe
 
 # Bun / Frontend
 frontend-js/node_modules/
diff --git a/Codex-Briefing.md b/Codex-Briefing.md
index 9e8a3b0..4b0ab79 100644
--- a/Codex-Briefing.md
+++ b/Codex-Briefing.md
@@ -1,4 +1,4 @@
-# Codex-Briefing — Email-Forwarder
+# Codex-Briefing — Mail-Graveyard
 
 Du baust ein Go-Single-Binary im Hausstil (wie WatchDove): `main.go` als
 Orchestrator, nummerierte `backend/NN-*.go`, Server-gerendertes HTML + HTMX,
diff --git a/Codex-Prompt-Durchstich.md b/Codex-Prompt-Durchstich.md
index 8716f00..071a673 100644
--- a/Codex-Prompt-Durchstich.md
+++ b/Codex-Prompt-Durchstich.md
@@ -5,7 +5,7 @@ lesen, dann NUR den Durchstich bauen (nicht mehr).
 
 ---
 
-Baue den **Durchstich** des Email-Forwarder (Go-Single-Binary, Hausstil steht als
+Baue den **Durchstich** des Mail-Graveyard (Go-Single-Binary, Hausstil steht als
 Stub-Gerüst). Ziel: **ein Konto, nur den Posteingang, sauber und wiederholbar
 umziehen.** Lies zuerst `Codex-Briefing.md` und `Projektbeschreibung.md`; die 6
 harten Regeln sind bindend.
@@ -29,6 +29,6 @@ Bewusst NOCH NICHT: Web-CRUD, Viewer, Weiterleiten, alle Ordner rekursiv,
 Rollen-Mapping (11-folders.go), `--watch`, POP3. Nur INBOX, nur CLI.
 
 **Abnahme:** Konto per SQL/Seed eintragen (Klartext-IMAP-Quelle testen!),
-`./emailforwarder --run test` zweimal laufen lassen → beim zweiten Mal werden
+`./mail-graveyard --run test` zweimal laufen lassen → beim zweiten Mal werden
 0 Mails kopiert (Idempotenz), Ziel-INBOX und lokale mbox enthalten dieselben
 Mails mit erhaltenen Flags und Original-Datum.
diff --git a/INSTALL.md b/INSTALL.md
index 88dd9bf..54f26cf 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-# Email-Forwarder — bauen & benutzen
+# Mail-Graveyard — bauen & benutzen
 
 ## 1. Bauen
 
@@ -7,7 +7,7 @@
 ```
 
 Holt htmx ins `frontend-js/dist`, macht `go mod tidy` und baut ein statisches
-Binary für Linux **und** Windows (`emailforwarder` / `emailforwarder.exe`).
+Binary für Linux **und** Windows (`mail-graveyard` / `mail-graveyard.exe`).
 
 ## 2. Konfig
 
@@ -23,7 +23,7 @@ an, nicht hier.
 ## 3. Starten (Web)
 
 ```sh
-./emailforwarder            # lauscht auf 127.0.0.1:8087
+./mail-graveyard            # lauscht auf 127.0.0.1:8087
 ```
 
 Browser auf `http://127.0.0.1:8087`, mit Admin-Login aus `config.json`.
@@ -37,8 +37,8 @@ Logins), Reiter **Umzug** (starten + Fortschritt), Reiter **Betrachten**
 Ohne Web, z. B. als Cronjob oder Dauerlauf im Umzugsfenster:
 
 ```sh
-./emailforwarder --run all            # einmalig alle Konten (Delta)
-./emailforwarder --run dr-gold --watch  # ein Konto, Delta-Schleife bis Stop
+./mail-graveyard --run all            # einmalig alle Konten (Delta)
+./mail-graveyard --run dr-gold --watch  # ein Konto, Delta-Schleife bis Stop
 ```
 
 Dank Message-ID-Cache kopiert jeder Lauf nur Neues — beliebig oft wiederholbar
diff --git a/Projektbeschreibung.md b/Projektbeschreibung.md
index 95373f6..83786e4 100644
--- a/Projektbeschreibung.md
+++ b/Projektbeschreibung.md
@@ -1,4 +1,4 @@
-# Email-Forwarder
+# Mail-Graveyard
 
 Kleines Go-Single-Binary für **Postfach-Umzüge zwischen Hosts**. Holt Mails aus
 Quell-Konten (IMAP, POP3 nur als Notnagel) und spielt sie **1:1 in Ziel-Konten
@@ -42,6 +42,6 @@ das zum Umzugszeitpunkt gilt.
 
 ## Bedienung
 
-- **Web (Default):** `./emailforwarder` → Browser auf `127.0.0.1:8087`.
-- **CLI (Cronjob/Cutover):** `./emailforwarder --run all` (einmalig) oder
-  `./emailforwarder --run dr-gold --watch` (Delta-Schleife).
+- **Web (Default):** `./mail-graveyard` → Browser auf `127.0.0.1:8087`.
+- **CLI (Cronjob/Cutover):** `./mail-graveyard --run all` (einmalig) oder
+  `./mail-graveyard --run dr-gold --watch` (Delta-Schleife).
diff --git a/backend/00-router.go b/backend/00-router.go
index aa899f4..0dba23b 100644
--- a/backend/00-router.go
+++ b/backend/00-router.go
@@ -38,12 +38,12 @@ func renderShell(w http.ResponseWriter, active, readingPane string) {
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 	fmt.Fprintf(w, `<!doctype html><html lang="de"><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<title>Email-Forwarder</title>
+<title>Mail-Graveyard</title>
 <link rel="stylesheet" href="/static/style.css">
 <script src="/static/htmx.min.js"></script></head>
 <body class="ol2013">
 <header class="ribbon">
-  <div class="ribbon-title">Email-Forwarder</div>
+  <div class="ribbon-title">Mail-Graveyard</div>
   <nav class="ribbon-tabs">
     <a class="tab %s" href="/">Umzug</a>
     <a class="tab" href="/accounts">Postf&auml;cher</a>
diff --git a/backend/02-database.go b/backend/02-database.go
index 94fa7e7..c06f278 100644
--- a/backend/02-database.go
+++ b/backend/02-database.go
@@ -53,7 +53,7 @@ type Account struct {
 //	     total, done, errors, state)          im Browser.
 func ConnectDB() error {
 	if Cfg.DBPath == "" {
-		Cfg.DBPath = "emailforwarder.db"
+		Cfg.DBPath = "mail-graveyard.db"
 	}
 	db, err := sql.Open("sqlite", Cfg.DBPath)
 	if err != nil {
diff --git a/compile.sh b/compile.sh
index 3743d43..f4e9412 100644
--- a/compile.sh
+++ b/compile.sh
@@ -12,6 +12,6 @@ go mod tidy
 
 # Statisches Binary. Der Umzug laeuft dort, wo Netz zu beiden Providern besteht
 # (Workstation oder DietPi-NB) -> Linux + Windows bauen.
-CGO_ENABLED=0 GOOS=linux   GOARCH=amd64 go build -trimpath -ldflags "-s -w" -o emailforwarder      .
-CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -trimpath -ldflags "-s -w" -o emailforwarder.exe  .
-echo "built ./emailforwarder und ./emailforwarder.exe"
+CGO_ENABLED=0 GOOS=linux   GOARCH=amd64 go build -trimpath -ldflags "-s -w" -o mail-graveyard      .
+CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -trimpath -ldflags "-s -w" -o mail-graveyard.exe  .
+echo "built ./mail-graveyard und ./mail-graveyard.exe"
diff --git a/config.json.example b/config.json.example
index 66b1b65..8b86beb 100644
--- a/config.json.example
+++ b/config.json.example
@@ -3,7 +3,7 @@
   "port": "8087",
   "admin_user": "vAdmin@golddata.eu",
   "admin_pass": "CHANGE-ME-lokal",
-  "db_path": "emailforwarder.db",
+  "db_path": "mail-graveyard.db",
   "mbox_root": "./backup",
   "forward_smtp": {
     "host": "",
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/config.env b/deploy/goldpi-test-container/email-forwarder-pod/config.env
deleted file mode 100644
index 64265cd..0000000
--- a/deploy/goldpi-test-container/email-forwarder-pod/config.env
+++ /dev/null
@@ -1,13 +0,0 @@
-SERVICE_NAME=Email-Forwarder
-POD_NAME=email-forwarder-pod
-CONTAINER_NAME=email-forwarder
-WATCH_CONTAINER_NAME=email-forwarder-watch
-IMAGE_NAME=localhost/email-forwarder:test
-NETWORK=base-net
-HOST_BIND=127.0.0.1
-APP_PORT=8087
-WATCH_ACCOUNT=codex-to-vdevop03
-WATCH_INTERVAL=60s
-BUILD_SRC=/mnt/DATA/Build/Email-Forwarder
-DEVOP_CONTAINER=DevOp-Pod-build
-APP_DIR=/mnt/DATA/Containers/Test-Container/Email-Forwarder-Pod
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/01-install-Email-Forwarder-Pod.sh b/deploy/goldpi-test-container/mail-graveyard-pod/01-install-Mail-Graveyard-Pod.sh
similarity index 80%
rename from deploy/goldpi-test-container/email-forwarder-pod/01-install-Email-Forwarder-Pod.sh
rename to deploy/goldpi-test-container/mail-graveyard-pod/01-install-Mail-Graveyard-Pod.sh
index 9cb7f88..43b5d0f 100644
--- a/deploy/goldpi-test-container/email-forwarder-pod/01-install-Email-Forwarder-Pod.sh
+++ b/deploy/goldpi-test-container/mail-graveyard-pod/01-install-Mail-Graveyard-Pod.sh
@@ -12,17 +12,17 @@ if [ ! -d "$BUILD_SRC" ]; then
   exit 2
 fi
 
-podman exec -w /work/Email-Forwarder "$DEVOP_CONTAINER" bash -lc '
+podman exec -w /work/Mail-Graveyard "$DEVOP_CONTAINER" bash -lc '
 set -euo pipefail
 mkdir -p frontend-js/dist
 if [ ! -f frontend-js/dist/htmx.min.js ]; then
   curl -fsSL https://unpkg.com/htmx.org@1.9.12/dist/htmx.min.js -o frontend-js/dist/htmx.min.js
 fi
 go mod tidy
-CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags "-s -w" -o emailforwarder .
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags "-s -w" -o mail-graveyard .
 '
 
-install -m0755 "$BUILD_SRC/emailforwarder" "$APP_DIR/build/emailforwarder"
+install -m0755 "$BUILD_SRC/mail-graveyard" "$APP_DIR/build/mail-graveyard"
 if [ ! -f "$APP_DIR/config.json" ]; then
   install -m0644 "$APP_DIR/config.json.example" "$APP_DIR/config.json"
 fi
@@ -31,7 +31,7 @@ install -m0644 "$APP_DIR/Containerfile" "$APP_DIR/build/Containerfile"
 
 podman build -t "$IMAGE_NAME" -f "$APP_DIR/build/Containerfile" "$APP_DIR/build"
 
-podman rm -f "${WATCH_CONTAINER_NAME:-email-forwarder-watch}" >/dev/null 2>&1 || true
+podman rm -f "${WATCH_CONTAINER_NAME:-mail-graveyard-watch}" >/dev/null 2>&1 || true
 podman rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
 podman pod rm -f "$POD_NAME" >/dev/null 2>&1 || true
 podman pod create --name "$POD_NAME" --network "$NETWORK" -p "$HOST_BIND:$APP_PORT:$APP_PORT" >/dev/null
@@ -42,7 +42,7 @@ podman run -d --name "$CONTAINER_NAME" --pod "$POD_NAME" \
   "$IMAGE_NAME" >/dev/null
 
 if [ -n "${WATCH_ACCOUNT:-}" ]; then
-  podman run -d --name "${WATCH_CONTAINER_NAME:-email-forwarder-watch}" --pod "$POD_NAME" \
+  podman run -d --name "${WATCH_CONTAINER_NAME:-mail-graveyard-watch}" --pod "$POD_NAME" \
     --restart=unless-stopped \
     -v "$APP_DIR/data:/app/data:Z" \
     -v "$APP_DIR/backup:/app/backup:Z" \
@@ -51,7 +51,7 @@ fi
 
 for _ in {1..20}; do
   if curl -fsS "http://$HOST_BIND:$APP_PORT/" >/dev/null 2>&1; then
-    echo "Email-Forwarder reachable at http://$HOST_BIND:$APP_PORT/"
+    echo "Mail-Graveyard reachable at http://$HOST_BIND:$APP_PORT/"
     exit 0
   fi
   sleep 1
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/02-reconf-Email-Forwarder-Pod.sh b/deploy/goldpi-test-container/mail-graveyard-pod/02-reconf-Mail-Graveyard-Pod.sh
similarity index 62%
rename from deploy/goldpi-test-container/email-forwarder-pod/02-reconf-Email-Forwarder-Pod.sh
rename to deploy/goldpi-test-container/mail-graveyard-pod/02-reconf-Mail-Graveyard-Pod.sh
index 272705f..5301aa0 100644
--- a/deploy/goldpi-test-container/email-forwarder-pod/02-reconf-Email-Forwarder-Pod.sh
+++ b/deploy/goldpi-test-container/mail-graveyard-pod/02-reconf-Mail-Graveyard-Pod.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -euo pipefail
 cd "$(dirname "$0")"
-./01-install-Email-Forwarder-Pod.sh
+./01-install-Mail-Graveyard-Pod.sh
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/03-import-Email-Forwarder-Pod.sh b/deploy/goldpi-test-container/mail-graveyard-pod/03-import-Mail-Graveyard-Pod.sh
similarity index 100%
rename from deploy/goldpi-test-container/email-forwarder-pod/03-import-Email-Forwarder-Pod.sh
rename to deploy/goldpi-test-container/mail-graveyard-pod/03-import-Mail-Graveyard-Pod.sh
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/04-export-Email-Forwarder-Pod.sh b/deploy/goldpi-test-container/mail-graveyard-pod/04-export-Mail-Graveyard-Pod.sh
similarity index 55%
rename from deploy/goldpi-test-container/email-forwarder-pod/04-export-Email-Forwarder-Pod.sh
rename to deploy/goldpi-test-container/mail-graveyard-pod/04-export-Mail-Graveyard-Pod.sh
index 98d3e00..423e18f 100644
--- a/deploy/goldpi-test-container/email-forwarder-pod/04-export-Email-Forwarder-Pod.sh
+++ b/deploy/goldpi-test-container/mail-graveyard-pod/04-export-Mail-Graveyard-Pod.sh
@@ -7,17 +7,17 @@ set +a
 
 mkdir -p "$APP_DIR/export"
 TS="$(date +%Y%m%d-%H%M%S)"
-OUT="$APP_DIR/export/email-forwarder-pod-$TS.tar.gz"
+OUT="$APP_DIR/export/mail-graveyard-pod-$TS.tar.gz"
 
 tar -czf "$OUT" \
   config.env \
   config.json \
   Containerfile \
-  01-install-Email-Forwarder-Pod.sh \
-  02-reconf-Email-Forwarder-Pod.sh \
-  03-import-Email-Forwarder-Pod.sh \
-  04-export-Email-Forwarder-Pod.sh \
-  05-uninstall-Email-Forwarder-Pod.sh \
+  01-install-Mail-Graveyard-Pod.sh \
+  02-reconf-Mail-Graveyard-Pod.sh \
+  03-import-Mail-Graveyard-Pod.sh \
+  04-export-Mail-Graveyard-Pod.sh \
+  05-uninstall-Mail-Graveyard-Pod.sh \
   data \
   backup
 
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/05-uninstall-Email-Forwarder-Pod.sh b/deploy/goldpi-test-container/mail-graveyard-pod/05-uninstall-Mail-Graveyard-Pod.sh
similarity index 76%
rename from deploy/goldpi-test-container/email-forwarder-pod/05-uninstall-Email-Forwarder-Pod.sh
rename to deploy/goldpi-test-container/mail-graveyard-pod/05-uninstall-Mail-Graveyard-Pod.sh
index e2be49c..6fde913 100644
--- a/deploy/goldpi-test-container/email-forwarder-pod/05-uninstall-Email-Forwarder-Pod.sh
+++ b/deploy/goldpi-test-container/mail-graveyard-pod/05-uninstall-Mail-Graveyard-Pod.sh
@@ -5,7 +5,7 @@ set -a
 source ./config.env
 set +a
 
-podman rm -f "${WATCH_CONTAINER_NAME:-email-forwarder-watch}" >/dev/null 2>&1 || true
+podman rm -f "${WATCH_CONTAINER_NAME:-mail-graveyard-watch}" >/dev/null 2>&1 || true
 podman rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
 podman pod rm -f "$POD_NAME" >/dev/null 2>&1 || true
 echo "Runtime removed. Persistent data kept at $APP_DIR/data and $APP_DIR/backup"
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/Containerfile b/deploy/goldpi-test-container/mail-graveyard-pod/Containerfile
similarity index 72%
rename from deploy/goldpi-test-container/email-forwarder-pod/Containerfile
rename to deploy/goldpi-test-container/mail-graveyard-pod/Containerfile
index 742063e..27109a7 100644
--- a/deploy/goldpi-test-container/email-forwarder-pod/Containerfile
+++ b/deploy/goldpi-test-container/mail-graveyard-pod/Containerfile
@@ -3,10 +3,10 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends ca-certificates \
  && rm -rf /var/lib/apt/lists/*
 WORKDIR /app
-COPY emailforwarder /app/emailforwarder
+COPY mail-graveyard /app/mail-graveyard
 COPY config.json /app/config.json
-RUN chmod 0755 /app/emailforwarder \
+RUN chmod 0755 /app/mail-graveyard \
  && mkdir -p /app/data /app/backup
 EXPOSE 8087
 VOLUME ["/app/data", "/app/backup"]
-ENTRYPOINT ["/app/emailforwarder"]
+ENTRYPOINT ["/app/mail-graveyard"]
diff --git a/deploy/goldpi-test-container/mail-graveyard-pod/config.env b/deploy/goldpi-test-container/mail-graveyard-pod/config.env
new file mode 100644
index 0000000..38b7d38
--- /dev/null
+++ b/deploy/goldpi-test-container/mail-graveyard-pod/config.env
@@ -0,0 +1,13 @@
+SERVICE_NAME=Mail-Graveyard
+POD_NAME=mail-graveyard-pod
+CONTAINER_NAME=mail-graveyard
+WATCH_CONTAINER_NAME=mail-graveyard-watch
+IMAGE_NAME=localhost/mail-graveyard:test
+NETWORK=base-net
+HOST_BIND=127.0.0.1
+APP_PORT=8087
+WATCH_ACCOUNT=codex-to-vdevop03
+WATCH_INTERVAL=60s
+BUILD_SRC=/mnt/DATA/Build/Mail-Graveyard
+DEVOP_CONTAINER=DevOp-Pod-build
+APP_DIR=/mnt/DATA/Containers/Test-Container/Mail-Graveyard-Pod
diff --git a/deploy/goldpi-test-container/email-forwarder-pod/config.json.example b/deploy/goldpi-test-container/mail-graveyard-pod/config.json.example
similarity index 85%
rename from deploy/goldpi-test-container/email-forwarder-pod/config.json.example
rename to deploy/goldpi-test-container/mail-graveyard-pod/config.json.example
index cf4b382..37e4f90 100644
--- a/deploy/goldpi-test-container/email-forwarder-pod/config.json.example
+++ b/deploy/goldpi-test-container/mail-graveyard-pod/config.json.example
@@ -3,7 +3,7 @@
   "port": "8087",
   "admin_user": "vAdmin@golddata.eu",
   "admin_pass": "CHANGE-ME-lokal",
-  "db_path": "/app/data/emailforwarder.db",
+  "db_path": "/app/data/mail-graveyard.db",
   "mbox_root": "/app/backup",
   "forward_smtp": {
     "host": "",
diff --git a/go.mod b/go.mod
index b45f512..699097d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module emailforwarder
+module mail-graveyard
 
 go 1.25
 
diff --git a/main.go b/main.go
index 78c8cad..b658e7d 100644
--- a/main.go
+++ b/main.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	"emailforwarder/backend"
+	"mail-graveyard/backend"
 )
 
 //go:embed frontend-js/dist/*
@@ -58,7 +58,7 @@ func main() {
 	backend.RegisterRoutes(mux)
 
 	addr := backend.Cfg.Bind + ":" + backend.Cfg.Port
-	log.Printf("Email-Forwarder listening on %s", addr)
+	log.Printf("Mail-Graveyard listening on %s", addr)
 	log.Fatal(http.ListenAndServe(addr, backend.AuthMiddleware(mux)))
 }