vboot: Convert reboot-related errors to vboot2-style

Error codes are renamed as follows:

 VBERROR_SHUTDOWN_REQUESTED
 --> VB2_REQUEST_SHUTDOWN

 VBERROR_REBOOT_REQUIRED
 --> VB2_REQUEST_REBOOT

 VBERROR_EC_REBOOT_TO_SWITCH_RW
 --> VB2_REQUEST_REBOOT_EC_SWITCH_RW

 VBERROR_EC_REBOOT_TO_RO_REQUIRED
 --> VB2_REQUEST_REBOOT_EC_TO_RO

 VBERROR_KEEP_LOOPING
 --> VB2_REQUEST_UI_CONTINUE

Since these are not really "errors", they're renamed to VB2_REQUEST_*
instead, with larger values to separate from real errors.

The old vboot1-style errors will be removed once the errors are renamed
in coreboot and depthcharge.

BRANCH=none
BUG=b:124141368, chromium:988410
TEST=make runtests

Change-Id: Ide1328f9c0f2803534fb3f1f1ecd16ad8ea36a4e
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2143030
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>

14 files changed, 220 insertions, 199 deletions

diff --git a/firmware/2lib/2auxfw_sync.c b/firmware/2lib/2auxfw_sync.c
index 1e173582..c39504d1 100644
--- a/firmware/2lib/2auxfw_sync.c
+++ b/firmware/2lib/2auxfw_sync.c
@@ -58,7 +58,7 @@ static vb2_error_t update_auxfw(struct vb2_context *ctx)
 		 *
 		 * If we fail for any other reason, trigger recovery mode.
 		 */
-		if (rv != VBERROR_EC_REBOOT_TO_RO_REQUIRED)
+		if (rv != VB2_REQUEST_REBOOT_EC_TO_RO)
 			vb2api_fail(ctx, VB2_RECOVERY_AUX_FW_UPDATE, rv);
 	}
 
@@ -100,7 +100,7 @@ vb2_error_t vb2api_auxfw_sync(struct vb2_context *ctx)
 		 * RO, so that the chips that had FW update get reset to a
 		 * clean state.
 		 */
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	}
 
 	return vb2ex_auxfw_finalize(ctx);
diff --git a/firmware/2lib/2ec_sync.c b/firmware/2lib/2ec_sync.c
index 47a90125..85f5b2e4 100644
--- a/firmware/2lib/2ec_sync.c
+++ b/firmware/2lib/2ec_sync.c
@@ -46,8 +46,7 @@ static void request_recovery(struct vb2_context *ctx, uint32_t recovery_request)
  */
 static inline int reboot_requested(vb2_error_t rv)
 {
-	return rv == VBERROR_REBOOT_REQUIRED ||
-	       rv == VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+	return rv == VB2_REQUEST_REBOOT || rv == VB2_REQUEST_REBOOT_EC_TO_RO;
 }
 
 /**
@@ -204,11 +203,11 @@ static vb2_error_t update_ec(struct vb2_context *ctx,
 	/* Verify the EC was updated properly */
 	sd->flags &= ~SYNC_FLAG(select);
 	if (check_ec_hash(ctx, select) != VB2_SUCCESS)
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	if (sd->flags & SYNC_FLAG(select)) {
 		VB2_DEBUG("Failed to update\n");
 		request_recovery(ctx, VB2_RECOVERY_EC_UPDATE);
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	}
 
 	VB2_DEBUG("Updated %s successfully\n", image_name_to_string(select));
@@ -237,7 +236,7 @@ static vb2_error_t check_ec_active(struct vb2_context *ctx)
 	if (rv != VB2_SUCCESS) {
 		VB2_DEBUG("vb2ex_ec_running_rw() returned %#x\n", rv);
 		request_recovery(ctx, VB2_RECOVERY_EC_UNKNOWN_IMAGE);
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	}
 
 	if (in_rw)
@@ -270,14 +269,14 @@ static vb2_error_t sync_ec(struct vb2_context *ctx)
 		if (reboot_requested(rv))
 			return rv;
 		else if (rv)
-			return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+			return VB2_REQUEST_REBOOT_EC_TO_RO;
 		/* Updated successfully. Cold reboot to switch to the new RW. */
 		if (ctx->flags & VB2_CONTEXT_NO_BOOT) {
 			VB2_DEBUG("Rebooting to jump to new EC-RW\n");
-			return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+			return VB2_REQUEST_REBOOT_EC_TO_RO;
 		} else if (EC_EFS) {
 			VB2_DEBUG("Rebooting to switch to new EC-RW\n");
-			return VBERROR_EC_REBOOT_TO_SWITCH_RW;
+			return VB2_REQUEST_REBOOT_EC_SWITCH_RW;
 		}
 	}
 
@@ -287,7 +286,7 @@ static vb2_error_t sync_ec(struct vb2_context *ctx)
 		 * verification result is revoked.
 		 */
 		VB2_DEBUG("Reset EC after Hmir update\n");
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	}
 
 	/* Tell EC to jump to RW. It should already be in RW for EFS2. */
@@ -304,10 +303,10 @@ static vb2_error_t sync_ec(struct vb2_context *ctx)
 			 *
 			 * All other errors trigger recovery mode.
 			 */
-			if (rv != VBERROR_EC_REBOOT_TO_RO_REQUIRED)
+			if (rv != VB2_REQUEST_REBOOT_EC_TO_RO)
 				request_recovery(ctx, VB2_RECOVERY_EC_JUMP_RW);
 
-			return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+			return VB2_REQUEST_REBOOT_EC_TO_RO;
 		}
 	}
 
