Change UINAME to CName of GUID/PPI/Protocol in all Msa file and change tool to support it.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@863 6f19259b-4bc3-4df7-8a09-765794883524

EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa

@@ -65,10 +65,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>ScsiPassThru</ProtocolCName>
+      <ProtocolCName>gEfiScsiPassThruProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa

@@ -66,10 +66,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>UgaDraw</ProtocolCName>
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa

@@ -84,19 +84,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>IdeControllerInit</ProtocolCName>
+      <ProtocolCName>gEfiIdeControllerInitProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>DiskInfo</ProtocolCName>
+      <ProtocolCName>gEfiDiskInfoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>
@@ -107,7 +107,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </Variables>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>DiskInfoIde</GuidCName>
+      <GuidCName>gEfiDiskInfoIdeInterfaceGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa

@@ -76,30 +76,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>IdeControllerInit</ProtocolCName>
+      <ProtocolCName>gEfiIdeControllerInitProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DiskInfo</ProtocolCName>
+      <ProtocolCName>gEfiDiskInfoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>DiskInfoIde</GuidCName>
+      <GuidCName>gEfiDiskInfoIdeInterfaceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>DiskInfoScsi</GuidCName>
+      <GuidCName>gEfiDiskInfoScsiInterfaceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>DiskInfoUsb</GuidCName>
+      <GuidCName>gEfiDiskInfoUsbInterfaceGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa

@@ -95,51 +95,51 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciRootBridgeIo</ProtocolCName>
+      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>UgaIo</ProtocolCName>
+      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciPlatform</ProtocolCName>
+      <ProtocolCName>gEfiPciPlatformProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>BusSpecificDriverOverride</ProtocolCName>
+      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciHotPlugRequest</ProtocolCName>
+      <ProtocolCName>gEfiPciHotPlugRequestProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>IncompatiblePciDeviceSupport</ProtocolCName>
+      <ProtocolCName>gEfiIncompatiblePciDeviceSupportProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciHotPlugInit</ProtocolCName>
+      <ProtocolCName>gEfiPciHotPlugInitProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciHostBridgeResourceAllocation</ProtocolCName>
+      <ProtocolCName>gEfiPciHostBridgeResourceAllocationProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PciOptionRomTable</GuidCName>
+      <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PciHotplugDevice</GuidCName>
+      <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StatusCodeSpecificData</GuidCName>
+      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa

@@ -96,40 +96,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciRootBridgeIo</ProtocolCName>
+      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciPlatform</ProtocolCName>
+      <ProtocolCName>gEfiPciPlatformProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>IncompatiblePciDeviceSupport</ProtocolCName>
+      <ProtocolCName>gEfiIncompatiblePciDeviceSupportProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciHostBridgeResourceAllocation</ProtocolCName>
+      <ProtocolCName>gEfiPciHostBridgeResourceAllocationProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciHotPlugInit</ProtocolCName>
+      <ProtocolCName>gEfiPciHotPlugInitProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UgaIo</ProtocolCName>
+      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>BusSpecificDriverOverride</ProtocolCName>
+      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>PciHotPlugRequest</ProtocolCName>
+      <ProtocolCName>gEfiPciHotPlugRequestProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <SystemTables>
@@ -142,13 +142,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </SystemTables>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>PciOptionRomTable</GuidCName>
+      <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>StatusCodeSpecificData</GuidCName>
+      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="PRIVATE">
-      <GuidCName>PciHotplugDevice</GuidCName>
+      <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa

@@ -94,51 +94,51 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciRootBridgeIo</ProtocolCName>
+      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>UgaIo</ProtocolCName>
+      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciPlatform</ProtocolCName>
+      <ProtocolCName>gEfiPciPlatformProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>BusSpecificDriverOverride</ProtocolCName>
+      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciHotPlugRequest</ProtocolCName>
+      <ProtocolCName>gEfiPciHotPlugRequestProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>IncompatiblePciDeviceSupport</ProtocolCName>
+      <ProtocolCName>gEfiIncompatiblePciDeviceSupportProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciHotPlugInit</ProtocolCName>
+      <ProtocolCName>gEfiPciHotPlugInitProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PciHostBridgeResourceAllocation</ProtocolCName>
+      <ProtocolCName>gEfiPciHostBridgeResourceAllocationProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PciOptionRomTable</GuidCName>
+      <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PciHotplugDevice</GuidCName>
+      <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StatusCodeSpecificData</GuidCName>
+      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa

@@ -66,10 +66,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>UsbHc</ProtocolCName>
+      <ProtocolCName>gEfiUsbHcProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa

@@ -74,16 +74,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>NetworkInterfaceIdentifier</ProtocolCName>
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>NetworkInterfaceIdentifier31</ProtocolCName>
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</ProtocolCName>
     </Protocol>
   </Protocols>
   <Events>

EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa

