diff --git a/user/caskd/dmenu/APKBUILD b/user/caskd/dmenu/APKBUILD
index 9203828..c0514de 100644
--- a/user/caskd/dmenu/APKBUILD
+++ b/user/caskd/dmenu/APKBUILD
@@ -1,10 +1,9 @@
 # Contributor: Eivind Uggedal <eu@eju.no>
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=user-caskd-dmenu
+pkgname=dmenu
 pkgver=5.0
 pkgrel=0
-provides="dmenu"
 _commit="6a103d231b1b4b8e223ec266730d9d11382a0673"
 pkgdesc="Dynamic menu for X (with caskd's patches)"
 url="https://tools.suckless.org/dmenu/"
@@ -33,4 +32,4 @@ package() {
 	make DESTDIR=$pkgdir PREFIX=/usr install
 }
 
-sha512sums="c673147668ca6580dfd4cdf817d67480b32c7b1cbc47340f8d931fd439ac47e94b9c30cd40354b5092fe8c72ca2a3bf9a19988a3436e2d9ae1d764ab302ad208  dmenu-patched-5.0-6a103d231b1b4b8e223ec266730d9d11382a0673.tar.gz"
+sha512sums="c673147668ca6580dfd4cdf817d67480b32c7b1cbc47340f8d931fd439ac47e94b9c30cd40354b5092fe8c72ca2a3bf9a19988a3436e2d9ae1d764ab302ad208  dmenu-5.0-6a103d231b1b4b8e223ec266730d9d11382a0673.tar.gz"
diff --git a/user/caskd/dwm-desktop/APKBUILD b/user/caskd/dwm-desktop/APKBUILD
index 2e2ad12..4a769ed 100644
--- a/user/caskd/dwm-desktop/APKBUILD
+++ b/user/caskd/dwm-desktop/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Gaber Ayoubi <gaber.ayoubi@gmail.com>
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=user-caskd-dwm-desktop
+pkgname=dwm-desktop
 pkgver=6.2
 pkgrel=3
 provides="dwm"
diff --git a/user/caskd/misc-scripts/APKBUILD b/user/caskd/misc-scripts/APKBUILD
index 671c215..f572a55 100644
--- a/user/caskd/misc-scripts/APKBUILD
+++ b/user/caskd/misc-scripts/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=user-caskd-misc-scripts
+pkgname=misc-scripts
 pkgver=1.2
 pkgrel=0
 _commit="e7a31117148fea24a24382706d8fe62c29274bb5"
diff --git a/user/caskd/slock/APKBUILD b/user/caskd/slock/APKBUILD
index 4a67f11..4330aa7 100644
--- a/user/caskd/slock/APKBUILD
+++ b/user/caskd/slock/APKBUILD
@@ -1,10 +1,9 @@
 # Contributor: Eivind Uggedal <eu@eju.no>
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=user-caskd-slock
+pkgname=slock
 pkgver=1.4
 pkgrel=0
-provides="slock"
 _commit="9b6454fc777947d79f6d340f12763ee784c42c89"
 pkgdesc="simple screen locker utility for X (with caskd's patches)"
 url="https://tools.suckless.org/slock/"
@@ -31,4 +30,4 @@ build() {
 package() {
 	make DESTDIR=$pkgdir PREFIX=/usr install
 }
-sha512sums="5722b27ba045f5f99309a1efafaa0e475538a0a5a6554e3da89407218faff8b3ad90a7cd5fbf9ded2670fb20ce8770ae2460e81a93df258ab96bad3fb5ed602b  slock-patched-1.4-9b6454fc777947d79f6d340f12763ee784c42c89.tar.gz"
+sha512sums="5722b27ba045f5f99309a1efafaa0e475538a0a5a6554e3da89407218faff8b3ad90a7cd5fbf9ded2670fb20ce8770ae2460e81a93df258ab96bad3fb5ed602b  slock-1.4-9b6454fc777947d79f6d340f12763ee784c42c89.tar.gz"
diff --git a/user/caskd/slstatus-desktop/APKBUILD b/user/caskd/slstatus-desktop/APKBUILD
index 253df72..69fe07f 100644
--- a/user/caskd/slstatus-desktop/APKBUILD
+++ b/user/caskd/slstatus-desktop/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Eivind Uggedal <eu@eju.no>
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=user-caskd-slstatus-desktop
+pkgname=slstatus-desktop
 pkgver=1
 pkgrel=1
 provides="slstatus"
diff --git a/user/caskd/st/APKBUILD b/user/caskd/st/APKBUILD
index 627107e..276d1b8 100644
--- a/user/caskd/st/APKBUILD
+++ b/user/caskd/st/APKBUILD
@@ -1,10 +1,9 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=user-caskd-st
+pkgname=st
 pkgver=0.8.4
 pkgrel=0
-provides="st"
 _commit="ac2b07b33180f97fbcbe291cb7ebe0ac543a53f1"
 pkgdesc="Simple terminal emulator for X (with caskd's patches)"
 url="https://st.suckless.org"
@@ -42,4 +41,4 @@ package() {
 	EOF
 }
 
-sha512sums="9aa4cbd39e1f25e73aad08f75c6ec1cee31e5e97266436fc42b9bd36a86f350c70843846feb76e49bb11fb1100c348cce7cdb534123f8e728ce330d1fb0bc429  st-patched-0.8.4-ac2b07b33180f97fbcbe291cb7ebe0ac543a53f1.tar.gz"
+sha512sums="9aa4cbd39e1f25e73aad08f75c6ec1cee31e5e97266436fc42b9bd36a86f350c70843846feb76e49bb11fb1100c348cce7cdb534123f8e728ce330d1fb0bc429  st-0.8.4-ac2b07b33180f97fbcbe291cb7ebe0ac543a53f1.tar.gz"