diff --git a/minoplhy-crowdsec-firewall-bouncer/APKBUILD b/minoplhy-crowdsec-firewall-bouncer/APKBUILD
index d98cce8..1778c1f 100755
--- a/minoplhy-crowdsec-firewall-bouncer/APKBUILD
+++ b/minoplhy-crowdsec-firewall-bouncer/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Minoplhy <c@3qx.nl>
 maintainer="Minoplhy <c@3qx.nl>"
-pkgname=minoplhy-crowdsec-firewall-bouncer
+pkgname=crowdsec-firewall-bouncer
 pkgver=0.0.31
 pkgrel=1
 pkgdesc="Crowdsec Bouncer: Iptables Firewall"
@@ -14,8 +14,8 @@ subpackages="
 	$pkgname-awall::noarch
 	"
 options="!check" # no test suite identified
-source="crowdsec-firewall-bouncer-$pkgver.tar.gz::https://github.com/crowdsecurity/cs-firewall-bouncer/archive/refs/tags/v$pkgver.tar.gz
-	crowdsec-firewall-bouncer.initd
+source="$pkgname-$pkgver.tar.gz::https://github.com/crowdsecurity/cs-firewall-bouncer/archive/refs/tags/v$pkgver.tar.gz
+	"$pkgname".initd
 	awall-policy.json
 	"
 
@@ -34,7 +34,7 @@ build() {
 
 package() {
 	install -Dm 0755 "$builddir"/crowdsec-firewall-bouncer "$pkgdir"/usr/bin/crowdsec-firewall-bouncer
-	install -Dm 0755 "$srcdir"/"crowdsec-firewall-bouncer".initd "$pkgdir"/etc/init.d/"crowdsec-firewall-bouncer.initd"
+	install -Dm 0755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname"
 
     install -dm 0755 \
 		"$pkgdir"/etc/crowdsec/bouncers
diff --git a/minoplhy-crowdsec/APKBUILD b/minoplhy-crowdsec/APKBUILD
index 080ac99..03898ce 100755
--- a/minoplhy-crowdsec/APKBUILD
+++ b/minoplhy-crowdsec/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: tetsumaki <yd-alpine@tetsumaki.net>
 # Contributor: Nicolas Lorin <androw95220@gmail.com>
 # Maintainer: Nicolas Lorin <androw95220@gmail.com>
-pkgname=minoplhy-crowdsec
+pkgname=crowdsec
 pkgver=1.6.8
 pkgrel=1
 pkgdesc="behavior detection engine, coupled with a global IP reputation network"
@@ -19,7 +19,7 @@ subpackages="
 	$pkgname-splunk-plugin:_plugin
 	"
 options="!check" # no test suite identified
-source="crowdsec-$pkgver-2.tar.gz::https://github.com/crowdsecurity/crowdsec/archive/refs/tags/v$pkgver.tar.gz
+source="$pkgname-$pkgver-2.tar.gz::https://github.com/crowdsecurity/crowdsec/archive/refs/tags/v$pkgver.tar.gz
 	system-sqlite.patch
 	crowdsec.initd
 	"