diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
index 704256dd18..4420603ef0 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
@@ -57,11 +57,11 @@
 
 
 [Guids]
-  gPeiPerformanceHobGuid                        # ALWAYS_CONSUMED
+  gPeiPerformanceHobGuid                        ## CONSUMES ## HOB
 
 
 [Protocols]
-  gPerformanceProtocolGuid                      # PROTOCOL ALWAYS_PRODUCED
+  gPerformanceProtocolGuid                      # PRODUCES
 
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries
diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf b/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf
index a23d947b9b..3a568506f7 100644
--- a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf
@@ -50,7 +50,6 @@
   MemoryAllocationLib
 
 [Protocols]
-  gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
-  gEfiFvbExtensionProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED
-
+  gEfiFirmwareVolumeBlockProtocolGuid           ## NOTIFY
+  gEfiFvbExtensionProtocolGuid                  ## CONSUMES
 
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index 8913239ca7..891e12dcc6 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -50,9 +50,8 @@
 
 
 [Guids]
-  gPeiPerformanceHobGuid
+  gPeiPerformanceHobGuid ## HOB
 
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries
   gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
-
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
index a3b5428efc..b42e87da81 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
@@ -62,10 +62,10 @@
   gEfiSasDevicePathGuid  | PcdDevicePathSupportDevicePathFromText OR PcdDevicePathSupportDevicePathToText ## SOMETIMES_CONSUMES ## GUID
   
 [Protocols]
-  gEfiDevicePathToTextProtocolGuid   | PcdDevicePathSupportDevicePathFromText ## SOMETIMES_CONSUMES
-  gEfiDevicePathFromTextProtocolGuid | PcdDevicePathSupportDevicePathToText ## SOMETIMES_CONSUMES
+  gEfiDevicePathToTextProtocolGuid   | PcdDevicePathSupportDevicePathFromText ## PRODUCES
+  gEfiDevicePathFromTextProtocolGuid | PcdDevicePathSupportDevicePathToText ## PRODUCES
   gEfiDevicePathUtilitiesProtocolGuid ## CONSUMES
-  gEfiDebugPortProtocolGuid          | PcdDevicePathSupportDevicePathFromText OR PcdDevicePathSupportDevicePathToText ## SOMETIMES_CONSUMES
+  gEfiDebugPortProtocolGuid          | PcdDevicePathSupportDevicePathFromText OR PcdDevicePathSupportDevicePathToText ## SOMETIMES_CONSUMES ## GUID
 
 [FeaturePcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
index 2ab12aaa1e..9f4ea8256d 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
@@ -52,6 +52,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support
 
 [Protocols]
-  gEfiUnicodeCollationProtocolGuid  | PcdUnicodeCollationSupport  ## SOMETIMES_PRODUCES
-  gEfiUnicodeCollation2ProtocolGuid | PcdUnicodeCollation2Support ## SOMETIMES_PRODUCES
+  gEfiUnicodeCollationProtocolGuid  | PcdUnicodeCollationSupport  ## PRODUCES
+  gEfiUnicodeCollation2ProtocolGuid | PcdUnicodeCollation2Support ## PRODUCES