diff --git a/MdePkg/Include/Ppi/PiPcd.h b/MdePkg/Include/Ppi/PiPcd.h
index b0c9e85f10..90984ac84b 100644
--- a/MdePkg/Include/Ppi/PiPcd.h
+++ b/MdePkg/Include/Ppi/PiPcd.h
@@ -104,6 +104,22 @@ UINT32
   IN        UINTN     TokenNumber
 );
 
+/**
+  Retrieves the current 64-bit value for a PCD token number. If the TokenNumber is invalid, the
+  results are unpredictable.
+  
+  @param[in]    Guid          The 128-bit unique value that designates which namespace to extract the value from.
+  @param[in]    TokenNumber   The PCD token number.
+  
+  @return 64-bit value for a given PCD token.  
+**/
+typedef
+UINT32
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_64)(
+  IN CONST  EFI_GUID  *Guid,
+  IN        UINTN     TokenNumber
+);
+
 /**
   Retrieves the current pointer to the value for a PCD token number. There should not be any
   alignment assumptions about the pointer that is returned by this function call. If the TokenNumber
@@ -299,7 +315,7 @@ EFI_STATUS
 
 typedef
 VOID
-(EFIAPI *PCD_PPI_CALLBACK)(
+(EFIAPI *EFI_PCD_PPI_CALLBACK)(
   IN EFI_GUID *Guid     OPTIONAL,
   IN UINTN    CallBackToken,
   IN VOID     *TokenData,
@@ -321,10 +337,10 @@ VOID
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_PEI_PCD_PPI_CALL_BACK_ON_SET)(
+(EFIAPI *EFI_PEI_PCD_PPI_CALLBACK_ON_SET)(
   IN CONST  EFI_GUID          *Guid   OPTIONAL,
   IN        UINTN             CallBackToken,
-  IN        PCD_PPI_CALLBACK  CallBackFunction
+  IN        EFI_PCD_PPI_CALLBACK  CallBackFunction
 );
 
 /**
@@ -343,10 +359,10 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_PEI_PCD_PPI_CANCEL_CALL_BACK)(
+(EFIAPI *EFI_PEI_PCD_PPI_CANCEL_CALLBACK)(
   IN CONST  EFI_GUID          *Guid   OPTIONAL,
   IN        UINTN             CallBackToken,
-  IN        PCD_PPI_CALLBACK  CallBackFunction
+  IN        EFI_PCD_PPI_CALLBACK  CallBackFunction
 );
 
 /**
diff --git a/MdePkg/Include/Protocol/PiPcd.h b/MdePkg/Include/Protocol/PiPcd.h
index fd6d1379ba..6bf56a96fb 100644
--- a/MdePkg/Include/Protocol/PiPcd.h
+++ b/MdePkg/Include/Protocol/PiPcd.h
@@ -285,7 +285,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_PCD_PROTOCOL_SET_POINTER_EX)(
+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_POINTER)(
   IN CONST  EFI_GUID  *Guid,
   IN        UINTN     TokenNumber,
   IN        UINTN     SizeOfValue,