diff --git a/asset-tool-git/PKGBUILD b/asset-tool-git/PKGBUILD
index ab79cc1..a5a1872 100644
--- a/asset-tool-git/PKGBUILD
+++ b/asset-tool-git/PKGBUILD
@@ -1,12 +1,13 @@
-pkgname=asset-tool-git
 pkgver=0.4.5.r148
+_name=asset-tool
+pkgname=$_name-git
 pkgrel=1
 pkgdesc="A tool for quickly downloading many Roblox assets."
 arch=('x86_64')
-url="https://git.itzana.me/StrafesNET/asset-tool"
+url="https://git.itzana.me/StrafesNET/$_name"
 license=('MIT')
 makedepends=('cargo')
-source=("$pkgname::git+https://git.itzana.me/StrafesNET/asset-tool")
+source=("$pkgname::git+https://git.itzana.me/StrafesNET/$_name")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -44,5 +45,5 @@ check() {
 
 package() {
 	cd $pkgname
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$_name"
 }
diff --git a/map-tool-git/PKGBUILD b/map-tool-git/PKGBUILD
index 094440c..3060c8a 100644
--- a/map-tool-git/PKGBUILD
+++ b/map-tool-git/PKGBUILD
@@ -1,12 +1,13 @@
-pkgname=map-tool-git
 pkgver=1.5.1.r101
+_name=map-tool
+pkgname=$_name-git
 pkgrel=1
 pkgdesc="A tool for working with bhop and surf maps."
 arch=('x86_64')
-url="https://git.itzana.me/StrafesNET/map-tool"
+url="https://git.itzana.me/StrafesNET/$_name"
 license=('MIT')
 makedepends=('cargo')
-source=("$pkgname::git+https://git.itzana.me/StrafesNET/map-tool")
+source=("$pkgname::git+https://git.itzana.me/StrafesNET/$_name")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -43,5 +44,5 @@ check() {
 
 package() {
 	cd $pkgname
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$_name"
 }
diff --git a/mapfixer-git/PKGBUILD b/mapfixer-git/PKGBUILD
index d364cab..b342a96 100644
--- a/mapfixer-git/PKGBUILD
+++ b/mapfixer-git/PKGBUILD
@@ -1,12 +1,13 @@
-pkgname=mapfixer
 pkgver=1.1.1.r111
+_name=mapfixer
+pkgname=$_name-git
 pkgrel=1
 pkgdesc="A tool for reviewing bhop and surf maps."
 arch=('x86_64')
-url="https://git.itzana.me/StrafesNET/mapfixer"
+url="https://git.itzana.me/StrafesNET/$_name"
 license=('MIT')
 makedepends=('cargo')
-source=("$pkgname::git+https://git.itzana.me/StrafesNET/mapfixer")
+source=("$pkgname::git+https://git.itzana.me/StrafesNET/$_name")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -43,5 +44,5 @@ check() {
 
 package() {
 	cd $pkgname
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$_name"
 }