@@ -339,7 +338,7 @@ static vb2_error_t sync_ec(struct vb2_context *ctx)
 		}
 		if (num_tries == RO_RETRIES) {
 			/* Ran out of tries */
-			return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+			return VB2_REQUEST_REBOOT_EC_TO_RO;
 		} else if (num_tries) {
 			/*
 			 * Update succeeded after a failure, so we've polluted
@@ -364,7 +363,7 @@ static vb2_error_t sync_ec(struct vb2_context *ctx)
 	if (rv != VB2_SUCCESS) {
 		VB2_DEBUG("vb2ex_ec_disable_jump() returned %#x\n", rv);
 		request_recovery(ctx, VB2_RECOVERY_EC_SOFTWARE_SYNC);
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	}
 
 	return rv;
@@ -377,9 +376,8 @@ static vb2_error_t sync_ec(struct vb2_context *ctx)
  * whether any updates are necessary.
  *
  * @param ctx		Vboot2 context
- * @return VB2_SUCCESS, VBERROR_EC_REBOOT_TO_RO_REQUIRED if the EC must
- * reboot back to its RO code to continue EC sync, or other non-zero error
- * code.
+ * @return VB2_SUCCESS, VB2_REQUEST_REBOOT_EC_TO_RO if the EC must reboot back
+ * to its RO code to continue EC sync, or other non-zero error code.
  */
 static vb2_error_t ec_sync_phase1(struct vb2_context *ctx)
 {
@@ -394,16 +392,16 @@ static vb2_error_t ec_sync_phase1(struct vb2_context *ctx)
 
 	/* Set VB2_SD_FLAG_ECSYNC_EC_IN_RW flag */
 	if (check_ec_active(ctx))
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 
 	/* Check if we need to update RW. Failures trigger recovery mode. */
 	if (check_ec_hash(ctx, VB_SELECT_FIRMWARE_EC_ACTIVE))
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 
 	/* See if we need to update EC-RO. */
 	if (vb2_nv_get(ctx, VB2_NV_TRY_RO_SYNC) &&
 	    check_ec_hash(ctx, VB_SELECT_FIRMWARE_READONLY)) {
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	}
 
 	/*
@@ -415,7 +413,7 @@ static vb2_error_t ec_sync_phase1(struct vb2_context *ctx)
 	 */
 	if ((sd->flags & SYNC_FLAG(VB_SELECT_FIRMWARE_EC_ACTIVE)) &&
 	    (sd->flags & VB2_SD_FLAG_ECSYNC_EC_IN_RW) && !EC_EFS) {
-		return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+		return VB2_REQUEST_REBOOT_EC_TO_RO;
 	}
 
 	return VB2_SUCCESS;
@@ -449,7 +447,7 @@ static int ec_sync_allowed(struct vb2_context *ctx)
  * and makes sure it has jumped to the correct image.
  *
  * @param ctx		Vboot2 context
- * @return VB2_SUCCESS, VBERROR_EC_REBOOT_TO_RO_REQUIRED if the EC must
+ * @return VB2_SUCCESS, VB2_REQUEST_REBOOT_EC_TO_RO if the EC must
  * reboot back to its RO code to continue EC sync, or other non-zero error
  * code.
  */
diff --git a/firmware/2lib/2kernel.c b/firmware/2lib/2kernel.c
index e05726d7..23563205 100644
--- a/firmware/2lib/2kernel.c
+++ b/firmware/2lib/2kernel.c
@@ -50,7 +50,7 @@ vb2_error_t vb2_normal_boot(struct vb2_context *ctx)
 
 	if (vb2_reset_nv_requests(ctx)) {
 		VB2_DEBUG("Normal mode: reboot to reset NVRAM requests\n");
-		return VBERROR_REBOOT_REQUIRED;
+		return VB2_REQUEST_REBOOT;
 	}
 
 	vb2_error_t rv = VbTryLoadKernel(ctx, VB_DISK_FLAG_FIXED);
diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h
index 3a303be1..6b5c0279 100644
--- a/firmware/2lib/include/2return_codes.h
+++ b/firmware/2lib/include/2return_codes.h
@@ -24,7 +24,30 @@ enum vb2_return_code {
 	/* Success - no error */
 	VB2_SUCCESS = 0,
 
-	/*
+	/**********************************************************************
+	 * Return values that are not considered errors
+	 */
+	VB2_REQUEST = 0x1000,
+
+	/* Calling firmware requested shutdown via VbExIsShutdownRequested() */
+	VB2_REQUEST_SHUTDOWN = 0x1001,
+
+	/* Calling firmware needs to perform a reboot */
+	VB2_REQUEST_REBOOT = 0x1002,
+
+	/* Need EC to reboot to read-only code to switch RW slot */
+	VB2_REQUEST_REBOOT_EC_SWITCH_RW = 0x1003,
+
+	/* Need EC to reboot to read-only code */
+	VB2_REQUEST_REBOOT_EC_TO_RO = 0x1004,
+
+	/* Continue in the UI loop.  This is used in UI internal functions. */
+	VB2_REQUEST_UI_CONTINUE	= 0x1005,
+
+	/* End of VB2_REQUEST_* */
+	VB2_REQUEST_END = 0x5000,
+
+	/**********************************************************************
 	 * All vboot2 error codes start at a large offset from zero, to reduce
 	 * the risk of overlap with other error codes (TPM, etc.).
 	 */
@@ -41,22 +64,22 @@ enum vb2_return_code {
 	 * TODO: deprecate these once they have all moved over to vboot2 style
 	 */
 	/* Calling firmware needs to perform a reboot. */
-	VBERROR_REBOOT_REQUIRED               = 0x10007,
+	VBERROR_REBOOT_REQUIRED               = VB2_REQUEST_REBOOT,
 	/* Calling firmware requested shutdown via VbExIsShutdownRequested() */
-	VBERROR_SHUTDOWN_REQUESTED            = 0x1000D,
+	VBERROR_SHUTDOWN_REQUESTED            = VB2_REQUEST_SHUTDOWN,
 	/* VbExBeep() can't make sound in the background */
 	VBERROR_NO_BACKGROUND_SOUND           = 0x10019,
 	/* Need EC to reboot to read-only code to switch RW slot */
-	VBERROR_EC_REBOOT_TO_SWITCH_RW        = 0x1001A,
+	VBERROR_EC_REBOOT_TO_SWITCH_RW        = VB2_REQUEST_REBOOT_EC_SWITCH_RW,
 	/* Need EC to reboot to read-only code */
-	VBERROR_EC_REBOOT_TO_RO_REQUIRED      = 0x10022,
+	VBERROR_EC_REBOOT_TO_RO_REQUIRED      = VB2_REQUEST_REBOOT_EC_TO_RO,
 	/* Peripheral busy. Cannot upgrade firmware at present. */
 	VBERROR_PERIPHERAL_BUSY               = 0x10030,
 	/* Error writing VPD */
 	VBERROR_VPD_WRITE                     = 0x10032,
 	/* Detachable UI internal functions may return the following codes */
 	/* No error; return to UI loop */
-	VBERROR_KEEP_LOOPING			= 0x30000,
+	VBERROR_KEEP_LOOPING			= VB2_REQUEST_UI_CONTINUE,
 
 	/**********************************************************************
 	 * SHA errors
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index 14f70c71..2750325b 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -48,7 +48,7 @@ static vb2_error_t handle_battery_cutoff(struct vb2_context *ctx)
 		VB2_TRY(vb2ex_commit_data(ctx));
 
 		vb2ex_ec_battery_cutoff();
-		return VBERROR_SHUTDOWN_REQUESTED;
+		return VB2_REQUEST_SHUTDOWN;
 	}
 
 	return VB2_SUCCESS;
@@ -210,7 +210,7 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx,
 		   we need to do is reboot. */
 		if (sd->recovery_reason == VB2_RECOVERY_TRAIN_AND_REBOOT) {
 			VB2_DEBUG("Reboot after retraining in recovery\n");
-			return VBERROR_REBOOT_REQUIRED;
+			return VB2_REQUEST_REBOOT;
 		}
 
 		/*
@@ -254,7 +254,7 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx,
 		 * The diagnostic menu should either boot a rom, or
 		 * return either of reboot or shutdown.
 		 */
-		return VBERROR_REBOOT_REQUIRED;
+		return VB2_REQUEST_REBOOT;
 	} else if (ctx->flags & VB2_CONTEXT_DEVELOPER_MODE) {
 		/* Developer boot.  This has UI. */
 		if (MENU_UI)
diff --git a/firmware/lib/vboot_ui_legacy_clamshell.c b/firmware/lib/vboot_ui_legacy_clamshell.c
index a759b931..3b2c91dc 100644
--- a/firmware/lib/vboot_ui_legacy_clamshell.c
+++ b/firmware/lib/vboot_ui_legacy_clamshell.c
@@ -134,7 +134,7 @@ static vb2_error_t vb2_altfw_ui(struct vb2_context *ctx)
 
 		if (vb2_want_shutdown(ctx, key)) {
 			VB2_DEBUG("developer UI - shutdown requested!\n");
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 		}
 		switch (key) {
 		case 0:
@@ -239,10 +239,10 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx)
 			VbDisplayScreen(ctx,
 				VB_SCREEN_TO_NORM_CONFIRMED, 0, NULL);
 			VbExSleepMs(5000);
-			return VBERROR_REBOOT_REQUIRED;
+			return VB2_REQUEST_REBOOT;
 		case -1:
 			VB2_DEBUG("shutdown requested\n");
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 		default:
 			/* Ignore user attempt to cancel */
 			VB2_DEBUG("ignore cancel TONORM\n");
@@ -269,7 +269,7 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx)
 		uint32_t key = VbExKeyboardRead();
 		if (vb2_want_shutdown(ctx, key)) {
 			VB2_DEBUG("developer UI - shutdown requested!\n");
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 		}
 
 		switch (key) {
@@ -310,10 +310,10 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx)
 				VbDisplayScreen(ctx,
 					VB_SCREEN_TO_NORM_CONFIRMED, 0, NULL);
 				VbExSleepMs(5000);
-				return VBERROR_REBOOT_REQUIRED;
+				return VB2_REQUEST_REBOOT;
 			case -1:
 				VB2_DEBUG("shutdown requested\n");
-				return VBERROR_SHUTDOWN_REQUESTED;
+				return VB2_REQUEST_SHUTDOWN;
 			default:
 				/* Stay in dev-mode */
 				VB2_DEBUG("stay in dev-mode\n");
@@ -445,7 +445,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx)
 			key = VbExKeyboardRead();
 			VbCheckDisplayKey(ctx, key, NULL);
 			if (vb2_want_shutdown(ctx, key))
-				return VBERROR_SHUTDOWN_REQUESTED;
+				return VB2_REQUEST_SHUTDOWN;
 			else if ((retval =
 				  vb2_check_diagnostic_key(ctx, key)) !=
 				  VB2_SUCCESS)
@@ -500,10 +500,10 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx)
 			switch (VbUserConfirms(ctx, vbc_flags)) {
 			case 1:
 				vb2_enable_developer_mode(ctx);
-				return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
+				return VB2_REQUEST_REBOOT_EC_TO_RO;
 			case -1:
 				VB2_DEBUG("Shutdown requested\n");
-				return VBERROR_SHUTDOWN_REQUESTED;
+				return VB2_REQUEST_SHUTDOWN;
 			default: /* zero, actually */
 				VB2_DEBUG("Not enabling dev-mode\n");
 				break;
@@ -515,7 +515,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx)
 			VbCheckDisplayKey(ctx, key, NULL);
 		}
 		if (vb2_want_shutdown(ctx, key))
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 		VbExSleepMs(KEY_DELAY_MS);
 	}
 
