diff --git a/hybris/android-headers-4.4/APKBUILD b/hybris/android-headers-4.4/APKBUILD
index 96a067b3e..78ac7dd48 100644
--- a/hybris/android-headers-4.4/APKBUILD
+++ b/hybris/android-headers-4.4/APKBUILD
@@ -8,13 +8,13 @@ url="https://github.com/ubports/android-headers"
 license="Apache"
 makedepends=""
 depends=""
-_rev=f636fa26a61b36bef284a7aeba95eb767344b8b4
-source="$pkgname-$_rev.tar.gz::https://github.com/ubports/android-headers/archive/$_rev.tar.gz
+_commit=f636fa26a61b36bef284a7aeba95eb767344b8b4
+source="$pkgname-$_commit.tar.gz::https://github.com/ubports/android-headers/archive/$_commit.tar.gz
 	android-headers.pc"
 pkgdesc="Android headers used for building libhybris"
 options="!check"
 
-builddir="$srcdir/$_pkgname-$_rev"
+builddir="$srcdir/$_pkgname-$_commit"
 
 package() {
 	cd "$builddir"
diff --git a/hybris/android-headers-7.1/APKBUILD b/hybris/android-headers-7.1/APKBUILD
index 554dd502c..acd819164 100644
--- a/hybris/android-headers-7.1/APKBUILD
+++ b/hybris/android-headers-7.1/APKBUILD
@@ -8,12 +8,12 @@ url="https://github.com/Halium/android-headers"
 license="Apache"
 makedepends=""
 depends=""
-_rev=1f6591ba7d42b91c32acf5a65a2a4fae983d6865
-source="$pkgname-$_rev.tar.gz::https://github.com/Halium/android-headers/archive/$_rev.tar.gz"
+_commit=1f6591ba7d42b91c32acf5a65a2a4fae983d6865
+source="$pkgname-$_commit.tar.gz::https://github.com/Halium/android-headers/archive/$_commit.tar.gz"
 pkgdesc="Android headers used for building libhybris"
 subpackages="$pkgname-caf:package_caf"
 
-builddir="$srcdir/$_pkgname-$_rev"
+builddir="$srcdir/$_pkgname-$_commit"
 
 package() {
 	cd "$builddir"
diff --git a/hybris/libhybris/APKBUILD b/hybris/libhybris/APKBUILD
index e24da33c7..e2c518ee8 100644
--- a/hybris/libhybris/APKBUILD
+++ b/hybris/libhybris/APKBUILD
@@ -8,8 +8,8 @@ makedepends="autoconf automake libtool wayland-dev linux-headers bsd-compat-head
 	libx11-dev libxcb-dev libxext-dev
 	android-headers-7.1 android-headers-4.4"
 depends_dev="bsd-compat-headers android-headers-7.1"
-_rev=4a7d95b73bf40bf6d03d12bf270974c3d0278099
-source="$pkgname-$_rev.tar.gz::https://github.com/libhybris/libhybris/archive/$_rev.tar.gz
+_commit=4a7d95b73bf40bf6d03d12bf270974c3d0278099
+source="$pkgname-$_commit.tar.gz::https://github.com/libhybris/libhybris/archive/$_commit.tar.gz
 	0001-Make-libhybris-compile-with-musl.patch
 	0002-tests-Regression-test-for-EGL-glibc-TLS-conflict.patch
 	0003-Implement-X11-EGL-platform-based-on-wayland-code.patch
@@ -29,7 +29,7 @@ fi
 
 options="!check !strip !tracedeps"
 
-builddir="$srcdir/$pkgname-$_rev"
+builddir="$srcdir/$pkgname-$_commit"
 _tmppkgdir="$srcdir/tmpinstall"
 _main_headers_ver=7.1
 
diff --git a/kde/plasma-phone-components/APKBUILD b/kde/plasma-phone-components/APKBUILD
index c55332660..4dd3539d2 100644
--- a/kde/plasma-phone-components/APKBUILD
+++ b/kde/plasma-phone-components/APKBUILD
@@ -13,7 +13,7 @@ makedepends="extra-cmake-modules kpeople-dev qt5-qtdeclarative-dev kactivities-d
 install="$pkgname.post-install
 	$pkgname.post-upgrade
 	$pkgname.post-deinstall"
-source="$pkgname-$pkgver.tar.gz::https://invent.kde.org/kde/$pkgname/-/archive/$_commit/$pkgname-$_commit.tar.gz"
+source="$pkgname-$_commit.tar.gz::https://invent.kde.org/kde/$pkgname/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ad5ecbcc24fc20dbe2df6669a8902b861c4aaa538477a03d408126e1118330e10127c94d4a70ee5bfbd294bf0c91fcc33f8de0bfc3ee3d423b26af4388449fd6  plasma-phone-components-0_git20190208.tar.gz"
+sha512sums="ad5ecbcc24fc20dbe2df6669a8902b861c4aaa538477a03d408126e1118330e10127c94d4a70ee5bfbd294bf0c91fcc33f8de0bfc3ee3d423b26af4388449fd6  plasma-phone-components-ed2fb0bcb85469a7f4d474f86e397c2dc7615f6b.tar.gz"
diff --git a/kde/polkit-qt/APKBUILD b/kde/polkit-qt/APKBUILD
index dd11552fd..e4964a5ed 100644
--- a/kde/polkit-qt/APKBUILD
+++ b/kde/polkit-qt/APKBUILD
@@ -11,7 +11,7 @@ license="LGPL-2.1"
 depends="polkit"
 depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev cmake automoc4 polkit-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/kde/$pkgname-1/archive/$_commit.tar.gz"
+source="$pkgname-$_commit.tar.gz::https://github.com/kde/$pkgname-1/archive/$_commit.tar.gz"
 subpackages="$pkgname-dev $pkgname-dev"
 builddir="$srcdir/$pkgname-1-$_commit"
 
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="254e2086492eda93e85a30713681a1cee3eda0889750d854c9cbd920dcc1c0a94933ad230dab3e2bb9bcdbc2f4236844a6dbdf0ad6cd8a90f99e24f0d13639ef  polkit-qt-0.112.0_git20160416.tar.gz"
+sha512sums="254e2086492eda93e85a30713681a1cee3eda0889750d854c9cbd920dcc1c0a94933ad230dab3e2bb9bcdbc2f4236844a6dbdf0ad6cd8a90f99e24f0d13639ef  polkit-qt-50624e06e88aabd7ae123ad6a4495630f81cd706.tar.gz"
diff --git a/main/abootimg/APKBUILD b/main/abootimg/APKBUILD
index 930c16656..17d813508 100644
--- a/main/abootimg/APKBUILD
+++ b/main/abootimg/APKBUILD
@@ -1,4 +1,4 @@
-_hash="1ebeb393252ab5aeed62e34bc439b6728444f06e"
+_commit="1ebeb393252ab5aeed62e34bc439b6728444f06e"
 
 pkgname=abootimg
 pkgver=0.6_git20150325
@@ -10,14 +10,14 @@ url="https://gitlab.com/ajs124/abootimg"
 depends=""
 makedepends="linux-headers util-linux-dev"
 subpackages="$pkgname-doc"
-source="${pkgname}-${_hash}.tar.bz2::https://gitlab.com/ajs124/${pkgname}/repository/${_hash}/archive.tar.bz2"
+source="${pkgname}-${_commit}.tar.bz2::https://gitlab.com/ajs124/${pkgname}/repository/${_commit}/archive.tar.bz2"
 options="!check"
 
-builddir="${srcdir}/abootimg-${_hash}-${_hash}"
+builddir="${srcdir}/abootimg-${_commit}-${_commit}"
 
 prepare() {
 	# Makefile tries to run git otherwise
-	echo "#define VERSION_STR \"$pkgver-$_hash\"" > "$builddir"/version.h
+	echo "#define VERSION_STR \"$pkgver-$_commit\"" > "$builddir"/version.h
 }
 
 build() {
diff --git a/main/unixbench/APKBUILD b/main/unixbench/APKBUILD
index e8794742b..27e08bc25 100644
--- a/main/unixbench/APKBUILD
+++ b/main/unixbench/APKBUILD
@@ -11,7 +11,7 @@ makedepends=""
 install=""
 options="!check"
 source="
-	${pkgname}-${pkgver}.tar.gz::https://github.com/kdlucas/byte-unixbench/archive/${_commit}.tar.gz
+	${pkgname}-${_commit}.tar.gz::https://github.com/kdlucas/byte-unixbench/archive/${_commit}.tar.gz
 	ubench
 "
 builddir="$srcdir/byte-unixbench-${_commit}/UnixBench"
@@ -29,5 +29,5 @@ package() {
 	cp -a pgms testdir Makefile src ${pkgdir}/usr/share/unixbench
 }
 
-sha512sums="ca4b7ab21eaacddcb99f9237998c42e2179d8e136e23dc0e4d9b2774f460588bc1851dbf0cdb9ad99bd485eb67434a74408f878f76a8ea5672615495ea074124  unixbench-5.1.3_git20180129.tar.gz
+sha512sums="ca4b7ab21eaacddcb99f9237998c42e2179d8e136e23dc0e4d9b2774f460588bc1851dbf0cdb9ad99bd485eb67434a74408f878f76a8ea5672615495ea074124  unixbench-070030e09f6effdf0c6721e8fcc3a5c6fb5bed1a.tar.gz
 91590bfaac3b118ad9a7ec66200ecc7b5ff88b84f5e8552c6b30fcc4436669eb4467d6b9a89d0be8682903e88b843fc4e40e3c7f90406c398449edb187ad6771  ubench"