diff --git a/arch/kwin-fourier/PKGBUILD b/arch/kwin-fourier/PKGBUILD
index c11a3077a9..a43e95ed9a 100644
--- a/arch/kwin-fourier/PKGBUILD
+++ b/arch/kwin-fourier/PKGBUILD
@@ -24,6 +24,7 @@ pkgname=kwin-fourier
 pkgver=6.6.4
 _dirver=$(echo $pkgver | cut -d. -f1-3)
 pkgrel=3
+_upname=kwin
 epoch=1
 arch=(aarch64 x86_64)
 url='https://kde.org/plasma-desktop/'
@@ -100,7 +101,7 @@ groups=(plasma)
 provides=(kwin)
 conflicts=(kwin)
 replaces=(kwin)
-source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig}
+source=(https://download.kde.org/stable/plasma/$_dirver/$_upname-$pkgver.tar.xz{,.sig}
         0001-transaction-bypass-watchDmaBuf-fence-wait.patch)
 sha256sums=('3f9439760580a977d018daf4b35b62e5a1700def7b21c8dfbfc789d21378d7ad'
             'SKIP'
@@ -112,11 +113,11 @@ validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell
               '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
 
 prepare() {
-  patch -d $pkgname-$pkgver -p1 < 0001-transaction-bypass-watchDmaBuf-fence-wait.patch
+  patch -d $_upname-$pkgver -p1 < 0001-transaction-bypass-watchDmaBuf-fence-wait.patch
 }
 
 build() {
-  cmake -B build  -S $pkgname-$pkgver \
+  cmake -B build  -S $_upname-$pkgver \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DBUILD_TESTING=OFF
   cmake --build build
diff --git a/arch/qt6-base-fourier/PKGBUILD b/arch/qt6-base-fourier/PKGBUILD
index b352a0230b..1dd2b2257d 100644
--- a/arch/qt6-base-fourier/PKGBUILD
+++ b/arch/qt6-base-fourier/PKGBUILD
@@ -108,7 +108,7 @@ optdepends=('freetds: MS SQL driver'
             'postgresql-libs: PostgreSQL driver'
             'unixodbc: ODBC driver')
 groups=(qt6)
-_pkgfn=${pkgbase/6-/}
+_pkgfn=qtbase
 source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$_pkgver
         qt6-base-cflags.patch
         qt6-base-nostrip.patch