diff --git a/firmware/lib/vboot_ui_legacy_menu.c b/firmware/lib/vboot_ui_legacy_menu.c
index 66e4c9c7..1e1462b8 100644
--- a/firmware/lib/vboot_ui_legacy_menu.c
+++ b/firmware/lib/vboot_ui_legacy_menu.c
@@ -134,7 +134,7 @@ static vb2_error_t boot_disk_action(struct vb2_context *ctx)
 		vb2_flash_screen(ctx);
 		vb2_error_notify("Developer mode disabled\n", NULL,
 				 VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 	VB2_DEBUG("trying fixed disk\n");
 	return VbTryLoadKernel(ctx, VB_DISK_FLAG_FIXED);
@@ -147,7 +147,7 @@ static vb2_error_t boot_legacy_action(struct vb2_context *ctx)
 		vb2_flash_screen(ctx);
 		vb2_error_notify("Developer mode disabled\n", NULL,
 				 VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 
 	if (!altfw_allowed) {
@@ -157,12 +157,12 @@ static vb2_error_t boot_legacy_action(struct vb2_context *ctx)
 				 "-mode documentation for details.\n",
 				 "Legacy boot is disabled\n",
 				 VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 
 	vb2_try_altfw(ctx, 1, VB_ALTFW_DEFAULT);
 	vb2_flash_screen(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 /* Boot from USB or SD card if allowed and available. */
@@ -174,7 +174,7 @@ static vb2_error_t boot_usb_action(struct vb2_context *ctx)
 		vb2_flash_screen(ctx);
 		vb2_error_notify("Developer mode disabled\n", NULL,
 				 VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 
 	if (!vb2_nv_get(ctx, VB2_NV_DEV_BOOT_USB) &&
@@ -187,7 +187,7 @@ static vb2_error_t boot_usb_action(struct vb2_context *ctx)
 				 "for details.\n",
 				 "USB booting is disabled\n",
 				 VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 
 	if (VB2_SUCCESS == VbTryLoadKernel(ctx, VB_DISK_FLAG_REMOVABLE)) {
@@ -197,7 +197,7 @@ static vb2_error_t boot_usb_action(struct vb2_context *ctx)
 
 	vb2_flash_screen(ctx);
 	vb2_error_notify(no_kernel, NULL, VB_BEEP_FAILED);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t enter_developer_menu(struct vb2_context *ctx)
@@ -217,14 +217,14 @@ static vb2_error_t enter_developer_menu(struct vb2_context *ctx)
 	}
 	vb2_change_menu(VB_MENU_DEV, menu_idx);
 	vb2_draw_current_screen(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t enter_dev_warning_menu(struct vb2_context *ctx)
 {
 	vb2_change_menu(VB_MENU_DEV_WARNING, VB_WARN_POWER_OFF);
 	vb2_draw_current_screen(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t enter_language_menu(struct vb2_context *ctx)
@@ -232,7 +232,7 @@ static vb2_error_t enter_language_menu(struct vb2_context *ctx)
 	vb2_change_menu(VB_MENU_LANGUAGES,
 			vb2_nv_get(ctx, VB2_NV_LOCALIZATION_INDEX));
 	vb2_draw_current_screen(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t enter_recovery_base_screen(struct vb2_context *ctx)
@@ -244,14 +244,14 @@ static vb2_error_t enter_recovery_base_screen(struct vb2_context *ctx)
 	else
 		vb2_change_menu(VB_MENU_RECOVERY_INSERT, 0);
 	vb2_draw_current_screen(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t enter_options_menu(struct vb2_context *ctx)
 {
 	vb2_change_menu(VB_MENU_OPTIONS, VB_OPTIONS_CANCEL);
 	vb2_draw_current_screen(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t enter_to_dev_menu(struct vb2_context *ctx)
@@ -261,11 +261,11 @@ static vb2_error_t enter_to_dev_menu(struct vb2_context *ctx)
 	if (vb2_get_sd(ctx)->flags & VB2_SD_FLAG_DEV_MODE_ENABLED) {
 		vb2_flash_screen(ctx);
 		vb2_error_notify(dev_already_on, NULL, VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 	vb2_change_menu(VB_MENU_TO_DEV, VB_TO_DEV_CANCEL);
 	vb2_draw_current_screen(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t enter_to_norm_menu(struct vb2_context *ctx)
@@ -275,7 +275,7 @@ static vb2_error_t enter_to_norm_menu(struct vb2_context *ctx)
 	/* Make sure user knows dev mode disabled */
 	if (disable_dev_boot)
 		VbExDisplayDebugInfo(dev_disable_msg, 0);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 /* Boot alternative bootloader if allowed and available. */
@@ -285,24 +285,24 @@ static vb2_error_t enter_altfw_menu(struct vb2_context *ctx)
 	if (disable_dev_boot) {
 		vb2_flash_screen(ctx);
 		vb2_error_beep(VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 	if (!altfw_allowed) {
 		vb2_flash_screen(ctx);
 		vb2_error_no_altfw();
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 	vb2_change_menu(VB_MENU_ALT_FW, 0);
 	vb2_draw_current_screen(ctx);
 
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 static vb2_error_t debug_info_action(struct vb2_context *ctx)
 {
 	force_redraw = 1;
 	VbDisplayDebugInfo(ctx);
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 /* Action when selecting a language entry in the language menu. */
@@ -335,7 +335,7 @@ static vb2_error_t language_action(struct vb2_context *ctx)
 	default:
 		/* This should never happen. */
 		VB2_DEBUG("ERROR: prev_menu state corrupted, force shutdown\n");
-		return VBERROR_SHUTDOWN_REQUESTED;
+		return VB2_REQUEST_SHUTDOWN;
 	}
 }
 
@@ -347,7 +347,7 @@ static vb2_error_t altfw_action(struct vb2_context *ctx)
 	VB2_DEBUG(no_legacy);
 	VbExDisplayDebugInfo(no_legacy, 0);
 
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 /* Action that enables developer mode and reboots. */
@@ -356,11 +356,11 @@ static vb2_error_t to_dev_action(struct vb2_context *ctx)
 	/* Sanity check, should never happen. */
 	if ((vb2_get_sd(ctx)->flags & VB2_SD_FLAG_DEV_MODE_ENABLED) ||
 	    !vb2_allow_recovery(ctx))
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 
 	vb2_enable_developer_mode(ctx);
 
-	return VBERROR_REBOOT_REQUIRED;
+	return VB2_REQUEST_REBOOT;
 }
 
 /* Action that disables developer mode, shows TO_NORM_CONFIRMED and reboots. */
@@ -371,7 +371,7 @@ static vb2_error_t to_norm_action(struct vb2_context *ctx)
 		vb2_error_notify("WARNING: TONORM prohibited by "
 				 "GBB FORCE_DEV_SWITCH_ON.\n", NULL,
 				 VB_BEEP_NOT_ALLOWED);
-		return VBERROR_KEEP_LOOPING;
+		return VB2_REQUEST_UI_CONTINUE;
 	}
 
 	VB2_DEBUG("leaving dev-mode.\n");
@@ -379,7 +379,7 @@ static vb2_error_t to_norm_action(struct vb2_context *ctx)
 	vb2_change_menu(VB_MENU_TO_NORM_CONFIRMED, 0);
 	vb2_draw_current_screen(ctx);
 	VbExSleepMs(5000);
-	return VBERROR_REBOOT_REQUIRED;
+	return VB2_REQUEST_REBOOT;
 }
 
 /* Action that will power off the system. */
@@ -387,7 +387,7 @@ static vb2_error_t power_off_action(struct vb2_context *ctx)
 {
 	VB2_DEBUG("Power off requested from screen %#x\n",
 		  menus[current_menu].screen);
-	return VBERROR_SHUTDOWN_REQUESTED;
+	return VB2_REQUEST_SHUTDOWN;
 }
 
 /**
@@ -475,7 +475,7 @@ static vb2_error_t vb2_handle_menu_input(struct vb2_context *ctx,
 	case VB_KEY_ENTER:
 		/* Menuless screens shut down on power button press. */
 		if (!menus[current_menu].size)
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 
 		return menus[current_menu].items[current_menu_idx].action(ctx);
 	default:
@@ -485,10 +485,10 @@ static vb2_error_t vb2_handle_menu_input(struct vb2_context *ctx,
 
 	if (VbWantShutdownMenu(ctx)) {
 		VB2_DEBUG("shutdown requested!\n");
-		return VBERROR_SHUTDOWN_REQUESTED;
+		return VB2_REQUEST_SHUTDOWN;
 	}
 
-	return VBERROR_KEEP_LOOPING;
+	return VB2_REQUEST_UI_CONTINUE;
 }
 
 /* Master table of all menus. Menus with size == 0 count as menuless screens. */
@@ -785,7 +785,7 @@ static vb2_error_t vb2_developer_legacy_menu(struct vb2_context *ctx)
 				  "user pressed key '%c': Boot alternative "
 				  "firmware\n", key);
 			vb2_try_altfw(ctx, altfw_allowed, key - '0');
-			ret = VBERROR_KEEP_LOOPING;
+			ret = VB2_REQUEST_UI_CONTINUE;
 			break;
 		default:
 			ret = vb2_handle_menu_input(ctx, key, 0);
@@ -793,7 +793,7 @@ static vb2_error_t vb2_developer_legacy_menu(struct vb2_context *ctx)
 		}
 
 		/* We may have loaded a kernel or decided to shut down now. */
-		if (ret != VBERROR_KEEP_LOOPING)
+		if (ret != VB2_REQUEST_UI_CONTINUE)
 			return ret;
 
 		/* Reset 30 second timer whenever we see a new key. */
@@ -836,7 +836,7 @@ static vb2_error_t broken_ui(struct vb2_context *ctx)
 	while (1) {
 		uint32_t key = VbExKeyboardRead();
 		vb2_error_t ret = vb2_handle_menu_input(ctx, key, 0);
-		if (ret != VBERROR_KEEP_LOOPING)
+		if (ret != VB2_REQUEST_UI_CONTINUE)
 			return ret;
 	}
 }
@@ -876,7 +876,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx)
 				VB2_DEBUG("ERROR: untrusted combo?!\n");
 		} else {
 			ret = vb2_handle_menu_input(ctx, key, key_flags);
-			if (ret != VBERROR_KEEP_LOOPING)
+			if (ret != VB2_REQUEST_UI_CONTINUE)
 				return ret;
 		}
 		VbExSleepMs(KEY_DELAY_MS);
diff --git a/firmware/lib/vboot_ui_legacy_wilco.c b/firmware/lib/vboot_ui_legacy_wilco.c
index d995b4c3..4cba2857 100644
--- a/firmware/lib/vboot_ui_legacy_wilco.c
+++ b/firmware/lib/vboot_ui_legacy_wilco.c
@@ -55,7 +55,7 @@ static vb2_error_t vb2_enter_vendor_data_ui(struct vb2_context *ctx,
 
 		if (vb2_want_shutdown(ctx, key)) {
 			VB2_DEBUG("Vendor Data UI - shutdown requested!\n");
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 		}
 		switch (key) {
 		case 0:
@@ -143,7 +143,7 @@ static vb2_error_t vb2_confirm_vendor_data_ui(struct vb2_context *ctx,
 		if (vb2_want_shutdown(ctx, key_confirm)) {
 			VB2_DEBUG("Confirm Vendor Data UI "
 				  "- shutdown requested!\n");
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 		}
 		switch (key_confirm) {
 		case 0:
@@ -176,7 +176,7 @@ static vb2_error_t vb2_confirm_vendor_data_ui(struct vb2_context *ctx,
 					vb2_nv_set(ctx,
 						   VB2_NV_DISABLE_DEV_REQUEST,
 						   1);
-					return VBERROR_REBOOT_REQUIRED;
+					return VB2_REQUEST_REBOOT;
 				} else {
 					vb2_error_notify(
 						"ERROR: Vendor data was not "
@@ -184,7 +184,7 @@ static vb2_error_t vb2_confirm_vendor_data_ui(struct vb2_context *ctx,
 						"System will now shutdown\n",
 						NULL, VB_BEEP_FAILED);
 					VbExSleepMs(5000);
-					return VBERROR_SHUTDOWN_REQUESTED;
+					return VB2_REQUEST_SHUTDOWN;
 				}
 			} else {
 				VB2_DEBUG("Confirm Vendor Data UI - user "
@@ -215,7 +215,7 @@ vb2_error_t vb2_vendor_data_ui(struct vb2_context *ctx)
 
 		if (vb2_want_shutdown(ctx, key_set)) {
 			VB2_DEBUG("Vendor Data UI - shutdown requested!\n");
-			return VBERROR_SHUTDOWN_REQUESTED;
+			return VB2_REQUEST_SHUTDOWN;
 		}
 
 		switch (key_set) {
@@ -272,7 +272,7 @@ vb2_error_t vb2_check_diagnostic_key(struct vb2_context *ctx,
 		VB2_DEBUG("Diagnostic mode requested, rebooting\n");
 		vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 1);
 
-		return VBERROR_REBOOT_REQUIRED;
+		return VB2_REQUEST_REBOOT;
 	}
 
 	return VB2_SUCCESS;
@@ -283,7 +283,7 @@ vb2_error_t vb2_diagnostics_ui(struct vb2_context *ctx)
 	int active = 1;
 	int button_released = 0;
 	int button_pressed = 0;
-	vb2_error_t result = VBERROR_REBOOT_REQUIRED;
+	vb2_error_t result = VB2_REQUEST_REBOOT;
 	int action_confirmed = 0;
 	uint64_t start_time_us;
 
@@ -313,7 +313,7 @@ vb2_error_t vb2_diagnostics_ui(struct vb2_context *ctx)
 		/* Check the lid and ignore the power button. */
 		if (vb2_want_shutdown(ctx, 0) & ~VB_SHUTDOWN_REQUEST_POWER_BUTTON) {
 			VB2_DEBUG("vb2_diagnostics_ui() - shutdown request\n");
-			result = VBERROR_SHUTDOWN_REQUESTED;
+			result = VB2_REQUEST_SHUTDOWN;
 			active = 0;
 			break;
 		}
diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c
index 823dec0b..104455f9 100644
--- a/tests/vb2_auxfw_sync_tests.c
+++ b/tests/vb2_auxfw_sync_tests.c
@@ -70,7 +70,7 @@ vb2_error_t vb2ex_auxfw_check(enum vb2_auxfw_update_severity *severity)
 	auxfw_update_severity = auxfw_mock_severity;
 	if (*severity == VB_AUX_FW_SLOW_UPDATE)
 		if (!auxfw_mock_display_available)
-			return VBERROR_REBOOT_REQUIRED;
+			return VB2_REQUEST_REBOOT;
 	return VB2_SUCCESS;
 }
 
@@ -103,7 +103,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	gbb.flags |= VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC;
 	auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE;
-	test_auxsync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, 0,
+	test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0,
 		     "VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC"
 		     " does not disable auxiliary FW update request");
 	TEST_EQ(auxfw_update_req, 1, "  aux fw update requested");
@@ -134,7 +134,7 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE;
-	test_auxsync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, 0,
+	test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0,
 		     "Fast auxiliary FW update needed");
 	TEST_EQ(auxfw_update_req, 1, "  aux fw update requested");
 	TEST_EQ(auxfw_protected, 0, "  aux fw protected");
@@ -142,12 +142,12 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	auxfw_mock_severity = VB_AUX_FW_SLOW_UPDATE;
 	auxfw_mock_display_available = 0;
-	test_auxsync(VBERROR_REBOOT_REQUIRED, 0,
+	test_auxsync(VB2_REQUEST_REBOOT, 0,
 		     "Slow auxiliary FW update needed - reboot for display");
 
 	ResetMocks();
 	auxfw_mock_severity = VB_AUX_FW_SLOW_UPDATE;
-	test_auxsync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, 0,
+	test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0,
 		     "Slow auxiliary FW update needed");
 	TEST_EQ(auxfw_update_req, 1, "  aux fw update requested");
 	TEST_EQ(auxfw_protected, 0, "  aux fw protected");
diff --git a/tests/vb2_ec_sync_tests.c b/tests/vb2_ec_sync_tests.c
index ad747e09..25f047d1 100644
--- a/tests/vb2_ec_sync_tests.c
+++ b/tests/vb2_ec_sync_tests.c
@@ -179,7 +179,7 @@ vb2_error_t vb2ex_ec_update_image(enum vb2_firmware_selection select)
 		return update_retval;
 
 	if (!mock_display_available)
-		return VBERROR_REBOOT_REQUIRED;
+		return VB2_REQUEST_REBOOT;
 
 	if (select == VB_SELECT_FIRMWARE_READONLY) {
 		ec_ro_updated = 1;
@@ -266,7 +266,7 @@ static void VbSoftwareSyncTest(void)
 	/* AP-RO cases */
 	ResetMocks();
 	in_rw_retval = VB2_ERROR_MOCK;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_UNKNOWN_IMAGE, "Unknown EC image");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -277,7 +277,7 @@ static void VbSoftwareSyncTest(void)
 	/* Calculate hashes */
 	ResetMocks();
 	mock_ec_rw_hash_size = 0;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_HASH_FAILED, "Bad EC hash");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -287,7 +287,7 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	mock_ec_rw_hash_size = 16;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_HASH_SIZE, "Bad EC hash size");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -297,7 +297,7 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	hexp_size = 0;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_EXPECTED_HASH, "Bad precalculated hash");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -307,7 +307,7 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	hexp_size = 16;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_HASH_SIZE,
 		   "Hash size mismatch");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
@@ -319,7 +319,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	hexp_size = 4;
 	mock_ec_rw_hash_size = 4;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, VB2_RECOVERY_EC_HASH_SIZE,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO, VB2_RECOVERY_EC_HASH_SIZE,
 		   "Custom hash size secdata_kernel v1");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -343,7 +343,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	ec_run_image = 1;
 	mock_ec_rw_hash[0]++;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   0, "Pending update needs reboot");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -357,7 +357,7 @@ static void VbSoftwareSyncTest(void)
 	vb2_secdata_kernel_set_ec_hash(ctx, hmir);
 	ec_run_image = 1;
 	mock_ec_rw_hash[0] = 43;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   0, "Reboot after synching Hmir");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -370,7 +370,7 @@ static void VbSoftwareSyncTest(void)
 	ec_run_image = 0;
 	ctx->flags |= VB2_CONTEXT_NO_BOOT;
 	mock_ec_rw_hash[0] = 43;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   0, "Reboot after synching Heff");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 1, "  ec rw updated");
@@ -385,7 +385,7 @@ static void VbSoftwareSyncTest(void)
 	ec_run_image = 0;
 	ctx->flags |= VB2_CONTEXT_NO_BOOT;
 	mock_ec_rw_hash[0] = 43;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   0, "Reboot after synching Hmir and Heff");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 1, "  ec rw updated");
@@ -399,7 +399,7 @@ static void VbSoftwareSyncTest(void)
 	vb2_secdata_kernel_set_ec_hash(ctx, hmir);
 	ec_run_image = 0;
 	ctx->flags |= VB2_CONTEXT_NO_BOOT;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   0, "Reboot after synching Hmir");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -454,7 +454,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	mock_ec_rw_hash[0]++;
 	update_hash++;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_UPDATE, "Updated hash mismatch");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 1, "  ec rw updated");
