diff --git a/README.md b/README.md
index 7aed8fe..da9bdf5 100644
--- a/README.md
+++ b/README.md
@@ -66,8 +66,8 @@ source in the `PKGBUILD` (and drop the `-bin` suffix), or don't package it.
 | `sharpemu-bin` | [sharpemu/sharpemu](https://github.com/sharpemu/sharpemu) — experimental PlayStation 5 emulator | tarball | [sharpemu-bin](https://aur.archlinux.org/packages/sharpemu-bin) |
 | `snapx-bin` | [SnapXL/SnapX](https://github.com/SnapXL/SnapX) — ShareX-fork screenshot/sharing tool | self-contained tarball | [snapx-bin](https://aur.archlinux.org/packages/snapx-bin) |
 | `tenzen-studio-bin` | [tenzen.studio](https://tenzen.studio) — Tenzen Studio, screen recorder and editor for product demos (proprietary Electron app) | Flatpak bundle | [tenzen-studio-bin](https://aur.archlinux.org/packages/tenzen-studio-bin) |
-| `timetable` | [ostfriese4/untis](https://codeberg.org/ostfriese4/untis) — "Timetable", a GTK4 + LibAdwaita client for WebUntis | *built from source* | [timetable](https://aur.archlinux.org/packages/timetable) |
-| `timetable-git` | [ostfriese4/untis](https://codeberg.org/ostfriese4/untis): `main` branch of `timetable` | *built from source* | [timetable-git](https://aur.archlinux.org/packages/timetable-git) |
+| `untis` | [ostfriese4/untis](https://codeberg.org/ostfriese4/untis): "Timetable", a GTK4 + LibAdwaita client for WebUntis. Called `timetable` on the AUR before | *built from source* | [untis](https://aur.archlinux.org/packages/untis) |
+| `untis-git` | [ostfriese4/untis](https://codeberg.org/ostfriese4/untis): `main` branch of `untis` | *built from source* | [untis-git](https://aur.archlinux.org/packages/untis-git) |
 | `vacuumtube-bin` | [shy1132/VacuumTube](https://github.com/shy1132/VacuumTube) — YouTube Leanback (TV UI) with built-in adblocker | `.deb` | [vacuumtube-bin](https://aur.archlinux.org/packages/vacuumtube-bin) |
 | `waydroid-helper-bin` | [waydroid-helper/waydroid-helper](https://github.com/waydroid-helper/waydroid-helper) — GTK4 GUI for Waydroid configuration and extensions | AppImage | [waydroid-helper-bin](https://aur.archlinux.org/packages/waydroid-helper-bin) |
 | `wiiudownloader-bin` | [Xpl0itU/WiiUDownloader](https://github.com/Xpl0itU/WiiUDownloader) — Wii U title downloader (Go + GTK4) | AppImage | [wiiudownloader-bin](https://aur.archlinux.org/packages/wiiudownloader-bin) |
diff --git a/timetable-git/.SRCINFO b/untis-git/.SRCINFO
similarity index 85%
rename from timetable-git/.SRCINFO
rename to untis-git/.SRCINFO
index 1d10e3d..dae478c 100644
--- a/timetable-git/.SRCINFO
+++ b/untis-git/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = timetable-git
+pkgbase = untis-git
 	pkgdesc = GTK4 + LibAdwaita client for WebUntis (git)
 	pkgver = 4.3.2.r31.g48ce032
 	pkgrel = 1
@@ -28,11 +28,10 @@ pkgbase = timetable-git
 	depends = gst-plugin-gtk4
 	depends = glib2
 	depends = hicolor-icon-theme
-	provides = timetable
 	provides = untis
-	conflicts = timetable
 	conflicts = untis
-	source = timetable-git::git+https://codeberg.org/ostfriese4/untis.git
+	conflicts = timetable
+	source = untis-git::git+https://codeberg.org/ostfriese4/untis.git
 	sha256sums = SKIP
 
-pkgname = timetable-git
+pkgname = untis-git
diff --git a/timetable-git/PKGBUILD b/untis-git/PKGBUILD
similarity index 95%
rename from timetable-git/PKGBUILD
rename to untis-git/PKGBUILD
index 2ecb79f..93c07d8 100644
--- a/timetable-git/PKGBUILD
+++ b/untis-git/PKGBUILD
@@ -2,7 +2,7 @@
 # This PKGBUILD is updated automatically:
 # https://github.com/Felitendo/PKGBUILDS
 
-pkgname=timetable-git
+pkgname=untis-git
 pkgver=4.3.2.r31.g48ce032
 pkgrel=1
 pkgdesc="GTK4 + LibAdwaita client for WebUntis (git)"
@@ -18,8 +18,8 @@ depends=('gtk4' 'libadwaita' 'webkitgtk-6.0' 'libsecret' 'python'
          'gst-plugins-base' 'gst-plugin-pipewire' 'gst-plugin-gtk4' 'glib2'
          'hicolor-icon-theme')
 makedepends=('meson' 'ninja' 'glib2-devel' 'gettext' 'git')
-provides=('timetable' 'untis')
-conflicts=('timetable' 'untis')
+provides=('untis')
+conflicts=('untis' 'timetable')
 source=("${pkgname}::git+https://codeberg.org/ostfriese4/untis.git")
 sha256sums=('SKIP')
 
diff --git a/timetable-git/pkg.sh b/untis-git/pkg.sh
similarity index 61%
rename from timetable-git/pkg.sh
rename to untis-git/pkg.sh
index 2667961..a2a5da3 100644
--- a/timetable-git/pkg.sh
+++ b/untis-git/pkg.sh
@@ -1,7 +1,7 @@
-# timetable-git - "Timetable" (https://codeberg.org/ostfriese4/untis) built
-# from the main branch. Same meson build as timetable.
+# untis-git - "Timetable" (https://codeberg.org/ostfriese4/untis) built
+# from the main branch. Same meson build as untis.
 #
-# There is no timetable-bin: upstream publishes no binary release assets, and
+# There is no untis-bin: upstream publishes no binary release assets, and
 # the app is pure Python anyway, so there would be nothing prebuilt to ship.
 #
 # VCS packages are not version-tracked here on purpose. The AUR copy of a -git
@@ -11,16 +11,6 @@
 # the package is rebuilt, re-checked and pushed only when the packaging itself
 # changes. makepkg then refreshes the pkgver snapshot as part of the test build.
 
-# The AUR name once belonged to an unrelated package that was deleted. It was
-# restored as an orphan and an adoption request filed; pushes fail until a
-# Package Maintainer grants it. So publish only once the AUR lists us as the
-# maintainer. After that this check can go.
-AUR_PUBLISH=false
-if [[ "$(curl -sf "https://aur.archlinux.org/rpc/v5/info/timetable-git" \
-  | jq -r '.results[0].Maintainer')" == "Felitendo" ]]; then
-  AUR_PUBLISH=true
-fi
-
 # Installed in CI (pacman) before the makepkg test build.
 BUILD_DEPS=(meson ninja glib2 glib2-devel gtk4 libadwaita python
             python-gobject gettext git)
diff --git a/timetable/.SRCINFO b/untis/.SRCINFO
similarity index 75%
rename from timetable/.SRCINFO
rename to untis/.SRCINFO
index a6cf53c..bd64b50 100644
--- a/timetable/.SRCINFO
+++ b/untis/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = timetable
+pkgbase = untis
 	pkgdesc = GTK4 + LibAdwaita client for WebUntis
 	pkgver = 4.3.2
-	pkgrel = 2
+	pkgrel = 1
 	url = https://codeberg.org/ostfriese4/untis
 	arch = any
 	license = GPL-3.0-or-later
@@ -20,9 +20,8 @@ pkgbase = timetable
 	depends = python-pyotp
 	depends = glib2
 	depends = hicolor-icon-theme
-	provides = untis
-	conflicts = untis
-	source = timetable-4.3.2.tar.gz::https://codeberg.org/ostfriese4/untis/archive/v4.3.2.tar.gz
+	conflicts = timetable
+	source = untis-4.3.2.tar.gz::https://codeberg.org/ostfriese4/untis/archive/v4.3.2.tar.gz
 	sha256sums = febd90cac783eb1953a3f094c3122b9e47a88e2ae7b8ed33fdc9279300b4505c
 
-pkgname = timetable
+pkgname = untis
diff --git a/timetable/PKGBUILD b/untis/PKGBUILD
similarity index 93%
rename from timetable/PKGBUILD
rename to untis/PKGBUILD
index ab8c5b8..c7b0561 100644
--- a/timetable/PKGBUILD
+++ b/untis/PKGBUILD
@@ -2,9 +2,9 @@
 # This PKGBUILD is updated automatically:
 # https://github.com/Felitendo/PKGBUILDS
 
-pkgname=timetable
+pkgname=untis
 pkgver=4.3.2
-pkgrel=2
+pkgrel=1
 pkgdesc="GTK4 + LibAdwaita client for WebUntis"
 arch=('any')
 url="https://codeberg.org/ostfriese4/untis"
@@ -13,8 +13,8 @@ depends=('gtk4' 'libadwaita' 'webkitgtk-6.0' 'libsecret' 'python'
          'python-gobject' 'python-cairo' 'python-requests' 'python-pyotp'
          'glib2' 'hicolor-icon-theme')
 makedepends=('meson' 'ninja' 'glib2-devel' 'gettext')
-provides=('untis')
-conflicts=('untis')
+# called timetable on the AUR before; same files
+conflicts=('timetable')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
 sha256sums=('febd90cac783eb1953a3f094c3122b9e47a88e2ae7b8ed33fdc9279300b4505c')
 
diff --git a/timetable/pkg.sh b/untis/pkg.sh
similarity index 91%
rename from timetable/pkg.sh
rename to untis/pkg.sh
index b73a353..265169d 100644
--- a/timetable/pkg.sh
+++ b/untis/pkg.sh
@@ -1,4 +1,4 @@
-# timetable - "Timetable" (https://codeberg.org/ostfriese4/untis), a GTK4 +
+# untis - "Timetable" (https://codeberg.org/ostfriese4/untis), a GTK4 +
 # LibAdwaita WebUntis client written in Python.
 #
 # Upstream publishes no binary release assets, so this is a source package: