diff --git a/include/efi.h b/include/efi.h
index dc8edc8743aca2f1b30f967c268c63ee616dbaa2..2f0be9c86cb08a69ac94aee7a4c21755fd62710f 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -227,9 +227,9 @@ struct efi_time_cap {
 };
 
 enum efi_locate_search_type {
-	all_handles,
-	by_register_notify,
-	by_protocol
+	ALL_HANDLES,
+	BY_REGISTER_NOTIFY,
+	BY_PROTOCOL
 };
 
 struct efi_open_protocol_info_entry {
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index b1050e5fb46299cab6d081ad2a61d2229ca07a0d..1f0f6c3494c6b0bfdd81414f3cc274b79638d8d7 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -934,11 +934,11 @@ static int efi_search(enum efi_locate_search_type search_type,
 	int i;
 
 	switch (search_type) {
-	case all_handles:
+	case ALL_HANDLES:
 		return 0;
-	case by_register_notify:
+	case BY_REGISTER_NOTIFY:
 		return -1;
-	case by_protocol:
+	case BY_PROTOCOL:
 		for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) {
 			const efi_guid_t *guid = efiobj->protocols[i].guid;
 			if (guid && !guidcmp(guid, protocol))