@@ -464,8 +464,8 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	mock_ec_rw_hash[0]++;
-	update_retval = VBERROR_EC_REBOOT_TO_RO_REQUIRED;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	update_retval = VB2_REQUEST_REBOOT_EC_TO_RO;
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   0, "Reboot for rw update");
 	TEST_EQ(ec_ro_updated, 0, "  ec rw updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -476,7 +476,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	mock_ec_rw_hash[0]++;
 	update_retval = VB2_ERROR_MOCK;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_UPDATE, "Update failed");
 	TEST_EQ(ec_ro_updated, 0, "  ec rw updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -488,7 +488,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	mock_ec_rw_hash[0]++;
 	mock_display_available = 0;
-	test_ssync(VBERROR_REBOOT_REQUIRED, 0,
+	test_ssync(VB2_REQUEST_REBOOT, 0,
 		   "Reboot for display - ec rw");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -501,7 +501,7 @@ static void VbSoftwareSyncTest(void)
 	vb2_nv_set(ctx, VB2_NV_TRY_RO_SYNC, 1);
 	mock_ec_ro_hash[0]++;
 	mock_display_available = 0;
-	test_ssync(VBERROR_REBOOT_REQUIRED, 0,
+	test_ssync(VB2_REQUEST_REBOOT, 0,
 		   "Reboot for display - ec ro");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -529,7 +529,7 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	jump_retval = VB2_ERROR_MOCK;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   VB2_RECOVERY_EC_JUMP_RW, "Jump to RW fail");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
@@ -538,8 +538,8 @@ static void VbSoftwareSyncTest(void)
 	TEST_EQ(ec_run_image, 0, "  ec run image");
 
 	ResetMocks();
-	jump_retval = VBERROR_EC_REBOOT_TO_RO_REQUIRED;
-	test_ssync(VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+	jump_retval = VB2_REQUEST_REBOOT_EC_TO_RO;
+	test_ssync(VB2_REQUEST_REBOOT_EC_TO_RO,
 		   0, "Jump to RW fail because locked");
 	TEST_EQ(ec_ro_updated, 0, "  ec ro updated");
 	TEST_EQ(ec_rw_updated, 0, "  ec rw updated");
diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c
index ddef912a..30da9ad5 100644
--- a/tests/vb2_kernel_tests.c
+++ b/tests/vb2_kernel_tests.c
@@ -278,14 +278,14 @@ static void normal_boot_tests(void)
 
 	reset_common_data(FOR_NORMAL_BOOT);
 	vb2_nv_set(ctx, VB2_NV_DISPLAY_REQUEST, 1);
-	TEST_EQ(vb2_normal_boot(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(vb2_normal_boot(ctx), VB2_REQUEST_REBOOT,
 		"vb2_normal_boot() reboot to reset NVRAM display request");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0,
 		"  display request reset");
 
 	reset_common_data(FOR_NORMAL_BOOT);
 	vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 1);
-	TEST_EQ(vb2_normal_boot(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(vb2_normal_boot(ctx), VB2_REQUEST_REBOOT,
 		"vb2_normal_boot() reboot to reset NVRAM diag request");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0,
 		"  diag request reset");}
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c
index 12a89af4..45ba7be5 100644
--- a/tests/vboot_api_kernel4_tests.c
+++ b/tests/vboot_api_kernel4_tests.c
@@ -298,7 +298,7 @@ static void select_and_load_kernel_tests(void)
 	/* Boot recovery - memory retraining */
 	reset_common_data();
 	sd->recovery_reason = VB2_RECOVERY_TRAIN_AND_REBOOT;
-	test_slk(VBERROR_REBOOT_REQUIRED, 0, "Recovery train and reboot");
+	test_slk(VB2_REQUEST_REBOOT, 0, "Recovery train and reboot");
 	TEST_FALSE(commit_data_called, "  no commit data");
 
 	/* Boot BROKEN recovery */
diff --git a/tests/vboot_legacy_clamshell_tests.c b/tests/vboot_legacy_clamshell_tests.c
index 054a2239..77944ba8 100644
--- a/tests/vboot_legacy_clamshell_tests.c
+++ b/tests/vboot_legacy_clamshell_tests.c
@@ -574,7 +574,7 @@ static void VbBootDevTest(void)
 	mock_gpio[1].gpio_flags = GPIO_SHUTDOWN;
 	mock_gpio[1].count = 1;
 	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested");
 	TEST_NEQ(audio_looping_calls_left, 0, "  aborts audio");
 
@@ -582,7 +582,7 @@ static void VbBootDevTest(void)
 	ResetMocks();
 	mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS;
 	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested by keyboard");
 
 	/* Space asks to disable virtual dev switch */
@@ -590,7 +590,7 @@ static void VbBootDevTest(void)
 	sd->flags = VB2_SD_FLAG_DEV_MODE_ENABLED;
 	mock_keypress[0] = ' ';
 	mock_keypress[1] = VB_KEY_ENTER;
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Space = tonorm");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING,
 		"  warning screen");
@@ -632,7 +632,7 @@ static void VbBootDevTest(void)
 	gbb.flags |= VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM;
 	mock_keypress[0] = VB_KEY_ENTER;
 	mock_keypress[1] = VB_KEY_ENTER;
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter = tonorm");
 
 	/* Tonorm ignored if GBB forces dev switch on */
@@ -651,7 +651,7 @@ static void VbBootDevTest(void)
 	mock_keypress[0] = ' ';
 	MockGpioAfter(3, GPIO_SHUTDOWN);
 	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested at tonorm");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING,
 		"  warning screen");
@@ -663,7 +663,7 @@ static void VbBootDevTest(void)
 	sd->flags = VB2_SD_FLAG_DEV_MODE_ENABLED;
 	mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS;
 	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested by keyboard at nonorm");
 
 	/* Ctrl+D dismisses warning */
@@ -697,7 +697,7 @@ static void VbBootDevTest(void)
 	MockGpioAfter(1000, GPIO_SHUTDOWN);
 	gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY;
 	mock_keypress[0] = VB_KEY_CTRL('L');
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_SHUTDOWN,
 		"Ctrl+L force legacy");
 	TEST_EQ(vbexlegacy_called, 0, "  try legacy");
 
