diff --git a/CONFIG b/CONFIG
index 1d8e2ae45..ef8605525 100644
--- a/CONFIG
+++ b/CONFIG
@@ -41,7 +41,7 @@ CONFIG_WERROR?=n
 CONFIG_COVERAGE?=n
 
 # Build with Address Sanitizer enabled
-CONFIG_ADDRESS_SANITIZER?=n
+CONFIG_ASAN?=n
 
 # Directory that contains the desired SPDK environment library.
 # By default, this is implemented using DPDK.
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index 2031ebcd6..2abcbf0eb 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -95,7 +95,7 @@ endif
 
 include $(CONFIG_ENV)/env.mk
 
-ifeq ($(CONFIG_ADDRESS_SANITIZER),y)
+ifeq ($(CONFIG_ASAN),y)
 COMMON_CFLAGS += -fsanitize=address
 LDFLAGS += -fsanitize=address
 endif