diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 47a971bf97..f0e9e46c52 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1292,7 +1292,7 @@ MpInitLibInitialize (
   CpuMpData->CpuApStackSize   = ApStackSize;
   CpuMpData->BackupBuffer     = BackupBufferAddr;
   CpuMpData->BackupBufferSize = ApResetVectorSize;
-  CpuMpData->EndOfPeiFlag     = FALSE;
+  CpuMpData->SaveRestoreFlag  = FALSE;
   CpuMpData->WakeupBuffer     = (UINTN) -1;
   CpuMpData->CpuCount         = 1;
   CpuMpData->BspNumber        = 0;
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index e53deb449d..9b0366ed37 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -198,7 +198,7 @@ struct _CPU_MP_DATA {
   UINTN                          WakeupBuffer;
   UINTN                          BackupBuffer;
   UINTN                          BackupBufferSize;
-  BOOLEAN                        EndOfPeiFlag;
+  BOOLEAN                        SaveRestoreFlag;
 
   volatile UINT32                StartCount;
   volatile UINT32                FinishedCount;
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
index 5e714eaf19..dd0f1da475 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
@@ -157,7 +157,7 @@ CpuMpEndOfPeiCallback (
       Hob.Raw = GET_NEXT_HOB (Hob);
     }
   } else {
-    CpuMpData->EndOfPeiFlag = TRUE;
+    CpuMpData->SaveRestoreFlag = TRUE;
     RestoreWakeupBuffer (CpuMpData);
   }
   return EFI_SUCCESS;
@@ -316,7 +316,7 @@ AllocateResetVector (
     BackupAndPrepareWakeupBuffer (CpuMpData);
   }
 
-  if (CpuMpData->EndOfPeiFlag) {
+  if (CpuMpData->SaveRestoreFlag) {
     BackupAndPrepareWakeupBuffer (CpuMpData);
   }
 }
@@ -331,7 +331,7 @@ FreeResetVector (
   IN CPU_MP_DATA              *CpuMpData
   )
 {
-  if (CpuMpData->EndOfPeiFlag) {
+  if (CpuMpData->SaveRestoreFlag) {
     RestoreWakeupBuffer (CpuMpData);
   }
 }