diff --git a/Makefile b/Makefile
index b98f9ed..e3b6630 100644
--- a/Makefile
+++ b/Makefile
@@ -166,11 +166,11 @@
 CFLAGS += -DTPM2_MODE
 endif
 
-# Enable USB boot when switching to dev mode
-ifneq ($(filter-out 0,${USB_BOOT_ON_DEV}),)
-CFLAGS += -DUSB_BOOT_ON_DEV=1
+# Enable boot from external disk when switching to dev mode
+ifneq ($(filter-out 0,${BOOT_EXTERNAL_ON_DEV}),)
+CFLAGS += -DBOOT_EXTERNAL_ON_DEV=1
 else
-CFLAGS += -DUSB_BOOT_ON_DEV=0
+CFLAGS += -DBOOT_EXTERNAL_ON_DEV=0
 endif
 
 # Enable EC early firmware selection.
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c
index 7163161..eaab89d 100644
--- a/firmware/2lib/2misc.c
+++ b/firmware/2lib/2misc.c
@@ -386,7 +386,7 @@
 	flags |= VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE;
 	vb2_secdata_firmware_set(ctx, VB2_SECDATA_FIRMWARE_FLAGS, flags);
 
-	if (USB_BOOT_ON_DEV)
+	if (BOOT_EXTERNAL_ON_DEV)
 		vb2_nv_set(ctx, VB2_NV_DEV_BOOT_EXTERNAL, 1);
 
 	VB2_DEBUG("Mode change will take effect on next reboot\n");
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c
index c076b1a..b82076f 100644
--- a/tests/vb2_misc_tests.c
+++ b/tests/vb2_misc_tests.c
@@ -644,7 +644,7 @@
 	TEST_NEQ(vb2_secdata_firmware_get(ctx, VB2_SECDATA_FIRMWARE_FLAGS) &
 	         VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE, 0,
 		 "dev mode flag set");
-	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL), USB_BOOT_ON_DEV,
+	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL), BOOT_EXTERNAL_ON_DEV,
 		"NV_DEV_BOOT_EXTERNAL set according to compile-time flag");
 
 	/* secdata_firmware not initialized, aborts */
diff --git a/tests/vboot_ui_legacy_clamshell_tests.c b/tests/vboot_ui_legacy_clamshell_tests.c
index 3b9727d..d33cb71 100644
--- a/tests/vboot_ui_legacy_clamshell_tests.c
+++ b/tests/vboot_ui_legacy_clamshell_tests.c
@@ -1149,7 +1149,7 @@
 			VB2_REQUEST_REBOOT_EC_TO_RO, msg);
 		TEST_EQ(virtdev_set, 1, "  virtual dev mode on");
 		TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL),
-			!!USB_BOOT_ON_DEV,
+			!!BOOT_EXTERNAL_ON_DEV,
 			"  NV_DEV_BOOT_EXTERNAL enabled");
 	} else {
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),