diff --git a/abi_gki_aarch64_whitelist b/abi_gki_aarch64
similarity index 100%
rename from abi_gki_aarch64_whitelist
rename to abi_gki_aarch64
diff --git a/abi_gki_aarch64_cuttlefish_whitelist b/abi_gki_aarch64_cuttlefish
similarity index 100%
rename from abi_gki_aarch64_cuttlefish_whitelist
rename to abi_gki_aarch64_cuttlefish
diff --git a/abi_gki_aarch64_qcom_whitelist b/abi_gki_aarch64_qcom
similarity index 100%
rename from abi_gki_aarch64_qcom_whitelist
rename to abi_gki_aarch64_qcom
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 8ceaaff0f7b3..d84cfe6bd5d9 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -3,10 +3,10 @@
 . ${ROOT_DIR}/common/build.config.gki
 
 ABI_DEFINITION=abi_gki_aarch64.xml
-KMI_WHITELIST=abi_gki_aarch64_whitelist
+KMI_WHITELIST=abi_gki_aarch64
 ADDITIONAL_KMI_WHITELISTS="
-abi_gki_aarch64_cuttlefish_whitelist
-abi_gki_aarch64_qcom_whitelist
+abi_gki_aarch64_cuttlefish
+abi_gki_aarch64_qcom
 "
 TRIM_NONLISTED_KMI=1
 KMI_WHITELIST_STRICT_MODE=1