diff --git a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
index 4cd81bacd7..aa682e8911 100644
--- a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
@@ -43,6 +43,6 @@
   PcdLib
 
 [Pcd.common]
-  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler 
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler     ## CONSUMES
 
 
diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.inf b/MdePkg/Library/PeiHobLib/PeiHobLib.inf
index 706f3c6361..8e13e82389 100644
--- a/MdePkg/Library/PeiHobLib/PeiHobLib.inf
+++ b/MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -42,7 +42,7 @@
   DebugLib
 
 [Guids]
-  gEfiHobMemoryAllocStackGuid                   # ALWAYS_CONSUMED
-  gEfiHobMemoryAllocBspStoreGuid                # ALWAYS_CONSUMED
-  gEfiHobMemoryAllocModuleGuid                  # ALWAYS_CONSUMED
+  gEfiHobMemoryAllocStackGuid                   ## PRODUCES ## HOB
+  gEfiHobMemoryAllocBspStoreGuid                ## PRODUCES ## HOB
+  gEfiHobMemoryAllocModuleGuid                  ## PRODUCES ## HOB
 
diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
index 1fc29b39d4..a5a7e86223 100644
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
@@ -43,7 +43,7 @@
   DebugLib
 
 [Ppis]
-  gEfiPeiSmbus2PpiGuid                           # PPI ALWAYS_CONSUMED
+  gEfiPeiSmbus2PpiGuid                           ## CONSUMES
 
 [Depex]
   gEfiPeiSmbus2PpiGuid 
diff --git a/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
index fef638860a..6891d71b39 100644
--- a/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
@@ -49,5 +49,5 @@
   DebugLib
 
 [Protocols]
-  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
+  gEfiPciRootBridgeIoProtocolGuid               ## CONSUMES
 
diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
index 5e77c6e406..8aba36b3b3 100644
--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
@@ -52,5 +52,5 @@
   DebugLib
 
 [Protocols]
-  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
+  gEfiPciRootBridgeIoProtocolGuid               ## CONSUMES