diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
index 757b4030df..1ae0008252 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
@@ -58,6 +58,6 @@
 
 
 [Protocols]
-  gEfiDiskIoProtocolGuid                        # PROTOCOL BY_START
-  gEfiBlockIoProtocolGuid                       # PROTOCOL TO_START
+  gEfiDiskIoProtocolGuid                        ## BY_START
+  gEfiBlockIoProtocolGuid                       ## TO_START
 
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
index b7fa67b5ea..596e1e96d4 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
@@ -61,14 +61,14 @@
 
 
 [Guids]
-  gEfiPartTypeUnusedGuid                        # SOMETIMES_CONSUMED
-  gEfiPartTypeSystemPartGuid                    # SOMETIMES_CONSUMED
+  gEfiPartTypeUnusedGuid                        ## SOMETIMES_CONSUMES ## GUID
+  gEfiPartTypeSystemPartGuid                    ## SOMETIMES_CONSUMES ## Protocol
 
 
 [Protocols]
-  gEfiBlockIoProtocolGuid                       # PROTOCOL BY_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL BY_START
-  gEfiDiskIoProtocolGuid                        # PROTOCOL BY_START
-  gEfiBlockIoProtocolGuid                       # PROTOCOL TO_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
-  gEfiDiskIoProtocolGuid                        # PROTOCOL TO_START
+  gEfiBlockIoProtocolGuid                       ## BY_START
+  gEfiDevicePathProtocolGuid                    ## BY_START
+  gEfiDiskIoProtocolGuid                        ## BY_START
+  gEfiBlockIoProtocolGuid                       ## TO_START
+  gEfiDevicePathProtocolGuid                    ## TO_START
+  gEfiDiskIoProtocolGuid                        ## TO_START
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
index 5592c5c574..7186ae3743 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              # PROTOCOL ALWAYS_PRODUCED
-  gEfiUnicodeCollation2ProtocolGuid             # PROTOCOL ALWAYS_PRODUCED
+  gEfiUnicodeCollationProtocolGuid              ## PRODUCES
+  gEfiUnicodeCollation2ProtocolGuid             ## PRODUCES