@@ -69,13 +69,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>ScsiPassThru</ProtocolCName>
+      <ProtocolCName>gEfiScsiPassThruProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>ScsiIo</ProtocolCName>
+      <ProtocolCName>gEfiScsiIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa

@@ -69,10 +69,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>ScsiIo</ProtocolCName>
+      <ProtocolCName>gEfiScsiIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa

@@ -72,13 +72,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UsbIo</ProtocolCName>
+      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>UsbAtapi</ProtocolCName>
+      <ProtocolCName>gEfiUsbAtapiProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa

@@ -81,13 +81,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="BY_START">
-      <ProtocolCName>UsbIo</ProtocolCName>
+      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UsbHc</ProtocolCName>
+      <ProtocolCName>gEfiUsbHcProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa

@@ -71,13 +71,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UsbIo</ProtocolCName>
+      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>UsbAtapi</ProtocolCName>
+      <ProtocolCName>gEfiUsbAtapiProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa

@@ -70,13 +70,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UsbIo</ProtocolCName>
+      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>UsbAtapi</ProtocolCName>
+      <ProtocolCName>gEfiUsbAtapiProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.msa

@@ -77,18 +77,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UsbIo</ProtocolCName>
+      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleTextIn</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>HotPlugDevice</GuidCName>
+      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa

@@ -72,10 +72,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UsbAtapi</ProtocolCName>
+      <ProtocolCName>gEfiUsbAtapiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa

@@ -74,13 +74,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UsbIo</ProtocolCName>
+      <ProtocolCName>gEfiUsbIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimplePointer</ProtocolCName>
+      <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Core/Dxe/DxeMain.msa

@@ -111,132 +111,132 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>Ebc</ProtocolCName>
+      <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Cpu</ProtocolCName>
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolume</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeDispatch</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeDispatchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SectionExtraction</ProtocolCName>
+      <ProtocolCName>gEfiSectionExtractionProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>DriverBinding</ProtocolCName>
+      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PlatformDriverOverride</ProtocolCName>
+      <ProtocolCName>gEfiPlatformDriverOverrideProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>BusSpecificDriverOverride</ProtocolCName>
+      <ProtocolCName>gEfiBusSpecificDriverOverrideProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Timer</ProtocolCName>
+      <ProtocolCName>gEfiTimerArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Metronome</ProtocolCName>
+      <ProtocolCName>gEfiMetronomeArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>MonotonicCounter</ProtocolCName>
+      <ProtocolCName>gEfiMonotonicCounterArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>VariableWrite</ProtocolCName>
+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Bds</ProtocolCName>
+      <ProtocolCName>gEfiBdsArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Variable</ProtocolCName>
+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Security</ProtocolCName>
+      <ProtocolCName>gEfiSecurityArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>WatchdogTimer</ProtocolCName>
+      <ProtocolCName>gEfiWatchdogTimerArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Runtime</ProtocolCName>
+      <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>RealTimeClock</ProtocolCName>
+      <ProtocolCName>gEfiRealTimeClockArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Reset</ProtocolCName>
+      <ProtocolCName>gEfiResetArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadFile</ProtocolCName>
+      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleFileSystem</ProtocolCName>
+      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadPeImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadPeImageProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>CustomizedDecompress</ProtocolCName>
+      <ProtocolCName>gEfiCustomizedDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>TianoDecompress</ProtocolCName>
+      <ProtocolCName>gEfiTianoDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Capsule</ProtocolCName>
+      <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>MemoryTypeInformation</GuidCName>
+      <GuidCName>gEfiMemoryTypeInformationGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>DxeServicesTable</GuidCName>
+      <GuidCName>gEfiDxeServicesTableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>HobList</GuidCName>
+      <GuidCName>gEfiHobListGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>DebugImageInfoTable</GuidCName>
+      <GuidCName>gEfiDebugImageInfoTableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>Apriori</GuidCName>
+      <GuidCName>gAprioriGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FirmwareFileSystem</GuidCName>
+      <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FileInfo</GuidCName>
+      <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>HobMemoryAllocModule</GuidCName>
+      <GuidCName>gEfiHobMemoryAllocModuleGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PeiPeCoffLoader</GuidCName>
+      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
     </GuidCNames>
     <!--<GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>LoadPeImage</GuidCName>
     </GuidCNames>-->
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>EventExitBootServices</GuidCName>
+      <GuidCName>gEfiEventExitBootServicesGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>EventVirtualAddressChange</GuidCName>
+      <GuidCName>gEfiEventVirtualAddressChangeGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>EventMemoryMapChange</GuidCName>
+      <GuidCName>gEfiEventMemoryMapChangeGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa

