diff --git a/Makefile.inc b/Makefile.inc
index a33dc7bc71..5e564d65e6 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -338,8 +338,8 @@ endif
 
 CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -I$(obj)
 CPPFLAGS_common += -Isrc/device/oprom/include
-VB_SOURCE ?= 3rdparty/vboot
-CPPFLAGS_common += -I$(VB_SOURCE)/firmware/include
+VBOOT_SOURCE ?= 3rdparty/vboot
+CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/include
 CPPFLAGS_common += -include $(src)/include/kconfig.h
 CPPFLAGS_common += -I3rdparty
 
diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc
index 4aa8906d43..b1cd900afd 100644
--- a/src/vendorcode/amd/pi/Makefile.inc
+++ b/src/vendorcode/amd/pi/Makefile.inc
@@ -62,7 +62,7 @@ AGESA_INC += -I$(src)/southbridge/amd/pi/hudson
 AGESA_INC += -I$(src)/arch/x86/include
 AGESA_INC += -I$(src)/include
 AGESA_INC += -I$(src)/commonlib/include
-AGESA_INC += -I$(VB_SOURCE)/firmware/include
+AGESA_INC += -I$(VBOOT_SOURCE)/firmware/include
 
 AGESA_CFLAGS += -march=amdfam10 -mno-3dnow -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_32 += $(AGESA_CFLAGS)
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index 31889e25a6..bf13fd6103 100644
--- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc
+++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
@@ -70,7 +70,7 @@ $(VB2_LIB): $(obj)/config.h
 	$(Q)FIRMWARE_ARCH=$(VB_FIRMWARE_ARCH) \
 	CC="$(CC_verstage)" \
 	CFLAGS="$(VBOOT_CFLAGS)" VBOOT2="y" \
-	$(MAKE) -C $(VB_SOURCE) \
+	$(MAKE) -C $(VBOOT_SOURCE) \
 		BUILD=$(abspath $(dir $(VB2_LIB))) \
 		V=$(V) \
 		fwlib20
diff --git a/util/futility/Makefile b/util/futility/Makefile
index f00e2eb975..36f2b317f7 100644
--- a/util/futility/Makefile
+++ b/util/futility/Makefile
@@ -2,7 +2,7 @@ top ?= $(abspath ../..)
 objutil ?= $(top)/util
 
 HOSTCC ?= $(CC)
-VB_SOURCE ?= $(top)/3rdparty/vboot
+VBOOT_SOURCE ?= $(top)/3rdparty/vboot
 
 .PHONY: all
 all: $(objutil)/futility/futility
diff --git a/util/futility/Makefile.inc b/util/futility/Makefile.inc
index d37be4b497..782953e649 100644
--- a/util/futility/Makefile.inc
+++ b/util/futility/Makefile.inc
@@ -2,7 +2,7 @@ additional-dirs += $(objutil)/futility
 
 $(objutil)/futility/build/futility/futility:
 	@printf "    MAKE       $(subst $(objutil)/,,$(@))\n"
-	unset CFLAGS LDFLAGS; $(MAKE) -C $(VB_SOURCE) \
+	unset CFLAGS LDFLAGS; $(MAKE) -C $(VBOOT_SOURCE) \
 		BUILD=$(abspath $@/../..) \
 		CC="$(HOSTCC)" \
 		V=$(V) \