diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 0324901ef9..26bc94c13f 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -787,7 +787,7 @@ Returns:
   //
   // Report that ExitBootServices() has been called
   //
-  // We are using gEfiDxeServicesTableGuid as the caller ID for Dxe Core
+  // We are using gEfiCallerIdGuid as the caller ID for Dxe Core
   //
   CoreReportProgressCode ((EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES));
 
diff --git a/MdeModulePkg/Core/Dxe/Library.h b/MdeModulePkg/Core/Dxe/Library.h
index 5e33da5285..8d41bd251b 100644
--- a/MdeModulePkg/Core/Dxe/Library.h
+++ b/MdeModulePkg/Core/Dxe/Library.h
@@ -31,7 +31,7 @@ CoreReportProgressCode (
 
 Routine Description:
 
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid.
+  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid.
     
 Arguments:
 
@@ -54,7 +54,7 @@ CoreReportProgressCodeSpecific (
 
 Routine Description:
 
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid, 
+  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid, 
   with a handle as additional information.
     
 Arguments:
diff --git a/MdeModulePkg/Core/Dxe/Library/Library.c b/MdeModulePkg/Core/Dxe/Library/Library.c
index 3d8a312cc2..b7c9097000 100644
--- a/MdeModulePkg/Core/Dxe/Library/Library.c
+++ b/MdeModulePkg/Core/Dxe/Library/Library.c
@@ -41,7 +41,7 @@ CoreReportProgressCodeSpecific (
 
 Routine Description:
 
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid,
+  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid,
   with a handle as additional information.
 
 Arguments:
@@ -65,7 +65,7 @@ Returns:
       EFI_PROGRESS_CODE,
       Value,
       0,
-      &gEfiDxeServicesTableGuid,
+      &gEfiCallerIdGuid,
       (EFI_STATUS_CODE_DATA *) &mStatusCodeData
       );
   }
@@ -79,7 +79,7 @@ CoreReportProgressCode (
 
 Routine Description:
 
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid.
+  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid.
 
 Arguments:
 
@@ -97,7 +97,7 @@ Returns:
       EFI_PROGRESS_CODE,
       Value,
       0,
-      &gEfiDxeServicesTableGuid,
+      &gEfiCallerIdGuid,
       NULL
       );
   }