@@ -94,44 +94,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>TianoDecompress</ProtocolCName>
+      <ProtocolCName>gEfiTianoDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>CustomizedDecompress</ProtocolCName>
+      <ProtocolCName>gEfiCustomizedDecompressProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <PPIs>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>DxeIpl</PpiCName>
+      <PpiCName>gEfiDxeIplPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>FvFileLoader</PpiCName>
+      <PpiCName>gEfiPeiFvFileLoaderPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>EndOfPeiSignal</PpiCName>
+      <PpiCName>gEfiEndOfPeiSignalPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>RecoveryModule</PpiCName>
+      <PpiCName>gEfiPeiRecoveryModulePpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>S3Resume</PpiCName>
+      <PpiCName>gEfiPeiS3ResumePpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>SectionExtraction</PpiCName>
+      <PpiCName>gEfiPeiSectionExtractionPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>Security</PpiCName>
+      <PpiCName>gEfiPeiSecurityPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="PRIVATE">
-      <PpiCName>PeiInMemory</PpiCName>
+      <PpiCName>gPeiInMemoryGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>PeiPeCoffLoader</GuidCName>
+      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa

@@ -93,44 +93,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>TianoDecompress</ProtocolCName>
+      <ProtocolCName>gEfiTianoDecompressProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>CustomizedDecompress</ProtocolCName>
+      <ProtocolCName>gEfiCustomizedDecompressProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <PPIs>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>DxeIpl</PpiCName>
+      <PpiCName>gEfiDxeIplPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>FvFileLoader</PpiCName>
+      <PpiCName>gEfiPeiFvFileLoaderPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>EndOfPeiSignal</PpiCName>
+      <PpiCName>gEfiEndOfPeiSignalPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>RecoveryModule</PpiCName>
+      <PpiCName>gEfiPeiRecoveryModulePpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>S3Resume</PpiCName>
+      <PpiCName>gEfiPeiS3ResumePpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>SectionExtraction</PpiCName>
+      <PpiCName>gEfiPeiSectionExtractionPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>Security</PpiCName>
+      <PpiCName>gEfiPeiSecurityPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="PRIVATE">
-      <PpiCName>PeiInMemory</PpiCName>
+      <PpiCName>gPeiInMemoryGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PeiPeCoffLoader</GuidCName>
+      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Core/Pei/PeiMain.msa

@@ -85,25 +85,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>MemoryDiscovered</PpiCName>
+      <PpiCName>gEfiPeiMemoryDiscoveredPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>FindFv</PpiCName>
+      <PpiCName>gEfiFindFvPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>FvFileLoader</PpiCName>
+      <PpiCName>gEfiPeiFvFileLoaderPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>DxeIpl</PpiCName>
+      <PpiCName>gEfiDxeIplPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>Reset</PpiCName>
+      <PpiCName>gEfiPeiResetPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>StatusCode</PpiCName>
+      <PpiCName>gEfiPeiStatusCodePpiGuid</PpiCName>
     </Ppi>
     <PpiNotify Usage="SOMETIMES_CONSUMED">
-      <PpiNotifyCName>Security</PpiNotifyCName>
+      <PpiNotifyCName>gEfiPeiSecurityPpiGuid</PpiNotifyCName>
     </PpiNotify>
   </PPIs>
   <Externs>

EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.msa

@@ -44,7 +44,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>CustomizedDecompress</ProtocolCName>
+      <ProtocolCName>gEfiCustomizedDecompressProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa

@@ -59,12 +59,12 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Performance</ProtocolCName>
+      <ProtocolCName>gPerformanceProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PeiPerformanceHob</GuidCName>
+      <GuidCName>gPeiPerformanceHobGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -78,7 +78,6 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.msa

@@ -44,7 +44,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>TianoDecompress</ProtocolCName>
+      <ProtocolCName>gEfiTianoDecompressProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.msa

@@ -44,7 +44,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Decompress</ProtocolCName>
+      <ProtocolCName>gEfiDecompressProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa

@@ -47,7 +47,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Performance</ProtocolCName>
+      <ProtocolCName>gPerformanceProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>
@@ -61,7 +61,6 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa

@@ -50,12 +50,12 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>DebugLevel</ProtocolCName>
+      <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StatusCodeDataTypeDebug</GuidCName>
+      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -69,7 +69,6 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
@@ -80,7 +79,6 @@
     <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

EdkModulePkg/Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.msa

@@ -38,7 +38,7 @@
   </PackageDependencies>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PeiPeCoffLoader</GuidCName>
+      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa

@@ -41,7 +41,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Print</ProtocolCName>
+      <ProtocolCName>gEfiPrintProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa

@@ -55,7 +55,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ExtendedSalBootService</ProtocolCName>
+      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa

@@ -43,7 +43,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ExtendedSalBootService</ProtocolCName>
+      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa

@@ -64,13 +64,13 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FvbExtension</ProtocolCName>
+      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>
     </Protocol>
     <ProtocolNotify Usage="SOMETIMES_CONSUMED">
-      <ProtocolNotifyCName>FirmwareVolumeBlock</ProtocolNotifyCName>
+      <ProtocolNotifyCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolNotifyCName>
     </ProtocolNotify>
   </Protocols>
   <Externs>

EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa

