diff --git a/firmware/include/bmpblk_header.h b/firmware/include/bmpblk_header.h
index 06ddaa8f7a..7a58821932 100644
--- a/firmware/include/bmpblk_header.h
+++ b/firmware/include/bmpblk_header.h
@@ -84,10 +84,14 @@ typedef struct ScreenLayout {
 
 /* Constants for screen index */
 typedef enum ScreenIndex {
-  SCREEN_DEVELOPER_MODE = 0,
-  SCREEN_RECOVERY_MODE,
-  SCREEN_RECOVERY_NO_OS,
-  SCREEN_RECOVERY_MISSING_OS,
+  SCREEN_DEVELOPER_WARNING = 0,
+  SCREEN_RECOVERY_REMOVE,
+  SCREEN_RECOVERY_NO_GOOD,
+  SCREEN_RECOVERY_INSERT,
+  SCREEN_RECOVERY_TO_DEV,
+  SCREEN_DEVELOPER_TO_NORM,
+  SCREEN_WAIT,
+  SCREEN_TO_NORM_CONFIRMED,
   MAX_VALID_SCREEN_INDEX,
   SCREEN_BLANK = ~0UL,
 } ScreenIndex;
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index 5c45ae1e52..88adc4642a 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -210,28 +210,28 @@ VbError_t VbDisplayScreenFromGBB(VbCommonParams* cparams, uint32_t screen,
    * here is awful. */
   switch (screen) {
   case VB_SCREEN_DEVELOPER_WARNING:
-    screen_index = 0;
+    screen_index = SCREEN_DEVELOPER_WARNING;
     break;
   case VB_SCREEN_RECOVERY_REMOVE:
-    screen_index = 1;
+    screen_index = SCREEN_RECOVERY_REMOVE;
     break;
   case VB_SCREEN_RECOVERY_NO_GOOD:
-    screen_index = 2;
+    screen_index = SCREEN_RECOVERY_NO_GOOD;
     break;
   case VB_SCREEN_RECOVERY_INSERT:
-    screen_index = 3;
+    screen_index = SCREEN_RECOVERY_INSERT;
     break;
   case VB_SCREEN_RECOVERY_TO_DEV:
-    screen_index = 4;
+    screen_index = SCREEN_RECOVERY_TO_DEV;
     break;
   case VB_SCREEN_DEVELOPER_TO_NORM:
-    screen_index = 5;
+    screen_index = SCREEN_DEVELOPER_TO_NORM;
     break;
   case VB_SCREEN_WAIT:
-    screen_index = 6;
+    screen_index = SCREEN_WAIT;
     break;
   case VB_SCREEN_TO_NORM_CONFIRMED:
-    screen_index = 7;
+    screen_index = SCREEN_TO_NORM_CONFIRMED;
     break;
   case VB_SCREEN_BLANK:
   case VB_SCREEN_DEVELOPER_EGG: