diff --git a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c
index 7ca4b8dec3..6798c9e981 100644
--- a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c
+++ b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUi.c
@@ -216,7 +216,7 @@ OrderLegacyBootOption4SameType (
   is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid
   is also updated.
 
-  @param CallbackData    The context data for BMM.
+  @param NVMapData   The data for egacy BBS boot.
 
   @return EFI_SUCCESS           The function completed successfully.
   @retval EFI_NOT_FOUND         If L"LegacyDevOrder" and gEfiLegacyDevOrderVariableGuid EFI Variable can be found.
@@ -647,8 +647,6 @@ GetMenuEntry (
   @param HiiHandle          Hii Handle of the package to be updated.
   @param MenuOption         The Menu whose string tokens need to be created
 
-  @retval  EFI_SUCCESS      String tokens created successfully
-  @retval  others           contain some errors
 **/
 VOID
 CreateLegacyMenuStringToken (
diff --git a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf
index 31090713fa..9582da5330 100644
--- a/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf
+++ b/IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf
@@ -54,14 +54,14 @@
   BaseMemoryLib
 
 [Guids]
-  gEfiIfrTianoGuid
-  gEfiIfrBootMaintenanceGuid
-  gEfiLegacyDevOrderVariableGuid
+  gEfiIfrTianoGuid                  ## SOMETIMES_PRODUCES ## UNDEFINED # Extended IFR Guid Opcode
+  gEfiIfrBootMaintenanceGuid        ## CONSUMES ## HII # BootMaint HII Package
+  gEfiLegacyDevOrderVariableGuid    ## PRODUCES ## Variable:L"LegacyDevOrder"
 
 [Protocols]
-  gEfiHiiConfigAccessProtocolGuid               ## PROTOCOL CONSUMES
-  gEfiLegacyBiosProtocolGuid
-  gEfiHiiConfigRoutingProtocolGuid
+  gEfiHiiConfigAccessProtocolGuid             ## PRODUCES
+  gEfiLegacyBiosProtocolGuid                  ## CONSUMES
+  gEfiHiiConfigRoutingProtocolGuid            ## CONSUMES
 
 [Depex]
   gEfiHiiDatabaseProtocolGuid