@@ -50,24 +50,24 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>OEMBadging</ProtocolCName>
+      <ProtocolCName>gEfiOEMBadgingProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolume</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ConsoleControl</ProtocolCName>
+      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>UgaDraw</ProtocolCName>
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleTextOut</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>Bmp</GuidCName>
+      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.msa

@@ -63,7 +63,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>
@@ -74,7 +74,7 @@
   </Variables>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>GlobalVariable</GuidCName>
+      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.msa

@@ -57,13 +57,13 @@
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>StatusCodeMemory</PpiCName>
+      <PpiCName>gPeiStatusCodeMemoryPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>StatusCode</PpiCName>
+      <PpiCName>gEfiPeiStatusCodePpiGuid</PpiCName>
     </Ppi>
     <PpiNotify Usage="SOMETIMES_CONSUMED">
-      <PpiNotifyCName>FvFileLoader</PpiNotifyCName>
+      <PpiNotifyCName>gEfiPeiFvFileLoaderPpiGuid</PpiNotifyCName>
     </PpiNotify>
   </PPIs>
   <Externs>

EdkModulePkg/Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/BsDataHubStatusCode.msa

@@ -60,10 +60,10 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>StatusCode</ProtocolCName>
+      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DataHub</ProtocolCName>
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Events>
@@ -80,7 +80,7 @@
   </DataHubs>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StatusCode</GuidCName>
+      <GuidCName>gEfiStatusCodeGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa

@@ -50,12 +50,12 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>DebugLevel</ProtocolCName>
+      <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StatusCodeDataTypeDebug</GuidCName>
+      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -69,7 +69,6 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
@@ -80,7 +79,6 @@
     <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa

@@ -50,12 +50,12 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>DebugLevel</ProtocolCName>
+      <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StatusCodeDataTypeDebug</GuidCName>
+      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -69,7 +69,6 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
@@ -80,7 +79,6 @@
     <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.msa

@@ -53,7 +53,7 @@
   </PackageDependencies>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>PeiPerformanceHob</GuidCName>
+      <GuidCName>gPeiPerformanceHobGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -64,7 +64,6 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa

@@ -70,15 +70,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Capsule</ProtocolCName>
+      <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>CapsuleVendor</GuidCName>
+      <GuidCName>gEfiCapsuleVendorGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>Capsule</GuidCName>
+      <GuidCName>gEfiCapsuleGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa

@@ -67,39 +67,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>UgaDraw</ProtocolCName>
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleTextOut</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleTextIn</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimplePointer</ProtocolCName>
+      <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>ConsoleControl</ProtocolCName>
+      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>PrimaryStandardErrorDevice</GuidCName>
+      <GuidCName>gEfiPrimaryStandardErrorDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>PrimaryConsoleInDevice</GuidCName>
+      <GuidCName>gEfiPrimaryConsoleInDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>PrimaryConsoleOutDevice</GuidCName>
+      <GuidCName>gEfiPrimaryConsoleOutDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>ConsoleOutDevice</GuidCName>
+      <GuidCName>gEfiConsoleOutDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StandardErrorDevice</GuidCName>
+      <GuidCName>gEfiStandardErrorDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>ConsoleInDevice</GuidCName>
+      <GuidCName>gEfiConsoleInDeviceGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa

@@ -69,16 +69,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>UgaDraw</ProtocolCName>
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleTextOut</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa

@@ -76,16 +76,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleTextOut</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleTextIn</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>SerialIo</ProtocolCName>
+      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>
@@ -104,22 +104,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </Variables>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>HotPlugDevice</GuidCName>
+      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>GlobalVariable</GuidCName>
+      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>PcAnsi</GuidCName>
+      <GuidCName>gEfiPcAnsiGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>VT100Plus</GuidCName>
+      <GuidCName>gEfiVT100PlusGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>VT100</GuidCName>
+      <GuidCName>gEfiVT100Guid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>VTUTF8</GuidCName>
+      <GuidCName>gEfiVTUTF8Guid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa

@@ -66,7 +66,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>DataHub</ProtocolCName>
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa

@@ -53,15 +53,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DataHub</ProtocolCName>
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>StatusCode</GuidCName>
+      <GuidCName>gEfiStatusCodeGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>StatusCodeDataTypeDebug</GuidCName>
+      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa

@@ -62,10 +62,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>DebugSupport</ProtocolCName>
+      <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa

@@ -73,13 +73,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="BY_START">
-      <ProtocolCName>DebugPort</ProtocolCName>
+      <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>SerialIo</ProtocolCName>
+      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>

EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa

@@ -65,10 +65,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>DiskIo</ProtocolCName>
+      <ProtocolCName>gEfiDiskIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa

@@ -74,21 +74,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DiskIo</ProtocolCName>
+      <ProtocolCName>gEfiDiskIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>PartTypeSystemPart</GuidCName>
+      <GuidCName>gEfiPartTypeSystemPartGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PartTypeUnused</GuidCName>
+      <GuidCName>gEfiPartTypeUnusedGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa

@@ -48,7 +48,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>UnicodeCollation</ProtocolCName>
+      <ProtocolCName>gEfiUnicodeCollationProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/Ebc/Dxe/Ebc.msa

@@ -78,10 +78,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Ebc</ProtocolCName>
+      <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>DebugSupport</ProtocolCName>
+      <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa

@@ -69,22 +69,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>VariableWrite</ProtocolCName>
+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Variable</ProtocolCName>
+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>VariableWrite</ProtocolCName>
+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Variable</ProtocolCName>
+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ExtendedSalVariableServices</ProtocolCName>
+      <ProtocolCName>gEfiExtendedSalVariableServicesProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ExtendedSalBootService</ProtocolCName>
+      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa

@@ -71,21 +71,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>FaultTolerantWriteLite</ProtocolCName>
+      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>PciRootBridgeIo</ProtocolCName>
+      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FlashMapHob</GuidCName>
+      <GuidCName>gEfiFlashMapHobGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>SystemNvDataFv</GuidCName>
+      <GuidCName>gEfiSystemNvDataFvGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa

@@ -61,10 +61,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SecurityPolicy</ProtocolCName>
+      <ProtocolCName>gEfiSecurityPolicyProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Crc32GuidedSectionExtraction</ProtocolCName>
+      <ProtocolCName>gEfiCrc32GuidedSectionExtractionProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.msa

@@ -61,7 +61,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>GenericMemTest</ProtocolCName>
+      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa

@@ -49,7 +49,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>BaseMemoryTest</PpiCName>
+      <PpiCName>gPeiBaseMemoryTestPpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.msa

@@ -66,7 +66,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>MonotonicCounter</ProtocolCName>
+      <ProtocolCName>gEfiMonotonicCounterArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>

EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa

@@ -79,28 +79,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>Bis</ProtocolCName>
+      <ProtocolCName>gEfiBisProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>LoadFile</ProtocolCName>
+      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>PxeBaseCodeCallBack</ProtocolCName>
+      <ProtocolCName>gEfiPxeBaseCodeCallbackProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>SimpleNetwork</ProtocolCName>
+      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>NetworkInterfaceIdentifier</ProtocolCName>
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>NetworkInterfaceIdentifier2</ProtocolCName>
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>PxeBaseCode</ProtocolCName>
+      <ProtocolCName>gEfiPxeBaseCodeProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <SystemTables>
@@ -110,7 +110,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </SystemTables>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>SmbiosTable</GuidCName>
+      <GuidCName>gEfiSmbiosTableGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa

@@ -69,16 +69,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PxeDhcp4Callback</ProtocolCName>
+      <ProtocolCName>gEfiPxeDhcp4CallbackProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>PxeDhcp4</ProtocolCName>
+      <ProtocolCName>gEfiPxeDhcp4ProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleNetwork</ProtocolCName>
+      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PxeBaseCode</ProtocolCName>
+      <ProtocolCName>gEfiPxeBaseCodeProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa

@@ -81,19 +81,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleNetwork</ProtocolCName>
+      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>PciIo</ProtocolCName>
+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>NetworkInterfaceIdentifier</ProtocolCName>
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>NetworkInterfaceIdentifier2</ProtocolCName>
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/PCD/Dxe/Pcd.msa

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -75,15 +75,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>PcdProtocol</ProtocolCName>
+      <ProtocolCName>gPcdProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Variable</ProtocolCName>
+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PcdDataBaseHob</GuidCName>
+      <GuidCName>gPcdDataBaseHobGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -97,13 +97,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdVpdBaseAddress</C_Name>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FEATURE_FLAG">

EdkModulePkg/Universal/PCD/Pei/Pcd.msa

@@ -69,18 +69,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>PcdPpi</PpiCName>
+      <PpiCName>gPcdPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>ReadOnlyVariable</PpiCName>
+      <PpiCName>gEfiPeiReadOnlyVariablePpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PcdDataBaseHob</GuidCName>
+      <GuidCName>gPcdDataBaseHobGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>PcdPeiCallbackFnTable</GuidCName>
+      <GuidCName>gPcdPeiCallbackFnTableHobGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -94,13 +94,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdVpdBaseAddress</C_Name>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FEATURE_FLAG">

EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa

@@ -76,10 +76,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Runtime</ProtocolCName>
+      <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.msa

@@ -50,7 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Security</ProtocolCName>
+      <ProtocolCName>gEfiSecurityArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.msa

@@ -81,10 +81,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DebugAssert</ProtocolCName>
+      <ProtocolCName>gEfiDebugAssertProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ExtendedSalStatusCodeServices</ProtocolCName>
+      <ProtocolCName>gEfiExtendedSalStatusCodeServicesProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa

@@ -71,10 +71,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FormCallback</ProtocolCName>
+      <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>
@@ -85,7 +85,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </Variables>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>GlobalVariable</GuidCName>
+      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa

