diff --git a/device/linux-asus-flo/APKBUILD b/device/linux-asus-flo/APKBUILD
index f06ea3a42..b10217228 100644
--- a/device/linux-asus-flo/APKBUILD
+++ b/device/linux-asus-flo/APKBUILD
@@ -1,4 +1,3 @@
-_vendor=asus
 _flavor=asus-flo
 _config="config-${_flavor}.armhf"
 pkgname=linux-${_flavor}
diff --git a/device/linux-htc-ace/APKBUILD b/device/linux-htc-ace/APKBUILD
index bc3f9155b..805d16183 100644
--- a/device/linux-htc-ace/APKBUILD
+++ b/device/linux-htc-ace/APKBUILD
@@ -11,7 +11,6 @@
 # - disable KINETO_GAN (caused problems when used with networkmanager, dhcpcd)
 # - patch framebuffer to report refresh rate of 60Hz
 
-_vendor=htc
 _flavor=htc-ace
 _config="config-${_flavor}.armv7"
 _hash="887cd64b8361ac89ac56810460947a537112bdc9"
diff --git a/device/linux-huawei-angler/APKBUILD b/device/linux-huawei-angler/APKBUILD
index 3870c9caa..f89217237 100644
--- a/device/linux-huawei-angler/APKBUILD
+++ b/device/linux-huawei-angler/APKBUILD
@@ -10,7 +10,6 @@
 # - enable devtmpfs (needed for udev -> touch support in weston)
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=huawei
 _flavor=huawei-angler
 _hash="04d1557af1259b211609fa41adbe852b5f9cf2da"
 _config="config-${_flavor}.aarch64"
diff --git a/device/linux-lg-d285/APKBUILD b/device/linux-lg-d285/APKBUILD
index 8c15e9e01..2343b6f8d 100644
--- a/device/linux-lg-d285/APKBUILD
+++ b/device/linux-lg-d285/APKBUILD
@@ -4,7 +4,6 @@
 # - enable devtmpfs (needed for udev -> touch support in weston)
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=lg
 _flavor=lg-d285
 _hash="75a583b12772acf3a6e7422cf781ddd7a9e9a5c5"
 _config="config-lg-d285.armhf"
diff --git a/device/linux-lg-d855/APKBUILD b/device/linux-lg-d855/APKBUILD
index c05dbb4f2..e638f1951 100644
--- a/device/linux-lg-d855/APKBUILD
+++ b/device/linux-lg-d855/APKBUILD
@@ -10,7 +10,6 @@
 # - enable devtmpfs (needed for udev -> touch support in weston)
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=lge
 _flavor=lg-d855
 _hash="efce7b0879c76224f5bf37d8a1025eaed99192b0"
 _config="config-${_flavor}.armhf"
@@ -30,7 +29,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 options="!strip !check !tracedeps"
 install=
 source="
-	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_${_vendor}_g3/archive/${_hash}.tar.gz
+	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_lge_g3/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
 	02_gpu-msm-fix-gcc5-compile.patch
