diff --git a/UefiCpuPkg/Include/Library/LocalApicLib.h b/UefiCpuPkg/Include/Library/LocalApicLib.h
index fae780d583..a1611f17dd 100644
--- a/UefiCpuPkg/Include/Library/LocalApicLib.h
+++ b/UefiCpuPkg/Include/Library/LocalApicLib.h
@@ -424,7 +424,7 @@ GetApicMsiValue (
   @param[out]  Thread        Returns the processor thread ID.
 **/
 VOID
-GetProcessorLocation(
+GetProcessorLocationByApicId (
   IN  UINT32  InitialApicId,
   OUT UINT32  *Package  OPTIONAL,
   OUT UINT32  *Core    OPTIONAL,
diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
index 5976403456..8384913bf4 100644
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
@@ -955,7 +955,7 @@ GetApicMsiValue (
   @param[out]  Thread        Returns the processor thread ID.
 **/
 VOID
-GetProcessorLocation(
+GetProcessorLocationByApicId (
   IN  UINT32  InitialApicId,
   OUT UINT32  *Package  OPTIONAL,
   OUT UINT32  *Core    OPTIONAL,
diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
index 91ffd24e6e..1e3c03905c 100644
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
@@ -1050,7 +1050,7 @@ GetApicMsiValue (
   @param[out]  Thread        Returns the processor thread ID.
 **/
 VOID
-GetProcessorLocation(
+GetProcessorLocationByApicId (
   IN  UINT32  InitialApicId,
   OUT UINT32  *Package  OPTIONAL,
   OUT UINT32  *Core    OPTIONAL,
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index f205b6bad4..56b870e527 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1325,7 +1325,7 @@ MpInitLibGetProcessorInfo (
   //
   // Get processor location information
   //
-  GetProcessorLocation (
+  GetProcessorLocationByApicId (
     CpuMpData->CpuData[ProcessorNumber].ApicId,
     &ProcessorInfoBuffer->Location.Package,
     &ProcessorInfoBuffer->Location.Core,
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
index 93ebb9ec73..29f3a58939 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
@@ -161,7 +161,7 @@ SmmAddProcessor (
         gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId == INVALID_APIC_ID) {
       gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId = ProcessorId;
       gSmmCpuPrivate->ProcessorInfo[Index].StatusFlag = 0;
-      GetProcessorLocation (
+      GetProcessorLocationByApicId (
         (UINT32)ProcessorId,
         &gSmmCpuPrivate->ProcessorInfo[Index].Location.Package,
         &gSmmCpuPrivate->ProcessorInfo[Index].Location.Core,