@@ -832,7 +832,7 @@ static void VbBootDevTest(void)
 	fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT;
 	mock_keypress[0] = VB_KEY_ESC;  /* Just causes TONORM again */
 	mock_keypress[1] = VB_KEY_ENTER;
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"FWMP dev disabled");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_TO_NORM,
 		"  tonorm screen");
@@ -849,7 +849,7 @@ static void VbBootDevTest(void)
 	fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT;
 	MockGpioAfter(1, GPIO_SHUTDOWN);
 	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested when dev disabled");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_TO_NORM,
 		"  tonorm screen");
@@ -860,7 +860,7 @@ static void VbBootDevTest(void)
 	fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT;
 	mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS;
 	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested by keyboard when dev disabled");
 
 	VB2_DEBUG("...done.\n");
@@ -878,7 +878,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[4] = '1';
 	mock_keypress[5] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[6] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data, don't confirm, esc");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "4321", "  Vendor data correct");
@@ -915,7 +915,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[9] = 'B';
 	mock_keypress[10] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[11] = VB_KEY_ENTER;  /* Confirm vendor data */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data esc, don't confirm, change last character");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "432B", "  Vendor data correct");
@@ -931,7 +931,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[5] = '5';
 	mock_keypress[6] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[7] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data extra keys ignored");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "4321", "  Vendor data correct");
