diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5c2585d..8eed565 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -61,10 +61,10 @@ TARGET_SCREEN_DENSITY := 186
 KERNEL_TOOLCHAIN               := $(shell pwd)/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-gnu-9.3/bin
 KERNEL_TOOLCHAIN_PREFIX        := aarch64-buildroot-linux-gnu-
 TARGET_KERNEL_CLANG_COMPILE    := false
-TARGET_KERNEL_SOURCE           := kernel/nvidia/kernel-$(TARGET_TEGRA_KERNEL)-nx
+TARGET_KERNEL_SOURCE           := kernel/nvidia/kernel-$(TARGET_KERNEL_VERSION)-nx
 TARGET_KERNEL_CONFIG           := tegra_android_defconfig
 TARGET_KERNEL_ADDITIONAL_FLAGS := \
-    NV_BUILD_KERNEL_OPTIONS=$(TARGET_TEGRA_KERNEL) \
+    NV_BUILD_KERNEL_OPTIONS=$(TARGET_KERNEL_VERSION) \
     HOSTCFLAGS="-fuse-ld=lld -Wno-unused-command-line-argument" \
     CONFIG_EXFAT_FS=m
 
diff --git a/device.mk b/device.mk
index ca4bd27..9d6ab10 100644
--- a/device.mk
+++ b/device.mk
@@ -19,7 +19,7 @@ TARGET_TEGRA_VARIANT    ?= common
 TARGET_TEGRA_BT       ?= bcm
 TARGET_TEGRA_CEC      := aosp
 TARGET_TEGRA_CPL      := none
-TARGET_TEGRA_KERNEL   ?= 4.9
+TARGET_KERNEL_VERSION ?= 4.9
 TARGET_TEGRA_KEYSTORE := software
 TARGET_TEGRA_LIGHT    ?= lineage
 TARGET_TEGRA_MAN_LVL  := 5