@@ -50,7 +49,7 @@ if [ "${CC:0:5}" != "gcc6-" ]; then
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
-ksrcdir="$srcdir/android_kernel_${_vendor}_g3-${_hash}"
+ksrcdir="$srcdir/android_kernel_lge_g3-${_hash}"
 
 prepare() {
 	local _patch_failed=
diff --git a/device/linux-lg-dory/APKBUILD b/device/linux-lg-dory/APKBUILD
index 83def4be2..3eaa31daa 100644
--- a/device/linux-lg-dory/APKBUILD
+++ b/device/linux-lg-dory/APKBUILD
@@ -10,7 +10,6 @@
 # - enabled CONFIG_VT (needed for weston to work)
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=lge
 _flavor=lg-dory
 _hash="6924014484d3406e3d2da384efc20e40e8a5ae80"
 _config="config-${_flavor}.armhf"
diff --git a/device/linux-lg-lenok/APKBUILD b/device/linux-lg-lenok/APKBUILD
index 33e6276a6..7ea7296e4 100644
--- a/device/linux-lg-lenok/APKBUILD
+++ b/device/linux-lg-lenok/APKBUILD
@@ -12,7 +12,6 @@
 # - Enable generation of dtb
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=lge
 _flavor=lg-lenok
 _hash="7044f08636f6b8407bb00404a2e27ae0ce859f1e"
 _config="config-${_flavor}.armhf"
diff --git a/device/linux-motorola-osprey/APKBUILD b/device/linux-motorola-osprey/APKBUILD
index 4a2488a64..b7efbb372 100644
--- a/device/linux-motorola-osprey/APKBUILD
+++ b/device/linux-motorola-osprey/APKBUILD
@@ -1,4 +1,3 @@
-_vendor=motorola
 _flavor=motorola-osprey
 _hash="ac87541051278c7ea7f494c0b689d08e4a5cdd4f"
 _config="config-${_flavor}.armhf"
@@ -39,7 +38,7 @@ if [ "${CC:0:5}" != "gcc6-" ]; then
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
-ksrcdir="$srcdir/android_kernel_${_vendor}_msm8916-${_hash}"
+ksrcdir="$srcdir/android_kernel_motorola_msm8916-${_hash}"
 
 prepare() {
 	local _patch_failed=
diff --git a/device/linux-motorola-titan/APKBUILD b/device/linux-motorola-titan/APKBUILD
index 6cb1271f9..fd25aa5f7 100644
--- a/device/linux-motorola-titan/APKBUILD
+++ b/device/linux-motorola-titan/APKBUILD
@@ -14,7 +14,6 @@
 # - mdss: hardcode refresh rate in the video driver
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=motorola
 _flavor=motorola-titan
 _commit="22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5"
 _config="config-$_flavor.armv7"
diff --git a/device/linux-oneplus-bacon/APKBUILD b/device/linux-oneplus-bacon/APKBUILD
index 6849161a9..274990ccf 100644
--- a/device/linux-oneplus-bacon/APKBUILD
+++ b/device/linux-oneplus-bacon/APKBUILD
@@ -11,7 +11,6 @@
 # - enable virtual terminal
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=oneplus
 _flavor=oneplus-bacon
 _version="dd65620ba04a8c6ba0e30553c9c95388daefae02"
 _config="config-${_flavor}.armv7"
diff --git a/device/linux-oneplus-onyx/APKBUILD b/device/linux-oneplus-onyx/APKBUILD
index 2d0021f1b..9afa58c65 100644
--- a/device/linux-oneplus-onyx/APKBUILD
+++ b/device/linux-oneplus-onyx/APKBUILD
@@ -1,7 +1,7 @@
 #****
 # This kernel doesn't work properly!
 # The kernel will panic whenever you attempt to use the framebuffer (and probably other things).
-# Note that this seems to be a gcc6/pmOS toolchain issue - as applying 00_mt_width_major_params.patch and using 
+# Note that this seems to be a gcc6/pmOS toolchain issue - as applying 00_mt_width_major_params.patch and using
 # config-oneplus-onyx.armhf with this kernel source in the Lineage toolchain will build & work fine.
 # See https://gitlab.com/postmarketOS/pmbootstrap/issues/848.
 #****
@@ -11,7 +11,7 @@
 # - add extra patches to support GCC 6
 # - Add 00_dontpanic.patch to prevent device from entering a download mode upon panic (reboot instead). CONFIG_MSM_DLOAD_MODE was also disabled.
 # - 00_mt_width_major_params.patch - Fixes touchscreen being rejected by libinput/weston because of params not being set.
-# - 
+# -
 #
 # Kernel config based on: arch/arm/configs/lineageos_onyx_defconfig
 # Changes:
@@ -21,7 +21,6 @@
 # - Disable ANDROID_PARANOID_NETWORK
 # - Enable SYSVIPC.
 
-_vendor=oneplus
 _flavor=oneplus-onyx
 _version="c83d4835d228f8330da7e33846eec33c64608349"
 _config="config-${_flavor}.armhf"
diff --git a/device/linux-samsung-i9305/APKBUILD b/device/linux-samsung-i9305/APKBUILD
index a6677d61e..b771be118 100644
--- a/device/linux-samsung-i9305/APKBUILD
+++ b/device/linux-samsung-i9305/APKBUILD
@@ -12,7 +12,6 @@
 # - add kernel modules installation
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=samsung
 _flavor=samsung-i9305
 _hash="fa8fa332fdec11744ffe0c742775cc22efe0d041"
 _config="config-${_flavor}.armhf"
@@ -32,7 +31,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 options="!strip !check !tracedeps"
 install=
 source="
-	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_${_vendor}_smdk4412/archive/${_hash}.tar.gz
+	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_samsung_smdk4412/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
 "
@@ -51,7 +50,7 @@ if [ "${CC:0:5}" != "gcc6-" ]; then
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
-ksrcdir="$srcdir/android_kernel_${_vendor}_smdk4412-${_hash}"
+ksrcdir="$srcdir/android_kernel_samsung_smdk4412-${_hash}"
 
 prepare() {
 	local _patch_failed=
@@ -94,7 +93,7 @@ build() {
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine"
 
 	echo "-- [ Build modules ] --"
-	# the 'no-pic' flag is necessary to avoid the 
+	# the 'no-pic' flag is necessary to avoid the
 	# error 'Unknown symbol _GLOBAL_OFFSET_TABLE_ (err 0)' when loading the module
 	make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \
@@ -109,7 +108,7 @@ package() {
 	install -D "$srcdir/build/include/config/kernel.release" \
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 
-	
+
 	cd "$srcdir"/build
 	unset LDFLAGS
 
diff --git a/device/linux-samsung-n7100/APKBUILD b/device/linux-samsung-n7100/APKBUILD
index dab2052fa..a742b74a4 100644
--- a/device/linux-samsung-n7100/APKBUILD
+++ b/device/linux-samsung-n7100/APKBUILD
@@ -14,8 +14,6 @@
 # timeconst_fix.patch: Removed condition for deprecated feature in Perl (bug present in Linux 3.9 and under)
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-
-_vendor=samsung
 _flavor=samsung-n7100
 _hash="5790cd7defee9cb6f9b392af4e3569e51230917a"
 _config="config-${_flavor}.armhf"
diff --git a/device/linux-sony-castor-windy/APKBUILD b/device/linux-sony-castor-windy/APKBUILD
index 100018283..8f486cf0b 100644
--- a/device/linux-sony-castor-windy/APKBUILD
+++ b/device/linux-sony-castor-windy/APKBUILD
@@ -10,7 +10,6 @@
 #	CONFIG_KERNEL_GZIP=y (so it works with busybox)
 # - disable proprietary graphics driver
 
-_vendor=sony
 _flavor=sony-castor-windy
 _branch=next
 _config="config-${_flavor}.armhf"
diff --git a/device/linux-t2m-flame/APKBUILD b/device/linux-t2m-flame/APKBUILD
index c01540175..e4d720b6a 100644
--- a/device/linux-t2m-flame/APKBUILD
+++ b/device/linux-t2m-flame/APKBUILD
@@ -10,7 +10,6 @@
 # - enable devtmpfs (needed for udev -> touch support in weston)
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_vendor=t2m
 _flavor=t2m-flame
 _hash="03396c93577aafae7ca3603de1c74eafd30e7d54"
 _config="config-${_flavor}.armhf"