@@ -946,7 +946,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[4] = 'z';
 	mock_keypress[5] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[6] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data converts case");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "ABYZ", "  Vendor data correct");
@@ -965,7 +965,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[8] = '1';
 	mock_keypress[9] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[10] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data backspace works");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "A321", "  Vendor data correct");
@@ -985,7 +985,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[9] = '1';
 	mock_keypress[10] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[11] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data invalid chars don't print");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "4321", "  Vendor data correct");
@@ -1003,7 +1003,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[7] = '0';
 	mock_keypress[8] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[9] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data invalid chars don't print with backspace");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "3210", "  Vendor data correct");
@@ -1021,7 +1021,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[7] = '1';
 	mock_keypress[8] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[9] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data backspace only doesn't underrun");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "4321", "  Vendor data correct");
@@ -1041,7 +1041,7 @@ static void VbBootDevVendorDataTest(void)
 	mock_keypress[9] = 'D';
 	mock_keypress[10] = VB_KEY_ENTER;  /* Set vendor data */
 	mock_keypress[11] = VB_KEY_ENTER;  /* Confirm vendor data (Default YES) */
-	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Enter set vendor data vowels not allowed after first char");
 	TEST_EQ(set_vendor_data_called, 1, "  VbExSetVendorData() called");
 	TEST_STR_EQ(set_vendor_data, "ABCD", "  Vendor data correct");