@@ -81,22 +81,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>UgaDraw</ProtocolCName>
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>OEMBadging</ProtocolCName>
+      <ProtocolCName>gEfiOEMBadgingProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolume</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ConsoleControl</ProtocolCName>
+      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>FormCallback</ProtocolCName>
+      <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>
@@ -107,7 +107,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </Variables>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>GlobalVariable</GuidCName>
+      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa

@@ -83,16 +83,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FormCallback</ProtocolCName>
+      <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>FormBrowser</ProtocolCName>
+      <ProtocolCName>gEfiFormBrowserProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Print</ProtocolCName>
+      <ProtocolCName>gEfiPrintProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Events>

EdkModulePkg/Universal/Variable/Pei/Variable.msa

@@ -53,10 +53,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>FlashMap</PpiCName>
+      <PpiCName>gPeiFlashMapPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>ReadOnlyVariable</PpiCName>
+      <PpiCName>gEfiPeiReadOnlyVariablePpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa

@@ -82,51 +82,51 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Variable</ProtocolCName>
+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>VariableWrite</ProtocolCName>
+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FaultTolerantWriteLite</ProtocolCName>
+      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>CpuIo</ProtocolCName>
+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FvbExtension</ProtocolCName>
+      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Variable</ProtocolCName>
+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>VariableWrite</ProtocolCName>
+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FaultTolerantWriteLite</ProtocolCName>
+      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>CpuIo</ProtocolCName>
+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FvbExtension</ProtocolCName>
+      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ExtendedSalBootService</ProtocolCName>
+      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ExtendedSalVariableServices</ProtocolCName>
+      <ProtocolCName>gEfiExtendedSalVariableServicesProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FlashMapHob</GuidCName>
+      <GuidCName>gEfiFlashMapHobGuid</GuidCName>
     </GuidCNames>
     <!--<GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>Hob</GuidCName>
@@ -135,7 +135,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       <GuidCName>SystemNvData</GuidCName>
     </GuidCNames>-->
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>AlternateFvBlock</GuidCName>
+      <GuidCName>gEfiAlternateFvBlockGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.msa

@@ -63,10 +63,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>StatusCode</ProtocolCName>
+      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>WatchdogTimer</ProtocolCName>
+      <ProtocolCName>gEfiWatchdogTimerArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa

@@ -72,13 +72,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>SimpleTextOut</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>SimpleTextIn</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Variables>
@@ -109,19 +109,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </Variables>
   <Guids>
     <GuidCNames Usage="SOMETIMES_PRODUCED">
-      <GuidCName>ConsoleInDevice</GuidCName>
+      <GuidCName>gEfiConsoleInDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_PRODUCED">
-      <GuidCName>ConsoleOutDevice</GuidCName>
+      <GuidCName>gEfiConsoleOutDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_PRODUCED">
-      <GuidCName>StandardErrorDevice</GuidCName>
+      <GuidCName>gEfiStandardErrorDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>HotPlugDevice</GuidCName>
+      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>GlobalVariable</GuidCName>
+      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa

@@ -87,13 +87,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DataHub</ProtocolCName>
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <ProtocolNotify Usage="SOMETIMES_CONSUMED">
-      <ProtocolNotifyCName>WinNtIo</ProtocolNotifyCName>
+      <ProtocolNotifyCName>gEfiWinNtIoProtocolGuid</ProtocolNotifyCName>
     </ProtocolNotify>
   </Protocols>
   <DataHubs>
@@ -139,19 +139,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </DataHubs>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>MiscSubClass</GuidCName>
+      <GuidCName>gEfiMiscSubClassGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>ProcessorSubClass</GuidCName>
+      <GuidCName>gEfiProcessorSubClassGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>MemoryProducer</GuidCName>
+      <GuidCName>gEfiMemoryProducerGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>MemorySubClass</GuidCName>
+      <GuidCName>gEfiMemorySubClassGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>WinNtMemory</GuidCName>
+      <GuidCName>gEfiWinNtMemoryGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa

@@ -127,58 +127,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Bds</ProtocolCName>
+      <ProtocolCName>gEfiBdsArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LegacyBios</ProtocolCName>
+      <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>UgaSplash</ProtocolCName>
+      <ProtocolCName>gEfiUgaSplashProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FormCallback</ProtocolCName>
+      <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DataHub</ProtocolCName>
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FormBrowser</ProtocolCName>
+      <ProtocolCName>gEfiFormBrowserProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>ConsoleControl</ProtocolCName>
+      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>CpuIo</ProtocolCName>
+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>UgaDraw</ProtocolCName>
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadFile</ProtocolCName>
+      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleFileSystem</ProtocolCName>
+      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SerialIo</ProtocolCName>
+      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>GenericMemTest</ProtocolCName>
+      <ProtocolCName>gEfiGenericMemTestProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>Cpu</ProtocolCName>
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>DriverBinding</ProtocolCName>
+      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <DataHubs>
@@ -206,19 +206,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </DataHubs>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>BootState</GuidCName>
+      <GuidCName>gEfiBootStateGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>GlobalVariable</GuidCName>
+      <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FlashMapHob</GuidCName>
+      <GuidCName>gEfiFlashMapHobGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FileSystemVolumeLabelInfoId</GuidCName>
+      <GuidCName>gEfiFileSystemVolumeLabelInfoIdGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FileInfo</GuidCName>
+      <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa

@@ -69,18 +69,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>WinNtIo</ProtocolCName>
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>BlockIo</ProtocolCName>
+      <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtVirtualDisks</GuidCName>
+      <GuidCName>gEfiWinNtVirtualDisksGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>WinNtPhysicalDisks</GuidCName>
+      <GuidCName>gEfiWinNtPhysicalDisksGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa

@@ -69,18 +69,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>WinNtIo</ProtocolCName>
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleTextOut</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleTextIn</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtConsole</GuidCName>
+      <GuidCName>gEfiWinNtConsoleGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa

@@ -70,18 +70,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>WinNtIo</ProtocolCName>
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SerialIo</ProtocolCName>
+      <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtSerialPort</GuidCName>
+      <GuidCName>gEfiWinNtSerialPortGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa

@@ -67,24 +67,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>WinNtIo</ProtocolCName>
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleFileSystem</ProtocolCName>
+      <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtFileSystem</GuidCName>
+      <GuidCName>gEfiWinNtFileSystemGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>FileSystemInfo</GuidCName>
+      <GuidCName>gEfiFileSystemInfoGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>FileInfo</GuidCName>
+      <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>FileSystemVolumeLabelInfoId</GuidCName>
+      <GuidCName>gEfiFileSystemVolumeLabelInfoIdGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa

@@ -69,13 +69,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="TO_START">
-      <ProtocolCName>WinNtIo</ProtocolCName>
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>UgaDraw</ProtocolCName>
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="BY_START">
-      <ProtocolCName>SimpleTextIn</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Events>
@@ -87,7 +87,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </Events>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtUga</GuidCName>
+      <GuidCName>gEfiWinNtUgaGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa

@@ -73,45 +73,45 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="BY_START">
-      <ProtocolCName>WinNtIo</ProtocolCName>
+      <ProtocolCName>gEfiWinNtIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>WinNtThunk</ProtocolCName>
+      <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="TO_START">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>PcdProtocol</ProtocolCName>
+      <ProtocolCName>gPcdProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtVirtualDisks</GuidCName>
+      <GuidCName>gEfiWinNtVirtualDisksGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtPhysicalDisks</GuidCName>
+      <GuidCName>gEfiWinNtPhysicalDisksGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtFileSystem</GuidCName>
+      <GuidCName>gEfiWinNtFileSystemGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtSerialPort</GuidCName>
+      <GuidCName>gEfiWinNtSerialPortGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtUga</GuidCName>
+      <GuidCName>gEfiWinNtUgaGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtConsole</GuidCName>
+      <GuidCName>gEfiWinNtConsoleGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtMemory</GuidCName>
+      <GuidCName>gEfiWinNtMemoryGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtCPUModel</GuidCName>
+      <GuidCName>gEfiWinNtCPUModelGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>WinNtCPUSpeed</GuidCName>
+      <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -128,79 +128,66 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtConsole</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtUga</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtSerialPort</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtFileSystem</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtVirtualDisk</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtPhysicalDisk</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuModel</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuSpeed</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtMemorySize</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdWinNtBinaryPatch1</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdWinNtBinaryPatch2</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FEATURE_FLAG">
       <C_Name>PcdWinNtFeatureFlag1</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtDynamicUINT32</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa

@@ -64,7 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Metronome</ProtocolCName>
+      <ProtocolCName>gEfiMetronomeArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa

@@ -63,7 +63,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>RealTimeClock</ProtocolCName>
+      <ProtocolCName>gEfiRealTimeClockArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa

@@ -63,7 +63,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Reset</ProtocolCName>
+      <ProtocolCName>gEfiResetArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa

@@ -64,10 +64,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Timer</ProtocolCName>
+      <ProtocolCName>gEfiTimerArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>Cpu</ProtocolCName>
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa

@@ -69,19 +69,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>Cpu</ProtocolCName>
+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>CpuIo</ProtocolCName>
+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>Hii</ProtocolCName>
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>DataHub</ProtocolCName>
+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
     <ProtocolNotify Usage="SOMETIMES_CONSUMED">
-      <ProtocolNotifyCName>WinNtIo</ProtocolNotifyCName>
+      <ProtocolNotifyCName>gEfiWinNtIoProtocolGuid</ProtocolNotifyCName>
     </ProtocolNotify>
   </Protocols>
   <DataHubs>
