1 files changed, 13 insertions, 13 deletions
diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.c b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
index b82b40fbb7..1d364bf692 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
@@ -174,13 +174,13 @@ FrontPageCallback (
     //
     // Collect the languages from what our current Language support is based on our VFR
     //
-    LanguageString = GetSupportedLanguages (gFrontPagePrivate.HiiHandle);
+    LanguageString = HiiLibGetSupportedLanguages (gFrontPagePrivate.HiiHandle);
     ASSERT (LanguageString != NULL);
 
     Index = 0;
     LangCode = LanguageString;
     while (*LangCode != 0) {
-      GetNextLanguage (&LangCode, Lang);
+      HiiLibGetNextLanguage (&LangCode, Lang);
 
       if (Index == Value->u8) {
         break;
@@ -335,7 +335,7 @@ Returns:
     //
     // Publish our HII data
     //
-    PackageList = PreparePackageList (2, &mFrontPageGuid, FrontPageVfrBin, BdsStrings);
+    PackageList = HiiLibPreparePackageList (2, &mFrontPageGuid, FrontPageVfrBin, BdsStrings);
     ASSERT (PackageList != NULL);
 
     Status = gHiiDatabase->NewPackageList (
@@ -353,7 +353,7 @@ Returns:
   //
   // Get current language setting
   //
-  GetCurrentLanguage (CurrentLang);
+  HiiLibGetCurrentLanguage (CurrentLang);
 
   //
   // Allocate space for creation of UpdateData Buffer
@@ -369,13 +369,13 @@ Returns:
   // Collect the languages from what our current Language support is based on our VFR
   //
   HiiHandle = gFrontPagePrivate.HiiHandle;
-  LanguageString = GetSupportedLanguages (HiiHandle);
+  LanguageString = HiiLibGetSupportedLanguages (HiiHandle);
   ASSERT (LanguageString != NULL);
 
   OptionCount = 0;
   LangCode = LanguageString;
   while (*LangCode != 0) {
-    GetNextLanguage (&LangCode, Lang);
+    HiiLibGetNextLanguage (&LangCode, Lang);
 
     if (gFrontPagePrivate.LanguageToken == NULL) {
       //
@@ -409,7 +409,7 @@ Returns:
       ASSERT_EFI_ERROR (Status);
 
       Token = 0;
-      Status = IfrLibNewString (HiiHandle, &Token, StringBuffer);
+      Status = HiiLibNewString (HiiHandle, &Token, StringBuffer);
       FreePool (StringBuffer);
     } else {
       Token = gFrontPagePrivate.LanguageToken[OptionCount];
@@ -542,7 +542,7 @@ Returns:
 {
   EFI_STATUS      Status;
 
-  Status = GetStringFromToken (ProducerGuid, Token, String);
+  Status = HiiLibGetStringFromToken (ProducerGuid, Token, String);
   if (EFI_ERROR (Status)) {
     *String = GetStringById (STRING_TOKEN (STR_MISSING_STRING));
   }
@@ -677,7 +677,7 @@ Returns:
         BiosVendor = (EFI_MISC_BIOS_VENDOR_DATA *) (DataHeader + 1);
         GetProducerString (&Record->ProducerName, BiosVendor->BiosVersion, &NewString);
         TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_BIOS_VERSION);
-        IfrLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
+        HiiLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
         FreePool (NewString);
         Find[0] = TRUE;
       }
@@ -688,7 +688,7 @@ Returns:
         SystemManufacturer = (EFI_MISC_SYSTEM_MANUFACTURER_DATA *) (DataHeader + 1);
         GetProducerString (&Record->ProducerName, SystemManufacturer->SystemProductName, &NewString);
         TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_COMPUTER_MODEL);
-        IfrLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
+        HiiLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
         FreePool (NewString);
         Find[1] = TRUE;
       }
@@ -699,7 +699,7 @@ Returns:
         ProcessorVersion = (EFI_PROCESSOR_VERSION_DATA *) (DataHeader + 1);
         GetProducerString (&Record->ProducerName, *ProcessorVersion, &NewString);
         TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_CPU_MODEL);
-        IfrLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
+        HiiLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
         FreePool (NewString);
         Find[2] = TRUE;
       }
@@ -710,7 +710,7 @@ Returns:
         ProcessorFrequency = (EFI_PROCESSOR_CORE_FREQUENCY_DATA *) (DataHeader + 1);
         ConvertProcessorToString (ProcessorFrequency, &NewString);
         TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_CPU_SPEED);
-        IfrLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
+        HiiLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
         FreePool (NewString);
         Find[3] = TRUE;
       }
@@ -724,7 +724,7 @@ Returns:
           &NewString
           );
         TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_MEMORY_SIZE);
-        IfrLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
+        HiiLibSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString);
         FreePool (NewString);
         Find[4] = TRUE;
       }