@@ -1142,13 +1142,13 @@ static void VbBootRecTestGpio(uint32_t first, uint32_t second, uint32_t third,
 
 	if (confirm) {
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_EC_REBOOT_TO_RO_REQUIRED, msg);
+			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_USB), !!USB_BOOT_ON_DEV,
 			"  NV_DEV_BOOT_USB enabled");
 	} else {
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_SHUTDOWN_REQUESTED, msg);
+			VB2_REQUEST_SHUTDOWN, msg);
 		TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
 	}
 }
@@ -1161,7 +1161,7 @@ static void VbBootRecTest(void)
 	ResetMocks();
 	MockGpioAfter(10, GPIO_SHUTDOWN);
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested");
 
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0,
@@ -1173,7 +1173,7 @@ static void VbBootRecTest(void)
 	ResetMocks();
 	mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested by keyboard");
 
 	/* Ignore power button held on boot */
@@ -1191,7 +1191,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval = VB2_ERROR_LK_NO_DISK_FOUND;
 	vbtlk_expect_removable = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Ignore power button held on boot");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT,
 		"  insert screen");
@@ -1204,7 +1204,7 @@ static void VbBootRecTest(void)
 	mock_num_disks[1] = 1;
 	mock_num_disks[2] = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Broken");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN,
 		"  broken screen");
@@ -1216,7 +1216,7 @@ static void VbBootRecTest(void)
 	mock_num_disks[1] = 1;
 	sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Broken (dev)");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN,
 		"  broken screen");
@@ -1228,7 +1228,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval = VB2_ERROR_LK_NO_DISK_FOUND;
 	vbtlk_expect_removable = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Insert (forced by GBB)");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT,
 		"  insert screen");
@@ -1240,7 +1240,7 @@ static void VbBootRecTest(void)
 	mock_num_disks[1] = 1;
 	sd->flags |= VB2_SD_FLAG_MANUAL_RECOVERY;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"No remove in rec");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN,
 		"  broken screen");
@@ -1251,7 +1251,7 @@ static void VbBootRecTest(void)
 	mock_num_disks[0] = 0;
 	mock_num_disks[1] = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Remove");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN,
 		"  broken screen");
@@ -1261,7 +1261,7 @@ static void VbBootRecTest(void)
 	MockGpioAfter(10, GPIO_SHUTDOWN);
 	mock_num_disks[0] = -1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Bad disk count");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN,
 		"  broken screen");
@@ -1273,7 +1273,7 @@ static void VbBootRecTest(void)
 	mock_keypress[0] = VB_KEY_CTRL('D');
 	trust_ec = 0;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Ctrl+D ignored if EC not trusted");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
 	TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV,
@@ -1286,7 +1286,7 @@ static void VbBootRecTest(void)
 	mock_keypress[0] = VB_KEY_CTRL('D');
 	vbtlk_expect_removable = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Ctrl+D ignored if already in dev mode");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
 	TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV,
@@ -1298,7 +1298,7 @@ static void VbBootRecTest(void)
 	mock_keypress[0] = VB_KEY_CTRL('D');
 	vbtlk_expect_removable = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Ctrl+D ignored if recovery not manually triggered");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
 	TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV,
@@ -1316,7 +1316,7 @@ static void VbBootRecTest(void)
 	mock_gpio[1].count = 100;
 	vbtlk_expect_removable = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Ctrl+D ignored if phys pres button is still pressed");
 	TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV,
 		 "  todev screen");
@@ -1331,7 +1331,7 @@ static void VbBootRecTest(void)
 	mock_keypress[1] = ' ';
 	vbtlk_expect_removable = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED,
+		VB2_REQUEST_SHUTDOWN,
 		"Ctrl+D todev abort");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT,
 		"  insert screen");
@@ -1352,7 +1352,7 @@ static void VbBootRecTest(void)
 	mock_keyflags[1] = VB_KEY_FLAG_TRUSTED_KEYBOARD;
 	vbtlk_expect_removable = 1;
 	TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-		VBERROR_EC_REBOOT_TO_RO_REQUIRED,
+		VB2_REQUEST_REBOOT_EC_TO_RO,
 		"Ctrl+D todev confirm via enter");
 	TEST_EQ(virtdev_set, 1, "  virtual dev mode on");
 
@@ -1465,11 +1465,11 @@ static void VbBootRecTest(void)
 	vbtlk_expect_removable = 1;
 	if (DIAGNOSTIC_UI)
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_REBOOT_REQUIRED,
+			VB2_REQUEST_REBOOT,
 			"Ctrl+C todiag - enabled");
 	else
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_SHUTDOWN_REQUESTED,
+			VB2_REQUEST_SHUTDOWN,
 			"Ctrl+C todiag - disabled");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI,
 		"  todiag is updated for Ctrl-C");
@@ -1491,11 +1491,11 @@ static void VbBootRecTest(void)
 	vbtlk_expect_removable = 1;
 	if (DIAGNOSTIC_UI)
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_REBOOT_REQUIRED,
+			VB2_REQUEST_REBOOT,
 			"F12 todiag - enabled");
 	else
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_SHUTDOWN_REQUESTED,
+			VB2_REQUEST_SHUTDOWN,
 			"F12 todiag - disabled");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI,
 		"  todiag is updated for F12");
@@ -1512,11 +1512,11 @@ static void VbBootRecTest(void)
 		"todiag is zero");
 	if (DIAGNOSTIC_UI)
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_REBOOT_REQUIRED,
+			VB2_REQUEST_REBOOT,
 			"Ctrl+C todiag os broken - enabled");
 	else
 		TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
-			VBERROR_SHUTDOWN_REQUESTED,
+			VB2_REQUEST_SHUTDOWN,
 			"Ctrl+C todiag os broken - disabled");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI,
 		"  todiag is updated for Ctrl-C");
@@ -1534,7 +1534,7 @@ static void VbBootDiagTest(void)
 
 	/* No key pressed - timeout. */
 	ResetMocks();
-	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Timeout");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG,
 		"  confirm screen");
@@ -1548,7 +1548,7 @@ static void VbBootDiagTest(void)
 	/* Esc key pressed. */
 	ResetMocks();
 	mock_keypress[0] = VB_KEY_ESC;
-	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Esc key");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG,
 		"  confirm screen");
@@ -1562,7 +1562,7 @@ static void VbBootDiagTest(void)
 	ResetMocks();
 	MockGpioAfter(10, GPIO_LID_CLOSED);
 	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx),
-		VBERROR_SHUTDOWN_REQUESTED, "Shutdown");
+		VB2_REQUEST_SHUTDOWN, "Shutdown");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG,
 		"  confirm screen");
 	TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK,
@@ -1575,7 +1575,7 @@ static void VbBootDiagTest(void)
 	ResetMocks();
 	mock_gpio[0].gpio_flags = GPIO_PRESENCE;
 	mock_gpio[0].count = ~0;
-	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Power held");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG,
 		"  confirm screen");
@@ -1587,7 +1587,7 @@ static void VbBootDiagTest(void)
 	/* Power button is pressed and released. */
 	ResetMocks();
 	MockGpioAfter(3, GPIO_PRESENCE);
-	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Confirm");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG,
 		"  confirm screen");
@@ -1612,7 +1612,7 @@ static void VbBootDiagTest(void)
 	mock_gpio[0].count = 2;
 	mock_gpio[1].gpio_flags = GPIO_PRESENCE;
 	mock_gpio[1].count = 2;
-	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VB2_REQUEST_REBOOT,
 		"Confirm but tpm fail");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG,
 		"  confirm screen");