@@ -94,16 +94,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </DataHubs>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>ProcessorProducer</GuidCName>
+      <GuidCName>gEfiProcessorProducerGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>ProcessorSubClass</GuidCName>
+      <GuidCName>gEfiProcessorSubClassGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>WinNtCPUModel</GuidCName>
+      <GuidCName>gEfiWinNtCPUModelGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>WinNtCPUSpeed</GuidCName>
+      <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa

@@ -61,10 +61,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>WinNtThunk</ProtocolCName>
+      <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa

@@ -42,7 +42,7 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>WinNtThunk</ProtocolCName>
+      <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Externs>

EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa

@@ -78,27 +78,27 @@
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>LoadedImage</ProtocolCName>
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolume</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>AcpiS3Save</ProtocolCName>
+      <ProtocolCName>gEfiAcpiS3SaveProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleTextOut</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleTextIn</ProtocolCName>
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>SimpleNetwork</ProtocolCName>
+      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>ShellFile</GuidCName>
+      <GuidCName>gEfiShellFileGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa

@@ -38,7 +38,7 @@
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>NtPeiLoadFile</PpiCName>
+      <PpiCName>gNtPeiLoadFilePpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa

@@ -63,13 +63,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>NtAutoScan</PpiCName>
+      <PpiCName>gPeiNtAutoScanPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>BaseMemoryTest</PpiCName>
+      <PpiCName>gPeiBaseMemoryTestPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>MemoryDiscovered</PpiCName>
+      <PpiCName>gEfiPeiMemoryDiscoveredPpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkNt32Pkg/Pei/BootMode/BootMode.msa

@@ -57,10 +57,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="SOMETIMES_PRODUCED">
-      <PpiCName>BootInRecoveryMode</PpiCName>
+      <PpiCName>gEfiPeiBootInRecoveryModePpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>MasterBootMode</PpiCName>
+      <PpiCName>gEfiPeiMasterBootModePpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa

@@ -57,7 +57,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>NtFwh</PpiCName>
+      <PpiCName>gNtFwhPpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkNt32Pkg/Pei/FlashMap/FlashMap.msa

@@ -60,26 +60,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <PPIs>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>FlashMap</PpiCName>
+      <PpiCName>gPeiFlashMapPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>NtFwh</PpiCName>
+      <PpiCName>gNtFwhPpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FlashMapHob</GuidCName>
+      <GuidCName>gEfiFlashMapHobGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>FirmwareFileSystem</GuidCName>
+      <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>SystemNvDataHob</GuidCName>
+      <GuidCName>gEfiSystemNvDataHobGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa

@@ -55,15 +55,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>StatusCode</ProtocolCName>
+      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <PPIs>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>StatusCode</PpiCName>
+      <PpiCName>gEfiPeiStatusCodePpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="SOMETIMES_CONSUMED">
-      <PpiCName>FvFileLoader</PpiCName>
+      <PpiCName>gEfiPeiFvFileLoaderPpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa

@@ -57,12 +57,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>WinNtThunk</ProtocolCName>
+      <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <PPIs>
     <Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>NtThunk</PpiCName>
+      <PpiCName>gPeiNtThunkPpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Externs>

EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa

@@ -74,13 +74,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>DevicePath</ProtocolCName>
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="SOMETIMES_PRODUCED">
-      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>FvbExtension</ProtocolCName>
+      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
   <Events>
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </Events>
   <Guids>
     <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>AlternateFvBlock</GuidCName>
+      <GuidCName>gEfiAlternateFvBlockGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>

EdkNt32Pkg/Sec/SecMain.msa

@@ -65,24 +65,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>
   <PPIs>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>NtThunk</PpiCName>
+      <PpiCName>gPeiNtThunkPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>NtAutoScan</PpiCName>
+      <PpiCName>gPeiNtAutoScanPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>NtFwh</PpiCName>
+      <PpiCName>gNtFwhPpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>StatusCode</PpiCName>
+      <PpiCName>gEfiPeiStatusCodePpiGuid</PpiCName>
     </Ppi>
     <Ppi Usage="ALWAYS_PRODUCED">
-      <PpiCName>NtPeiLoadFile</PpiCName>
+      <PpiCName>gNtPeiLoadFilePpiGuid</PpiCName>
     </Ppi>
   </PPIs>
   <Guids>
     <GuidCNames Usage="ALWAYS_PRODUCED">
-      <GuidCName>PeiPeCoffLoader</GuidCName>
+      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -93,19 +93,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdWinNtFirmwareVolume</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdWinNtBootMode</C_Name>
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa

@@ -49,7 +49,7 @@
   </PackageDependencies>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>StatusCodeDataTypeDebug</GuidCName>
+      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>
@@ -60,7 +60,6 @@
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-
       <HelpText/>
     </PcdEntry>
   </PcdCoded>

MdePkg/Library/DxeHobLib/DxeHobLib.msa

@@ -43,7 +43,7 @@
   </PackageDependencies>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>HobList</GuidCName>
+      <GuidCName>gEfiHobListGuid</GuidCName>
     </GuidCNames>
   </Guids>
   <Externs>