diff --git a/tests/vboot_legacy_menu_tests.c b/tests/vboot_legacy_menu_tests.c
index 39eb0184..80325f85 100644
--- a/tests/vboot_legacy_menu_tests.c
+++ b/tests/vboot_legacy_menu_tests.c
@@ -365,7 +365,7 @@ static void VbBootDevTest(void)
 	/* Shutdown requested in loop */
 	ResetMocksForDeveloper();
 	shutdown_request_calls_left = 2;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -382,7 +382,7 @@ static void VbBootDevTest(void)
 	 */
 	ResetMocksForDeveloper();
 	mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"dev warning menu: default to power off");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
@@ -402,7 +402,7 @@ static void VbBootDevTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // Cancel
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // Power Off
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Power Off in DEVELOPER");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
 	TEST_EQ(vbexlegacy_called, 0, "  not legacy");
@@ -430,7 +430,7 @@ static void VbBootDevTest(void)
 	/* Pressing ENTER is equivalent to power button. */
 	ResetMocksForDeveloper();
 	mock_keypress[0] = VB_KEY_ENTER;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"dev warning menu: ENTER is power button");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
 		"  warning screen");
@@ -443,7 +443,7 @@ static void VbBootDevTest(void)
 	ResetMocksForDeveloper();
 	gbb.flags |= VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM;
 	mock_keypress[0] = VB_KEY_ENTER;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"dev warning menu: ENTER unaffected by GBB");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
 		"  warning screen");
@@ -457,7 +457,7 @@ static void VbBootDevTest(void)
 	mock_keypress[0] = ' ';
 	mock_keypress[1] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS;
 	mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS;	// select Power Off
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"SPACE or VolUp+Down have no effect");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -474,7 +474,7 @@ static void VbBootDevTest(void)
 	mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS;
 	mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS;
 	mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_REBOOT,
 		"disable developer mode");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
@@ -526,7 +526,7 @@ static void VbBootDevTest(void)
 	mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS;
 	mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS;
 	shutdown_request_calls_left = 2;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested at tonorm");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
@@ -1098,7 +1098,7 @@ static void VbBootDevTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enable os verification
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // confirm is the default
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_REBOOT,
 		"TONORM via menu");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1,
 		"  disable dev request");
@@ -1131,7 +1131,7 @@ static void VbBootDevTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_LONG_PRESS;	/* same */
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS;	/* noop */
 	mock_keypress[i++] = VB_KEY_ENTER;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_REBOOT,
 		"FWMP dev disabled");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1,
 		"  disable dev request");
@@ -1177,7 +1177,7 @@ static void VbBootDevTest(void)
 	ResetMocksForDeveloper();
 	fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT;
 	shutdown_request_calls_left = 1;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested when dev disabled");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 0,
@@ -1195,7 +1195,7 @@ static void VbBootDevTest(void)
 	i = 0;
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS;	// Power Off
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Power Off when dev disabled");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 0,
@@ -1264,7 +1264,7 @@ static void VbBootRecTest(void)
 
 	/* Shutdown requested in BROKEN */
 	ResetMocks();
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested in BROKEN");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1282,7 +1282,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[3] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested in BROKEN with disks");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1297,7 +1297,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested in BROKEN with later disk");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1314,7 +1314,7 @@ static void VbBootRecTest(void)
 		VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested in BROKEN with dev switch");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1328,7 +1328,7 @@ static void VbBootRecTest(void)
 	ResetMocksForManualRecovery();
 	vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested in INSERT with manual rec");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1343,7 +1343,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
 	gbb.flags |= VB2_GBB_FLAG_FORCE_MANUAL_RECOVERY;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shutdown requested in INSERT forced by GBB flag");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1358,7 +1358,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
 	sd->flags &= ~VB2_SD_FLAG_MANUAL_RECOVERY;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Go to BROKEN if recovery not manually requested");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1373,7 +1373,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
 	trust_ec = 0;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Go to BROKEN if EC is not trusted");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1457,7 +1457,7 @@ static void VbBootRecTest(void)
 	mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD;
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_LONG_PRESS;
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shortcuts ignored in BROKEN");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  powered down explicitly");
@@ -1485,7 +1485,7 @@ static void VbBootRecTest(void)
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
 	vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Shortcuts ignored in INSERT");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  powered down explicitly");
@@ -1502,7 +1502,7 @@ static void VbBootRecTest(void)
 	mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter options
 	mock_keypress[1] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off
 	mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Power Off BROKEN through OPTIONS");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1522,7 +1522,7 @@ static void VbBootRecTest(void)
 	mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter options
 	mock_keypress[1] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off
 	mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Power Off NOGOOD through OPTIONS");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1546,7 +1546,7 @@ static void VbBootRecTest(void)
 	mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS;
 	vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Power Off INSERT through TO_DEV");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1566,7 +1566,7 @@ static void VbBootRecTest(void)
 	mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter options
 	mock_keypress[1] = VB_BUTTON_VOL_UP_SHORT_PRESS; // show debug info
 	mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Show Debug info from BROKEN through OPTIONS");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 1, "  no debug info");
@@ -1584,7 +1584,7 @@ static void VbBootRecTest(void)
 	/* Show Debug Info on NOGOOD with Tab */
 	ResetMocksForManualRecovery();
 	mock_keypress[0] = '\t';
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Show Debug info on NOGOOD with Tab");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 1, "  no debug info");
@@ -1608,7 +1608,7 @@ static void VbBootRecTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // cancel
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // power off
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"go to TO_DEV screen and cancel");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  powered down explicitly");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
@@ -1639,7 +1639,7 @@ static void VbBootRecTest(void)
 	mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD;
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS;
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_REBOOT,
 		"go to TO_DEV screen and confirm");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1661,7 +1661,7 @@ static void VbBootRecTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; // try to_dev
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // try confirm
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Untrusted keyboard cannot enter TO_DEV");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1684,7 +1684,7 @@ static void VbBootRecTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; // enter to_dev
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // try to confirm...
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Untrusted keyboard cannot navigate in TO_DEV");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1737,7 +1737,7 @@ static void VbBootRecTest(void)
 	i = 0;
 	mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD;
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; // enter to_dev
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Ctrl+D ignored if already in dev mode");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1766,7 +1766,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval[0] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[1] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Drop back to INSERT from TO_DEV when removing invalid USB");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  powered down explicitly");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
@@ -1801,7 +1801,7 @@ static void VbBootRecTest(void)
 	vbtlk_retval[3] = VB2_ERROR_LK_NO_DISK_FOUND -
 		VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[4] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"Drop back to NOGOOD from LANGUAGE when inserting invalid USB");
 	TEST_EQ(shutdown_request_calls_left, 0, "  timed out");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
@@ -1862,7 +1862,7 @@ static void VbTestLanguageMenu(void)
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // select current lang
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // cancel -> BROKEN
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // power off
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"go to language menu from BROKEN");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  powered down explicitly");
@@ -1910,7 +1910,7 @@ static void VbTestLanguageMenu(void)
 	mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD;
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"go to language menus from INSERT");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  powered down explicitly");
@@ -1974,7 +1974,7 @@ static void VbTestLanguageMenu(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // cancel
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		" scroll through all language menus in developer options");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  powered down explicitly");
@@ -2094,7 +2094,7 @@ static void VbNavigationTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // language
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
-	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED,
+	TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_SHUTDOWN,
 		"recovery mode long navigation");
 	TEST_EQ(debug_info_displayed, 1, "  showed debug info");
 	TEST_EQ(shutdown_request_calls_left, 0, "  timed out");